Issue/540 567 no proxy config, trusted reverse proxies

dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/fhir/authorization/read/ReadAccessHelperImpl.java

@@ -352,10 +352,10 @@ private boolean isValidOrganizationReadAccessTag(Coding coding,
 				.filter(e -> EXTENSION_READ_ACCESS_ORGANIZATION.equals(e.getUrl())).collect(Collectors.toList());
 
 		return coding.hasExtension() && exts.size() == 1
-				&& isValidExtensionReadAccesOrganization(exts.get(0), organizationWithIdentifierExists);
+				&& isValidExtensionReadAccessOrganization(exts.get(0), organizationWithIdentifierExists);
 	}
 
-	private boolean isValidExtensionReadAccesOrganization(Extension extension,
+	private boolean isValidExtensionReadAccessOrganization(Extension extension,
 			Predicate<Identifier> organizationWithIdentifierExists)
 	{
 		return extension.hasValue() && extension.getValue() instanceof Identifier value

dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/fhir/client/AbstractFhirWebserviceClientJerseyWithRetry.java

@@ -65,7 +65,8 @@ else if (nTimes != RetryClient.RETRY_FOREVER)
 					if (tryNumber < nTimes || nTimes == RetryClient.RETRY_FOREVER)
 					{
 						logger.warn("Caught {} - {}; trying again in {}s{}", e.getClass().getName(), e.getMessage(),
-								delay, nTimes == RetryClient.RETRY_FOREVER ? " (retry " + (tryNumber + 1) + ")" : "");
+								delay.toSeconds(),
+								nTimes == RetryClient.RETRY_FOREVER ? " (retry " + (tryNumber + 1) + ")" : "");
 
 						try
 						{

dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/fhir/client/BasicFhirWebserviceCientWithRetryImpl.java → dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/fhir/client/BasicFhirWebserviceClientWithRetryImpl.java

@@ -29,10 +29,10 @@
 
 import jakarta.ws.rs.core.MediaType;
 
-class BasicFhirWebserviceCientWithRetryImpl extends AbstractFhirWebserviceClientJerseyWithRetry
+class BasicFhirWebserviceClientWithRetryImpl extends AbstractFhirWebserviceClientJerseyWithRetry
 		implements BasicFhirWebserviceClient
 {
-	BasicFhirWebserviceCientWithRetryImpl(FhirWebserviceClientJersey delegate, int nTimes, Duration delay)
+	BasicFhirWebserviceClientWithRetryImpl(FhirWebserviceClientJersey delegate, int nTimes, Duration delay)
 	{
 		super(delegate, nTimes, delay);
 	}

dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/fhir/client/FhirWebserviceClientJersey.java

@@ -747,7 +747,7 @@ public BasicFhirWebserviceClient withRetry(int nTimes, long delayMillis)
 		if (delayMillis < 0)
 			throw new IllegalArgumentException("delayMillis < 0");
 
-		return new BasicFhirWebserviceCientWithRetryImpl(this, nTimes, Duration.ofMillis(delayMillis));
+		return new BasicFhirWebserviceClientWithRetryImpl(this, nTimes, Duration.ofMillis(delayMillis));
 	}
 
 	@Override
@@ -756,7 +756,7 @@ public BasicFhirWebserviceClient withRetryForever(long delayMillis)
 		if (delayMillis < 0)
 			throw new IllegalArgumentException("delayMillis < 0");
 
-		return new BasicFhirWebserviceCientWithRetryImpl(this, RETRY_FOREVER, Duration.ofMillis(delayMillis));
+		return new BasicFhirWebserviceClientWithRetryImpl(this, RETRY_FOREVER, Duration.ofMillis(delayMillis));
 	}
 
 	@Override

dsf-bpe/dsf-bpe-process-api-v1-operaton/src/main/java/dev/dsf/bpe/v1/activity/AbstractTaskMessageSend.java

@@ -287,7 +287,7 @@ protected void handleSendTaskError(DelegateExecution execution, Variables variab
 					exception.getMessage());
 		}
 
-		// if we are not a multi instance message send task or all sends have failed (targets emtpy)
+		// if we are not a multi instance message send task or all sends have failed (targets empty)
 		else
 		{
 			logger.debug("Error while executing Task message send {}", getClass().getName(), exception);

dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/activity/AbstractTaskMessageSend.java

@@ -287,7 +287,7 @@ protected void handleSendTaskError(DelegateExecution execution, Variables variab
 					exception.getMessage());
 		}
 
-		// if we are not a multi instance message send task or all sends have failed (targets emtpy)
+		// if we are not a multi instance message send task or all sends have failed (targets empty)
 		else
 		{
 			logger.debug("Error while executing Task message send {}", getClass().getName(), exception);

dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/service/ReadAccessHelperImpl.java

@@ -364,10 +364,10 @@ private boolean isValidOrganizationReadAccessTag(Coding coding,
 				.filter(e -> EXTENSION_READ_ACCESS_ORGANIZATION.equals(e.getUrl())).collect(Collectors.toList());
 
 		return coding.hasExtension() && exts.size() == 1
-				&& isValidExtensionReadAccesOrganization(exts.get(0), organizationWithIdentifierExists);
+				&& isValidExtensionReadAccessOrganization(exts.get(0), organizationWithIdentifierExists);
 	}
 
-	private boolean isValidExtensionReadAccesOrganization(Extension extension,
+	private boolean isValidExtensionReadAccessOrganization(Extension extension,
 			Predicate<Identifier> organizationWithIdentifierExists)
 	{
 		return extension.hasValue() && extension.getValue() instanceof Identifier value

dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/service/process/Role.java

@@ -42,22 +42,22 @@ public class Role implements Recipient, Requester
 	private final String practitionerRoleSystem;
 	private final String practitionerRoleCode;
 
-	public Role(boolean localIdentity, String parentOrganizationIdentifier, String organizatioRoleSystem,
+	public Role(boolean localIdentity, String parentOrganizationIdentifier, String organizationRoleSystem,
 			String organizationRoleCode, String practitionerRoleSystem, String practitionerRoleCode)
 	{
 		Objects.requireNonNull(parentOrganizationIdentifier, "parentOrganizationIdentifier");
 		if (parentOrganizationIdentifier.isBlank())
 			throw new IllegalArgumentException("parentOrganizationIdentifier blank");
-		Objects.requireNonNull(organizatioRoleSystem, "organizatioRoleSystem");
-		if (organizatioRoleSystem.isBlank())
-			throw new IllegalArgumentException("organizatioRoleSystem blank");
+		Objects.requireNonNull(organizationRoleSystem, "organizationRoleSystem");
+		if (organizationRoleSystem.isBlank())
+			throw new IllegalArgumentException("organizationRoleSystem blank");
 		Objects.requireNonNull(organizationRoleCode, "organizationRoleCode");
 		if (organizationRoleCode.isBlank())
 			throw new IllegalArgumentException("organizationRoleCode blank");
 
 		this.localIdentity = localIdentity;
 		this.parentOrganizationIdentifier = parentOrganizationIdentifier;
-		this.organizationRoleSystem = organizatioRoleSystem;
+		this.organizationRoleSystem = organizationRoleSystem;
 		this.organizationRoleCode = organizationRoleCode;
 
 		this.practitionerRoleSystem = practitionerRoleSystem;

dsf-bpe/dsf-bpe-process-api-v2/src/main/java/dev/dsf/bpe/v2/activity/task/BusinessKeyStrategies.java

@@ -36,7 +36,7 @@ public String get(Variables variables, Target target)
 		}
 	},
 	/**
-	 * Generates an alternative buisness-key for the current process instance and uses the alternative when sending Task
+	 * Generates an alternative business-key for the current process instance and uses the alternative when sending Task
 	 * resources.
 	 * <p>
 	 * This can be used to hide the current business-key from the target, but allows the target to reply using the send
@@ -66,7 +66,6 @@ public String get(Variables variables, Target target)
 		{
 			return createBusinessKey();
 		}
-
 	};
 
 	private static String createBusinessKey()

dsf-bpe/dsf-bpe-process-api-v2/src/main/java/dev/dsf/bpe/v2/service/CryptoService.java

@@ -326,7 +326,7 @@ default PrivateKey readPrivateKey(Path pem, char[] password) throws IOException
 	/**
 	 * @param certificate
 	 *            not <code>null</code>
-	 * @return <code>true</code> if the given <b>certificate</b> not-after field is after {@link ZonedDateTime#now()}
+	 * @return <code>true</code> if {@link ZonedDateTime#now()} is after the given <b>certificate</b>s not-after field
 	 */
 	boolean isCertificateExpired(X509Certificate certificate);
 

dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/AbstractProcessPlugin.java

@@ -243,9 +243,9 @@ public boolean isDefaultUserTaskListenerOrSuperClassOf(String className)
 		}
 		catch (BeansException | ClassNotFoundException | ClassCastException e)
 		{
-			logger.debug("Unable check if {} is super class of {}", className,
-					getDefaultUserTaskListenerClass().getName(), e);
-			logger.warn("Unable check if {} is super class of {}: {} - {}", className,
+			logger.debug("Unable check if {} is subclass of {}", className, getDefaultUserTaskListenerClass().getName(),
+					e);
+			logger.warn("Unable check if {} is subclass of {}: {} - {}", className,
 					getDefaultUserTaskListenerClass().getName(), e.getClass().getName(), e.getMessage());
 
 			throw new RuntimeException(e);
@@ -759,8 +759,8 @@ private boolean isValid(BpmnFileAndModel fileAndModel)
 		if (!getDefinitionResourceVersion().equals(processKeyAndVersion.getVersion()))
 		{
 			logger.warn(
-					"Operaton version tag of process in '{}' does not match process plugin version (tag: {} vs. plugin: {})",
-					fileAndModel.file(), processKeyAndVersion.getVersion(), getDefinitionVersion());
+					"Operaton version tag of process in '{}' does not match process plugin resource version (tag: {} vs. plugin: {})",
+					fileAndModel.file(), processKeyAndVersion.getVersion(), getDefinitionResourceVersion());
 			return false;
 		}
 		if (!PROCESS_ID_PATTERN.matcher(processKeyAndVersion.getId()).matches())
@@ -1113,10 +1113,10 @@ else if (fhirConfig.isValueSet(resource))
 		};
 	}
 
-	private boolean isValidMetadataResouce(Object resource, String file)
+	private boolean isValidMetadataResource(Object resource, String file)
 	{
 		boolean urlOk = fhirConfig.hasMetadataResourceUrl(resource);
-		boolean versionDefined = fhirConfig.hasMetadataresourceVersion(resource);
+		boolean versionDefined = fhirConfig.hasMetadataResourceVersion(resource);
 		boolean versionOk = versionDefined && fhirConfig.getMetadataResourceVersion(resource)
 				.map(v -> v.equals(getDefinitionResourceVersion())).orElse(false);
 
@@ -1158,7 +1158,7 @@ private boolean hasProfile(String file, Object resource, String profile)
 	private boolean isValidActivityDefinition(String file, Object resource)
 	{
 		boolean hasProfile = hasProfile(file, resource, P_ACTIVITY_DEFINITION);
-		boolean metadataResourceOk = isValidMetadataResouce(resource, file);
+		boolean metadataResourceOk = isValidMetadataResource(resource, file);
 		boolean urlOk = fhirConfig.getActivityDefinitionUrl(resource)
 				.map(u -> ACTIVITY_DEFINITION_URL_PATTERN.matcher(u).matches()).orElse(false);
 
@@ -1173,17 +1173,17 @@ private boolean isValidActivityDefinition(String file, Object resource)
 
 	private boolean isValidCodeSystem(String file, Object resource)
 	{
-		return hasProfile(file, resource, P_CODE_SYSTEM) && isValidMetadataResouce(resource, file);
+		return hasProfile(file, resource, P_CODE_SYSTEM) && isValidMetadataResource(resource, file);
 	}
 
 	private boolean isValidLibrary(String file, Object resource)
 	{
-		return hasProfile(file, resource, P_LIBRARY) && isValidMetadataResouce(resource, file);
+		return hasProfile(file, resource, P_LIBRARY) && isValidMetadataResource(resource, file);
 	}
 
 	private boolean isValidMeasure(String file, Object resource)
 	{
-		return hasProfile(file, resource, P_MEASURE) && isValidMetadataResouce(resource, file);
+		return hasProfile(file, resource, P_MEASURE) && isValidMetadataResource(resource, file);
 	}
 
 	private boolean isValidNamingSystem(String file, Object resource)
@@ -1211,7 +1211,7 @@ private boolean isValidQuestionnaire(String file, Object resource)
 					file, getDefinitionName(), getDefinitionVersion());
 		}
 
-		return hasProfile && hasQuestionnaireItemsWithRequired && isValidMetadataResouce(resource, file);
+		return hasProfile && hasQuestionnaireItemsWithRequired && isValidMetadataResource(resource, file);
 	}
 
 	private boolean isValidStructureDefinition(String file, Object resource)
@@ -1237,7 +1237,7 @@ private boolean isValidStructureDefinition(String file, Object resource)
 		}
 
 		return hasProfile && hasStructureDefinitionTaskDsfValueSetBindingsWithoutVersion && baseDefinitionOk
-				&& isValidMetadataResouce(resource, file);
+				&& isValidMetadataResource(resource, file);
 	}
 
 	private boolean isValidTask(String file, Object resource, String localOrganizationIdentifierValue)
@@ -1378,7 +1378,7 @@ private boolean isLocalOrganization(Reference reference, String refLocation, Str
 
 	private boolean isValidValueSet(String file, Object resource)
 	{
-		return hasProfile(file, resource, P_VALUE_SET) && isValidMetadataResouce(resource, file);
+		return hasProfile(file, resource, P_VALUE_SET) && isValidMetadataResource(resource, file);
 	}
 
 	private List<BpmnFileAndModel> filterBpmnModelsWithoutMatchingActivityDefinitions(

dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/ProcessPluginFhirConfig.java

@@ -54,7 +54,7 @@ public static final record Reference(Optional<String> system, Optional<String> v
 	private final Function<Object, byte[]> encodeResource;
 	private final Function<Object, Optional<String>> getResourceName;
 
-	private final Predicate<Object> hasMetadataresourceVersion;
+	private final Predicate<Object> hasMetadataResourceVersion;
 	private final Predicate<Object> hasMetadataResourceUrl;
 	private final Function<Object, Optional<String>> getMetadataResourceVersion;
 
@@ -137,7 +137,7 @@ public ProcessPluginFhirConfig(Class<R> resourceClass, Class<A> activityDefiniti
 		this.getResourceName = getResourceName;
 
 		this.hasMetadataResourceUrl = hasMetadataResourceUrl;
-		this.hasMetadataresourceVersion = hasMetadataResourceVersion;
+		this.hasMetadataResourceVersion = hasMetadataResourceVersion;
 		this.getMetadataResourceVersion = getMetadataResourceVersion;
 
 		this.getActivityDefinitionUrl = getActivityDefinitionUrl;
@@ -284,9 +284,9 @@ public boolean hasMetadataResourceUrl(Object metadataResource)
 		return isMetadataResource(metadataResource) && hasMetadataResourceUrl.test(metadataResource);
 	}
 
-	public boolean hasMetadataresourceVersion(Object metadataResource)
+	public boolean hasMetadataResourceVersion(Object metadataResource)
 	{
-		return isMetadataResource(metadataResource) && hasMetadataresourceVersion.test(metadataResource);
+		return isMetadataResource(metadataResource) && hasMetadataResourceVersion.test(metadataResource);
 	}
 
 	public Optional<String> getMetadataResourceVersion(Object metadataResource)

dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/client/dsf/BasicWebserviceCientWithRetryImpl.java → dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/client/dsf/BasicWebserviceClientWithRetryImpl.java

@@ -22,9 +22,10 @@
 import org.hl7.fhir.r4.model.Bundle;
 import org.hl7.fhir.r4.model.Resource;
 
-class BasicWebserviceCientWithRetryImpl extends AbstractWebserviceClientJerseyWithRetry implements BasicWebserviceClient
+class BasicWebserviceClientWithRetryImpl extends AbstractWebserviceClientJerseyWithRetry
+		implements BasicWebserviceClient
 {
-	BasicWebserviceCientWithRetryImpl(WebserviceClientJersey delegate, int nTimes, Duration delayMillis)
+	BasicWebserviceClientWithRetryImpl(WebserviceClientJersey delegate, int nTimes, Duration delayMillis)
 	{
 		super(delegate, nTimes, delayMillis);
 	}

dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/client/dsf/WebserviceClientJersey.java

@@ -190,7 +190,7 @@ PreferReturn create(PreferReturnType returnType, Resource resource)
 			throw handleError(response);
 	}
 
-	PreferReturn createConditionaly(PreferReturnType returnType, Resource resource, String ifNoneExistCriteria)
+	PreferReturn createConditionally(PreferReturnType returnType, Resource resource, String ifNoneExistCriteria)
 	{
 		Objects.requireNonNull(returnType, "returnType");
 		Objects.requireNonNull(resource, "resource");
@@ -253,7 +253,7 @@ PreferReturn update(PreferReturnType returnType, Resource resource)
 			throw handleError(response);
 	}
 
-	PreferReturn updateConditionaly(PreferReturnType returnType, Resource resource, Map<String, List<String>> criteria)
+	PreferReturn updateConditionally(PreferReturnType returnType, Resource resource, Map<String, List<String>> criteria)
 	{
 		Objects.requireNonNull(returnType, "returnType");
 		Objects.requireNonNull(resource, "resource");
@@ -364,7 +364,7 @@ public BasicWebserviceClient withRetry(int nTimes, Duration delay)
 		if (delay == null || delay.isNegative())
 			throw new IllegalArgumentException("delay null or negative");
 
-		return new BasicWebserviceCientWithRetryImpl(this, nTimes, delay);
+		return new BasicWebserviceClientWithRetryImpl(this, nTimes, delay);
 	}
 
 	@Override
@@ -373,6 +373,6 @@ public BasicWebserviceClient withRetryForever(Duration delay)
 		if (delay == null || delay.isNegative())
 			throw new IllegalArgumentException("delay null or negative");
 
-		return new BasicWebserviceCientWithRetryImpl(this, RETRY_FOREVER, delay);
+		return new BasicWebserviceClientWithRetryImpl(this, RETRY_FOREVER, delay);
 	}
 }

dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/config/FhirClientConfigYaml.java

@@ -399,6 +399,7 @@ public OidcAuth(@JsonProperty(OidcAuth.PROPERTY_BASE_URL) String baseUrl,
 			this.verifyAuthorizedParty = verifyAuthorizedParty;
 		}
 
+		@Override
 		public String baseUrl()
 		{
 			if (baseUrl != null && baseUrl.endsWith("/"))
@@ -407,6 +408,7 @@ public String baseUrl()
 				return baseUrl;
 		}
 
+		@Override
 		public String discoveryPath()
 		{
 			if (discoveryPath != null && !discoveryPath.startsWith("/"))
@@ -508,6 +510,7 @@ public FhirClientConfigYaml(@JsonProperty(FhirClientConfigYaml.PROPERTY_BASE_URL
 		this.oidcAuth = oidcAuth;
 	}
 
+	@Override
 	public String baseUrl()
 	{
 		if (baseUrl != null && baseUrl.endsWith("/"))

dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/engine/DelegateProviderImpl.java

@@ -192,7 +192,7 @@ private void stopProcess(ProcessIdAndVersion processIdAndVersion, DelegateExecut
 
 		try
 		{
-			searchInProgessTasks(execution.getBusinessKey()).forEach(task ->
+			searchInProgressTasks(execution.getBusinessKey()).forEach(task ->
 			{
 				try
 				{
@@ -226,15 +226,15 @@ private void stopProcess(ProcessIdAndVersion processIdAndVersion, DelegateExecut
 				"Plugin for process " + processIdAndVersion + " not found");
 	}
 
-	protected final Stream<Task> searchInProgessTasks(String businessKey)
+	protected final Stream<Task> searchInProgressTasks(String businessKey)
 	{
 		List<Stream<BundleEntryComponent>> resources = new ArrayList<>();
 
 		boolean hasMore = true;
 		int page = 1;
 		while (hasMore)
 		{
-			Bundle resultBundle = searchInProgessTasks(page++);
+			Bundle resultBundle = searchInProgressTasks(page++);
 
 			resources.add(resultBundle.getEntry().stream().filter(BundleEntryComponent::hasSearch)
 					.filter(BundleEntryComponent::hasResource));
@@ -248,7 +248,7 @@ protected final Stream<Task> searchInProgessTasks(String businessKey)
 				.filter(r -> r instanceof Task).map(r -> (Task) r).filter(hasBusinessKey(businessKey));
 	}
 
-	private Bundle searchInProgessTasks(int page)
+	private Bundle searchInProgressTasks(int page)
 	{
 		// TODO add business-key custom search parameter to FHIR server
 

dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/engine/MultiVersionBpmnParse.java

@@ -133,7 +133,7 @@ protected TaskListener parseTaskListener(Element taskListenerElement, String tas
 		else
 		{
 			TaskListener taskListener = super.parseTaskListener(taskListenerElement, taskElementId);
-			logger.debug("Not modifying {} in BPMN element with id '{}", taskListener.getClass().getName(),
+			logger.debug("Not modifying {} in BPMN element with id '{}'", taskListener.getClass().getName(),
 					getElementId(taskListenerElement));
 			return taskListener;
 		}
@@ -149,7 +149,7 @@ public ExecutionListener parseExecutionListener(Element executionListenerElement
 			List<FieldDeclaration> fieldDeclarations = parseFieldDeclarations(executionListenerElement);
 
 			logger.debug("Modifying {} for {} in BPMN element with id '{}'",
-					MultiVersionClassDelegateTaskListener.class.getName(), className,
+					MultiVersionClassDelegateExecutionListener.class.getName(), className,
 					getElementId(executionListenerElement));
 			return new MultiVersionClassDelegateExecutionListener(className, fieldDeclarations, delegateProvider);
 		}