junit fix and refactoring

Author: mahendya1002

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

@@ -30,8 +30,6 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 import java.io.*;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;

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

@@ -178,7 +178,7 @@ public static Document runTransaction(
                 }
             }
 
-            setVersionInformation(request, nsURI, mc.retryIfMTIFieldExistEnabled());
+            setVersionInformation(request, nsURI);
 
             DocumentBuilder builder = Utility.newDocumentBuilder();
 
@@ -269,7 +269,7 @@ private static void setMerchantID(
      * @param request request to set the version information in.
      * @param nsURI   namespaceURI to use.
      */
-    private static void setVersionInformation(Document request, String nsURI, boolean isAddingMTIEnabled) {
+    private static void setVersionInformation(Document request, String nsURI) {
         //
         // First, delete the version fields currently in the request document,
         // if any.

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

@@ -1,9 +1,6 @@
 package com.cybersource.ws.client;
 
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.*;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -17,7 +14,17 @@
 public class ClientTest extends BaseTest {
 
     Map<String, String> request = getSampleRequest();
+    Properties orgMerchantProps = new Properties();
+    @Before
+    public void setup(){
+        orgMerchantProps.putAll(merchantProperties);
+    }
 
+    @After
+    public void tearDown(){
+        merchantProperties.clear();
+        merchantProperties.putAll(orgMerchantProps);
+    }
     @Test
     public void testSetVersionInformation() throws InvocationTargetException {
         Class[] argClasses = {Map.class};