Merge pull request #21 from SourceLabOrg/sp/prepForRelease

Prep for release of 2.0.1

Author: Crim

CHANGELOG.md

@@ -2,6 +2,15 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.0.1 (04/23/2019)
+
+### Bugfix
+- Updated ConnectorPluginConfigValidationResults classes to be publicly scoped. Thanks [tchiotludo](https://github.com/tchiotludo)!
+
+### Internal Dependency Updates
+- Updated Google Guava from 27.0.1-JRE to 27.1-JRE
+- Updated HttpComponents from 4.5.7 to 4.5.8 
+
 ## 2.0.0 (04/05/2019)
 
 ### Bugfix / Breaking Change

README.md

@@ -12,7 +12,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>2.0.0</version>
+    <version>2.0.1</version>
 </dependency>
 ```
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.sourcelab</groupId>
     <artifactId>kafka-connect-client</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
     <packaging>jar</packaging>
 
     <!-- Require Maven 3.3.9 -->
@@ -47,10 +47,10 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- guava version -->
-        <guava.version>27.0.1-jre</guava.version>
+        <guava.version>27.1-jre</guava.version>
 
         <!-- Http Components version -->
-        <http-components.version>4.5.7</http-components.version>
+        <http-components.version>4.5.8</http-components.version>
 
         <!-- Jackson version -->
         <jackson.version>2.9.8</jackson.version>
@@ -64,7 +64,7 @@
         <checkstyle.version>8.19</checkstyle.version>
 
         <!-- Log4J Version -->
-        <log4j2.version>2.11.1</log4j2.version>
+        <log4j2.version>2.11.2</log4j2.version>
 
         <!-- test toggling -->
         <skipTests>false</skipTests>
@@ -133,11 +133,10 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.23.4</version>
+            <version>2.27.0</version>
             <scope>test</scope>
         </dependency>
 
-
         <!-- Data providers on tests -->
         <dependency>
             <groupId>com.tngtech.java</groupId>
@@ -166,7 +165,7 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>9.4.14.v20181114</version>
+            <version>9.4.17.v20190418</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

src/main/java/org/sourcelab/kafka/connect/apiclient/request/JacksonFactory.java

@@ -20,6 +20,9 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.type.MapType;
+
+import java.util.Map;
 
 /**
  * Creates properly configured Jackson XML Mapper instances.
@@ -32,6 +35,12 @@ public final class JacksonFactory {
      */
     private static final ObjectMapper mapper = new ObjectMapper();
 
+    /**
+     * Defines a "type safe" Map[String, String] deserialization type for Jackson.
+     */
+    public static final MapType mapTypeStringString = mapper.getTypeFactory()
+        .constructMapType(Map.class, String.class, String.class);
+
     /*
      * Statically configure the instance.
      */

src/main/java/org/sourcelab/kafka/connect/apiclient/request/get/GetConnectorConfig.java

@@ -53,6 +53,6 @@ public Object getRequestBody() {
 
     @Override
     public Map<String, String> parseResponse(final String responseStr) throws IOException {
-        return JacksonFactory.newInstance().readValue(responseStr, Map.class);
+        return JacksonFactory.newInstance().readValue(responseStr, JacksonFactory.mapTypeStringString);
     }
 }

src/test/java/org/sourcelab/kafka/connect/apiclient/KafkaConnectClientUnitTest.java

@@ -21,6 +21,8 @@
 import org.junit.Test;
 import org.sourcelab.kafka.connect.apiclient.rest.RestClient;
 import org.sourcelab.kafka.connect.apiclient.rest.RestResponse;
+import org.sourcelab.kafka.connect.apiclient.rest.exceptions.ConcurrentConfigModificationException;
+import org.sourcelab.kafka.connect.apiclient.rest.exceptions.ResourceNotFoundException;
 import org.sourcelab.kafka.connect.apiclient.rest.exceptions.UnauthorizedRequestException;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -32,15 +34,14 @@
  */
 public class KafkaConnectClientUnitTest {
 
+    private final Configuration configuration = new Configuration("http://localhost:9092");
+
     /**
      * This test verifies that if the underlying RestClient returns a response with Http Status Code 401,
      * then KafkaConnectClient will throw an UnauthorizedRequestException.
      */
     @Test(expected = UnauthorizedRequestException.class)
     public void unAuthorizedException() {
-        // Create configuration
-        final Configuration configuration = new Configuration("http://localhost:9092");
-
         // Create mock RestResponse
         final RestResponse restResponse = new RestResponse("Invalid credentials.", HttpStatus.SC_UNAUTHORIZED);
 
@@ -55,4 +56,52 @@ public void unAuthorizedException() {
         // Call any method that makes a request via RestClient.
         client.getConnectors();
     }
-}
+
+    /**
+     * This test verifies that if the underlying RestClient returns a response with Http Status Code 404,
+     * then KafkaConnectClient will throw a ResourceNotFoundException.
+     */
+    @Test(expected = ResourceNotFoundException.class)
+    public void on404_resourceNotFoundException() {
+        // Create mock RestResponse
+        final String connectorName = "DoesNotExist";
+        final String result = "{\"error_code\":404,\"message\":\"Connector " + connectorName + " not found\"}";
+
+        final RestResponse restResponse = new RestResponse(result, HttpStatus.SC_NOT_FOUND);
+
+        // Create mock RestClient
+        final RestClient mockRestClient = mock(RestClient.class);
+        when(mockRestClient.submitRequest(any()))
+            .thenReturn(restResponse);
+
+        // Create client
+        final KafkaConnectClient client = new KafkaConnectClient(configuration, mockRestClient);
+
+        // Call any method that makes a request via RestClient.
+        client.getConnector(connectorName);
+    }
+
+    /**
+     * This test verifies that if the underlying RestClient returns a response with Http Status Code 409,
+     * then KafkaConnectClient will throw a ConcurrentConfigModificationException.
+     */
+    @Test(expected = ConcurrentConfigModificationException.class)
+    public void on409_concurrentConfigModificationException() {
+        // Create mock RestResponse
+        final String connectorName = "DoesNotExist";
+        final String result = "{\"error_code\":409,\"message\":\"Rebalance in progress.\"}";
+
+        final RestResponse restResponse = new RestResponse(result, HttpStatus.SC_CONFLICT);
+
+        // Create mock RestClient
+        final RestClient mockRestClient = mock(RestClient.class);
+        when(mockRestClient.submitRequest(any()))
+            .thenReturn(restResponse);
+
+        // Create client
+        final KafkaConnectClient client = new KafkaConnectClient(configuration, mockRestClient);
+
+        // Call any method that makes a request via RestClient.
+        client.getConnector(connectorName);
+    }
+}

src/test/java/org/sourcelab/kafka/connect/apiclient/request/get/connector/GetConnectorPluginsTest.java

@@ -26,10 +26,10 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 public class GetConnectorPluginsTest extends AbstractRequestTest {
     private static final Logger logger = LoggerFactory.getLogger(GetConnectorPluginsTest.class);

src/test/java/org/sourcelab/kafka/connect/apiclient/request/get/connector/GetConnectorTasksTest.java

@@ -19,25 +19,18 @@
 
 import com.google.common.collect.ImmutableMap;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.sourcelab.kafka.connect.apiclient.request.AbstractRequestTest;
-import org.sourcelab.kafka.connect.apiclient.request.dto.ConnectorPlugin;
 import org.sourcelab.kafka.connect.apiclient.request.dto.Task;
-import org.sourcelab.kafka.connect.apiclient.request.get.GetConnectorPlugins;
 import org.sourcelab.kafka.connect.apiclient.request.get.GetConnectorTasks;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 public class GetConnectorTasksTest extends AbstractRequestTest {
-    private static final Logger logger = LoggerFactory.getLogger(GetConnectorTasksTest.class);
-
     /**
      * Test Parsing GET /connectors response.
      */

src/test/java/testserver/TestHttpServer.java

@@ -118,7 +118,7 @@ private void configureServer() {
             // SSL requires a certificate so we configure a factory for ssl contents with information pointing to what
             // keystore the ssl connection needs to know about. Much more configuration is available the ssl context,
             // including things like choosing the particular certificate out of a keystore to be used.
-            final SslContextFactory sslContextFactory = new SslContextFactory();
+            final SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
 
             // define server side key
             sslContextFactory.setKeyStorePath(keyStoreFile);

src/test/resources/mockResponses/errorResourceNotFound.json

@@ -0,0 +1 @@
+{"error_code":404,"message":"Connector DoesNotExist not found"}