Revert "Support SIP TLS"

[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 599c43a..d45deb3 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
@@ -23,17 +23,15 @@ import org.apache.http.client.HttpRequestRetryHandler;
 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.HttpClientBuilder;
+import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.onap.config.api.JettySSLUtils;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.http.config.ClientCertificate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 
 public class HttpClientFactory {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(HttpClientFactory.class);
+    private static final Logger logger = Logger.getLogger(HttpClientFactory.class.getName());
     private static final UserTokenHandler userTokenHandler = context -> null;
     private final HttpConnectionMngFactory connectionMngFactory;
 
@@ -42,25 +40,13 @@ public class HttpClientFactory {
     }
 
     HttpClient createClient(String protocol, HttpClientConfigImmutable config) {
-        LOGGER.debug("Create {} client based on {}", protocol, config);
-        final ClientCertificate clientCertificate = Constants.HTTPS.equals(protocol) ? config.getClientCertificate() : null;
-        final HttpClientConnectionManager connectionManager = connectionMngFactory.getOrCreate(clientCertificate);
-        final RequestConfig requestConfig = createClientTimeoutConfiguration(config);
-
-        try {
-            final HttpClientBuilder httpClientBuilder = HttpClients.custom()
-                .setDefaultRequestConfig(requestConfig)
-                .setConnectionManager(connectionManager)
-                .setUserTokenHandler(userTokenHandler)
-                .setRetryHandler(resolveRetryHandler(config));
-            if (clientCertificate != null) {
-                httpClientBuilder.setSSLContext(JettySSLUtils.getSslContext());
-            }
-            return new HttpClient(httpClientBuilder.build(), config);
-        } catch (Exception e) {
-            LOGGER.error("Failed to createClient", e);
-            throw new RuntimeException(e);
-        }
+        logger.debug("Create {} client based on {}", protocol, config);
+        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();
+        return new HttpClient(client, config);
     }
 
     private HttpRequestRetryHandler resolveRetryHandler(HttpClientConfigImmutable config) {