Catalog alignment

[sdc.git] / common-app-api / src / main / java / org / openecomp / sdc / common / http / client / api / HttpClientFactory.java

diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/http/client/api/HttpClientFactory.java b/common-app-api/src/main/java/org/openecomp/sdc/common/http/client/api/HttpClientFactory.java
index 24e2f90..9824532 100644 (file)
--- a/common-app-api/src/main/java/org/openecomp/sdc/common/http/client/api/HttpClientFactory.java
+++ b/common-app-api/src/main/java/org/openecomp/sdc/common/http/client/api/HttpClientFactory.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,33 +25,36 @@ import org.apache.http.client.UserTokenHandler;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.conn.HttpClientConnectionManager;
 import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.HttpClients;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.http.config.ClientCertificate;
+import org.openecomp.sdc.common.log.interceptors.ApacheClientLogRequestInterceptor;
+import org.openecomp.sdc.common.log.interceptors.ApacheClientLogResponseInterceptor;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 
 public class HttpClientFactory {
 
-    private static final Logger LOGGER = Logger.getLogger(HttpClientFactory.class.getName());
-    private static final UserTokenHandler USER_TOKEN_HANDLER = context -> null;
+    private static final Logger logger = Logger.getLogger(HttpClientFactory.class.getName());
+    private static final UserTokenHandler userTokenHandler = context -> null;
     private final HttpConnectionMngFactory connectionMngFactory;
-
+    
     HttpClientFactory(HttpConnectionMngFactory connectionMngFactory) {
         this.connectionMngFactory = connectionMngFactory;
     }
 
     HttpClient createClient(String protocol, HttpClientConfigImmutable config) {
-        LOGGER.debug("Create {} client based on {}", protocol, config);
+        logger.debug("Create {} client based on {}", protocol, config);
 
-        ClientCertificate clientCertificate = Constants.HTTPS.equals(protocol) ? config.getClientCertificate() : null;
+        ClientCertificate clientCertificate = Constants.HTTPS.equals(protocol) ? config.getClientCertificate() : null; 
         HttpClientConnectionManager connectionManager = connectionMngFactory.getOrCreate(clientCertificate);
         RequestConfig requestConfig = createClientTimeoutConfiguration(config);
         CloseableHttpClient client = HttpClients.custom()
-                .setDefaultRequestConfig(requestConfig)
-                .setConnectionManager(connectionManager)
-                .setUserTokenHandler(USER_TOKEN_HANDLER)
-                .setRetryHandler(resolveRetryHandler(config))
-                .build();
+                    .setDefaultRequestConfig(requestConfig)
+                    .setConnectionManager(connectionManager)
+                    .setUserTokenHandler(userTokenHandler)
+                    .setRetryHandler(resolveRetryHandler(config))
+                    .build();
 
         return new HttpClient(client, config);
     }
@@ -59,7 +62,7 @@ public class HttpClientFactory {
     private HttpRequestRetryHandler resolveRetryHandler(HttpClientConfigImmutable config) {
         return config.getNumOfRetries() > 0 ? config.getRetryHandler() : null;
     }
-
+        
     private RequestConfig createClientTimeoutConfiguration(HttpClientConfigImmutable config) {
         return RequestConfig.custom()
                 .setConnectTimeout(config.getConnectTimeoutMs())