Merge pull request #129 from DivyaDosibhatla/future

Added Request and Response headers

Author: mahendya1002

README.md

@@ -10,7 +10,7 @@ To install the `cybersource-sdk-java` from central repository, add dependency to
 <dependency>
   <groupId>com.cybersource</groupId>
   <artifactId>cybersource-sdk-java</artifactId>
-  <version>6.2.7</version>
+  <version>6.2.8</version>
 </dependency> 
 ```
 Run `mvn install` to install dependency
@@ -19,7 +19,7 @@ Run `mvn install` to install dependency
 Add the dependency to your build.gradle
 ```java
 dependencies {
-  compile 'com.cybersource:cybersource-sdk-java:6.2.6'
+  compile 'com.cybersource:cybersource-sdk-java:6.2.8'
 }
 ```
 ## Requirements
@@ -183,6 +183,11 @@ Retry Pattern allows to retry sending a failed request and it will only work wit
 
 ## Changes
 
+Version Cybersource-sdk-java 6.2.8 (SEPT,2019)
+_______________________________
+
+  1)Added request header and logged request and response headers
+
 Version Cybersource-sdk-java 6.2.7 (MAR,2019)
 _______________________________
   1) Fixed security vulnerabilities found in the jar dependencies.

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

@@ -124,9 +124,8 @@ private void checkForFault()
             throws FaultException, ClientException {
         try {
             logger.log(Logger.LT_INFO, "Reading response...");
-
             int responseCode = getHttpResponseCode();
-
+            logResponseHeaders();
             // if successful, there's nothing left to do here.
             // we'll process the response in a later method.
             if (responseCode == HttpURLConnection.HTTP_OK) return;
@@ -214,7 +213,15 @@ static ByteArrayOutputStream makeStream(Document doc)
 
         return baos;
     }
+    /*
+     * Log Request and Response Headers
+     * 
+     */
+
+    	abstract public void logRequestHeaders();
+    	abstract public void logResponseHeaders();
 }
 
+
 /* Copyright 2006 CyberSource Corporation */
 

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

@@ -26,7 +26,6 @@
 import org.apache.commons.httpclient.params.HttpConnectionManagerParams;
 import org.apache.commons.httpclient.params.HttpMethodParams;
 import org.w3c.dom.Document;
-
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerException;
@@ -37,7 +36,10 @@
 import java.net.ProtocolException;
 import java.util.ArrayList;
 import java.util.List;
-
+import java.util.List;
+import org.apache.commons.httpclient.Header;
+import java.util.ArrayList;
+import java.util.Arrays;
 /**
  * Class helps in posting the Request document for the Transaction using HttpClient.
  * Converts the document to String format and also helps in setting up the Proxy connections.
@@ -81,7 +83,8 @@ void postDocument(Document request)
 
         postMethod.setRequestEntity(
                 new StringRequestEntity(requestString, null, "UTF-8"));
-
+        postMethod.setRequestHeader(Utility.ORIGIN_TIMESTAMP, String.valueOf(System.currentTimeMillis()));
+		logRequestHeaders();
         httpClient.executeMethod(postMethod);
     }
 
@@ -231,6 +234,19 @@ public boolean retryMethod(
             return false;
         }
     }
+    
+    @Override
+	public void logRequestHeaders() {		
+		List<Header> reqheaders=Arrays.asList(postMethod.getRequestHeaders());
+        logger.log(Logger.LT_INFO, "Request Headers: " +reqheaders);
+	}
+	
+	@Override
+	public void logResponseHeaders() {
+		List<Header> respheaders=Arrays.asList(postMethod.getResponseHeaders());
+		 logger.log(Logger.LT_INFO, "Response Headers"+ respheaders);
+	}
+	
 }
 
 /* Copyright 2006 CyberSource Corporation */

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

@@ -31,6 +31,10 @@
 import java.net.MalformedURLException;
 import java.net.ProtocolException;
 import java.net.URL;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 
 
 /**
@@ -57,6 +61,8 @@ void postDocument(Document request)
         URL url = new URL(serverURL);
 
         con = ConnectionHelper.openConnection(url, mc);
+        con.setRequestProperty(Utility.ORIGIN_TIMESTAMP, String.valueOf(System.currentTimeMillis()));
+        logRequestHeaders();
         con.setRequestMethod("POST");
         con.setDoOutput(true);
         ConnectionHelper.setTimeout(con, mc.getTimeout());
@@ -130,6 +136,21 @@ private static byte[] documentToByteArray(Document doc)
             }
         }
     }
+    
+    @Override
+    public void logResponseHeaders() {
+		if(con!=null) {
+	        logger.log(Logger.LT_INFO, "Response headers : "+con.getHeaderFields());			
+			}
+		}
+    
+    
+    @Override
+    public void logRequestHeaders() {
+		if(con!=null) {
+        	logger.log(Logger.LT_INFO, "Request Headers : "+con.getRequestProperties());
+        	}
+	      }
 }
 
 /* Copyright 2006 CyberSource Corporation */

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

@@ -48,7 +48,8 @@ private Utility() {
     /**
      * Version number of this release.
      */
-    public static final String VERSION = "6.2.7";
+    public static final String VERSION = "6.2.8";
+    public static final String ORIGIN_TIMESTAMP = "v-c-origin-ia";
 
     /**
      * If in the Request map, a key called "_has_escapes" is present and is set

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

@@ -182,6 +182,16 @@ public boolean retryMethod(
             return false;
         }
     }
+    
+ 	@Override
+ 	public void logResponseHeaders() {	
+ 		
+ 	}
+     
+     
+     @Override
+ 	public void logRequestHeaders() {
 
+ 	}
 }
 

samples/nvp/compileSample.bat

@@ -2,15 +2,15 @@
 
 set LOCAL_CP=
 rem ----------------------------------------------------------------------------
-rem Replace this with cybersource-sdk-java-6.2.7.jar when using Java SDK 1.6 or later.
+rem Replace this with cybersource-sdk-java-6.2.8.jar when using Java SDK 1.6 or later.
 rem If using this scripts outside zip package then give maven clean install. 
 rem This will generate all required dependencies under target/dependencies.These dependencies are used in CLASSPATH.
 rem ----------------------------------------------------------------------------
 
-if exist ../../lib set LOCAL_CP=%LOCAL_CP%;../../lib/cybersource-sdk-java-6.2.7.jar
+if exist ../../lib set LOCAL_CP=%LOCAL_CP%;../../lib/cybersource-sdk-java-6.2.8.jar
 if not exist ../../lib (
 	if not exist target goto error
-	set LOCAL_CP=%LOCAL_CP%;target/dependencies/cybersource-sdk-java-6.2.7.jar
+	set LOCAL_CP=%LOCAL_CP%;target/dependencies/cybersource-sdk-java-6.2.8.jar
 )
 
 if not exist classes mkdir classes

samples/nvp/compileSample.sh

@@ -2,13 +2,13 @@
 
 LOCAL_CP=
 # -----------------------------------------------------------------------------
-# Replace this with cybersource-sdk-java-6.2.7.jar when using Java SDK 1.6 or later.
+# Replace this with cybersource-sdk-java-6.2.8.jar when using Java SDK 1.6 or later.
 # If using this scripts outside zip package then give maven clean install.
 # This will generate all required dependencies under target/dependencies.These dependencies are used in CLASSPATH.
 # -----------------------------------------------------------------------------
 
 if test -d ../../lib
-then LOCAL_CP=$LOCAL_CP:../../lib/cybersource-sdk-java-6.2.7.jar
+then LOCAL_CP=$LOCAL_CP:../../lib/cybersource-sdk-java-6.2.8.jar
 fi
 
 if test ! -d ../../lib
@@ -19,7 +19,7 @@ then
 		echo "Execute maven clean install , This will generate all required dependencies under target/dependencies!!"
 		exit 1
 	fi
-LOCAL_CP=$LOCAL_CP:target/dependencies/cybersource-sdk-java-6.2.7.jar
+LOCAL_CP=$LOCAL_CP:target/dependencies/cybersource-sdk-java-6.2.8.jar
 fi
 
 if test ! -d ./classes

samples/nvp/runSample.bat

@@ -4,7 +4,7 @@ set LOCAL_CP=
 set LOCAL_CP=%LOCAL_CP%;classes
 
 rem ----------------------------------------------------------------------------
-rem Replace cybersource-sdk-java-6.2.7.jar when using Java SDK 1.6 or later.
+rem Replace cybersource-sdk-java-6.2.8.jar when using Java SDK 1.6 or later.
 rem If using this scripts outside zip package then give maven clean install. 
 rem This will generate all required dependencies under target/dependencies.These dependencies are used in CLASSPATH.
 rem ----------------------------------------------------------------------------

samples/nvp/runSample.sh

@@ -4,7 +4,7 @@ LOCAL_CP=
 LOCAL_CP=$LOCAL_CP:./classes
 
 # -----------------------------------------------------------------------------
-# Replace this with cybersource-sdk-java-6.2.7.jar when using Java SDK 1.6 or later.
+# Replace this with cybersource-sdk-java-6.2.8.jar when using Java SDK 1.6 or later.
 # If using this scripts outside zip package then give maven clean install.
 # This will generate all required dependencies under target/dependencies.These dependencies are used in CLASSPATH.
 # -----------------------------------------------------------------------------