Merge pull request #135 from AuthorizeNet/future

RC 1.9.6

Author: kikmak42

.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>anet_java_sdk.1.4.x</name>
+	<name>anet_java_sdk</name>
 	<comment></comment>
 	<projects>
 	</projects>

pom.xml

@@ -151,6 +151,9 @@
                 <includes>
                     <include>*</include>
                 </includes>
+                <excludes>
+                	<exclude>log4j.properties</exclude>
+                </excludes>
             </resource>
         </resources>
     </build>

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

@@ -6,6 +6,8 @@ public final class Constants {
 	public static final String HTTPS_USE_PROXY = "https.proxyUse";
 	public static final String HTTPS_PROXY_HOST = "https.proxyHost";
 	public static final String HTTPS_PROXY_PORT = "https.proxyPort";
+	public static final String HTTPS_PROXY_USERNAME = "https.proxyUsername";
+    public static final String HTTPS_PROXY_PASSWORD = "https.proxyPassword";
 
 	public static final String HTTP_USE_PROXY = "http.proxyUse";
 	public static final String HTTP_PROXY_HOST = "http.proxyHost";
@@ -33,5 +35,5 @@ public final class Constants {
 	public static final String HTTP_READ_TIME_OUT = "http.ReadTimeout";
 	public static final int HTTP_READ_TIME_OUT_DEFAULT_VALUE = 30000;
 
-	public static final String CLIENT_ID = "sdk-java-1.9.5";
+	public static final String CLIENT_ID = "sdk-java-1.9.6";
 }

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

@@ -68,7 +68,7 @@ public ANetApiResponse call() throws Exception {
         try {
             HttpPost httppost = HttpUtility.createPostRequest(this.env, this.request);
             httpCaller = HttpClient.getHttpsClient();
-			HttpClient.setProxyIfRequested(httpCaller);
+			
             HttpResponse httpResponse = httpCaller.execute(httppost);
 
 			if ( null != httpResponse) { 

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

@@ -20,15 +20,23 @@
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.Credentials;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
 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.BasicCredentialsProvider;
+import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.client.LaxRedirectStrategy;
+import org.apache.http.impl.conn.DefaultProxyRoutePlanner;
 import org.apache.http.params.CoreProtocolPNames;
 import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.protocol.HTTP;
@@ -51,6 +59,9 @@ public class HttpClient {
 	static boolean UseProxy = Environment.getBooleanProperty(Constants.HTTPS_USE_PROXY);
 	static String ProxyHost = Environment.getProperty(Constants.HTTPS_PROXY_HOST);
 	static int ProxyPort = Environment.getIntProperty(Constants.HTTPS_PROXY_PORT);
+	static String proxyUsername = Environment.getProperty(Constants.HTTPS_PROXY_USERNAME);
+	static String proxyPassword = Environment.getProperty(Constants.HTTPS_PROXY_PASSWORD);
+	
 	static int httpConnectionTimeout = Environment.getIntProperty(Constants.HTTP_CONNECTION_TIME_OUT);
 	static int httpReadTimeout = Environment.getIntProperty(Constants.HTTP_READ_TIME_OUT);
 
@@ -153,9 +164,7 @@ public static Map<ResponseField, String> execute(Environment environment, Transa
 
 		if(environment != null && transaction != null) {
 			try {
-				org.apache.http.client.HttpClient httpClient = getHttpsClient();
-
-				setProxyIfRequested(httpClient);
+				CloseableHttpClient httpClient = getHttpsClient();
 
 				// create the HTTP POST object
 				HttpPost httpPost = createHttpPost(environment, transaction);
@@ -243,10 +252,8 @@ public static BasicXmlDocument executeXML(Environment environment, Transaction t
 
 		if(environment != null && transaction != null) {
 			try {
-				org.apache.http.client.HttpClient httpClient = getHttpsClient();
+				CloseableHttpClient httpClient = getHttpsClient();
 
-				setProxyIfRequested(httpClient);
-				
 				// create the HTTP POST object
 				HttpPost httpPost = createHttpPost(environment, transaction);
 
@@ -307,22 +314,6 @@ public static BasicXmlDocument executeXML(Environment environment, Transaction t
 		return response;
 	}
 
-	/**
-	 * if proxy use is requested, set http-client appropriately 
-	 * @param httpClient the client to add proxy values to 
-	 */
-	public static void setProxyIfRequested(org.apache.http.client.HttpClient httpClient) {
-		if ( UseProxy)
-		{
-			if ( !proxySet) {
-				LogHelper.info(logger, "Setting up proxy to URL: '%s://%s:%d'", Constants.PROXY_PROTOCOL, ProxyHost, ProxyPort);
-				proxySet = true;
-			}
-			HttpHost proxyHttpHost = new HttpHost(ProxyHost, ProxyPort, Constants.PROXY_PROTOCOL);
-			httpClient.getParams().setParameter( ConnRoutePNames.DEFAULT_PROXY, proxyHttpHost);
-		}
-	}
-	
 	/**
 	 * @return returns an SSL context with TLSv1.2 protocol instance to be used in the call
 	 */
@@ -342,19 +333,58 @@ private static SSLContext getSSLContext() {
 
 	/**
 	 * Returns a HTTPClient instance which enforce TLSv1.2 protocol for all the calls 
-	 * @return org.apache.http.client.HttpClient instance 
+	 * @return CloseableHttpClient instance 
 	 * @throws Exception
 	 */
-	static org.apache.http.client.HttpClient getHttpsClient() throws Exception {
+	static CloseableHttpClient 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();
+			
+			CloseableHttpClient httpClient;
+			
+			if ( UseProxy && ProxyHost != null) {
+				
+				HttpClientBuilder hcBuilder;
+				if (proxyUsername != null && proxyPassword != null) {
+					LogHelper.info(logger, "Setting up proxy to URL with Authentication: '%s://%s@%s:%d'", Constants.PROXY_PROTOCOL, proxyUsername, ProxyHost, ProxyPort);
+					CredentialsProvider credsProvider = new BasicCredentialsProvider();
+					AuthScope proxyScope = new AuthScope(ProxyHost, ProxyPort);
+					Credentials proxyCreds = new UsernamePasswordCredentials(proxyUsername, proxyPassword);
+					credsProvider.setCredentials(proxyScope, proxyCreds);
+					hcBuilder = HttpClients.custom()
+								.setSSLSocketFactory(sslSocketFactory)
+								.setDefaultRequestConfig(requestConfig)
+								.setRedirectStrategy(new LaxRedirectStrategy())
+								.setDefaultCredentialsProvider(credsProvider);
+				}
+				else {
+					LogHelper.info(logger, "Setting up proxy to URL: '%s://%s:%d'", Constants.PROXY_PROTOCOL, ProxyHost, ProxyPort);
+					hcBuilder = HttpClients.custom()
+								.setSSLSocketFactory(sslSocketFactory)
+								.setDefaultRequestConfig(requestConfig)
+								.setRedirectStrategy(new LaxRedirectStrategy());
+				}
+				
+				HttpHost httpProxy = new HttpHost(ProxyHost, ProxyPort, Constants.PROXY_PROTOCOL);
+	            hcBuilder.setProxy(httpProxy);
+        
+	            httpClient = hcBuilder.build();
+
+				proxySet = true;
+			}
+			else {
+				LogHelper.warn(logger, "Defaulting to non-proxy environment");
+				
+				httpClient =  HttpClients.custom()
+						.setSSLSocketFactory(sslSocketFactory)
+						.setDefaultRequestConfig(requestConfig)
+						.setRedirectStrategy(new LaxRedirectStrategy())
+						.build();
+			} 
+
+			return httpClient;
 		} catch (Exception e) {
 			return null;
 		}