unique id 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   >  "+(logger.getUniqueKey()).toString() + "\n" +
+            		"UUID   >  "+(logger.getUniqueKey()) + "\n" +
             		"Input request is" + "\n" +
             		"======================================= \n"
             		+ mapToString(request, true, PCI.REQUEST));

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

@@ -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 -- "+logger.getUniqueKey().toString()+ " Retry Count -- "+executionCount);
+         	        logger.log( Logger.LT_INFO, " Retrying Request -- "+logger.getUniqueKey()+ " Retry Count -- "+executionCount);
                  } catch (InterruptedException e) {
          	        e.printStackTrace();
                  }

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

@@ -29,8 +29,8 @@
 public class LoggerWrapper implements Logger {
     private Logger logger = null;
     private MyStopWatch stopWatch = new MyStopWatch();
-    private UUID uniqueKey=UUID.randomUUID();
-  
+    private UUID uniqueKey;
+
     /**
      * Constructor.
      *
@@ -52,6 +52,7 @@ public LoggerWrapper(
         MerchantConfig mc = _mc;
         boolean prepare = false;
         boolean logTranStart = false;
+        uniqueKey = UUID.randomUUID();
 
         if (_logger != null) {
             logger = _logger;
@@ -79,8 +80,8 @@ public LoggerWrapper(
      * Getter method for uniqueKey
      * @return UUID
      */
-    public UUID getUniqueKey() {
-        return uniqueKey;
+    public String getUniqueKey() {
+        return uniqueKey!=null ? uniqueKey.toString():null;
     }
 
     /**

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   >  "+(logger.getUniqueKey()).toString() + "\n" +
+            		"UUID   >  "+(logger.getUniqueKey()) + "\n" +
             		"Input request is" + "\n" +
             		"======================================= \n"
                     + Utility.nodeToString(doc, PCI.REQUEST));

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 -- " +logger.getUniqueKey().toString()+ " Retry Count -- "+executionCount);
+         	        logger.log( Logger.LT_INFO," Retrying Request -- " +logger.getUniqueKey()+ " Retry Count -- "+executionCount);
                  } catch (InterruptedException e) {
          	        // TODO Auto-generated catch block
          	        e.printStackTrace();