Merge remote-tracking branch

'origin/issue/122_ValidationForwarding_Proxy_Config' into develop
num-codex · Mar 25, 2024 · 7e2e2b5 · 7e2e2b5
2 parents bd453a8 + 092537f
commit 7e2e2b5
Show file tree

Hide file tree

Showing 26 changed files with 83 additions and 104 deletions.
diff --git a/...erk_universitaetsmedizin/codex/processes/data_transfer/client/DataStoreClientFactory.java b/...erk_universitaetsmedizin/codex/processes/data_transfer/client/DataStoreClientFactory.java
@@ -155,11 +155,10 @@ public void testConnection()
 		{
 			logger.info(
 					"Testing connection to Data Store FHIR server with {trustStorePath: {}, certificatePath: {}, privateKeyPath: {}, privateKeyPassword: {},"
-							+ " basicAuthUsername {}, basicAuthPassword {}, bearerToken {}, serverBase: {}, proxyUrl {}, proxyUsername, proxyPassword {}}",
+							+ " basicAuthUsername: {}, basicAuthPassword: {}, bearerToken: {}, serverBase: {}, proxy: values from 'DEV_DSF_PROXY'... config}",
 					trustStorePath, certificatePath, privateKeyPath, privateKeyPassword != null ? "***" : "null",
 					dataStoreServerBasicAuthUsername, dataStoreServerBasicAuthPassword != null ? "***" : "null",
-					dataStoreServerBearerToken != null ? "***" : "null", dataStoreServerBase, proxyUrl, proxyUsername,
-					proxyPassword != null ? "***" : "null");
+					dataStoreServerBearerToken != null ? "***" : "null", dataStoreServerBase);
 
 			getDataStoreClient().testConnection();
 		}

diff --git a/...tzwerk_universitaetsmedizin/codex/processes/data_transfer/client/DataStoreClientImpl.java b/...tzwerk_universitaetsmedizin/codex/processes/data_transfer/client/DataStoreClientImpl.java
@@ -81,8 +81,7 @@ private void configureProxy(IRestfulClientFactory clientFactory, String proxyUrl
 				clientFactory.setProxy(url.getHost(), url.getPort());
 				clientFactory.setProxyCredentials(proxyUsername, proxyPassword);
 
-				logger.info("Using proxy for data FHIR server connection with {host: {}, port: {}, username: {}}",
-						url.getHost(), url.getPort(), proxyUsername);
+				logger.info("Using proxy for data FHIR server connection with values from 'DEV_DSF_PROXY'... config");
 			}
 			catch (MalformedURLException e)
 			{

diff --git a/...netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/FttpClientFactory.java b/...netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/FttpClientFactory.java
@@ -154,11 +154,10 @@ public void testConnection()
 		{
 			logger.info(
 					"Testing connection to fTTP with {trustStorePath: {}, certificatePath: {}, privateKeyPath: {}, privateKeyPassword: {},"
-							+ " basicAuthUsername: {}, basicAuthPassword: {}, serverBase: {}, apiKey: {}, study: {}, target: {}, proxyUrl: {}, proxyUsername: {}, proxyPassword: {}}",
+							+ " basicAuthUsername: {}, basicAuthPassword: {}, serverBase: {}, apiKey: {}, study: {}, target: {}, proxy: values from 'DEV_DSF_PROXY'... config}",
 					trustStorePath, certificatePath, privateKeyPath, privateKeyPassword != null ? "***" : "null",
 					fttpBasicAuthUsername, fttpBasicAuthPassword != null ? "***" : "null", fttpServerBase,
-					fttpApiKey != null ? "***" : "null", fttpStudy, fttpTarget, proxyUrl, proxyUsername,
-					proxyPassword != null ? "***" : "null");
+					fttpApiKey != null ? "***" : "null", fttpStudy, fttpTarget);
 
 			getFttpClient().testConnection();
 		}

diff --git a/...de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/FttpClientImpl.java b/...de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/FttpClientImpl.java
@@ -101,8 +101,7 @@ private void configureProxy(IRestfulClientFactory clientFactory, String proxyUrl
 				clientFactory.setProxy(url.getHost(), url.getPort());
 				clientFactory.setProxyCredentials(proxyUsername, proxyPassword);
 
-				logger.info("Using proxy for fTTP connection with {host: {}, port: {}, username: {}}", url.getHost(),
-						url.getPort(), proxyUsername);
+				logger.info("Using proxy for fTTP connection with values from 'DEV_DSF_PROXY'... config");
 			}
 			catch (MalformedURLException e)
 			{

diff --git a/...ersitaetsmedizin/codex/processes/data_transfer/client/fhir/AbstractComplexFhirClient.java b/...ersitaetsmedizin/codex/processes/data_transfer/client/fhir/AbstractComplexFhirClient.java
@@ -66,7 +66,7 @@ else if (resource instanceof Encounter e)
 			e.setSubject(patientRef);
 		else if (resource instanceof Immunization i)
 			i.setPatient(patientRef);
-		else if (resource instanceof Medication m)
+		else if (resource instanceof Medication)
 			; // nothing to do
 		else if (resource instanceof MedicationAdministration ma)
 			ma.setSubject(patientRef);
@@ -94,7 +94,7 @@ else if (resource instanceof Encounter e)
 			return Optional.of(e.getSubject());
 		else if (resource instanceof Immunization i)
 			return Optional.of(i.getPatient());
-		else if (resource instanceof Medication m)
+		else if (resource instanceof Medication)
 			return Optional.empty();
 		else if (resource instanceof MedicationAdministration ma)
 			return Optional.of(ma.getSubject());
@@ -198,8 +198,8 @@ protected Optional<Patient> findPatientInLocalFhirStore(String pseudonym)
 		}
 		catch (Exception e)
 		{
-			logger.warn("Error while searching for Patient with pseudonym " + NAMING_SYSTEM_NUM_CODEX_CRR_PSEUDONYM
-					+ "|" + pseudonym, e);
+			logger.warn("Error while searching for Patient with pseudonym {}|{}", NAMING_SYSTEM_NUM_CODEX_CRR_PSEUDONYM,
+					pseudonym, e);
 			throw e;
 		}
 	}

diff --git a/...rk_universitaetsmedizin/codex/processes/data_transfer/client/fhir/AbstractFhirClient.java b/...rk_universitaetsmedizin/codex/processes/data_transfer/client/fhir/AbstractFhirClient.java
@@ -636,7 +636,7 @@ public Optional<Patient> getPatient(String reference)
 				logger.warn("Patient {} not found: {} - {}", reference, e.getClass().getName(), e.getMessage());
 
 				if (logger.isDebugEnabled())
-					logger.debug("Error while reading patient " + reference, e);
+					logger.debug("Error while reading patient {}", reference, e);
 
 				return Optional.empty();
 			}
@@ -684,7 +684,7 @@ public void updatePatient(Patient patient)
 		}
 		catch (Exception e)
 		{
-			logger.warn("Could not update patient " + id, e);
+			logger.warn("Could not update patient {}", id, e);
 			throw e;
 		}
 	}

diff --git a/...werk_universitaetsmedizin/codex/processes/data_transfer/client/fhir/FhirBridgeClient.java b/...werk_universitaetsmedizin/codex/processes/data_transfer/client/fhir/FhirBridgeClient.java
@@ -167,7 +167,7 @@ private Optional<Patient> update(Patient existingPatient, Patient newPatient, St
 		}
 		catch (Exception e)
 		{
-			logger.warn("Could not update patient " + newPatient.getIdElement().toString(), e);
+			logger.warn("Could not update patient {}", newPatient.getIdElement().toString(), e);
 			throw e;
 		}
 	}
@@ -230,7 +230,7 @@ private Optional<Patient> create(Patient newPatient, String pseudonym, String bu
 		}
 		catch (Exception e)
 		{
-			logger.warn("Could not create patient " + newPatient.getIdElement().toString(), e);
+			logger.warn("Could not create patient {}", newPatient.getIdElement().toString(), e);
 			throw e;
 		}
 	}
@@ -318,7 +318,7 @@ private Optional<Resource> findResourceInLocalFhirStore(String url, Class<? exte
 		}
 		catch (Exception e)
 		{
-			logger.warn("Error while searching for Resource with url " + url, e);
+			logger.warn("Error while searching for Resource with url {}", url, e);
 			throw e;
 		}
 	}
@@ -426,8 +426,8 @@ else if (outcome.getOperationOutcome() != null && outcome.getOperationOutcome()
 		}
 		catch (Exception e)
 		{
-			logger.warn("Count not update " + newResource.getResourceType().name() + " "
-					+ newResource.getIdElement().toString(), e);
+			logger.warn("Count not update {} {}", newResource.getResourceType().name(),
+					newResource.getIdElement().toString(), e);
 			throw e;
 		}
 	}
@@ -497,8 +497,8 @@ else if (outcome.getOperationOutcome() != null && outcome.getOperationOutcome()
 		}
 		catch (Exception e)
 		{
-			logger.warn("Could not create " + newResource.getResourceType().name() + " "
-					+ newResource.getIdElement().toString(), e);
+			logger.warn("Could not create {} {}", newResource.getResourceType().name(),
+					newResource.getIdElement().toString(), e);
 			throw e;
 		}
 	}

diff --git a/...zwerk_universitaetsmedizin/codex/processes/data_transfer/service/receive/DecryptData.java b/...zwerk_universitaetsmedizin/codex/processes/data_transfer/service/receive/DecryptData.java
@@ -67,7 +67,7 @@ protected void doExecute(DelegateExecution execution, Variables variables) throw
 		catch (InvalidKeyException | BadPaddingException | IllegalBlockSizeException | NoSuchPaddingException
 				| NoSuchAlgorithmException | InvalidAlgorithmParameterException | IOException e)
 		{
-			logger.warn("Unable to decrypt data from DIC: " + e.getMessage(), e);
+			logger.warn("Unable to decrypt data from DIC: {}", e.getMessage(), e);
 			throw new BpmnError(CODESYSTEM_NUM_CODEX_DATA_TRANSFER_ERROR_VALUE_DECRYPTION_OF_DATA_FROM_DIC_FAILED,
 					"Error while decrypting data from DIC");
 		}

diff --git a/...iversitaetsmedizin/codex/processes/data_transfer/service/receive/DownloadDataFromDts.java b/...iversitaetsmedizin/codex/processes/data_transfer/service/receive/DownloadDataFromDts.java
@@ -44,7 +44,7 @@ protected void doExecute(DelegateExecution execution, Variables variables) throw
 		}
 		catch (Exception e)
 		{
-			logger.warn("Error while reading Binary resoruce: " + e.getMessage(), e);
+			logger.warn("Error while reading Binary resoruce: {}", e.getMessage(), e);
 
 			throw new BpmnError(
 					CODESYSTEM_NUM_CODEX_DATA_TRANSFER_ERROR_VALUE_DOWNLOAD_OF_ENCRYPTED_DATA_FROM_DTS_FAILED,

diff --git a/...rsitaetsmedizin/codex/processes/data_transfer/service/receive/EncryptValidationError.java b/...rsitaetsmedizin/codex/processes/data_transfer/service/receive/EncryptValidationError.java
@@ -58,7 +58,7 @@ protected void doExecute(DelegateExecution execution, Variables variables) throw
 				| InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException
 				| ShortBufferException e)
 		{
-			logger.warn("Unable to encrypt validation error for DIC: " + e.getMessage(), e);
+			logger.warn("Unable to encrypt validation error for DIC: {}", e.getMessage(), e);
 			throw new BpmnError(
 					CODESYSTEM_NUM_CODEX_DATA_TRANSFER_ERROR_VALUE_ECRYPTION_OF_VALIDATION_ERROR_FOR_DIC_FAILED,
 					"Unable to encrypt validation error for DIC");

diff --git a/...aetsmedizin/codex/processes/data_transfer/service/receive/StoreValidationErrorForDts.java b/...aetsmedizin/codex/processes/data_transfer/service/receive/StoreValidationErrorForDts.java
@@ -76,7 +76,7 @@ private IdType createBinaryResource(Binary binary)
 		catch (Exception e)
 		{
 			dataLogger.logData("Binary to create", binary);
-			logger.warn("Error while creating Binary resource: " + e.getMessage(), e);
+			logger.warn("Error while creating Binary resource: {}", e.getMessage(), e);
 
 			throw new BpmnError(
 					CODESYSTEM_NUM_CODEX_DATA_TRANSFER_ERROR_VALUE_UNABLE_TO_STORE_ECRYPTED_VALIDATION_ERROR,

diff --git a/...aetsmedizin/codex/processes/data_transfer/service/send/DecryptValidationErrorFromDts.java b/...aetsmedizin/codex/processes/data_transfer/service/send/DecryptValidationErrorFromDts.java
@@ -49,7 +49,7 @@ protected void doExecute(DelegateExecution execution, Variables variables) throw
 		catch (InvalidKeyException | NoSuchAlgorithmException | NoSuchPaddingException
 				| InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException | IOException e)
 		{
-			logger.warn("Unable to decrypt validation error from CRR: " + e.getMessage(), e);
+			logger.warn("Unable to decrypt validation error from CRR: {}", e.getMessage(), e);
 			throw new BpmnError(
 					CODESYSTEM_NUM_CODEX_DATA_TRANSFER_ERROR_VALUE_DECRYPTION_OF_VALIDATION_ERROR_FROM_CRR_FAILED,
 					"Error while decrypting validation error from CRR");

diff --git a/...etsmedizin/codex/processes/data_transfer/service/send/DownloadValidationErrorFromDts.java b/...etsmedizin/codex/processes/data_transfer/service/send/DownloadValidationErrorFromDts.java
@@ -57,7 +57,7 @@ protected void doExecute(DelegateExecution execution, Variables variables) throw
 		}
 		catch (Exception e)
 		{
-			logger.warn("Error while reading Binary resoruce: " + e.getMessage(), e);
+			logger.warn("Error while reading Binary resoruce: {}", e.getMessage(), e);
 
 			throw new BpmnError(
 					CODESYSTEM_NUM_CODEX_DATA_TRANSFER_ERROR_VALUE_DOWNLOAD_OF_ENCRYPTED_VALIDATION_ERROR_FROM_DTS_FAILED,

diff --git a/...netzwerk_universitaetsmedizin/codex/processes/data_transfer/service/send/EncryptData.java b/...netzwerk_universitaetsmedizin/codex/processes/data_transfer/service/send/EncryptData.java
@@ -88,7 +88,7 @@ protected void doExecute(DelegateExecution execution, dev.dsf.bpe.v1.variables.V
 				| InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException
 				| ShortBufferException | IOException e)
 		{
-			logger.warn("Unable to encrypt data for CRR: " + e.getMessage(), e);
+			logger.warn("Unable to encrypt data for CRR: {}", e.getMessage(), e);
 			throw new BpmnError(CODESYSTEM_NUM_CODEX_DATA_TRANSFER_ERROR_VALUE_ECRYPTION_OF_DATA_FOR_CRR_FAILED,
 					"Unable to encrypt data for CRR");
 		}

diff --git a/...de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/service/send/ReadData.java b/...de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/service/send/ReadData.java
@@ -372,21 +372,22 @@ private <R extends DomainResource, C> R fixReferenceFromComponents(R resource, M
 						&& uuidsById.containsKey(oldReference.getReference()))
 				{
 					logger.debug(
-							"Replacing reference at " + path
-									+ " from resource {} with bundle temporary id in transport bundle",
-							i, getAbsoluteId(resource).getValue());
+							"Replacing reference at {}[{}] from resource {} with bundle temporary id in transport bundle",
+							path, i, getAbsoluteId(resource).getValue());
 					setReference.apply(component, new Reference(uuidsById.get(oldReference.getReference())));
 				}
 				else if ((oldReference.hasReference() && oldReference.getReference() == null
 						&& oldReference.getReferenceElement_()
 								.hasExtension("http://hl7.org/fhir/StructureDefinition/data-absent-reason"))
 						|| oldReference.hasExtension("http://hl7.org/fhir/StructureDefinition/data-absent-reason"))
 				{
-					logger.debug("Not removing empty reference at " + path + " with data-absent-reason extension", i);
+					logger.debug(
+							"Not removing empty reference at {}[{}] with data-absent-reason extension from resource {} in transport bundle",
+							path, i, getAbsoluteId(resource).getValue());
 				}
 				else
 				{
-					logger.warn("Removing reference at " + path + " from resource {} in transport bundle", i,
+					logger.warn("Removing reference at {}[{}] from resource {} in transport bundle", path, i,
 							getAbsoluteId(resource).getValue());
 					setReference.apply(component, null);
 				}
@@ -454,7 +455,7 @@ private <R extends DomainResource, C> void cleanUnsupportedReferenceFromComponen
 				C component = components.get(i);
 				if (hasReference.apply(component))
 				{
-					logger.warn("Removing reference at " + path + " from resource {} in transport bundle", i,
+					logger.warn("Removing reference at {}[{}] from resource {} in transport bundle", path, i,
 							getAbsoluteId(resource).getValue());
 					setReference.apply(component, null);
 				}
@@ -471,7 +472,7 @@ private <R extends DomainResource, C> void cleanUnsupportedReferenceFromComponen
 			C component = getComponents.apply(resource);
 			if (hasReference.apply(component))
 			{
-				logger.warn("Removing reference at " + path + " from resource {} in transport bundle",
+				logger.warn("Removing reference at {} from resource {} in transport bundle", path,
 						getAbsoluteId(resource).getValue());
 				setReference.apply(component, null);
 			}
@@ -490,7 +491,7 @@ private <R extends DomainResource, C> void cleanUnsupportedReferencesFromCompone
 				C component = components.get(i);
 				if (hasReferences.apply(component))
 				{
-					logger.warn("Removing references at " + path + " from resource {} in transport bundle", i,
+					logger.warn("Removing references at {}[{}] from resource {} in transport bundle", path, i,
 							getAbsoluteId(resource).getValue());
 					setReferences.apply(component, null);
 				}
@@ -514,7 +515,7 @@ private <R extends DomainResource, C1, C2> void cleanUnsupportedReferencesFromCo
 					C2 component2 = components2.get(i);
 					if (hasReference.apply(component2))
 					{
-						logger.warn("Removing reference at " + path + "[{}] from resource {} in transport bundle", i,
+						logger.warn("Removing reference at {}[{}] from resource {} in transport bundle", path, i,
 								getAbsoluteId(resource).getValue());
 						setReference.apply(component2, null);
 					}

diff --git a/...werk_universitaetsmedizin/codex/processes/data_transfer/service/send/StoreDataForDts.java b/...werk_universitaetsmedizin/codex/processes/data_transfer/service/send/StoreDataForDts.java
@@ -76,7 +76,7 @@ private IdType createBinaryResource(Binary binary)
 		catch (Exception e)
 		{
 			dataLogger.logData("Binary to create", binary);
-			logger.warn("Error while creating Binary resource: " + e.getMessage(), e);
+			logger.warn("Error while creating Binary resource: {}", e.getMessage(), e);
 
 			throw new BpmnError(CODESYSTEM_NUM_CODEX_DATA_TRANSFER_ERROR_VALUE_UNABLE_TO_STORE_ECRYPTED_DATA,
 					"Unable to create Binary resource with encrypted data for DTS in local DSF FHIR server");

diff --git a/...ersitaetsmedizin/codex/processes/data_transfer/service/translate/DownloadDataFromDic.java b/...ersitaetsmedizin/codex/processes/data_transfer/service/translate/DownloadDataFromDic.java
@@ -52,7 +52,7 @@ protected void doExecute(DelegateExecution execution, Variables variables) throw
 		}
 		catch (Exception e)
 		{
-			logger.warn("Error while reading Binary resoruce: " + e.getMessage(), e);
+			logger.warn("Error while reading Binary resoruce: {}", e.getMessage(), e);
 
 			throw new BpmnError(
 					CODESYSTEM_NUM_CODEX_DATA_TRANSFER_ERROR_VALUE_DOWNLOAD_OF_ENCRYPTED_DATA_FROM_DIC_FAILED,

diff --git a/...dizin/codex/processes/data_transfer/service/translate/DownloadValidationErrorFromCrr.java b/...dizin/codex/processes/data_transfer/service/translate/DownloadValidationErrorFromCrr.java
@@ -44,7 +44,7 @@ protected void doExecute(DelegateExecution execution, Variables variables) throw
 		}
 		catch (Exception e)
 		{
-			logger.warn("Error while reading Binary resoruce: " + e.getMessage(), e);
+			logger.warn("Error while reading Binary resoruce: {}", e.getMessage(), e);
 
 			throw new BpmnError(
 					CODESYSTEM_NUM_CODEX_DATA_TRANSFER_ERROR_VALUE_DOWNLOAD_OF_ENCRYTPED_VALIDATION_ERROR_FROM_CRR_FAILED,

diff --git a/...universitaetsmedizin/codex/processes/data_transfer/service/translate/StoreDataForCrr.java b/...universitaetsmedizin/codex/processes/data_transfer/service/translate/StoreDataForCrr.java
@@ -76,7 +76,7 @@ private IdType createBinaryResource(Binary binary)
 		catch (Exception e)
 		{
 			dataLogger.logData("Binary to create", binary);
-			logger.warn("Error while creating Binary resource: " + e.getMessage(), e);
+			logger.warn("Error while creating Binary resource: {}", e.getMessage(), e);
 
 			throw new BpmnError(CODESYSTEM_NUM_CODEX_DATA_TRANSFER_ERROR_VALUE_UNABLE_TO_STORE_ECRYPTED_DATA,
 					"Unable to create Binary resource with encrypted data for CRR in local DSF FHIR server");

diff --git a/...tsmedizin/codex/processes/data_transfer/service/translate/StoreValidationErrorForDic.java b/...tsmedizin/codex/processes/data_transfer/service/translate/StoreValidationErrorForDic.java
@@ -76,7 +76,7 @@ private IdType createBinaryResource(Binary binary)
 		catch (Exception e)
 		{
 			dataLogger.logData("Binary to create", binary);
-			logger.warn("Error while creating Binary resource: " + e.getMessage(), e);
+			logger.warn("Error while creating Binary resource: {}", e.getMessage(), e);
 
 			throw new BpmnError(
 					CODESYSTEM_NUM_CODEX_DATA_TRANSFER_ERROR_VALUE_UNABLE_TO_STORE_ECRYPTED_VALIDATION_ERROR,