Cleanup

Author: Stephen Powis

src/main/java/org/sourcelab/kafka/connect/apiclient/KafkaConnectClient.java

@@ -30,8 +30,8 @@
 import org.sourcelab.kafka.connect.apiclient.request.dto.ConnectorPluginConfigDefinition;
 import org.sourcelab.kafka.connect.apiclient.request.dto.ConnectorPluginConfigValidationResults;
 import org.sourcelab.kafka.connect.apiclient.request.dto.ConnectorStatus;
-import org.sourcelab.kafka.connect.apiclient.request.dto.ConnectorsWithExpandedMetadata;
 import org.sourcelab.kafka.connect.apiclient.request.dto.ConnectorsWithExpandedInfo;
+import org.sourcelab.kafka.connect.apiclient.request.dto.ConnectorsWithExpandedMetadata;
 import org.sourcelab.kafka.connect.apiclient.request.dto.ConnectorsWithExpandedStatus;
 import org.sourcelab.kafka.connect.apiclient.request.dto.NewConnectorDefinition;
 import org.sourcelab.kafka.connect.apiclient.request.dto.Task;

src/main/java/org/sourcelab/kafka/connect/apiclient/request/dto/ConnectorsWithExpandedInfo.java

@@ -1,67 +1,16 @@
 package org.sourcelab.kafka.connect.apiclient.request.dto;
 
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
-import java.util.stream.Collectors;
 
-public class ConnectorsWithExpandedInfo {
-    @JsonAnySetter
-    private Map<String, ConnectorsWithExpandedInfo.ConnectorWithExpandedInfo> results = new HashMap<>();
+public interface ConnectorsWithExpandedInfo {
 
-    public Collection<String> getConnectorNames() {
-        return results.keySet();
-    }
+    Collection<String> getConnectorNames();
 
-    public ConnectorDefinition getDefinitionForConnector(final String connectorName) {
-        if (!results.containsKey(connectorName)) {
-            throw new IllegalArgumentException("Results do not contain connector: " + connectorName);
-        }
-        return results.get(connectorName).getInfo();
-    }
+    ConnectorDefinition getDefinitionForConnector(final String connectorName);
 
-    public Collection<ConnectorDefinition> getAllStatuses() {
-        return results
-            .values()
-            .stream()
-            .map(ConnectorsWithExpandedInfo.ConnectorWithExpandedInfo::getInfo)
-            .collect(Collectors.toList());
-    }
+    Collection<ConnectorDefinition> getAllDefinitions();
 
-    public Map<String, ConnectorDefinition> getMappedStatuses() {
-        return Collections.unmodifiableMap(
-            results
-                .entrySet()
-                .stream()
-                .collect(Collectors.toMap(Map.Entry::getKey, (entry) -> entry.getValue().getInfo()))
-        );
-    }
-
-    @Override
-    public String toString() {
-        return "ConnectorsWithExpandedInfo{"
-            + results
-            + '}';
-    }
-
-    public static class ConnectorWithExpandedInfo {
-
-        @JsonProperty("info")
-        private ConnectorDefinition info;
-
-        public ConnectorDefinition getInfo() {
-            return info;
-        }
-
-        @Override
-        public String toString() {
-            return "Connector{" +
-                "info=" + info +
-                '}';
-        }
-    }
+    Map<String, ConnectorDefinition> getMappedDefinitions();
 }

src/main/java/org/sourcelab/kafka/connect/apiclient/request/dto/ConnectorsWithExpandedMetadata.java

@@ -9,7 +9,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-public class ConnectorsWithExpandedMetadata {
+public class ConnectorsWithExpandedMetadata implements ConnectorsWithExpandedInfo, ConnectorsWithExpandedStatus {
     @JsonAnySetter
     private Map<String, ConnectorsWithExpandedMetadata.ConnectorWithExpandedMetadata> results = new HashMap<>();
 

src/main/java/org/sourcelab/kafka/connect/apiclient/request/dto/ConnectorsWithExpandedStatus.java

@@ -1,68 +1,15 @@
 package org.sourcelab.kafka.connect.apiclient.request.dto;
 
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
-import java.util.stream.Collectors;
-
-public class ConnectorsWithExpandedStatus {
-
-    @JsonAnySetter
-    private Map<String, ConnectorWithExpandedStatus> results = new HashMap<>();
-
-    public Collection<String> getConnectorNames() {
-        return results.keySet();
-    }
-
-    public ConnectorStatus getStatusForConnector(final String connectorName) {
-        if (!results.containsKey(connectorName)) {
-            throw new IllegalArgumentException("Results do not contain connector: " + connectorName);
-        }
-        return results.get(connectorName).getStatus();
-    }
-
-    public Collection<ConnectorStatus> getAllStatuses() {
-        return results
-            .values()
-            .stream()
-            .map(ConnectorWithExpandedStatus::getStatus)
-            .collect(Collectors.toList());
-    }
-
-    public Map<String, ConnectorStatus> getMappedStatuses() {
-        return Collections.unmodifiableMap(
-            results
-                .entrySet()
-                .stream()
-                .collect(Collectors.toMap(Map.Entry::getKey, (entry) -> entry.getValue().getStatus()))
-        );
-    }
 
-    @Override
-    public String toString() {
-        return "ConnectorsWithExpandedStatus{"
-            + results
-            + '}';
-    }
+public interface ConnectorsWithExpandedStatus {
 
-    public static class ConnectorWithExpandedStatus {
+    Collection<String> getConnectorNames();
 
-        @JsonProperty("status")
-        private ConnectorStatus status;
+    ConnectorStatus getStatusForConnector(final String connectorName);
 
-        public ConnectorStatus getStatus() {
-            return status;
-        }
+    Collection<ConnectorStatus> getAllStatuses();
 
-        @Override
-        public String toString() {
-            return "Connector{" +
-                "status=" + status +
-                '}';
-        }
-    }
+    Map<String, ConnectorStatus> getMappedStatuses();
 }

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

@@ -2,6 +2,7 @@
 
 import org.sourcelab.kafka.connect.apiclient.request.JacksonFactory;
 import org.sourcelab.kafka.connect.apiclient.request.dto.ConnectorsWithExpandedInfo;
+import org.sourcelab.kafka.connect.apiclient.request.dto.ConnectorsWithExpandedMetadata;
 
 import java.io.IOException;
 
@@ -14,7 +15,7 @@ public String getApiEndpoint() {
 
     @Override
     public ConnectorsWithExpandedInfo parseResponse(final String responseStr) throws IOException {
-        return JacksonFactory.newInstance().readValue(responseStr, ConnectorsWithExpandedInfo.class);
+        return JacksonFactory.newInstance().readValue(responseStr, ConnectorsWithExpandedMetadata.class);
     }
 }
 

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

@@ -2,6 +2,7 @@
 
 
 import org.sourcelab.kafka.connect.apiclient.request.JacksonFactory;
+import org.sourcelab.kafka.connect.apiclient.request.dto.ConnectorsWithExpandedMetadata;
 import org.sourcelab.kafka.connect.apiclient.request.dto.ConnectorsWithExpandedStatus;
 
 import java.io.IOException;
@@ -15,6 +16,6 @@ public String getApiEndpoint() {
 
     @Override
     public ConnectorsWithExpandedStatus parseResponse(final String responseStr) throws IOException {
-        return JacksonFactory.newInstance().readValue(responseStr, ConnectorsWithExpandedStatus.class);
+        return JacksonFactory.newInstance().readValue(responseStr, ConnectorsWithExpandedMetadata.class);
     }
 }