X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Frestclient%2Fclient%2FRestClient.java;h=0bdb177f44569a6c6dc53eff4b73a2fddca5c0fc;hb=refs%2Fheads%2Fmaster;hp=89d5c62d9596c147e9bba5bdfa2ec4cd0151b477;hpb=c782aa5250b32e8aa3c7ecd088f47fd87334a8ef;p=aai%2Frest-client.git

diff --git a/src/main/java/org/onap/aai/restclient/client/RestClient.java b/src/main/java/org/onap/aai/restclient/client/RestClient.java
index 89d5c62..0bdb177 100644
--- a/src/main/java/org/onap/aai/restclient/client/RestClient.java
+++ b/src/main/java/org/onap/aai/restclient/client/RestClient.java
@@ -31,7 +31,9 @@ import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.stream.Collectors;
+
 import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.Invocation.Builder;
 import javax.ws.rs.client.WebTarget;
@@ -39,16 +41,17 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedHashMap;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
-import org.onap.aai.cl.api.LogFields;
+
 import org.onap.aai.cl.api.LogLine;
-import org.onap.aai.cl.api.Logger;
-import org.onap.aai.cl.eelf.LoggerFactory;
 import org.onap.aai.cl.mdc.MdcContext;
 import org.onap.aai.cl.mdc.MdcOverride;
 import org.onap.aai.restclient.enums.RestAuthenticationMode;
 import org.onap.aai.restclient.logging.RestClientMsgs;
 import org.onap.aai.restclient.rest.RestClientBuilder;
 
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+
 
 
 /**
@@ -69,11 +72,10 @@ public class RestClient {
     private static final String REST_CLIENT_INSTANCE = "REST_CLIENT_INSTANCE";
 
     /** Standard logger for producing log statements. */
-    private Logger logger = LoggerFactory.getInstance().getLogger("AAIRESTClient");
+    private static EELFLogger logger = EELFManager.getLogger(RestClient.class.getName());
 
     /** Standard logger for producing metric statements. */
-    private Logger metricsLogger = LoggerFactory.getInstance().getMetricsLogger("AAIRESTClient");
-
+    private static EELFLogger metricsLogger = EELFManager.getMetricsLogger();
     private SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
 
     /** Reusable function call for GET REST operations. */
@@ -97,8 +99,8 @@ public class RestClient {
     /**
      * Creates a new instance of the {@link RestClient}.
      */
-    public RestClient() {
-        clientBuilder = new RestClientBuilder();
+    public RestClient(ClientBuilder builder) {
+        clientBuilder = new RestClientBuilder(builder);
     }
 
     /**
@@ -389,12 +391,11 @@ public class RestClient {
             if (responseStatus != null) {
                 responseStatusCodeString = responseStatus.toString();
             }
-
-            metricsLogger.info(RestClientMsgs.HTTP_REQUEST_TIME,
-                    new LogFields().setField(LogLine.DefinedFields.STATUS_CODE, responseStatusCodeString)
-                            .setField(LogLine.DefinedFields.RESPONSE_CODE, operationResult.getResultCode())
-                            .setField(LogLine.DefinedFields.RESPONSE_DESCRIPTION, operationResult.getResult()),
-                    override, requestType, Long.toString(System.currentTimeMillis() - startTimeInMs), url);
+            Map<String, String> logFields = new HashMap<String, String>();
+            logFields.put(LogLine.DefinedFields.STATUS_CODE.name(), responseStatusCodeString);
+            logFields.put(LogLine.DefinedFields.RESPONSE_CODE.name(), String.valueOf(operationResult.getResultCode()));
+            logFields.put(LogLine.DefinedFields.RESPONSE_DESCRIPTION.name(), operationResult.getResult());
+            metricsLogger.info(RestClientMsgs.HTTP_REQUEST_TIME, logFields.toString(), requestType, Long.toString(System.currentTimeMillis() - startTimeInMs), url);
             logger.info(RestClientMsgs.HTTP_REQUEST_TIME, requestType,
                     Long.toString(System.currentTimeMillis() - startTimeInMs), url);
             logger.info(RestClientMsgs.HTTP_RESPONSE, url,