Merge pull request #12 from SourceLabOrg/sp/dropPreconditions

Crim · web-flow · commit 2482b65527a0 · 2019-01-29T10:17:05.000+09:00
Replace Guava's Preconditions with Objects.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## 1.0.4 (UNRELEASED)
+
+### Internal Dependency Updates
 - Updated Guava from 24.0-JRE to 25.0-JRE for [CVE-2018-10237](https://github.com/google/guava/wiki/CVE-2018-10237).
+- Replace internal calls to Guava's Preconditions with Objects.requireNonNull()
 
 ## 1.0.3 (04/16/2018)
 - More specific exception classes thrown when requests fail.
diff --git a/pom.xml b/pom.xml
@@ -137,6 +137,14 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- Hamcrest Matchers -->
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
+
         <!-- Used in tests for reading files -->
         <dependency>
             <groupId>commons-io</groupId>
diff --git a/src/main/java/org/sourcelab/kafka/connect/apiclient/request/delete/DeleteConnector.java b/src/main/java/org/sourcelab/kafka/connect/apiclient/request/delete/DeleteConnector.java
@@ -17,9 +17,8 @@
 
 package org.sourcelab.kafka.connect.apiclient.request.delete;
 
-import com.google.common.base.Preconditions;
-
 import java.io.IOException;
+import java.util.Objects;
 
 import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
 
@@ -34,7 +33,7 @@ public final class DeleteConnector implements DeleteRequest<Boolean> {
      * @param connectorName Name of the connector.
      */
     public DeleteConnector(final String connectorName) {
-        Preconditions.checkNotNull(connectorName);
+        Objects.requireNonNull(connectorName);
         this.connectorName = connectorName;
     }
 
diff --git a/src/main/java/org/sourcelab/kafka/connect/apiclient/request/get/GetConnector.java b/src/main/java/org/sourcelab/kafka/connect/apiclient/request/get/GetConnector.java
@@ -17,11 +17,11 @@
 
 package org.sourcelab.kafka.connect.apiclient.request.get;
 
-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 java.util.Objects;
 
 import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
 
@@ -37,7 +37,7 @@ public final class GetConnector implements GetRequest<ConnectorDefinition> {
      * @param connectorName Name of the connector.
      */
     public GetConnector(final String connectorName) {
-        Preconditions.checkNotNull(connectorName);
+        Objects.requireNonNull(connectorName);
         this.connectorName = connectorName;
     }
 
diff --git a/src/main/java/org/sourcelab/kafka/connect/apiclient/request/get/GetConnectorConfig.java b/src/main/java/org/sourcelab/kafka/connect/apiclient/request/get/GetConnectorConfig.java
@@ -17,11 +17,11 @@
 
 package org.sourcelab.kafka.connect.apiclient.request.get;
 
-import com.google.common.base.Preconditions;
 import org.sourcelab.kafka.connect.apiclient.request.JacksonFactory;
 
 import java.io.IOException;
 import java.util.Map;
+import java.util.Objects;
 
 import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
 
@@ -37,7 +37,7 @@ public final class GetConnectorConfig implements GetRequest<Map<String, String>>
      * @param connectorName Name of the connector.
      */
     public GetConnectorConfig(final String connectorName) {
-        Preconditions.checkNotNull(connectorName);
+        Objects.requireNonNull(connectorName);
         this.connectorName = connectorName;
     }
 
diff --git a/src/main/java/org/sourcelab/kafka/connect/apiclient/request/get/GetConnectorStatus.java b/src/main/java/org/sourcelab/kafka/connect/apiclient/request/get/GetConnectorStatus.java
@@ -17,11 +17,11 @@
 
 package org.sourcelab.kafka.connect.apiclient.request.get;
 
-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 java.util.Objects;
 
 import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
 
@@ -37,7 +37,7 @@ public final class GetConnectorStatus implements GetRequest<ConnectorStatus> {
      * @param connectorName Name of connector.
      */
     public GetConnectorStatus(final String connectorName) {
-        Preconditions.checkNotNull(connectorName);
+        Objects.requireNonNull(connectorName);
         this.connectorName = connectorName;
     }
 
diff --git a/src/main/java/org/sourcelab/kafka/connect/apiclient/request/get/GetConnectorTaskStatus.java b/src/main/java/org/sourcelab/kafka/connect/apiclient/request/get/GetConnectorTaskStatus.java
@@ -17,11 +17,11 @@
 
 package org.sourcelab.kafka.connect.apiclient.request.get;
 
-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 java.util.Objects;
 
 import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
 
@@ -39,7 +39,7 @@ public final class GetConnectorTaskStatus implements GetRequest<TaskStatus> {
      * @param taskId Task id.
      */
     public GetConnectorTaskStatus(final String connectorName, final int taskId) {
-        Preconditions.checkNotNull(connectorName);
+        Objects.requireNonNull(connectorName);
         this.connectorName = connectorName;
         this.taskId = taskId;
     }
diff --git a/src/main/java/org/sourcelab/kafka/connect/apiclient/request/get/GetConnectorTasks.java b/src/main/java/org/sourcelab/kafka/connect/apiclient/request/get/GetConnectorTasks.java
@@ -17,12 +17,12 @@
 
 package org.sourcelab.kafka.connect.apiclient.request.get;
 
-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 java.util.Objects;
 
 import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
 
@@ -38,7 +38,7 @@ public final class GetConnectorTasks implements GetRequest<Collection<Task>> {
      * @param connectorName name of the connector.
      */
     public GetConnectorTasks(final String connectorName) {
-        Preconditions.checkNotNull(connectorName);
+        Objects.requireNonNull(connectorName);
         this.connectorName = connectorName;
     }
 
diff --git a/src/main/java/org/sourcelab/kafka/connect/apiclient/request/post/PostConnector.java b/src/main/java/org/sourcelab/kafka/connect/apiclient/request/post/PostConnector.java
@@ -17,12 +17,12 @@
 
 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;
 
 import java.io.IOException;
+import java.util.Objects;
 
 /**
  * Defines request to deploy a new connector.
@@ -35,7 +35,7 @@ public final class PostConnector implements PostRequest<ConnectorDefinition> {
      * @param connectorDefinition Defines the new connector to be deployed.
      */
     public PostConnector(final NewConnectorDefinition connectorDefinition) {
-        Preconditions.checkNotNull(connectorDefinition);
+        Objects.requireNonNull(connectorDefinition);
         this.connectorDefinition = connectorDefinition;
     }
 
diff --git a/src/main/java/org/sourcelab/kafka/connect/apiclient/request/post/PostConnectorRestart.java b/src/main/java/org/sourcelab/kafka/connect/apiclient/request/post/PostConnectorRestart.java
@@ -17,9 +17,8 @@
 
 package org.sourcelab.kafka.connect.apiclient.request.post;
 
-import com.google.common.base.Preconditions;
-
 import java.io.IOException;
+import java.util.Objects;
 
 import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
 
@@ -34,7 +33,7 @@ public final class PostConnectorRestart implements PostRequest<Boolean> {
      * @param connectorName Name of connector to restart
      */
     public PostConnectorRestart(final String connectorName) {
-        Preconditions.checkNotNull(connectorName);
+        Objects.requireNonNull(connectorName);
         this.connectorName = connectorName;
     }
 
diff --git a/src/main/java/org/sourcelab/kafka/connect/apiclient/request/post/PostConnectorTaskRestart.java b/src/main/java/org/sourcelab/kafka/connect/apiclient/request/post/PostConnectorTaskRestart.java
@@ -17,9 +17,9 @@
 
 package org.sourcelab.kafka.connect.apiclient.request.post;
 
-import com.google.common.base.Preconditions;
 
 import java.io.IOException;
+import java.util.Objects;
 
 import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
 
@@ -36,7 +36,7 @@ public final class PostConnectorTaskRestart implements PostRequest<Boolean> {
      * @param taskId Id of the task.
      */
     public PostConnectorTaskRestart(final String connectorName, final int taskId) {
-        Preconditions.checkNotNull(connectorName);
+        Objects.requireNonNull(connectorName);
         this.connectorName = connectorName;
         this.taskId = taskId;
     }
diff --git a/src/main/java/org/sourcelab/kafka/connect/apiclient/request/put/PutConnectorConfig.java b/src/main/java/org/sourcelab/kafka/connect/apiclient/request/put/PutConnectorConfig.java
@@ -17,14 +17,14 @@
 
 package org.sourcelab.kafka.connect.apiclient.request.put;
 
-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 java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
 
@@ -41,8 +41,8 @@ public final class PutConnectorConfig implements PutRequest<ConnectorDefinition>
      * @param config Map of configuration items.
      */
     public PutConnectorConfig(final String connectorName, final Map<String, String> config) {
-        Preconditions.checkNotNull(connectorName);
-        Preconditions.checkNotNull(config);
+        Objects.requireNonNull(connectorName);
+        Objects.requireNonNull(config);
         this.connectorName = connectorName;
         this.config = Collections.unmodifiableMap(new HashMap<>(config));
     }
diff --git a/src/main/java/org/sourcelab/kafka/connect/apiclient/request/put/PutConnectorPause.java b/src/main/java/org/sourcelab/kafka/connect/apiclient/request/put/PutConnectorPause.java
@@ -17,9 +17,8 @@
 
 package org.sourcelab.kafka.connect.apiclient.request.put;
 
-import com.google.common.base.Preconditions;
-
 import java.io.IOException;
+import java.util.Objects;
 
 import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
 
@@ -34,7 +33,7 @@ public final class PutConnectorPause implements PutRequest<Boolean> {
      * @param connectorName Name of connector
      */
     public PutConnectorPause(final String connectorName) {
-        Preconditions.checkNotNull(connectorName);
+        Objects.requireNonNull(connectorName);
         this.connectorName = connectorName;
     }
 
diff --git a/src/main/java/org/sourcelab/kafka/connect/apiclient/request/put/PutConnectorPluginConfigValidate.java b/src/main/java/org/sourcelab/kafka/connect/apiclient/request/put/PutConnectorPluginConfigValidate.java
@@ -17,14 +17,14 @@
 
 package org.sourcelab.kafka.connect.apiclient.request.put;
 
-import com.google.common.base.Preconditions;
 import org.sourcelab.kafka.connect.apiclient.request.JacksonFactory;
 import org.sourcelab.kafka.connect.apiclient.request.dto.ConnectorPluginConfigValidationResults;
 
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
 
@@ -41,8 +41,8 @@ public final class PutConnectorPluginConfigValidate implements PutRequest<Connec
      * @param config Configuration entries to validate.
      */
     public PutConnectorPluginConfigValidate(final String connectorPluginName, final Map<String, String> config) {
-        Preconditions.checkNotNull(connectorPluginName);
-        Preconditions.checkNotNull(config);
+        Objects.requireNonNull(connectorPluginName);
+        Objects.requireNonNull(config);
         this.connectorPluginName = connectorPluginName;
         this.config = Collections.unmodifiableMap(new HashMap<>(config));
     }
diff --git a/src/main/java/org/sourcelab/kafka/connect/apiclient/request/put/PutConnectorResume.java b/src/main/java/org/sourcelab/kafka/connect/apiclient/request/put/PutConnectorResume.java
@@ -17,9 +17,8 @@
 
 package org.sourcelab.kafka.connect.apiclient.request.put;
 
-import com.google.common.base.Preconditions;
-
 import java.io.IOException;
+import java.util.Objects;
 
 import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
 
@@ -34,7 +33,7 @@ public final class PutConnectorResume implements PutRequest<Boolean> {
      * @param connectorName Name of connector
      */
     public PutConnectorResume(final String connectorName) {
-        Preconditions.checkNotNull(connectorName);
+        Objects.requireNonNull(connectorName);
         this.connectorName = connectorName;
     }
 
diff --git a/src/main/java/org/sourcelab/kafka/connect/apiclient/rest/exceptions/InvalidRequestException.java b/src/main/java/org/sourcelab/kafka/connect/apiclient/rest/exceptions/InvalidRequestException.java
@@ -17,9 +17,10 @@
 
 package org.sourcelab.kafka.connect.apiclient.rest.exceptions;
 
-import com.google.common.base.Preconditions;
 import org.sourcelab.kafka.connect.apiclient.request.RequestErrorResponse;
 
+import java.util.Objects;
+
 /**
  * Represents when a request is invalid.
  */
@@ -59,7 +60,7 @@ public int getErrorCode() {
      * @return Appropriate Exception class.
      */
     public static InvalidRequestException factory(final RequestErrorResponse errorResponse) {
-        Preconditions.checkNotNull(errorResponse, "Invalid RequestErrorResponse parameter, must not be null");
+        Objects.requireNonNull(errorResponse, "Invalid RequestErrorResponse parameter, must not be null");
 
         switch (errorResponse.getErrorCode()) {
             case 404:
