1 files changed, 22 insertions, 37 deletions

diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/http/client/api/HttpConnectionMngFactory.java b/common-app-api/src/main/java/org/openecomp/sdc/common/http/client/api/HttpConnectionMngFactory.java
index c5634eaf8c..966bf857c8 100644
--- a/common-app-api/src/main/java/org/openecomp/sdc/common/http/client/api/HttpConnectionMngFactory.java
+++ b/common-app-api/src/main/java/org/openecomp/sdc/common/http/client/api/HttpConnectionMngFactory.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,9 +17,15 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.common.http.client.api;
 
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.config.Registry;
 import org.apache.http.config.RegistryBuilder;
@@ -35,69 +41,50 @@ import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.http.config.ClientCertificate;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
 public class HttpConnectionMngFactory {
 
     private static final String P12_KEYSTORE_EXTENTION = ".p12";
     private static final String PFX_KEYSTORE_EXTENTION = ".pfx";
     private static final String JKS_KEYSTORE_EXTENTION = ".jks";
-    
     private static final String P12_KEYSTORE_TYPE = "pkcs12";
     private static final String JKS_KEYSTORE_TYPE = "jks";
-    
     private static final Logger logger = Logger.getLogger(HttpConnectionMngFactory.class.getName());
     private static final int DEFAULT_CONNECTION_POOL_SIZE = 30;
     private static final int DEFAULT_MAX_CONNECTION_PER_ROUTE = 5;
     private static final int VALIDATE_CONNECTION_AFTER_INACTIVITY_MS = 10000;
-    
     private Map<ClientCertificate, HttpClientConnectionManager> sslClientConnectionManagers = new ConcurrentHashMap<>();
     private HttpClientConnectionManager plainClientConnectionManager;
-    
+
     HttpConnectionMngFactory() {
         plainClientConnectionManager = createConnectionMng(null);
     }
 
     HttpClientConnectionManager getOrCreate(ClientCertificate clientCertificate) {
-        if(clientCertificate == null) {
+        if (clientCertificate == null) {
             return plainClientConnectionManager;
         }
         return sslClientConnectionManagers.computeIfAbsent(clientCertificate, k -> createConnectionMng(clientCertificate));
     }
-    
-    private HttpClientConnectionManager createConnectionMng(ClientCertificate clientCertificate) {
 
+    private HttpClientConnectionManager createConnectionMng(ClientCertificate clientCertificate) {
         SSLContextBuilder sslContextBuilder = new SSLContextBuilder();
         SSLConnectionSocketFactory sslsf = null;
         try {
             sslContextBuilder.loadTrustMaterial(new TrustSelfSignedStrategy());
-            
-            if(clientCertificate != null) {
+            if (clientCertificate != null) {
                 setClientSsl(clientCertificate, sslContextBuilder);
             }
             sslsf = new SSLConnectionSocketFactory(sslContextBuilder.build(), NoopHostnameVerifier.INSTANCE);
-        }
-        catch (GeneralSecurityException e) {
+        } catch (GeneralSecurityException e) {
             logger.debug("Create SSL connection socket factory failed with exception, use default SSL factory ", e);
             sslsf = SSLConnectionSocketFactory.getSocketFactory();
         }
-
         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);
-
         return manager;
     }
 
@@ -107,12 +94,11 @@ public class HttpConnectionMngFactory {
             KeyStore clientKeyStore = createClientKeyStore(clientCertificate.getKeyStore(), keyStorePassword);
             sslContextBuilder.loadKeyMaterial(clientKeyStore, keyStorePassword);
             logger.debug("#setClientSsl - Set Client Certificate authentication");
-        }
-        catch (IOException | GeneralSecurityException e) {
+        } catch (IOException | GeneralSecurityException e) {
             logger.debug("#setClientSsl - Set Client Certificate authentication failed with exception, diasable client SSL authentication ", e);
         }
     }
-        
+
     private KeyStore createClientKeyStore(String keyStorePath, char[] keyStorePassword) throws IOException, GeneralSecurityException {
         KeyStore keyStore = null;
         try (InputStream stream = new FileInputStream(keyStorePath)) {
@@ -121,15 +107,14 @@ public class HttpConnectionMngFactory {
         }
         return keyStore;
     }
-    
+
     private String getKeyStoreType(String keyStore) {
-        if(!StringUtils.isEmpty(keyStore)) {
-            if(keyStore.endsWith(P12_KEYSTORE_EXTENTION) || keyStore.endsWith(PFX_KEYSTORE_EXTENTION)) {
+        if (!StringUtils.isEmpty(keyStore)) {
+            if (keyStore.endsWith(P12_KEYSTORE_EXTENTION) || keyStore.endsWith(PFX_KEYSTORE_EXTENTION)) {
                 return P12_KEYSTORE_TYPE;
-            }
-            else if(keyStore.endsWith(JKS_KEYSTORE_EXTENTION)) {
+            } else if (keyStore.endsWith(JKS_KEYSTORE_EXTENTION)) {
                 return JKS_KEYSTORE_TYPE;
-            }            
+            }
         }
         return KeyStore.getDefaultType();
     }