Merge remote-tracking branch

'origin/issues/45_GECCO_Basic_Authentication' into develop

Author: hhund

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

@@ -104,17 +104,6 @@ protected ApacheRestfulClientFactoryWithTlsConfig createClientFactory(KeyStore t
 		return hapiClientFactory;
 	}
 
-	private IGenericClient createGenericClient()
-	{
-		IGenericClient client = clientFactory.newGenericClient(geccoServerBase);
-
-		configuredWithBasicAuth(client);
-		configureBearerTokenAuthInterceptor(client);
-		configureLoggingInterceptor(client);
-
-		return client;
-	}
-
 	private void configuredWithBasicAuth(IGenericClient client)
 	{
 		if (geccoServerBasicAuthUsername != null && geccoServerBasicAuthPassword != null)
@@ -141,9 +130,8 @@ private void configureLoggingInterceptor(IGenericClient client)
 	@Override
 	public void testConnection()
 	{
-		IGenericClient client = createGenericClient();
-
-		CapabilityStatement statement = client.capabilities().ofType(CapabilityStatement.class).execute();
+		CapabilityStatement statement = getGenericFhirClient().capabilities().ofType(CapabilityStatement.class)
+				.execute();
 
 		logger.info("Connection test OK {} - {}", statement.getSoftware().getName(),
 				statement.getSoftware().getVersion());
@@ -181,7 +169,13 @@ public Path getSearchBundleOverride()
 	@Override
 	public IGenericClient getGenericFhirClient()
 	{
-		return clientFactory.newGenericClient(geccoServerBase);
+		IGenericClient client = clientFactory.newGenericClient(geccoServerBase);
+
+		configuredWithBasicAuth(client);
+		configureBearerTokenAuthInterceptor(client);
+		configureLoggingInterceptor(client);
+
+		return client;
 	}
 
 	@Override