Merge pull request #56 from MosheElisha/feature/54-allow-custom-http-client-builder

#54 Allow configuration of HttpClient by making HttpClientRestClient extensible

Author: Crim

src/main/java/org/sourcelab/kafka/connect/apiclient/rest/HttpClientRestClient.java

@@ -107,7 +107,7 @@ public void init(final Configuration configuration) {
         final HttpsContextBuilder httpsContextBuilder = new HttpsContextBuilder(configuration);
 
         // Setup client builder
-        final HttpClientBuilder clientBuilder = HttpClientBuilder.create();
+        final HttpClientBuilder clientBuilder = createHttpClientBuilder();
         clientBuilder
             // Define timeout
             .setConnectionTimeToLive(configuration.getConnectionTimeToLiveInSeconds(), TimeUnit.SECONDS)
@@ -206,6 +206,15 @@ public void close() {
         httpClient = null;
     }
 
+    /**
+     * Create the HttpClientBuilder which is used to create the HttpClient.
+     * This method allows users to extend this class and use a custom builder if needed.
+     * @return The HttpClientBuilder to use for creating the HttpClient.
+     */
+    protected HttpClientBuilder createHttpClientBuilder() {
+        return HttpClientBuilder.create();
+    }
+
     /**
      * Make a request against the Pardot API.
      * @param request The request to submit.

src/test/java/org/sourcelab/kafka/connect/apiclient/rest/HttpClientRestClientTest.java

@@ -17,6 +17,7 @@
 
 package org.sourcelab.kafka.connect.apiclient.rest;
 
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.sourcelab.kafka.connect.apiclient.Configuration;
@@ -27,6 +28,8 @@
 import java.io.File;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 public class HttpClientRestClientTest {
 
@@ -77,6 +80,29 @@ public void doHttpTest() throws Exception {
         }
     }
 
+    /**
+     * Test that the HttpClientRestClient actually uses the builder returned from the
+     * {@link HttpClientRestClient#createHttpClientBuilder()} method.
+     */
+    @Test
+    public void doHttp_withCustomHttpClientBuilder() {
+        // Create a mock builder and a rest client that uses the mock builder
+        final HttpClientBuilder builderMock = mock(HttpClientBuilder.class);
+        HttpClientRestClient restClient = new HttpClientRestClient() {
+            @Override
+            protected HttpClientBuilder createHttpClientBuilder() {
+                return builderMock;
+            }
+        };
+
+        // Init the rest client
+        final Configuration configuration = new Configuration("http://localhost:" + HTTP_PORT);
+        restClient.init(configuration);
+
+        // Verify the mock was used to create the HttpClient
+        verify(builderMock).build();
+    }
+
     /**
      * Test against Https server.
      */
@@ -186,4 +212,4 @@ public Object parseResponse(final String responseStr) {
             return responseStr;
         }
     }
-}
+}