[utilities COMMIT] in /java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient: HttpClientB...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Oct 11 21:53:49 2013
New Revision: 458

URL: http://svn.shibboleth.net/view/utilities?rev=458&view=rev
Log:
Checkpoint some working changes to HttpClientBuilder.  Deprecations are gone, but this class probably isn't going to stay this way.

Added:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupport.java   (with props)
Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java?rev=458&r1=457&r2=458&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java Fri Oct 11 21:53:49 2013
@@ -19,14 +19,6 @@
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
 
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
@@ -36,17 +28,10 @@
 import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.http.client.CredentialsProvider;
 import org.apache.http.client.HttpClient;
-import org.apache.http.client.params.AllClientPNames;
-import org.apache.http.client.protocol.RequestAcceptEncoding;
-import org.apache.http.client.protocol.ResponseContentEncoding;
-import org.apache.http.conn.ClientConnectionManager;
-import org.apache.http.conn.scheme.PlainSocketFactory;
-import org.apache.http.conn.scheme.Scheme;
-import org.apache.http.conn.scheme.SchemeRegistry;
-import org.apache.http.conn.ssl.SSLSocketFactory;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.impl.conn.PoolingClientConnectionManager;
-import org.apache.http.params.HttpParams;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.config.ConnectionConfig;
+import org.apache.http.config.SocketConfig;
+import org.apache.http.impl.client.BasicCredentialsProvider;
 
 //TODO retry attempts, keep alive strategy
 
@@ -82,12 +67,6 @@
      */
     private boolean connectionStalecheck;
 
-    /** Total number of connections that may be open. Default value: 20 */
-    private int connectionsMaxTotal;
-
-    /** Maximum number of connections that may be opened to a single host. Default value: 2 */
-    private int connectionsMaxPerRoute;
-
     /** Host name of the HTTP proxy server through which connections will be made. Default value: null. */
     private String connectionProxyHost;
 
@@ -105,9 +84,22 @@
 
     /** Character set used for HTTP entity content. Default value: UTF-8 */
     private String httpContentCharSet;
+    
+    /** The Apache HttpClientBuilder 4.3+ instance over which to layer this builder. */
+    private org.apache.http.impl.client.HttpClientBuilder apacheBuilder;
 
     /** Constructor. */
     public HttpClientBuilder() {
+        this(null);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param builder the Apache HttpClientBuilder 4.3+ instance over which to layer this builder
+     */
+    public HttpClientBuilder(org.apache.http.impl.client.HttpClientBuilder builder) {
+        apacheBuilder = builder;
         resetDefaults();
     }
 
@@ -120,8 +112,6 @@
         connectionDisregardSslCertificate = false;
         connectionCloseAfterResponse = true;
         connectionStalecheck = false;
-        connectionsMaxTotal = 20;
-        connectionsMaxPerRoute = 2;
         connectionProxyHost = null;
         connectionProxyPort = 8080;
         connectionProxyUsername = null;
@@ -275,44 +265,6 @@
     }
 
     /**
-     * Gets the maximum number of connections that may be open at any given time when pooling is used.
-     * 
-     * @return maximum number of connections that may be open at any given time when pooling is used
-     */
-    public int getConnectionsMaxTotal() {
-        return connectionsMaxTotal;
-    }
-
-    /**
-     * Sets the maximum number of connections that may be open at any given time when pooling is used.
-     * 
-     * @param max maximum number of connections that may be open at any given time when pooling is used; must be greater
-     *            than zero
-     */
-    public void setConnectionsMaxTotal(final int max) {
-        connectionsMaxTotal = (int) Constraint.isGreaterThan(0, max, "Max total connections must be greater than 0");
-    }
-
-    /**

[... 183 lines stripped ...]