Skip to content
This repository was archived by the owner on Oct 6, 2025. It is now read-only.

Commit 7e2e2b5

Browse files
hhundhhund
committed
Merge remote-tracking branch
'origin/issue/122_ValidationForwarding_Proxy_Config' into develop
2 parents bd453a8 + 092537f commit 7e2e2b5

26 files changed

+83
-104
lines changed

‎codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/DataStoreClientFactory.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,10 @@ public void testConnection()
155155
{
156156
logger.info(
157157
"Testing connection to Data Store FHIR server with {trustStorePath: {}, certificatePath: {}, privateKeyPath: {}, privateKeyPassword: {},"
158-
+ " basicAuthUsername {}, basicAuthPassword {}, bearerToken {}, serverBase: {}, proxyUrl {}, proxyUsername, proxyPassword {}}",
158+
+ " basicAuthUsername: {}, basicAuthPassword: {}, bearerToken: {}, serverBase: {}, proxy: values from 'DEV_DSF_PROXY'... config}",
159159
trustStorePath, certificatePath, privateKeyPath, privateKeyPassword != null ? "***" : "null",
160160
dataStoreServerBasicAuthUsername, dataStoreServerBasicAuthPassword != null ? "***" : "null",
161-
dataStoreServerBearerToken != null ? "***" : "null", dataStoreServerBase, proxyUrl, proxyUsername,
162-
proxyPassword != null ? "***" : "null");
161+
dataStoreServerBearerToken != null ? "***" : "null", dataStoreServerBase);
163162

164163
getDataStoreClient().testConnection();
165164
}

‎codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/DataStoreClientImpl.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@ private void configureProxy(IRestfulClientFactory clientFactory, String proxyUrl
8181
clientFactory.setProxy(url.getHost(), url.getPort());
8282
clientFactory.setProxyCredentials(proxyUsername, proxyPassword);
8383

84-
logger.info("Using proxy for data FHIR server connection with {host: {}, port: {}, username: {}}",
85-
url.getHost(), url.getPort(), proxyUsername);
84+
logger.info("Using proxy for data FHIR server connection with values from 'DEV_DSF_PROXY'... config");
8685
}
8786
catch (MalformedURLException e)
8887
{

‎codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/FttpClientFactory.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,10 @@ public void testConnection()
154154
{
155155
logger.info(
156156
"Testing connection to fTTP with {trustStorePath: {}, certificatePath: {}, privateKeyPath: {}, privateKeyPassword: {},"
157-
+ " basicAuthUsername: {}, basicAuthPassword: {}, serverBase: {}, apiKey: {}, study: {}, target: {}, proxyUrl: {}, proxyUsername: {}, proxyPassword: {}}",
157+
+ " basicAuthUsername: {}, basicAuthPassword: {}, serverBase: {}, apiKey: {}, study: {}, target: {}, proxy: values from 'DEV_DSF_PROXY'... config}",
158158
trustStorePath, certificatePath, privateKeyPath, privateKeyPassword != null ? "***" : "null",
159159
fttpBasicAuthUsername, fttpBasicAuthPassword != null ? "***" : "null", fttpServerBase,
160-
fttpApiKey != null ? "***" : "null", fttpStudy, fttpTarget, proxyUrl, proxyUsername,
161-
proxyPassword != null ? "***" : "null");
160+
fttpApiKey != null ? "***" : "null", fttpStudy, fttpTarget);
162161

163162
getFttpClient().testConnection();
164163
}

‎codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/FttpClientImpl.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ private void configureProxy(IRestfulClientFactory clientFactory, String proxyUrl
101101
clientFactory.setProxy(url.getHost(), url.getPort());
102102
clientFactory.setProxyCredentials(proxyUsername, proxyPassword);
103103

104-
logger.info("Using proxy for fTTP connection with {host: {}, port: {}, username: {}}", url.getHost(),
105-
url.getPort(), proxyUsername);
104+
logger.info("Using proxy for fTTP connection with values from 'DEV_DSF_PROXY'... config");
106105
}
107106
catch (MalformedURLException e)
108107
{

‎codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/fhir/AbstractComplexFhirClient.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ else if (resource instanceof Encounter e)
6666
e.setSubject(patientRef);
6767
else if (resource instanceof Immunization i)
6868
i.setPatient(patientRef);
69-
else if (resource instanceof Medication m)
69+
else if (resource instanceof Medication)
7070
; // nothing to do
7171
else if (resource instanceof MedicationAdministration ma)
7272
ma.setSubject(patientRef);
@@ -94,7 +94,7 @@ else if (resource instanceof Encounter e)
9494
return Optional.of(e.getSubject());
9595
else if (resource instanceof Immunization i)
9696
return Optional.of(i.getPatient());
97-
else if (resource instanceof Medication m)
97+
else if (resource instanceof Medication)
9898
return Optional.empty();
9999
else if (resource instanceof MedicationAdministration ma)
100100
return Optional.of(ma.getSubject());
@@ -198,8 +198,8 @@ protected Optional<Patient> findPatientInLocalFhirStore(String pseudonym)
198198
}
199199
catch (Exception e)
200200
{
201-
logger.warn("Error while searching for Patient with pseudonym " + NAMING_SYSTEM_NUM_CODEX_CRR_PSEUDONYM
202-
+ "|" + pseudonym, e);
201+
logger.warn("Error while searching for Patient with pseudonym {}|{}", NAMING_SYSTEM_NUM_CODEX_CRR_PSEUDONYM,
202+
pseudonym, e);
203203
throw e;
204204
}
205205
}

‎codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/fhir/AbstractFhirClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ public Optional<Patient> getPatient(String reference)
636636
logger.warn("Patient {} not found: {} - {}", reference, e.getClass().getName(), e.getMessage());
637637

638638
if (logger.isDebugEnabled())
639-
logger.debug("Error while reading patient " + reference, e);
639+
logger.debug("Error while reading patient {}", reference, e);
640640

641641
return Optional.empty();
642642
}
@@ -684,7 +684,7 @@ public void updatePatient(Patient patient)
684684
}
685685
catch (Exception e)
686686
{
687-
logger.warn("Could not update patient " + id, e);
687+
logger.warn("Could not update patient {}", id, e);
688688
throw e;
689689
}
690690
}

‎codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/fhir/FhirBridgeClient.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ private Optional<Patient> update(Patient existingPatient, Patient newPatient, St
167167
}
168168
catch (Exception e)
169169
{
170-
logger.warn("Could not update patient " + newPatient.getIdElement().toString(), e);
170+
logger.warn("Could not update patient {}", newPatient.getIdElement().toString(), e);
171171
throw e;
172172
}
173173
}
@@ -230,7 +230,7 @@ private Optional<Patient> create(Patient newPatient, String pseudonym, String bu
230230
}
231231
catch (Exception e)
232232
{
233-
logger.warn("Could not create patient " + newPatient.getIdElement().toString(), e);
233+
logger.warn("Could not create patient {}", newPatient.getIdElement().toString(), e);
234234
throw e;
235235
}
236236
}
@@ -318,7 +318,7 @@ private Optional<Resource> findResourceInLocalFhirStore(String url, Class<? exte
318318
}
319319
catch (Exception e)
320320
{
321-
logger.warn("Error while searching for Resource with url " + url, e);
321+
logger.warn("Error while searching for Resource with url {}", url, e);
322322
throw e;
323323
}
324324
}
@@ -426,8 +426,8 @@ else if (outcome.getOperationOutcome() != null && outcome.getOperationOutcome()
426426
}
427427
catch (Exception e)
428428
{
429-
logger.warn("Count not update " + newResource.getResourceType().name() + " "
430-
+ newResource.getIdElement().toString(), e);
429+
logger.warn("Count not update {} {}", newResource.getResourceType().name(),
430+
newResource.getIdElement().toString(), e);
431431
throw e;
432432
}
433433
}
@@ -497,8 +497,8 @@ else if (outcome.getOperationOutcome() != null && outcome.getOperationOutcome()
497497
}
498498
catch (Exception e)
499499
{
500-
logger.warn("Could not create " + newResource.getResourceType().name() + " "
501-
+ newResource.getIdElement().toString(), e);
500+
logger.warn("Could not create {} {}", newResource.getResourceType().name(),
501+
newResource.getIdElement().toString(), e);
502502
throw e;
503503
}
504504
}

‎codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/service/receive/DecryptData.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ protected void doExecute(DelegateExecution execution, Variables variables) throw
6767
catch (InvalidKeyException | BadPaddingException | IllegalBlockSizeException | NoSuchPaddingException
6868
| NoSuchAlgorithmException | InvalidAlgorithmParameterException | IOException e)
6969
{
70-
logger.warn("Unable to decrypt data from DIC: " + e.getMessage(), e);
70+
logger.warn("Unable to decrypt data from DIC: {}", e.getMessage(), e);
7171
throw new BpmnError(CODESYSTEM_NUM_CODEX_DATA_TRANSFER_ERROR_VALUE_DECRYPTION_OF_DATA_FROM_DIC_FAILED,
7272
"Error while decrypting data from DIC");
7373
}

‎codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/service/receive/DownloadDataFromDts.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ protected void doExecute(DelegateExecution execution, Variables variables) throw
4444
}
4545
catch (Exception e)
4646
{
47-
logger.warn("Error while reading Binary resoruce: " + e.getMessage(), e);
47+
logger.warn("Error while reading Binary resoruce: {}", e.getMessage(), e);
4848

4949
throw new BpmnError(
5050
CODESYSTEM_NUM_CODEX_DATA_TRANSFER_ERROR_VALUE_DOWNLOAD_OF_ENCRYPTED_DATA_FROM_DTS_FAILED,

‎codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/service/receive/EncryptValidationError.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ protected void doExecute(DelegateExecution execution, Variables variables) throw
5858
| InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException
5959
| ShortBufferException e)
6060
{
61-
logger.warn("Unable to encrypt validation error for DIC: " + e.getMessage(), e);
61+
logger.warn("Unable to encrypt validation error for DIC: {}", e.getMessage(), e);
6262
throw new BpmnError(
6363
CODESYSTEM_NUM_CODEX_DATA_TRANSFER_ERROR_VALUE_ECRYPTION_OF_VALIDATION_ERROR_FOR_DIC_FAILED,
6464
"Unable to encrypt validation error for DIC");

0 commit comments

Comments
 (0)