minor refactoring

Author: mahendya1002

java/src/main/java/com/cybersource/ws/client/Client.java

@@ -101,16 +101,15 @@ public static Map<String, String> runTransaction(
 
             setVersionInformation(request);
 
+            logger = new LoggerWrapper(_logger, prepare, logTranStart, mc);
+
             if (mc.getUseHttpClientWithConnectionPool()){
                 String mtiField = request.get(MERCHANT_TRANSACTION_IDENTIFIER);
                 if(StringUtils.isBlank(mtiField)) {
                     throw new ClientException(HTTP_BAD_REQUEST, MTI_FIELD_ERR_MSG, false, logger);
                 }
             }
 
-
-            logger = new LoggerWrapper(_logger, prepare, logTranStart, mc);
-
             DocumentBuilder builder = Utility.newDocumentBuilder();
 
             Document signedDoc

java/src/main/java/com/cybersource/ws/client/PoolingHttpClientConnection.java

@@ -338,13 +338,13 @@ public boolean retryRequest(IOException exception, int executionCount, HttpConte
 
             HttpClientContext httpClientContext = HttpClientContext.adapt(httpContext);
             if (!httpClientContext.isRequestSent()) {
-                retryAfter(retryWaitInterval, executionCount, logger);
+                retryAfter(retryWaitInterval, executionCount, "request_not_sent");
                 return true;
             }
 
             if(mc.retryIfMTIFieldExistEnabled()){
                 if (exception instanceof NoHttpResponseException) {
-                    retryAfter(retryWaitInterval, executionCount, logger);
+                    retryAfter(retryWaitInterval, executionCount, "NoHttpResponseException");
                     return true;
                 }
                 if(exception instanceof java.net.SocketException) {
@@ -353,7 +353,7 @@ public boolean retryRequest(IOException exception, int executionCount, HttpConte
                         errMessage = exception.getLocalizedMessage();
                     }
                     if (StringUtils.isNotBlank(errMessage) && ( errMessage.equalsIgnoreCase("Connection reset") || errMessage.contains("Connection reset"))) {
-                        retryAfter(retryWaitInterval, executionCount, logger);
+                        retryAfter(retryWaitInterval, executionCount, "SocketException:Connection reset");
                         return true;
                     }
                 }
@@ -388,10 +388,10 @@ private void setProxy(HttpClientBuilder httpClientBuilder, RequestConfig.Builder
         }
     }
 
-    private void retryAfter(long millis, int executionCount, LoggerWrapper logger) {
+    private void retryAfter(long millis, int executionCount, String reason) {
         try {
             Thread.sleep(millis);
-            logger.log(Logger.LT_INFO, "Retrying Request -- " + logger.getUniqueKey() + " Retry Count -- " + executionCount);
+            logger.log(Logger.LT_INFO, "Retrying Request due to " + reason +"-- Retry Count -- " + executionCount);
         } catch (InterruptedException ex) {
             ex.printStackTrace();
         }

java/src/main/java/com/cybersource/ws/client/XMLClient.java

@@ -169,15 +169,15 @@ public static Document runTransaction(
 
             nsURI = mc.getEffectiveNamespaceURI();
 
+            logger = new LoggerWrapper(_logger, prepare, logTranStart, mc);
+
             if (mc.getUseHttpClientWithConnectionPool()){
                 String mtiField = checkIfMTIFiledExist(request, nsURI);
                 if(StringUtils.isBlank(mtiField)) {
                     throw new ClientException(HTTP_BAD_REQUEST, MTI_FIELD_ERR_MSG, false, logger);
                 }
             }
 
-            logger = new LoggerWrapper(_logger, prepare, logTranStart, mc);
-
             setVersionInformation(request, nsURI, mc.retryIfMTIFieldExistEnabled());
 
             DocumentBuilder builder = Utility.newDocumentBuilder();