1 files changed, 38 insertions, 40 deletions

diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/http/client/api/HttpClientConfigImmutable.java b/common-app-api/src/main/java/org/openecomp/sdc/common/http/client/api/HttpClientConfigImmutable.java
index f0fe09fe7c..9b21e1ac87 100644
--- a/common-app-api/src/main/java/org/openecomp/sdc/common/http/client/api/HttpClientConfigImmutable.java
+++ b/common-app-api/src/main/java/org/openecomp/sdc/common/http/client/api/HttpClientConfigImmutable.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.
@@ -29,40 +29,46 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-final class HttpClientConfigImmutable {
+public final class HttpClientConfigImmutable {
 
     private final Map<String, String> headers;
     private final BasicAuthorization basicAuthorization;
     private final ClientCertificate clientCertificate;
     private final Timeouts timeouts;
+    private boolean enableMetricLogging;
     /*
-     * use ComparableHttpRequestRetryHandler.compare instead of default generated equals
+     * use ComparableHttpRequestRetryHandler.compare instead of default generated equals 
      */
     private final ComparableHttpRequestRetryHandler retryHandler;
     private final int numOfRetries;
-
+    
     static HttpClientConfigImmutable getOrCreate(HttpClientConfig httpClientConfig) {
         // TODO: retrieve from a pool if exist, otherwise create new
-        return new HttpClientConfigImmutable(httpClientConfig);
+        return new HttpClientConfigImmutable(httpClientConfig); 
     }
 
-    HttpClientConfigImmutable(HttpClientConfig httpClientConfig) {
+    public HttpClientConfigImmutable(HttpClientConfig httpClientConfig) {
         timeouts = httpClientConfig.getTimeouts() != null ? new Timeouts(httpClientConfig.getTimeouts()) : null;
         basicAuthorization = httpClientConfig.getBasicAuthorization() != null ? new BasicAuthorization(httpClientConfig.getBasicAuthorization()) : null;
         clientCertificate = httpClientConfig.getClientCertificate() != null ? new ClientCertificate(httpClientConfig.getClientCertificate()) : null;
         headers = httpClientConfig.getHeaders() != null ? Collections.unmodifiableMap(new HashMap<>(httpClientConfig.getHeaders())) : null;
         retryHandler = httpClientConfig.getRetryHandler();
         numOfRetries = httpClientConfig.getNumOfRetries();
+        enableMetricLogging = httpClientConfig.isEnableMetricLogging();
+    }
+
+    public boolean isEnableMetricLogging() {
+        return enableMetricLogging;
     }
 
     Map<String, String> getHeaders() {
         return headers;
     }
 
-    int getNumOfRetries() {
+    public int getNumOfRetries() {
         return numOfRetries;
     }
-
+    
     String getBasicAuthPassword() {
         return basicAuthorization != null ? basicAuthorization.getPassword() : null;
     }
@@ -82,20 +88,20 @@ final class HttpClientConfigImmutable {
     ClientCertificate getClientCertificate() {
         return clientCertificate != null ? new ClientCertificate(clientCertificate) : null;
     }
-
-    int getReadTimeoutMs() {
+    
+    public int getReadTimeoutMs() {
         return timeouts.getReadTimeoutMs();
     }
 
-    int getConnectTimeoutMs() {
+    public int getConnectTimeoutMs() {
         return timeouts.getConnectTimeoutMs();
     }
 
-    int getConnectPoolTimeoutMs() {
+    public int getConnectPoolTimeoutMs() {
         return timeouts.getConnectPoolTimeoutMs();
     }
 
-    ComparableHttpRequestRetryHandler getRetryHandler() {
+    public ComparableHttpRequestRetryHandler getRetryHandler() {
         return retryHandler;
     }
 
@@ -113,51 +119,43 @@ final class HttpClientConfigImmutable {
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj) {
+        if (this == obj)
             return true;
-        }
-        if (obj == null) {
+        if (obj == null)
             return false;
-        }
-        if (getClass() != obj.getClass()) {
+        if (getClass() != obj.getClass())
             return false;
-        }
         HttpClientConfigImmutable other = (HttpClientConfigImmutable) obj;
         if (basicAuthorization == null) {
-            if (other.basicAuthorization != null) {
+            if (other.basicAuthorization != null)
                 return false;
-            }
-        } else if (!basicAuthorization.equals(other.basicAuthorization)) {
-            return false;
         }
+        else if (!basicAuthorization.equals(other.basicAuthorization))
+            return false;
         if (clientCertificate == null) {
-            if (other.clientCertificate != null) {
+            if (other.clientCertificate != null)
                 return false;
-            }
-        } else if (!clientCertificate.equals(other.clientCertificate)) {
-            return false;
         }
+        else if (!clientCertificate.equals(other.clientCertificate))
+            return false;
         if (headers == null) {
-            if (other.headers != null) {
+            if (other.headers != null)
                 return false;
-            }
-        } else if (!headers.equals(other.headers)) {
-            return false;
         }
+        else if (!headers.equals(other.headers))
+            return false;
         if (retryHandler == null) {
-            if (other.retryHandler != null) {
+            if (other.retryHandler != null)
                 return false;
-            }
-        } else if (!retryHandler.compare(other.retryHandler)) {
-            return false;
         }
+        else if (!retryHandler.compare(other.retryHandler))
+            return false;
         if (timeouts == null) {
-            if (other.timeouts != null) {
+            if (other.timeouts != null)
                 return false;
-            }
-        } else if (!timeouts.equals(other.timeouts)) {
-            return false;
         }
+        else if (!timeouts.equals(other.timeouts))
+            return false;
         return true;
     }