Merge pull request #131 from AuthorizeNet/future

Future

Author: Sunny Raj Rathod

.classpath

@@ -4,8 +4,8 @@
 	<classpathentry kind="src" path="resources"/>
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="lib" path="lib/commons-logging-1.1.1.jar"/>
-	<classpathentry kind="lib" path="lib/httpclient-4.0.1.jar"/>
-	<classpathentry kind="lib" path="lib/httpcore-4.0.1.jar"/>
+	<classpathentry kind="lib" path="lib/httpclient-4.5.3.jar"/>
+	<classpathentry kind="lib" path="lib/httpcore-4.4.6.jar"/>
 	<classpathentry kind="lib" path="lib/junit-4.8.2.jar"/>
 	<classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

src/main/java/net/authorize/aim/Result.java

@@ -17,6 +17,7 @@ public class Result<T> extends net.authorize.Result<T> {
 	private ResponseCode responseCode;
 	private ResponseReasonCode reasonResponseCode;
 	private String responseText;
+	private String transactionId;
 
 	private Result() { }
 
@@ -29,8 +30,11 @@ public static <T> Result<T> createResult(T object, Map<ResponseField, String> re
 		}
 
 		String responseCodeStr = responseMap.get(ResponseField.RESPONSE_CODE);
+		
+		result.transactionId = responseMap.get(ResponseField.TRANSACTION_ID);
+		
 		result.responseCode = responseCodeStr!=null && !"".equals(responseCodeStr)?
-				ResponseCode.findByResponseCode(Integer.parseInt(responseCodeStr)):
+				ResponseCode.findByResponseCode(Double.valueOf(responseCodeStr).intValue()):
 					ResponseCode.ERROR;
 
 		String responseReasonCodeStr = responseMap.get(ResponseField.RESPONSE_REASON_CODE);
@@ -58,6 +62,10 @@ public String getResponseText() {
 		return responseText;
 	}
 
+	public String getTransactionId() {
+		return transactionId;
+	}
+
 	public boolean isApproved() {
 		return ResponseCode.APPROVED.equals(this.responseCode);
 	}

src/main/java/net/authorize/api/controller/GetCustomerProfileController.java

@@ -16,8 +16,7 @@ protected void validateRequest() {
 		GetCustomerProfileRequest request = this.getApiRequest();
 
 		//validate required fields		
-		if ( null == request.getCustomerProfileId()) throw new NullPointerException("CustomerProfileId cannot be null");
-		
+
 		//validate not-required fields		
 		//creditCardOne.setCardCode("");
 	}

src/main/java/net/authorize/sim/Result.java

@@ -69,7 +69,7 @@ public static Result createResult(String apiLoginId, String merchantMD5Key, Map<
 		}
 
 		result.responseCode = responseCodeStr!=null && !"".equals(responseCodeStr)?
-				ResponseCode.findByResponseCode(Integer.parseInt(responseCodeStr)):
+				ResponseCode.findByResponseCode(Double.valueOf(responseCodeStr).intValue()):
 					ResponseCode.UNKNOWN;
 		result.reasonResponseCode = responseReasonCodeStr!=null && !"".equals(responseReasonCodeStr)?
 				ResponseReasonCode.findByReasonCode(Integer.parseInt(responseReasonCodeStr)):

src/main/java/net/authorize/util/HttpCallTask.java

@@ -63,11 +63,11 @@ public ANetApiResponse call() throws Exception {
 		ANetApiResponse response = null;
 		StringBuilder buffer = new StringBuilder();
 
-		DefaultHttpClient httpCaller = null;
+		org.apache.http.client.HttpClient httpCaller = null;
 
         try {
             HttpPost httppost = HttpUtility.createPostRequest(this.env, this.request);
-            httpCaller = new DefaultHttpClient();
+            httpCaller = HttpClient.getHttpsClient();
 			HttpClient.setProxyIfRequested(httpCaller);
             HttpResponse httpResponse = httpCaller.execute(httppost);
 

src/main/java/net/authorize/util/HttpClient.java

@@ -7,19 +7,28 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URLDecoder;
+import java.security.KeyStore;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManagerFactory;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
+import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.conn.params.ConnRoutePNames;
+import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.client.LaxRedirectStrategy;
 import org.apache.http.params.CoreProtocolPNames;
 import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.protocol.HTTP;
@@ -144,7 +153,7 @@ public static Map<ResponseField, String> execute(Environment environment, Transa
 
 		if(environment != null && transaction != null) {
 			try {
-				DefaultHttpClient httpClient = new DefaultHttpClient();
+				org.apache.http.client.HttpClient httpClient = getHttpsClient();
 
 				setProxyIfRequested(httpClient);
 
@@ -234,7 +243,7 @@ public static BasicXmlDocument executeXML(Environment environment, Transaction t
 
 		if(environment != null && transaction != null) {
 			try {
-				DefaultHttpClient httpClient = new DefaultHttpClient();
+				org.apache.http.client.HttpClient httpClient = getHttpsClient();
 
 				setProxyIfRequested(httpClient);
 
@@ -302,7 +311,7 @@ public static BasicXmlDocument executeXML(Environment environment, Transaction t
 	 * if proxy use is requested, set http-client appropriately 
 	 * @param httpClient the client to add proxy values to 
 	 */
-	public static void setProxyIfRequested(DefaultHttpClient httpClient) {
+	public static void setProxyIfRequested(org.apache.http.client.HttpClient httpClient) {
 		if ( UseProxy)
 		{
 			if ( !proxySet) {
@@ -313,4 +322,41 @@ public static void setProxyIfRequested(DefaultHttpClient httpClient) {
 			httpClient.getParams().setParameter( ConnRoutePNames.DEFAULT_PROXY, proxyHttpHost);
 		}
 	}
+	
+	/**
+	 * @return returns an SSL context with TLSv1.2 protocol instance to be used in the call
+	 */
+	private static SSLContext getSSLContext() {
+		try {
+			final SSLContext sc = SSLContext.getInstance("TLSv1.2");
+			final TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+			trustManagerFactory.init((KeyStore) null);
+			sc.init(null, trustManagerFactory.getTrustManagers(), new java.security.SecureRandom());
+			return sc;
+		}
+		catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+	/**
+	 * Returns a HTTPClient instance which enforce TLSv1.2 protocol for all the calls 
+	 * @return org.apache.http.client.HttpClient instance 
+	 * @throws Exception
+	 */
+	static org.apache.http.client.HttpClient getHttpsClient() throws Exception {
+		SSLContext sslcontext = getSSLContext();
+		try {
+			LayeredConnectionSocketFactory sslSocketFactory = new org.apache.http.conn.ssl.SSLConnectionSocketFactory(sslcontext, SSLConnectionSocketFactory.STRICT_HOSTNAME_VERIFIER);
+			RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(httpConnectionTimeout).build();
+			return HttpClients.custom()
+					.setSSLSocketFactory(sslSocketFactory)
+					.setDefaultRequestConfig(requestConfig)
+					.setRedirectStrategy(new LaxRedirectStrategy())
+					.build();
+		} catch (Exception e) {
+			return null;
+		}
+	}
 }