(#176) HttpClientEnvelope + PlainHttpClient

src/main/java/com/amihaiemil/docker/HttpClientEnvelope.java

@@ -0,0 +1,129 @@
+/**
+ * Copyright (c) 2018, Mihai Emil Andronache
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1)Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 2)Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 3)Neither the name of docker-java-api nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.amihaiemil.docker;
+
+import java.io.IOException;
+import java.util.function.Supplier;
+import org.apache.http.HttpHost;
+import org.apache.http.HttpRequest;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.ResponseHandler;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.conn.ClientConnectionManager;
+import org.apache.http.params.HttpParams;
+import org.apache.http.protocol.HttpContext;
+
+/**
+ * HTTP client envelope.
+ *
+ * @author George Aristy (george.aristy@gmail.com)
+ * @version $Id$
+ * @since 0.0.4
+ */
+abstract class HttpClientEnvelope implements HttpClient {
+    /**
+     * Actual HttpClient.
+     */
+    private final HttpClient enveloped;
+
+    /**
+     * Ctor.
+     * @param enveloped The concrete http client
+     */
+    HttpClientEnvelope(final Supplier<HttpClient> enveloped) {
+        this.enveloped = enveloped.get();
+    }
+
+    @Override
+    public HttpParams getParams() {
+        return this.enveloped.getParams();
+    }
+
+    @Override
+    public ClientConnectionManager getConnectionManager() {
+        return this.enveloped.getConnectionManager();
+    }
+
+    @Override
+    public HttpResponse execute(final HttpUriRequest request)
+        throws IOException, ClientProtocolException {
+        return this.enveloped.execute(request);
+    }
+
+    @Override
+    public HttpResponse execute(final HttpUriRequest request,
+        final HttpContext context)
+        throws IOException, ClientProtocolException {
+        return this.enveloped.execute(request, context);
+    }
+
+    @Override
+    public HttpResponse execute(final HttpHost target,
+        final HttpRequest request)
+        throws IOException, ClientProtocolException {
+        return this.enveloped.execute(target, request);
+    }
+
+    @Override
+    public HttpResponse execute(final HttpHost target,
+        final HttpRequest request, final HttpContext context)
+        throws IOException, ClientProtocolException {
+        return this.enveloped.execute(target, request, context);
+    }
+
+    @Override
+    public <T> T execute(final HttpUriRequest request,
+        final ResponseHandler<? extends T> responseHandler)
+        throws IOException, ClientProtocolException {
+        return this.enveloped.execute(request, responseHandler);
+    }
+
+    @Override
+    public <T> T execute(final HttpUriRequest request,
+        final ResponseHandler<? extends T> responseHandler,
+        final HttpContext context) throws IOException, ClientProtocolException {
+        return this.enveloped.execute(request, responseHandler, context);
+    }
+
+    @Override
+    public <T> T execute(final HttpHost target, final HttpRequest request,
+        final ResponseHandler<? extends T> responseHandler)
+        throws IOException, ClientProtocolException {
+        return this.enveloped.execute(target, request, responseHandler);
+    }
+
+    // @checkstyle ParameterNumber (2 lines)
+    @Override
+    public <T> T execute(final HttpHost target, final HttpRequest request,
+        final ResponseHandler<? extends T> responseHandler,
+        final HttpContext context) throws IOException, ClientProtocolException {
+        return this.enveloped.execute(
+            target, request, responseHandler, context
+        );
+    }
+}

src/main/java/com/amihaiemil/docker/PlainHttpClient.java

@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) 2018, Mihai Emil Andronache
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1)Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 2)Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 3)Neither the name of docker-java-api nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.amihaiemil.docker;
+
+import org.apache.http.impl.client.HttpClients;
+
+/**
+ * Plain HTTP (no TLS) client.
+ *
+ * @author George Aristy (george.aristy@gmail.com)
+ * @version $Id$
+ * @since 0.0.4
+ */
+final class PlainHttpClient extends HttpClientEnvelope {
+    /**
+     * Ctor.
+     */
+    PlainHttpClient() {
+        super(() -> HttpClients.custom()
+            .setMaxConnPerRoute(10)
+            .setMaxConnTotal(10)
+            .build()
+        );
+    }
+}

src/main/java/com/amihaiemil/docker/RemoteDocker.java

@@ -76,6 +76,17 @@ public final class RemoteDocker extends RtDocker {
         );
     }
 
+    /**
+     * Remote Docker engine.
+     * 
+     * An insecure docker API v1.35 endpoint is assumed.
+     * 
+     * @param uri Remote Docker URI.
+     */
+    public RemoteDocker(final URI uri) {
+        this(new PlainHttpClient(), uri);
+    }
+
     /**
      * Remote Docker engine. You have to configure your own HttpClient,
      * most likely with some authentication mechanism, depending on where

src/main/java/com/amihaiemil/docker/SslHttpClient.java

@@ -30,17 +30,8 @@
 import java.security.GeneralSecurityException;
 import java.util.function.Supplier;
 
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.HttpClient;
-import org.apache.http.client.ResponseHandler;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.conn.ClientConnectionManager;
 import org.apache.http.impl.client.HttpClients;
-import org.apache.http.params.HttpParams;
-import org.apache.http.protocol.HttpContext;
 import org.apache.http.ssl.SSLContexts;
 
 /**
@@ -50,16 +41,8 @@
  * @version $Id$
  * @since 0.0.1
  * @checkstyle ParameterNumber (150 lines)
- * @todo #100:30min Add a plain HTTP client for use. It is possible
- *  for users to disable TLS on docker's API. See
- *  https://docs.docker.com/registry/insecure/.
  */
-final class SslHttpClient implements HttpClient {
-    /**
-     * Decorated HttpClient.
-     */
-    private final HttpClient origin;
-
+final class SslHttpClient extends HttpClientEnvelope {
     /**
      * Ctor.
      * @param keys Path to the keystore.
@@ -92,79 +75,6 @@ final class SslHttpClient implements HttpClient {
      * @param client Decorated HttpClient.
      */
     SslHttpClient(final Supplier<HttpClient> client) {
-        this(client.get());
-    }
-
-    /**
-     * Ctor.
-     * @param client Decorated HttpClient.
-     */
-    SslHttpClient(final HttpClient client) {
-        this.origin = client;
-    }
-
-    @Override
-    public HttpParams getParams() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public ClientConnectionManager getConnectionManager() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public HttpResponse execute(final HttpUriRequest request)
-        throws IOException, ClientProtocolException {
-        return this.origin.execute(request);
-    }
-
-    @Override
-    public HttpResponse execute(final HttpUriRequest request,
-        final HttpContext context)
-        throws IOException, ClientProtocolException {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public HttpResponse execute(final HttpHost target,
-        final HttpRequest request)
-        throws IOException, ClientProtocolException {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public HttpResponse execute(final HttpHost target,
-        final HttpRequest request, final HttpContext context)
-        throws IOException, ClientProtocolException {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public <T> T execute(final HttpUriRequest request,
-        final ResponseHandler<? extends T> responseHandler)
-        throws IOException, ClientProtocolException {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public <T> T execute(final HttpUriRequest request,
-        final ResponseHandler<? extends T> responseHandler,
-        final HttpContext context) throws IOException, ClientProtocolException {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public <T> T execute(final HttpHost target, final HttpRequest request,
-        final ResponseHandler<? extends T> responseHandler)
-        throws IOException, ClientProtocolException {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public <T> T execute(final HttpHost target, final HttpRequest request,
-        final ResponseHandler<? extends T> responseHandler,
-        final HttpContext context) throws IOException, ClientProtocolException {
-        throw new UnsupportedOperationException("Not supported yet.");
+        super(client);
     }
 }