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

Commit 84f8f9c

Browse files
committed
fixes #25, initialization order bug
1 parent 3e6387c commit 84f8f9c

1 file changed

Lines changed: 3 additions & 9 deletions

File tree

  • codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ public class FttpClientImpl implements FttpClient, InitializingBean
4545
private final String fttpTarget;
4646
private final String fttpApiKey;
4747

48-
private final String proxySchemeHostPort;
49-
private final String proxyUsername;
50-
private final String proxyPassword;
51-
5248
private final boolean hapiClientVerbose;
5349

5450
public FttpClientImpl(KeyStore trustStore, KeyStore keyStore, char[] keyStorePassword, int connectTimeout,
@@ -67,9 +63,7 @@ public FttpClientImpl(KeyStore trustStore, KeyStore keyStore, char[] keyStorePas
6763
this.fttpStudy = fttpStudy;
6864
this.fttpTarget = fttpTarget;
6965

70-
this.proxySchemeHostPort = proxySchemeHostPort;
71-
this.proxyUsername = proxyUsername;
72-
this.proxyPassword = proxyPassword;
66+
configureProxy(clientFactory, proxySchemeHostPort, proxyUsername, proxyPassword);
7367

7468
this.hapiClientVerbose = hapiClientVerbose;
7569
}
@@ -85,7 +79,6 @@ protected ApacheRestfulClientFactoryWithTlsConfig createClientFactory(KeyStore t
8579
ApacheRestfulClientFactoryWithTlsConfig hapiClientFactory = new ApacheRestfulClientFactoryWithTlsConfig(
8680
fhirContext, trustStore, keyStore, keyStorePassword);
8781
hapiClientFactory.setServerValidationMode(ServerValidationModeEnum.NEVER);
88-
configureProxy(hapiClientFactory);
8982

9083
hapiClientFactory.setConnectTimeout(connectTimeout);
9184
hapiClientFactory.setSocketTimeout(socketTimeout);
@@ -95,7 +88,8 @@ protected ApacheRestfulClientFactoryWithTlsConfig createClientFactory(KeyStore t
9588
return hapiClientFactory;
9689
}
9790

98-
private void configureProxy(ApacheRestfulClientFactoryWithTlsConfig clientFactory)
91+
private void configureProxy(IRestfulClientFactory clientFactory, String proxySchemeHostPort, String proxyUsername,
92+
String proxyPassword)
9993
{
10094
if (StringUtils.isNotBlank(proxySchemeHostPort))
10195
{

0 commit comments

Comments
 (0)