Merge remote-tracking branch 'origin/issues/25_fTTP_proxy_configuration'

into develop

Author: hhund

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

@@ -45,10 +45,6 @@ public class FttpClientImpl implements FttpClient, InitializingBean
 	private final String fttpTarget;
 	private final String fttpApiKey;
 
-	private final String proxySchemeHostPort;
-	private final String proxyUsername;
-	private final String proxyPassword;
-
 	private final boolean hapiClientVerbose;
 
 	public FttpClientImpl(KeyStore trustStore, KeyStore keyStore, char[] keyStorePassword, int connectTimeout,
@@ -67,9 +63,7 @@ public FttpClientImpl(KeyStore trustStore, KeyStore keyStore, char[] keyStorePas
 		this.fttpStudy = fttpStudy;
 		this.fttpTarget = fttpTarget;
 
-		this.proxySchemeHostPort = proxySchemeHostPort;
-		this.proxyUsername = proxyUsername;
-		this.proxyPassword = proxyPassword;
+		configureProxy(clientFactory, proxySchemeHostPort, proxyUsername, proxyPassword);
 
 		this.hapiClientVerbose = hapiClientVerbose;
 	}
@@ -85,7 +79,6 @@ protected ApacheRestfulClientFactoryWithTlsConfig createClientFactory(KeyStore t
 		ApacheRestfulClientFactoryWithTlsConfig hapiClientFactory = new ApacheRestfulClientFactoryWithTlsConfig(
 				fhirContext, trustStore, keyStore, keyStorePassword);
 		hapiClientFactory.setServerValidationMode(ServerValidationModeEnum.NEVER);
-		configureProxy(hapiClientFactory);
 
 		hapiClientFactory.setConnectTimeout(connectTimeout);
 		hapiClientFactory.setSocketTimeout(socketTimeout);
@@ -95,7 +88,8 @@ protected ApacheRestfulClientFactoryWithTlsConfig createClientFactory(KeyStore t
 		return hapiClientFactory;
 	}
 
-	private void configureProxy(ApacheRestfulClientFactoryWithTlsConfig clientFactory)
+	private void configureProxy(IRestfulClientFactory clientFactory, String proxySchemeHostPort, String proxyUsername,
+			String proxyPassword)
 	{
 		if (StringUtils.isNotBlank(proxySchemeHostPort))
 		{

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

@@ -4,8 +4,11 @@
 
 import org.hl7.fhir.instance.model.api.IBaseBundle;
 import org.hl7.fhir.instance.model.api.IBaseResource;
+import org.hl7.fhir.r4.model.CapabilityStatement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.context.event.EventListener;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.interceptor.api.IInterceptorService;
@@ -99,6 +102,33 @@ public HapiFhirClientFactory(FhirContext fhirContext, String serverBase, String
 			clientFactory = null;
 	}
 
+	@EventListener({ ContextRefreshedEvent.class })
+	public void onContextRefreshedEvent(ContextRefreshedEvent event)
+	{
+		if (isConfigured())
+		{
+			try
+			{
+				logger.info(
+						"Testing connection to GECCO FHIR server with {basicAuthUsername: {}, basicAuthPassword: {}, bearerToken: {}, serverBase: {}}",
+						basicAuthUsername, basicAuthPassword != null ? "***" : "null",
+						bearerToken != null ? "***" : "null", serverBase);
+
+				CapabilityStatement statement = getFhirStoreClient().capabilities().ofType(CapabilityStatement.class)
+						.execute();
+
+				logger.info("Connection test OK {} - {}", statement.getSoftware().getName(),
+						statement.getSoftware().getVersion());
+			}
+			catch (Exception e)
+			{
+				logger.error("Error while testing connection to GECCO FHIR server", e);
+			}
+		}
+		else
+			logger.warn("GECCO FHIR server Client stub implementation, no connection test performed");
+	}
+
 	protected boolean isConfigured()
 	{
 		return serverBase != null && !serverBase.isEmpty();