Improve test coverage

[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / config / HttpClientFactory.java

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/config/HttpClientFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/config/HttpClientFactory.java
index f2544aa..cadab4e 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/config/HttpClientFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/config/HttpClientFactory.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.config;
 
 import org.apache.http.client.HttpRequestRetryHandler;
@@ -46,28 +45,18 @@ public class HttpClientFactory {
     private static final int DEFAULT_MAX_CONNECTION_PER_ROUTE = 5;
     private static final int VALIDATE_CONNECTION_AFTER_INACTIVITY_MS = 10000;
     private static final int CONNECT_TIMEOUT_MS = 15000;
-
-    private static final Logger log = Logger.getLogger(HttpClientFactory.class);
     private static final UserTokenHandler userTokenHandler = context -> null;
 
-    private HttpClientConnectionManager createConnectionManager(){
+    private HttpClientConnectionManager createConnectionManager() {
         SSLConnectionSocketFactory sslsf = getSslConnectionSocketFactory();
-
         Registry<ConnectionSocketFactory> registry = RegistryBuilder.<ConnectionSocketFactory>create()
-                .register(Constants.HTTP, PlainConnectionSocketFactory.getSocketFactory())
-                .register(Constants.HTTPS, sslsf).build();
-
+            .register(Constants.HTTP, PlainConnectionSocketFactory.getSocketFactory()).register(Constants.HTTPS, sslsf).build();
         PoolingHttpClientConnectionManager manager = new PoolingHttpClientConnectionManager(registry);
-
         manager.setMaxTotal(DEFAULT_CONNECTION_POOL_SIZE);
         manager.setDefaultMaxPerRoute(DEFAULT_MAX_CONNECTION_PER_ROUTE);
         manager.setValidateAfterInactivity(VALIDATE_CONNECTION_AFTER_INACTIVITY_MS);
-
-        SocketConfig socketConfig = SocketConfig.custom()
-                .setSoTimeout(CONNECT_TIMEOUT_MS)
-                .build();
+        SocketConfig socketConfig = SocketConfig.custom().setSoTimeout(CONNECT_TIMEOUT_MS).build();
         manager.setDefaultSocketConfig(socketConfig);
-
         return manager;
     }
 
@@ -75,7 +64,6 @@ public class HttpClientFactory {
         return new SSLConnectionSocketFactory(SSLContexts.createSystemDefault());
     }
 
-
     /*
     The difference between this client factory and the one in common api,
     is that this one returns an apache httpclient instance, rather than a custom created custom.
@@ -87,24 +75,16 @@ public class HttpClientFactory {
         HttpClientConfig httpClientConfig = new HttpClientConfig(new Timeouts(connectTimeoutMs, readTimeoutMs));
         HttpClientConfigImmutable immutableHttpClientConfig = new HttpClientConfigImmutable(httpClientConfig);
         RequestConfig requestConfig = createClientTimeoutConfiguration(immutableHttpClientConfig);
-        return HttpClients.custom()
-                .setConnectionManager(connManager)
-                .setDefaultRequestConfig(requestConfig)
-                .setUserTokenHandler(userTokenHandler)
-                .setRetryHandler(resolveRetryHandler(immutableHttpClientConfig))
-                .build();
+        return HttpClients.custom().setConnectionManager(connManager).setDefaultRequestConfig(requestConfig).setUserTokenHandler(userTokenHandler)
+            .setRetryHandler(resolveRetryHandler(immutableHttpClientConfig)).build();
     }
 
-    private  RequestConfig createClientTimeoutConfiguration(HttpClientConfigImmutable config) {
-        return RequestConfig.custom()
-                .setConnectTimeout(config.getConnectTimeoutMs())
-                .setSocketTimeout(config.getReadTimeoutMs())
-                .setConnectionRequestTimeout(config.getConnectPoolTimeoutMs())
-                .build();
+    private RequestConfig createClientTimeoutConfiguration(HttpClientConfigImmutable config) {
+        return RequestConfig.custom().setConnectTimeout(config.getConnectTimeoutMs()).setSocketTimeout(config.getReadTimeoutMs())
+            .setConnectionRequestTimeout(config.getConnectPoolTimeoutMs()).build();
     }
 
     private HttpRequestRetryHandler resolveRetryHandler(HttpClientConfigImmutable config) {
         return config.getNumOfRetries() > 0 ? config.getRetryHandler() : null;
     }
-
 }