more code cleanup

Author: Crim

pom.xml

@@ -78,6 +78,13 @@
             <version>4.5.4</version>
         </dependency>
 
+        <!-- Guava for Preconditions and URI Escaping -->
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>24.0-jre</version>
+        </dependency>
+
         <!-- For parsing XML responses to POJOs -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -89,16 +96,6 @@
             <artifactId>jackson-databind</artifactId>
             <version>${jackson.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-xml</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-joda</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
 
         <!-- Logging -->
         <dependency>

src/main/java/org/sourcelab/kafka/connect/apiclient/request/delete/DeleteConnector.java

@@ -1,9 +1,11 @@
 package org.sourcelab.kafka.connect.apiclient.request.delete;
 
-import com.sun.xml.internal.rngom.util.Uri;
+import com.google.common.base.Preconditions;
 
 import java.io.IOException;
 
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
 /**
  * Defines a request to delete a connector.
  */
@@ -15,15 +17,13 @@ public final class DeleteConnector implements DeleteRequest<Boolean> {
      * @param connectorName Name of the connector.
      */
     public DeleteConnector(final String connectorName) {
-        if (connectorName == null) {
-            throw new NullPointerException("connectorName parameter may not be null!");
-        }
+        Preconditions.checkNotNull(connectorName);
         this.connectorName = connectorName;
     }
 
     @Override
     public String getApiEndpoint() {
-        return "/connectors/" + Uri.escapeDisallowedChars(connectorName);
+        return "/connectors/" + urlPathSegmentEscaper().escape(connectorName);
     }
 
     @Override

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

@@ -1,11 +1,13 @@
 package org.sourcelab.kafka.connect.apiclient.request.get;
 
-import com.sun.xml.internal.rngom.util.Uri;
+import com.google.common.base.Preconditions;
 import org.sourcelab.kafka.connect.apiclient.request.JacksonFactory;
 import org.sourcelab.kafka.connect.apiclient.request.dto.ConnectorDefinition;
 
 import java.io.IOException;
 
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
 /**
  * Defines request to get details about a deployed connector.
  */
@@ -18,15 +20,13 @@ public final class GetConnector implements GetRequest<ConnectorDefinition> {
      * @param connectorName Name of the connector.
      */
     public GetConnector(final String connectorName) {
-        if (connectorName == null) {
-            throw new NullPointerException("connectorName parameter may not be null!");
-        }
+        Preconditions.checkNotNull(connectorName);
         this.connectorName = connectorName;
     }
 
     @Override
     public String getApiEndpoint() {
-        return "/connectors/" + Uri.escapeDisallowedChars(connectorName);
+        return "/connectors/" + urlPathSegmentEscaper().escape(connectorName);
     }
 
     @Override

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

@@ -1,11 +1,13 @@
 package org.sourcelab.kafka.connect.apiclient.request.get;
 
-import com.sun.xml.internal.rngom.util.Uri;
+import com.google.common.base.Preconditions;
 import org.sourcelab.kafka.connect.apiclient.request.JacksonFactory;
 
 import java.io.IOException;
 import java.util.Map;
 
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
 /**
  * Defines a request for getting the configuration for a connector.
  */
@@ -18,15 +20,13 @@ public final class GetConnectorConfig implements GetRequest<Map<String, String>>
      * @param connectorName Name of the connector.
      */
     public GetConnectorConfig(final String connectorName) {
-        if (connectorName == null) {
-            throw new NullPointerException("connectorName parameter may not be null!");
-        }
+        Preconditions.checkNotNull(connectorName);
         this.connectorName = connectorName;
     }
 
     @Override
     public String getApiEndpoint() {
-        return "/connectors/" + Uri.escapeDisallowedChars(connectorName) + "/config";
+        return "/connectors/" + urlPathSegmentEscaper().escape(connectorName) + "/config";
     }
 
     @Override

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

@@ -1,11 +1,13 @@
 package org.sourcelab.kafka.connect.apiclient.request.get;
 
-import com.sun.xml.internal.rngom.util.Uri;
+import com.google.common.base.Preconditions;
 import org.sourcelab.kafka.connect.apiclient.request.JacksonFactory;
 import org.sourcelab.kafka.connect.apiclient.request.dto.ConnectorStatus;
 
 import java.io.IOException;
 
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
 /**
  * Defines request to get the status of a connector.
  */
@@ -18,15 +20,13 @@ public final class GetConnectorStatus implements GetRequest<ConnectorStatus> {
      * @param connectorName Name of connector.
      */
     public GetConnectorStatus(final String connectorName) {
-        if (connectorName == null) {
-            throw new NullPointerException("connectorName parameter may not be null!");
-        }
+        Preconditions.checkNotNull(connectorName);
         this.connectorName = connectorName;
     }
 
     @Override
     public String getApiEndpoint() {
-        return "/connectors/" + Uri.escapeDisallowedChars(connectorName) + "/status";
+        return "/connectors/" + urlPathSegmentEscaper().escape(connectorName) + "/status";
     }
 
     @Override

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

@@ -1,11 +1,13 @@
 package org.sourcelab.kafka.connect.apiclient.request.get;
 
-import com.sun.xml.internal.rngom.util.Uri;
+import com.google.common.base.Preconditions;
 import org.sourcelab.kafka.connect.apiclient.request.JacksonFactory;
 import org.sourcelab.kafka.connect.apiclient.request.dto.TaskStatus;
 
 import java.io.IOException;
 
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
 /**
  * Defines a request to get the status of a connector's task.
  */
@@ -20,16 +22,14 @@ public final class GetConnectorTaskStatus implements GetRequest<TaskStatus> {
      * @param taskId Task id.
      */
     public GetConnectorTaskStatus(final String connectorName, final int taskId) {
-        if (connectorName == null) {
-            throw new NullPointerException("connectorName parameter may not be null!");
-        }
+        Preconditions.checkNotNull(connectorName);
         this.connectorName = connectorName;
         this.taskId = taskId;
     }
 
     @Override
     public String getApiEndpoint() {
-        return "/connectors/" + Uri.escapeDisallowedChars(connectorName) + "/tasks/" + taskId + "/status";
+        return "/connectors/" + urlPathSegmentEscaper().escape(connectorName) + "/tasks/" + taskId + "/status";
     }
 
     @Override

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

@@ -1,12 +1,14 @@
 package org.sourcelab.kafka.connect.apiclient.request.get;
 
-import com.sun.xml.internal.rngom.util.Uri;
+import com.google.common.base.Preconditions;
 import org.sourcelab.kafka.connect.apiclient.request.JacksonFactory;
 import org.sourcelab.kafka.connect.apiclient.request.dto.Task;
 
 import java.io.IOException;
 import java.util.Collection;
 
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
 /**
  * Defines request to get tasks for a connector.
  */
@@ -19,15 +21,13 @@ public final class GetConnectorTasks implements GetRequest<Collection<Task>> {
      * @param connectorName name of the connector.
      */
     public GetConnectorTasks(final String connectorName) {
-        if (connectorName == null) {
-            throw new NullPointerException("connectorName parameter may not be null!");
-        }
+        Preconditions.checkNotNull(connectorName);
         this.connectorName = connectorName;
     }
 
     @Override
     public String getApiEndpoint() {
-        return "/connectors/" + Uri.escapeDisallowedChars(connectorName) + "/tasks";
+        return "/connectors/" + urlPathSegmentEscaper().escape(connectorName) + "/tasks";
     }
 
     @Override

src/main/java/org/sourcelab/kafka/connect/apiclient/request/post/PostConnector.java

@@ -1,5 +1,6 @@
 package org.sourcelab.kafka.connect.apiclient.request.post;
 
+import com.google.common.base.Preconditions;
 import org.sourcelab.kafka.connect.apiclient.request.JacksonFactory;
 import org.sourcelab.kafka.connect.apiclient.request.dto.ConnectorDefinition;
 import org.sourcelab.kafka.connect.apiclient.request.dto.NewConnectorDefinition;
@@ -17,9 +18,7 @@ public final class PostConnector implements PostRequest<ConnectorDefinition> {
      * @param connectorDefinition Defines the new connector to be deployed.
      */
     public PostConnector(final NewConnectorDefinition connectorDefinition) {
-        if (connectorDefinition == null) {
-            throw new NullPointerException("ConnectorDefinition parameter cannot be a null reference!");
-        }
+        Preconditions.checkNotNull(connectorDefinition);
         this.connectorDefinition = connectorDefinition;
     }
 

src/main/java/org/sourcelab/kafka/connect/apiclient/request/post/PostConnectorRestart.java

@@ -1,9 +1,11 @@
 package org.sourcelab.kafka.connect.apiclient.request.post;
 
-import com.sun.xml.internal.rngom.util.Uri;
+import com.google.common.base.Preconditions;
 
 import java.io.IOException;
 
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
 /**
  * Defines a request to restart a connector.
  */
@@ -15,15 +17,13 @@ public final class PostConnectorRestart implements PostRequest<Boolean> {
      * @param connectorName Name of connector to restart
      */
     public PostConnectorRestart(final String connectorName) {
-        if (connectorName == null) {
-            throw new NullPointerException("connectorName parameter may not be null!");
-        }
+        Preconditions.checkNotNull(connectorName);
         this.connectorName = connectorName;
     }
 
     @Override
     public String getApiEndpoint() {
-        return "/connectors/" + Uri.escapeDisallowedChars(connectorName) + "/restart";
+        return "/connectors/" + urlPathSegmentEscaper().escape(connectorName) + "/restart";
     }
 
     @Override

src/main/java/org/sourcelab/kafka/connect/apiclient/request/post/PostConnectorTaskRestart.java

@@ -1,9 +1,11 @@
 package org.sourcelab.kafka.connect.apiclient.request.post;
 
-import com.sun.xml.internal.rngom.util.Uri;
+import com.google.common.base.Preconditions;
 
 import java.io.IOException;
 
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
 /**
  * Defines request to restart a connector's task.
  */
@@ -17,16 +19,14 @@ public final class PostConnectorTaskRestart implements PostRequest<Boolean> {
      * @param taskId Id of the task.
      */
     public PostConnectorTaskRestart(final String connectorName, final int taskId) {
-        if (connectorName == null) {
-            throw new NullPointerException("connectorName parameter may not be null!");
-        }
+        Preconditions.checkNotNull(connectorName);
         this.connectorName = connectorName;
         this.taskId = taskId;
     }
 
     @Override
     public String getApiEndpoint() {
-        return "/connectors/" + Uri.escapeDisallowedChars(connectorName) + "/tasks/" + taskId + "/restart";
+        return "/connectors/" + urlPathSegmentEscaper().escape(connectorName) + "/tasks/" + taskId + "/restart";
     }
 
     @Override