added option to enable verbose HAPI client logging

Author: hhund

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

@@ -97,10 +97,12 @@ public void testConnection()
 	private final String proxyUsername;
 	private final String proxyPassword;
 
+	private final boolean hapiClientVerbose;
+
 	public FttpClientFactory(Path trustStorePath, Path certificatePath, Path privateKeyPath, int connectTimeout,
 			int socketTimeout, int connectionRequestTimeout, String fttpBasicAuthUsername, String fttpBasicAuthPassword,
 			String fttpServerBase, String fttpApiKey, String fttpStudy, String fttpTarget, String proxySchemeHostPort,
-			String proxyUsername, String proxyPassword)
+			String proxyUsername, String proxyPassword, boolean hapiClientVerbose)
 	{
 		this.trustStorePath = trustStorePath;
 		this.certificatePath = certificatePath;
@@ -121,6 +123,8 @@ public FttpClientFactory(Path trustStorePath, Path certificatePath, Path private
 		this.proxySchemeHostPort = proxySchemeHostPort;
 		this.proxyUsername = proxyUsername;
 		this.proxyPassword = proxyPassword;
+
+		this.hapiClientVerbose = hapiClientVerbose;
 	}
 
 	@EventListener({ ContextRefreshedEvent.class })
@@ -166,7 +170,7 @@ protected FttpClient createFttpClient()
 
 		return new FttpClientImpl(trustStore, keyStore, keyStorePassword, connectTimeout, socketTimeout,
 				connectionRequestTimeout, fttpBasicAuthUsername, fttpBasicAuthPassword, fttpServerBase, fttpApiKey,
-				fttpStudy, fttpTarget, proxySchemeHostPort, proxyUsername, proxyPassword);
+				fttpStudy, fttpTarget, proxySchemeHostPort, proxyUsername, proxyPassword, hapiClientVerbose);
 	}
 
 	private KeyStore readTrustStore(Path trustPath)

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

@@ -49,11 +49,12 @@ public class FttpClientImpl implements FttpClient, InitializingBean
 	private final String proxyUsername;
 	private final String proxyPassword;
 
+	private final boolean hapiClientVerbose;
+
 	public FttpClientImpl(KeyStore trustStore, KeyStore keyStore, char[] keyStorePassword, int connectTimeout,
 			int socketTimeout, int connectionRequestTimeout, String fttpBasicAuthUsername, String fttpBasicAuthPassword,
-			String fttpServerBase, String fttpApiKey, String fttpStudy, String fttpTarget,
-
-			String proxySchemeHostPort, String proxyUsername, String proxyPassword)
+			String fttpServerBase, String fttpApiKey, String fttpStudy, String fttpTarget, String proxySchemeHostPort,
+			String proxyUsername, String proxyPassword, boolean hapiClientVerbose)
 	{
 		clientFactory = createClientFactory(trustStore, keyStore, keyStorePassword, connectTimeout, socketTimeout,
 				connectionRequestTimeout);
@@ -69,6 +70,8 @@ public FttpClientImpl(KeyStore trustStore, KeyStore keyStore, char[] keyStorePas
 		this.proxySchemeHostPort = proxySchemeHostPort;
 		this.proxyUsername = proxyUsername;
 		this.proxyPassword = proxyPassword;
+
+		this.hapiClientVerbose = hapiClientVerbose;
 	}
 
 	protected ApacheRestfulClientFactoryWithTlsConfig createClientFactory(KeyStore trustStore, KeyStore keyStore,
@@ -235,16 +238,26 @@ public void testConnection()
 	private IGenericClient createGenericClient()
 	{
 		IGenericClient client = clientFactory.newGenericClient(fttpServerBase);
-		client.registerInterceptor(new LoggingInterceptor());
 
-		if (configuredWithBasicAuth())
-			client.registerInterceptor(new BasicAuthInterceptor(fttpBasicAuthUsername, fttpBasicAuthPassword));
+		configuredWithBasicAuth(client);
+		configureLoggingInterceptor(client);
 
 		return client;
 	}
 
-	private boolean configuredWithBasicAuth()
+	private void configuredWithBasicAuth(IGenericClient client)
+	{
+		if (fttpBasicAuthUsername != null && fttpBasicAuthPassword != null)
+			client.registerInterceptor(new BasicAuthInterceptor(fttpBasicAuthUsername, fttpBasicAuthPassword));
+	}
+
+	private void configureLoggingInterceptor(IGenericClient client)
 	{
-		return fttpBasicAuthUsername != null && fttpBasicAuthPassword != null;
+		if (hapiClientVerbose)
+		{
+			LoggingInterceptor loggingInterceptor = new LoggingInterceptor(true);
+			loggingInterceptor.setLogger(new HapiClientLogger(logger));
+			client.registerInterceptor(loggingInterceptor);
+		}
 	}
 }