1 files changed, 9 insertions, 22 deletions

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 982453246f..d45deb328b 100644
--- 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.
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.common.http.client.api;
 
 import org.apache.http.client.HttpRequestRetryHandler;
@@ -25,12 +24,9 @@ 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 {
@@ -38,36 +34,27 @@ public class HttpClientFactory {
     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);
-
-        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(userTokenHandler)
-                    .setRetryHandler(resolveRetryHandler(config))
-                    .build();
-
+        CloseableHttpClient client = HttpClients.custom().setDefaultRequestConfig(requestConfig).setConnectionManager(connectionManager)
+            .setUserTokenHandler(userTokenHandler).setRetryHandler(resolveRetryHandler(config)).build();
         return new HttpClient(client, config);
     }
 
     private HttpRequestRetryHandler resolveRetryHandler(HttpClientConfigImmutable config) {
         return config.getNumOfRetries() > 0 ? config.getRetryHandler() : null;
     }
-        
+
     private RequestConfig createClientTimeoutConfiguration(HttpClientConfigImmutable config) {
-        return RequestConfig.custom()
-                .setConnectTimeout(config.getConnectTimeoutMs())
-                .setSocketTimeout(config.getReadTimeoutMs())
-                .setConnectionRequestTimeout(config.getConnectPoolTimeoutMs())
-                .build();
+        return RequestConfig.custom().setConnectTimeout(config.getConnectTimeoutMs()).setSocketTimeout(config.getReadTimeoutMs())
+            .setConnectionRequestTimeout(config.getConnectPoolTimeoutMs()).build();
     }
 }