Separate out connection and socket timeout prop and removing httpclient3.1 jar

Author: mahendya1002

README.md

@@ -232,19 +232,18 @@ Retry Pattern allows to retry sending a failed request and it will only work wit
       The XML Security project is aimed at providing implementation of security standards for XML,supports XML-Signature Syntax and Processing,XML Encryption Syntax and Processing, and supports XML Digital Signature APIs.
     4. org.apache.commons:commons-lang3:3.4
       Apache Commons Lang, a package of Java utility classes for the classes that are in java.lang's hierarchy, or are considered to be so standard as to justify existence in java.lang.
-    5. commons-httpclient:commons-httpclient:3.1
-      Provides a framework by which new request types (methods) or HTTP extensions can be created easily.
-    6. commons-logging:commons-logging:jar:1.1.1
+    5. commons-logging:commons-logging:jar:1.1.1
       This is getting downloaded as compile time dependency of wss4j:1.6.19.Apache Commons Logging is a thin adapter allowing configurable bridging to other, well known logging systems.
-    7. org.slf4j:slf4j-api:1.7.21 and org.slf4j:slf4j-jcl:1.7.21
+    6. org.slf4j:slf4j-api:1.7.21 and org.slf4j:slf4j-jcl:1.7.21
       slf4j-api is getting used as a dependency for wss4j. Modified to latest version.
-    8. junit:junit:4.13.1
+    7. junit:junit:4.13.1
       JUnit is a unit testing framework for Java.
-    9. org.mockito:mockito-all:1.10.19
+    8. org.mockito:mockito-all:1.10.19
       Mock objects library for java  
-    10. org.apache.httpcomponents:httpclient:4.5.11
+    9. org.apache.httpcomponents:httpclient:4.5.11
        Provides reusable components for client-side authentication, HTTP state management, and HTTP connection management. It is used for poolinghttpclientconnectionmanager feature.
-
+    10. org.apache.httpcomponents:httpcore:4.4.13
+       Provides low level HTTP transport components that can be used to build custom client and server side HTTP services with a minimal footprint.
 
 ## Changes
 _______________________________

java/pom.xml

@@ -243,18 +243,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>3.1</version>
-            <exclusions>
-	          <exclusion>
-	            <groupId>commons-logging</groupId>
-	            <artifactId>commons-logging</artifactId>
-	          </exclusion>
-        	</exclusions>
-        </dependency>
-        <dependency>
+         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
             <version>1.61</version>

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

@@ -18,6 +18,16 @@
 
 package com.cybersource.ws.client;
 
+import org.apache.http.HttpHost;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.config.AuthSchemes;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.ProxyAuthenticationStrategy;
+import org.apache.http.impl.conn.DefaultProxyRoutePlanner;
 import org.bouncycastle.util.encoders.Base64;
 
 import java.io.IOException;
@@ -26,6 +36,7 @@
 import java.net.Proxy;
 import java.net.URL;
 import java.nio.charset.Charset;
+import java.util.Collections;
 
 /**
  * Helps in creating the Proxy and adding Proxy credentials to JDKHttpURLConnection.
@@ -45,12 +56,11 @@ public static boolean getDefaultUseHttpClient() {
     /**
      * Sets the timeout for HTTP Request
      * @param con - HttpURLConnection
-     * @param timeout - timeout integer value
+     * @param mc - MerchantConfig
      */
-    public static void setTimeout(HttpURLConnection con, int timeout) {
-        int timeoutInMS = timeout * 1000;
-        con.setConnectTimeout(timeoutInMS);
-        con.setReadTimeout(timeoutInMS);
+    public static void setTimeout(HttpURLConnection con, MerchantConfig mc) {
+        con.setConnectTimeout(mc.getConnectionTimeoutMs());
+        con.setReadTimeout(mc.getSocketTimeoutMs());
     }
 
     /**
@@ -108,4 +118,30 @@ private static void addProxyCredentials(
 
         }
     }
+
+    /**
+     * Set proxy by using proxy credentials to create httpclient
+     *
+     * @param httpClientBuilder
+     * @param requestConfigBuilder
+     * @param merchantConfig
+     */
+    public static void setProxy(HttpClientBuilder httpClientBuilder, RequestConfig.Builder requestConfigBuilder, MerchantConfig merchantConfig) {
+        if (merchantConfig.getProxyHost() != null) {
+            HttpHost proxy = new HttpHost(merchantConfig.getProxyHost(), merchantConfig.getProxyPort());
+            DefaultProxyRoutePlanner routePlanner = new DefaultProxyRoutePlanner(proxy);
+            httpClientBuilder.setRoutePlanner(routePlanner);
+
+            if (merchantConfig.getProxyUser() != null) {
+                httpClientBuilder.setProxyAuthenticationStrategy(new ProxyAuthenticationStrategy());
+                requestConfigBuilder.setProxyPreferredAuthSchemes(Collections.singletonList(AuthSchemes.BASIC));
+
+                CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+                credentialsProvider.setCredentials(AuthScope.ANY,
+                        new UsernamePasswordCredentials(merchantConfig.getProxyUser(), merchantConfig.getProxyPassword()));
+
+                httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+            }
+        }
+    }
 }