removed the merge conflicts

adkumar3 · adkumar3 · commit a44734b3853d · 2017-03-01T11:08:41.000+05:30
diff --git a/java/src/main/java/com/cybersource/ws/client/Client.java b/java/src/main/java/com/cybersource/ws/client/Client.java
@@ -1,20 +1,20 @@
 /*
-* Copyright 2003-2014 CyberSource Corporation
-*
-* THE SOFTWARE AND THE DOCUMENTATION ARE PROVIDED ON AN "AS IS" AND "AS
-* AVAILABLE" BASIS WITH NO WARRANTY.  YOU AGREE THAT YOUR USE OF THE SOFTWARE AND THE
-* DOCUMENTATION IS AT YOUR SOLE RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR
-* COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. TO THE FULLEST
-* EXTENT PERMISSIBLE UNDER APPLICABLE LAW, CYBERSOURCE AND ITS AFFILIATES EXPRESSLY DISCLAIM ALL
-* WARRANTIES OF ANY KIND, EXPRESS OR IMPLIED, WITH RESPECT TO THE SOFTWARE AND THE
-* DOCUMENTATION, INCLUDING ALL WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
-* SATISFACTORY QUALITY, ACCURACY, TITLE AND NON-INFRINGEMENT, AND ANY WARRANTIES THAT MAY ARISE
-* OUT OF COURSE OF PERFORMANCE, COURSE OF DEALING OR USAGE OF TRADE.  NEITHER CYBERSOURCE NOR
-* ITS AFFILIATES WARRANT THAT THE FUNCTIONS OR INFORMATION CONTAINED IN THE SOFTWARE OR THE
-* DOCUMENTATION WILL MEET ANY REQUIREMENTS OR NEEDS YOU MAY HAVE, OR THAT THE SOFTWARE OR
-* DOCUMENTATION WILL OPERATE ERROR FREE, OR THAT THE SOFTWARE OR DOCUMENTATION IS COMPATIBLE
-* WITH ANY PARTICULAR OPERATING SYSTEM.
-*/
+ * Copyright 2003-2014 CyberSource Corporation
+ *
+ * THE SOFTWARE AND THE DOCUMENTATION ARE PROVIDED ON AN "AS IS" AND "AS
+ * AVAILABLE" BASIS WITH NO WARRANTY.  YOU AGREE THAT YOUR USE OF THE SOFTWARE AND THE
+ * DOCUMENTATION IS AT YOUR SOLE RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR
+ * COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. TO THE FULLEST
+ * EXTENT PERMISSIBLE UNDER APPLICABLE LAW, CYBERSOURCE AND ITS AFFILIATES EXPRESSLY DISCLAIM ALL
+ * WARRANTIES OF ANY KIND, EXPRESS OR IMPLIED, WITH RESPECT TO THE SOFTWARE AND THE
+ * DOCUMENTATION, INCLUDING ALL WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
+ * SATISFACTORY QUALITY, ACCURACY, TITLE AND NON-INFRINGEMENT, AND ANY WARRANTIES THAT MAY ARISE
+ * OUT OF COURSE OF PERFORMANCE, COURSE OF DEALING OR USAGE OF TRADE.  NEITHER CYBERSOURCE NOR
+ * ITS AFFILIATES WARRANT THAT THE FUNCTIONS OR INFORMATION CONTAINED IN THE SOFTWARE OR THE
+ * DOCUMENTATION WILL MEET ANY REQUIREMENTS OR NEEDS YOU MAY HAVE, OR THAT THE SOFTWARE OR
+ * DOCUMENTATION WILL OPERATE ERROR FREE, OR THAT THE SOFTWARE OR DOCUMENTATION IS COMPATIBLE
+ * WITH ANY PARTICULAR OPERATING SYSTEM.
+ */
 
 package com.cybersource.ws.client;
 
@@ -49,18 +49,18 @@
  */
 public class Client {
     private static final String HEADER_FORMAT = "{0}={1}";
-
+    
     private static final String SOAP_ENVELOPE1 = "<soap:Envelope xmlns:soap=\"" +
-            "http://schemas.xmlsoap.org/soap/envelope/\">\n<soap:Body id=\"body1\">\n" +
-            "<nvpRequest xmlns=\"{0}\">\n{1}</nvpRequest>" +
-            "\n</soap:Body>\n</soap:Envelope>";
-
+    "http://schemas.xmlsoap.org/soap/envelope/\">\n<soap:Body id=\"body1\">\n" +
+    "<nvpRequest xmlns=\"{0}\">\n{1}</nvpRequest>" +
+    "\n</soap:Body>\n</soap:Envelope>";
+    
     private static final String ELEM_NVP_REPLY = "nvpReply";
-
+    
     private static final String MERCHANT_ID = "merchantID";
-
     
-
+    
+    
     /**
      * Runs a transaction.
      *
@@ -71,11 +71,11 @@ public class Client {
      * @throws ClientException if any other exception occurs.
      */
     public static Map runTransaction(Map<String,String> request, Properties props)
-            throws FaultException, ClientException {
+    throws FaultException, ClientException {
         return (runTransaction(
-                request, props, null, true, true));
+                               request, props, null, true, true));
     }
-
+    
     /**
      * Runs a transaction.
      *
@@ -91,16 +91,16 @@ public static Map runTransaction(Map<String,String> request, Properties props)
      * @throws ClientException if any other exception occurs.
      */
     public static Map runTransaction(
-            Map<String, String> request, Properties props,
-            Logger _logger, boolean prepare, boolean logTranStart)
-            throws FaultException, ClientException {
+                                     Map<String, String> request, Properties props,
+                                     Logger _logger, boolean prepare, boolean logTranStart)
+    throws FaultException, ClientException {
         MerchantConfig mc;
         LoggerWrapper logger = null;
         Connection con = null;
-
+        
         try {
             setVersionInformation(request);
-
+            
             String merchantID = request.get(MERCHANT_ID);
             if (merchantID == null) {
                 // if no merchantID is present in the request, get its
@@ -111,17 +111,17 @@ public static Map runTransaction(
             } else {
                 mc = new MerchantConfig(props, merchantID);
             }
-
+            
             logger = new LoggerWrapper(_logger, prepare, logTranStart, mc);
-
+            
             DocumentBuilder builder = Utility.newDocumentBuilder();
-
+            
             Document signedDoc
-                    = soapWrapAndSign(request, mc, builder,logger);
+            = soapWrapAndSign(request, mc, builder,logger);
             
-//          FileWriter writer = new FileWriter(new File("signedDoc.xml"));
-//          writer.write(XMLUtils.PrettyDocumentToString(signedDoc));
-//          writer.close();
+            //          FileWriter writer = new FileWriter(new File("signedDoc.xml"));
+            //          writer.write(XMLUtils.PrettyDocumentToString(signedDoc));
+            //          writer.close();
             
             con = Connection.getInstance(mc, builder, logger);
             Document wrappedReply = con.post(signedDoc);
@@ -131,29 +131,29 @@ public static Map runTransaction(
             return replyMap;
         } catch (IOException e) {
             throw new ClientException(
-                    e, con != null && con.isRequestSent(), logger);
+                                      e, con != null && con.isRequestSent(), logger);
         } catch (ParserConfigurationException e) {
             throw new ClientException(
-                    e, con != null && con.isRequestSent(), logger);
+                                      e, con != null && con.isRequestSent(), logger);
         } catch (SignException e) {
             throw new ClientException(
-                    e, con != null && con.isRequestSent(), logger);
+                                      e, con != null && con.isRequestSent(), logger);
         } catch (ConfigException e) {
             throw new ClientException(
-                    e, con != null && con.isRequestSent(), logger);
+                                      e, con != null && con.isRequestSent(), logger);
         } catch (SAXException e) {
-        	throw new ClientException(
-                    e, con != null && con.isRequestSent(), logger);
-		} catch (SignEncryptException e) {
-			throw new ClientException(
-                    e, con != null && con.isRequestSent(), logger);
-		} finally {
+            throw new ClientException(
+                                      e, con != null && con.isRequestSent(), logger);
+        } catch (SignEncryptException e) {
+            throw new ClientException(
+                                      e, con != null && con.isRequestSent(), logger);
+        } finally {
             if (con != null) {
                 con.release();
             }
         }
     }
-
+    
     /**
      * Sets the version information in the request.
      *
@@ -164,8 +164,8 @@ private static void setVersionInformation(Map<String, String> request) {
         request.put("clientLibraryVersion", Utility.VERSION);
         request.put("clientEnvironment", Utility.ENVIRONMENT);
     }
-
-
+    
+    
     /**
      * Wraps the given Map object in SOAP envelope and signs it.
      *
@@ -176,77 +176,76 @@ private static void setVersionInformation(Map<String, String> request) {
      * @return signed document.
      * @throws IOException   if reading from string fails.
      * @throws SignException if signing fails.
-     * @throws SAXException 
-     * @throws SignEncryptException 
+     * @throws SAXException
+     * @throws SignEncryptException
      */
     private static Document soapWrapAndSign(
-            Map request, MerchantConfig mc, DocumentBuilder builder,
-            LoggerWrapper logger)
-            throws
-            IOException, SignException, SAXException, SignEncryptException {
+                                            Map request, MerchantConfig mc, DocumentBuilder builder,
+                                            LoggerWrapper logger)
+    throws
+    IOException, SignException, SAXException, SignEncryptException {
         boolean logSignedData = mc.getLogSignedData();
         if (!logSignedData) {
             logger.log(
-            		Logger.LT_REQUEST,
-            		"UUID   >  "+(mc.getUniqueKey()).toString() + "\n" +
-            		"Input request is" + "\n" +
-            		"======================================= \n"
-            		+ mapToString(request, true, PCI.REQUEST));
+                       Logger.LT_REQUEST,
+                       "UUID   >  "+(mc.getUniqueKey()).toString() + "\n" +
+                       "Input request is" + "\n" +
+                       "======================================= \n"
+                       + mapToString(request, true, PCI.REQUEST));
         }
         
         Document wrappedDoc = soapWrap(request, mc, builder,logger);
-        logger.log(Logger.LT_INFO, "Client, End of soapWrap   ",true); 
+        logger.log(Logger.LT_INFO, "Client, End of soapWrap   ",true);
         
         Document resultDocument = null;
-<<<<<<< HEAD
         if(mc.getEnablejdkcert()){
-        	SecurityUtil.readJdkCert(mc,logger);
+            SecurityUtil.readJdkCert(mc,logger);
         }
         else{
-        	SecurityUtil.loadMerchantP12File(mc,logger);
-        	logger.log(Logger.LT_INFO, "Client, End of loadMerchantP12File   ", true);       
+            SecurityUtil.loadMerchantP12File(mc,logger);
+            logger.log(Logger.LT_INFO, "Client, End of loadMerchantP12File   ", true);
         }
         // sign Document object
         resultDocument = SecurityUtil.createSignedDoc(wrappedDoc, mc.getMerchantID(), mc.getKeyPassword(), logger);
         logger.log(Logger.LT_INFO, "Client, End of createSignedDoc   ", true);
-
+        
         if ( mc.getUseSignAndEncrypted() ) {
-        	// Encrypt signed Document
+            // Encrypt signed Document
             resultDocument = SecurityUtil.handleMessageCreation(resultDocument, mc.getMerchantID(), logger);
             logger.log(Logger.LT_INFO, "Client, End of handleMessageCreation   ", true);
         }
-=======
+        
         SecurityUtil.loadMerchantP12File(mc,logger);
-        logger.log(Logger.LT_INFO, "Client, End of loadMerchantP12File   ", true);       
+        logger.log(Logger.LT_INFO, "Client, End of loadMerchantP12File   ", true);
         
         // sign Document object
         resultDocument = SecurityUtil.createSignedDoc(wrappedDoc, mc.getMerchantID(), mc.getKeyPassword(), logger);
         logger.log(Logger.LT_INFO, "Client, End of createSignedDoc   ", true);
-
+        
         if ( mc.getUseSignAndEncrypted() ) {
-        	// Encrypt signed Document
+            // Encrypt signed Document
             resultDocument = SecurityUtil.handleMessageCreation(resultDocument, mc.getMerchantID(), logger);
             logger.log(Logger.LT_INFO, "Client, End of handleMessageCreation   ", true);
         }
->>>>>>> upstream/master
+        
         if (logSignedData) {
-           logger.log(Logger.LT_REQUEST,Utility.nodeToString(resultDocument, PCI.REQUEST));
-        	//logger.log(Logger.LT_REQUEST,XMLUtils.PrettyDocumentToString(resultDocument));
+            logger.log(Logger.LT_REQUEST,Utility.nodeToString(resultDocument, PCI.REQUEST));
+            //logger.log(Logger.LT_REQUEST,XMLUtils.PrettyDocumentToString(resultDocument));
         }
-
+        
         return resultDocument ;
     }
-
+    
     private static Document soapWrap(Map request, MerchantConfig mc, DocumentBuilder builder, LoggerWrapper logger) throws SAXException, IOException{
-    	// wrap in SOAP envelope
+        // wrap in SOAP envelope
         Object[] arguments
-                = {mc.getEffectiveNamespaceURI(),
-                mapToString(request, false, PCI.REQUEST)};
+        = {mc.getEffectiveNamespaceURI(),
+            mapToString(request, false, PCI.REQUEST)};
         String xmlString = MessageFormat.format(SOAP_ENVELOPE1, arguments);
         // load XML string into a Document object
         StringReader sr = new StringReader( xmlString );
         Document wrappedDoc = builder.parse( new InputSource( sr ) );
-        sr.close(); 
+        sr.close();
         return wrappedDoc;
     }
     
@@ -260,36 +259,36 @@ private static Document soapWrap(Map request, MerchantConfig mc, DocumentBuilder
      * @return content of SOAP body as a Map object.
      */
     private static HashMap soapUnwrap(
-            Document doc, MerchantConfig mc, LoggerWrapper logger) {
-    	
-    	// 3/8/2016 if the message was encrypted we need to decrypt it
-    	
+                                      Document doc, MerchantConfig mc, LoggerWrapper logger) {
+        
+        // 3/8/2016 if the message was encrypted we need to decrypt it
+        
         boolean logSignedData = mc.getLogSignedData();
         if (logSignedData) {
             logger.log(Logger.LT_REPLY,
-                    Utility.nodeToString(doc, PCI.REPLY));
+                       Utility.nodeToString(doc, PCI.REPLY));
         }
-
+        
         // look for the nvpReply element
         Node nvpReply
-                = Utility.getElement(
-                doc, ELEM_NVP_REPLY, mc.getEffectiveNamespaceURI());
-
+        = Utility.getElement(
+                             doc, ELEM_NVP_REPLY, mc.getEffectiveNamespaceURI());
+        
         Text nvpString = (Text) nvpReply.getFirstChild();
-
+        
         String replyString = nvpString.getNodeValue();
-
+        
         HashMap reply = Utility.stringToMap(replyString);
-
+        
         if (!logSignedData) {
             logger.log(
-                    Logger.LT_REPLY,
-                    mapToString(reply, true, PCI.REPLY));
+                       Logger.LT_REPLY,
+                       mapToString(reply, true, PCI.REPLY));
         }
-
+        
         return reply;
     }
-
+    
     /**
      * Converts the contents of a Map object into a string, one name-value pair
      * to a line and the name and value are separated by an equal sign.
@@ -303,9 +302,9 @@ private static HashMap soapUnwrap(
      *         empty.
      */
     static String mapToString(Map src, boolean mask, int type) {
-       return Utility.mapToString(src, mask, type);
+        return Utility.mapToString(src, mask, type);
     }
-
+    
     
 } 
 
diff --git a/java/src/main/java/com/cybersource/ws/client/MerchantConfig.java b/java/src/main/java/com/cybersource/ws/client/MerchantConfig.java
@@ -558,7 +558,6 @@ public void setAllowRetry(boolean allowRetry) {
 		this.allowRetry = allowRetry;
 	}
 
-<<<<<<< HEAD
 	public boolean getcacert() {
 		return cacert;
 	}
@@ -569,6 +568,5 @@ public boolean getEnablejdkcert() {
 	public String getcacertpassword(){
 		return cacertpassword;
 	}
-=======
->>>>>>> upstream/master
+
 }
diff --git a/java/src/main/java/com/cybersource/ws/client/XMLClient.java b/java/src/main/java/com/cybersource/ws/client/XMLClient.java
@@ -340,7 +340,6 @@ private static Document soapWrapAndSign(
         logger.log(Logger.LT_INFO, "Client, End of soapWrap   ",true); 
         
         Document resultDocument = null;
-<<<<<<< HEAD
         if(mc.getEnablejdkcert()){
         	SecurityUtil.readJdkCert(mc,logger);
         }
@@ -357,7 +356,6 @@ private static Document soapWrapAndSign(
             resultDocument = SecurityUtil.handleMessageCreation(resultDocument , mc.getMerchantID() , logger);
             logger.log(Logger.LT_INFO, "Client, End of handleMessageCreation   ", true);
         }
-=======
 
         SecurityUtil.loadMerchantP12File(mc,logger);
         logger.log(Logger.LT_INFO, "Client, End of loadMerchantP12File   ", true);
@@ -371,7 +369,6 @@ private static Document soapWrapAndSign(
             resultDocument = SecurityUtil.handleMessageCreation(resultDocument , mc.getMerchantID() , logger);
             logger.log(Logger.LT_INFO, "Client, End of handleMessageCreation   ", true);
         }
->>>>>>> upstream/master
         if (logSignedData) {
            logger.log(Logger.LT_REQUEST,Utility.nodeToString(resultDocument, PCI.REQUEST));
         	//logger.log(Logger.LT_REQUEST,XMLUtils.PrettyDocumentToString(resultDocument));

Original file line number	Diff line number	Diff line change
`@@ -558,7 +558,6 @@ public void setAllowRetry(boolean allowRetry) {`
`558`	`558`	`this.allowRetry = allowRetry;`
`559`	`559`	`}`
`560`	`560`
`561`		`-<<<<<<< HEAD`
`562`	`561`	`public boolean getcacert() {`
`563`	`562`	`return cacert;`
`564`	`563`	`}`
`@@ -569,6 +568,5 @@ public boolean getEnablejdkcert() {`
`569`	`568`	`public String getcacertpassword(){`
`570`	`569`	`return cacertpassword;`
`571`	`570`	`}`
`572`		`-=======`
`573`		`->>>>>>> upstream/master`
	`571`	`+`
`574`	`572`	`}`