minor refactoring

Author: mahendya1002

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

@@ -210,7 +210,7 @@ private static Document soapWrapAndSign(
         if (!logSignedData) {
             logger.log(
             		Logger.LT_REQUEST,
-            		"UUID   >  "+(mc.getUniqueKey()).toString() + "\n" +
+            		"UUID   >  "+(logger.getUniqueKey()).toString() + "\n" +
             		"Input request is" + "\n" +
             		"======================================= \n"
             		+ mapToString(request, true, PCI.REQUEST));

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

@@ -78,7 +78,7 @@ void postDocument(Document request, long requestSentTime)
     	 * SimpleHttpConnectionManager(boolean alwaysClose) : 
     	 * alwaysClose - if set true, the connection manager will always close connections upon release.
     	 */
-    	
+
         HttpClient httpClient = new HttpClient(new SimpleHttpConnectionManager(true));
         setTimeout(httpClient, mc.getTimeout() * 1000);
         setProxy(httpClient);
@@ -255,7 +255,7 @@ public boolean retryMethod(
                 // if it's OK to retry methods that have been sent
             	try {
          	        Thread.sleep(retryWaitInterval);
-         	        logger.log( Logger.LT_INFO+" Retrying Request -- ",mc.getUniqueKey().toString()+ " Retry Count -- "+executionCount);
+         	        logger.log( Logger.LT_INFO, " Retrying Request -- "+logger.getUniqueKey().toString()+ " Retry Count -- "+executionCount);
                  } catch (InterruptedException e) {
          	        e.printStackTrace();
                  }

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

@@ -18,6 +18,8 @@
 
 package com.cybersource.ws.client;
 
+import java.util.UUID;
+
 /**
  * An internal class used by the clients to encapsulate the logger, primarily
  * to avoid having to check if the Logger object is null before logging.  It
@@ -27,6 +29,7 @@
 public class LoggerWrapper implements Logger {
     private Logger logger = null;
     private MyStopWatch stopWatch = new MyStopWatch();
+    private UUID uniqueKey=UUID.randomUUID();
 
     /**
      * Constructor.
@@ -72,6 +75,14 @@ public LoggerWrapper(
 
     }
 
+    /**
+     * Getter method for uniqueKey
+     * @return UUID
+     */
+    public UUID getUniqueKey() {
+        return uniqueKey;
+    }
+
     /**
      * Calls the encapsulated Logger object's prepare() method.
      *

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

@@ -37,8 +37,6 @@ public class MerchantConfig {
     private final static int DEFAULT_TIMEOUT = 130;
     private final static int DEFAULT_PROXY_PORT = 8080;
 
-    private UUID uniqueKey=UUID.randomUUID();
-    
     private final Properties props;
 
     private final String merchantID;
@@ -856,14 +854,6 @@ private int getIntegerProperty(
         }
     }
 
-    /**
-     * Getter method for uniqueKey
-     * @return UUID
-     */
-    public UUID getUniqueKey() {
-        return uniqueKey;
-    }
-
     /**
      * Getter method for numberOfRetries
      * @return int

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

@@ -337,7 +337,7 @@ public boolean retryRequest(IOException exception, int executionCount, HttpConte
             if (!httpClientContext.isRequestSent()) {
                 try {
                     Thread.sleep(retryWaitInterval);
-                    logger.log(Logger.LT_INFO, "Retrying Request -- " + mc.getUniqueKey() + " Retry Count -- " + executionCount);
+                    logger.log(Logger.LT_INFO, "Retrying Request -- " + logger.getUniqueKey() + " Retry Count -- " + executionCount);
                 } catch (InterruptedException ex) {
                     ex.printStackTrace();
                 }

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

@@ -368,7 +368,7 @@ private static Document soapWrapAndSign(
 
     	if (!logSignedData) {
             logger.log(Logger.LT_REQUEST,
-            		"UUID   >  "+(mc.getUniqueKey()).toString() + "\n" +
+            		"UUID   >  "+(logger.getUniqueKey()).toString() + "\n" +
             		"Input request is" + "\n" +
             		"======================================= \n"
                     + Utility.nodeToString(doc, PCI.REQUEST));

java/src/main/resources/cybs.properties

@@ -12,7 +12,7 @@ targetAPIVersion=1.164
 # If serverURL is provided then it takes precedence over the above settings. By default
 # the serverURL config is commented out.
 sendToProduction=false
-sendToAkamai=true
+sendToAkamai=false
 #serverURL=https://ics2wstesta.ic3.com/commerce/1.x/transactionProcessor
 
 #To enable HttpClientConnection

java/src/test/java/com/cybersource/ws/client/CustomHttpConnectionClass.java

@@ -171,7 +171,7 @@ public boolean retryMethod(
                 // if it's OK to retry methods that have been sent
             	try {
          	        Thread.sleep(retryWaitInterval);
-         	        logger.log( Logger.LT_INFO+" Retrying Request -- ",mc.getUniqueKey().toString()+ " Retry Count -- "+executionCount);
+         	        logger.log( Logger.LT_INFO," Retrying Request -- " +logger.getUniqueKey().toString()+ " Retry Count -- "+executionCount);
                  } catch (InterruptedException e) {
          	        // TODO Auto-generated catch block
          	        e.printStackTrace();

samples/nvp/cybs.properties

@@ -12,7 +12,7 @@ targetAPIVersion=1.164
 # If serverURL is provided then it takes precedence over the above settings. By default
 # the serverURL config is commented out.
 sendToProduction=false
-sendToAkamai=true
+sendToAkamai=false
 #serverURL=https://ics2wstesta.ic3.com/commerce/1.x/transactionProcessor
 
 #To enable HttpClientConnection

samples/xml/cybs.properties

@@ -12,7 +12,7 @@ targetAPIVersion=1.164
 # If serverURL is provided then it takes precedence over the above settings. By default
 # the serverURL config is commented out.
 sendToProduction=false
-sendToAkamai=true
+sendToAkamai=false
 #serverURL=https://ics2wstesta.ic3.com/commerce/1.x/transactionProcessor
 
 #To enable HttpClientConnection