Merge pull request #1 from SourceLabOrg/master

Syncing with original repo

Author: MosheElisha

CHANGELOG.md

@@ -2,6 +2,14 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 3.1.2 (07/21/2021)
+
+- [Issue-54](https://github.com/SourceLabOrg/kafka-connect-client/issues/54) Resolution for issue-54
+
+#### Internal Dependency Updates
+- org.apache.logging.log4j from 2.13.2 -> 2.14.1
+- org.slf4j:slf4j from 1.7.30 -> 1.7.32
+
 ## 3.1.1 (04/08/2021)
 
 #### Bugfixes

README.md

@@ -14,7 +14,7 @@ This client library is released on Maven Central.  Add a new dependency to your
 <dependency>
     <groupId>org.sourcelab</groupId>
     <artifactId>kafka-connect-client</artifactId>
-    <version>3.1.1</version>
+    <version>3.1.2</version>
 </dependency>
 ```
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.sourcelab</groupId>
     <artifactId>kafka-connect-client</artifactId>
-    <version>3.1.1</version>
+    <version>3.1.2</version>
     <packaging>jar</packaging>
 
     <!-- Require Maven 3.3.9 -->
@@ -64,8 +64,8 @@
         <checkstyle.version>8.32</checkstyle.version>
 
         <!-- Log4J Version -->
-        <log4j2.version>2.13.2</log4j2.version>
-        <slf4j.version>1.7.30</slf4j.version>
+        <log4j2.version>2.14.1</log4j2.version>
+        <slf4j.version>1.7.32</slf4j.version>
 
         <!-- test toggling -->
         <skipTests>false</skipTests>
@@ -140,15 +140,15 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.8.0</version>
+            <version>2.11.0</version>
             <scope>test</scope>
         </dependency>
 
         <!-- Test Http/Https Client -->
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>9.4.39.v20210325</version>
+            <version>9.4.43.v20210629</version>
             <scope>test</scope>
         </dependency>
 

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;
         }
     }
-}
+}