Issue docker-java#1: use HttpClient 4.2 with connecting pooling

kpelykh · kpelykh · commit b70ed459c4b3 · 2013-07-19T12:15:35.000-07:00
diff --git a/pom.xml b/pom.xml
@@ -59,11 +59,11 @@
 
 
         <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>3.1</version>
-            <scope>compile</scope>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.2.5</version>
         </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
diff --git a/src/main/java/com/kpelykh/docker/client/DockerClient.java b/src/main/java/com/kpelykh/docker/client/DockerClient.java
@@ -9,9 +9,16 @@
 import com.sun.jersey.api.client.config.DefaultClientConfig;
 import com.sun.jersey.api.json.JSONConfiguration;
 import com.sun.jersey.client.apache4.ApacheHttpClient4;
+import com.sun.jersey.client.apache4.ApacheHttpClient4Handler;
 import com.sun.jersey.core.util.MultivaluedMapImpl;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.http.client.HttpClient;
+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.impl.client.DefaultHttpClient;
+import org.apache.http.impl.conn.PoolingClientConnectionManager;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
 import org.slf4j.Logger;
@@ -43,12 +50,23 @@ public DockerClient(String serverUrl) {
         restEndpointUrl = serverUrl + "/v1.3";
         ClientConfig clientConfig = new DefaultClientConfig();
         clientConfig.getFeatures().put(JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE);
-        client = ApacheHttpClient4.create(clientConfig);
+
+        SchemeRegistry schemeRegistry = new SchemeRegistry();
+        schemeRegistry.register(new Scheme("http", 4243, PlainSocketFactory.getSocketFactory()));
+
+        PoolingClientConnectionManager cm = new PoolingClientConnectionManager(schemeRegistry);
+        // Increase max total connection
+        cm.setMaxTotal(1000);
+        // Increase default max connection per route
+        cm.setDefaultMaxPerRoute(1000);
+
+        HttpClient httpClient = new DefaultHttpClient(cm);
+        client = new ApacheHttpClient4(new ApacheHttpClient4Handler(httpClient, null, false), clientConfig);
+
         client.addFilter(new JsonClientFilter());
         //client.addFilter(new LoggingFilter());
     }
 
-
     /**
      ** MISC API
      **
@@ -91,15 +109,15 @@ public Version version() throws DockerException {
      **
      **/
 
-    public String pull(String repository) throws DockerException {
+    public ClientResponse pull(String repository) throws DockerException {
         return this.pull(repository, null, null);
     }
 
-    public String pull(String repository, String tag) throws DockerException {
+    public ClientResponse pull(String repository, String tag) throws DockerException {
         return this.pull(repository, tag, null);
     }
 
-    public String pull(String repository, String tag, String registry) throws DockerException {
+    public ClientResponse pull(String repository, String tag, String registry) throws DockerException {
         Preconditions.checkNotNull(repository, "Repository was not specified");
 
         if (StringUtils.countMatches(repository, ":") == 1) {
@@ -118,7 +136,7 @@ public String pull(String repository, String tag, String registry) throws Docker
 
         try {
             LOGGER.trace("POST: " + webResource.toString());
-            return webResource.accept(MediaType.APPLICATION_JSON).post(String.class);
+            return webResource.accept(MediaType.APPLICATION_OCTET_STREAM_TYPE).post(ClientResponse.class);
         } catch (UniformInterfaceException exception) {
             if (exception.getResponse().getStatus() == 500) {
                 throw new DockerException("Server error.", exception);
@@ -424,11 +442,7 @@ public ClientResponse logContainer(String containerId) throws DockerException {
         params.add("logs", "1");
         params.add("stdout", "1");
         params.add("stderr", "1");
-        //params.add("stream", "1");
-
-        Client client = Client.create();
-        ClientConfig clientConfig = new DefaultClientConfig();
-        clientConfig.getFeatures().put(JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE);
+        params.add("stream", "1");
 
         WebResource webResource = client.resource(restEndpointUrl + String.format("/containers/%s/attach", containerId))
                 .queryParams(params);
@@ -580,10 +594,6 @@ public ClientResponse build(File dockerFolder, String tag) throws DockerExceptio
         //We need to use Jersey HttpClient here, since ApacheHttpClient4 will not add boundary filed to
         //Content-Type: multipart/form-data; boundary=Boundary_1_372491238_1372806136625
 
-        Client client = Client.create();
-        ClientConfig clientConfig = new DefaultClientConfig();
-        clientConfig.getFeatures().put(JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE);
-
         MultivaluedMap<String,String> params = new MultivaluedMapImpl();
         params.add("t", tag);
 
