Review fixes

bsideup · bsideup · commit 120391deb393 · 2021-02-05T11:32:38.000+01:00
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListConfigsCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListConfigsCmd.java
@@ -2,7 +2,6 @@
 
 import com.github.dockerjava.api.model.Config;
 
-import javax.annotation.CheckForNull;
 import java.util.List;
 import java.util.Map;
 
@@ -13,23 +12,9 @@
  */
 public interface ListConfigsCmd extends SyncDockerCmd<List<Config>> {
 
-    @CheckForNull
     Map<String, List<String>> getFilters();
 
-    /**
-     * @param ids - Show only config with the given ids
-     */
-    ListConfigsCmd withIdFilter(List<String> ids);
-
-    /**
-     * @param names - Show only config with the given names
-     */
-    ListConfigsCmd withNameFilter(List<String> names);
-
-    /**
-     * @param labels - Show only config with the passed labels. Labels is a {@link Map} that contains label keys and values
-     */
-    ListConfigsCmd withLabelFilter(Map<String, String> labels);
+    ListConfigsCmd withFilters(Map<String, List<String>> filters);
 
     interface Exec extends DockerCmdSyncExec<ListConfigsCmd, List<Config>> {
     }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Config.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Config.java
@@ -1,6 +1,8 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -10,8 +12,11 @@
  *
  * @since {@link RemoteApiVersion#VERSION_1_30}
  */
+@ToString
+@EqualsAndHashCode
 public class Config implements Serializable {
-    public static final long serialVersionUID = 1L;
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * @since 1.30
@@ -35,7 +40,7 @@ public class Config implements Serializable {
      * @since 1.30
      */
     @JsonProperty("Spec")
-    private ServiceSpec spec;
+    private ConfigSpec spec;
 
     /**
      * @since 1.30
@@ -67,11 +72,11 @@ public void setUpdatedAt(Date updatedAt) {
         this.updatedAt = updatedAt;
     }
 
-    public ServiceSpec getSpec() {
+    public ConfigSpec getSpec() {
         return spec;
     }
 
-    public void setSpec(ServiceSpec spec) {
+    public void setSpec(ConfigSpec spec) {
         this.spec = spec;
     }
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ConfigSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ConfigSpec.java
@@ -0,0 +1,24 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_30}
+ */
+@EqualsAndHashCode
+@ToString
+public class ConfigSpec implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("Name")
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateConfigCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateConfigCmdImpl.java
@@ -12,8 +12,7 @@
 /**
  * Creates a new config
  */
-public class CreateConfigCmdImpl extends AbstrDockerCmd<CreateConfigCmd, CreateConfigResponse> implements
-    CreateConfigCmd {
+public class CreateConfigCmdImpl extends AbstrDockerCmd<CreateConfigCmd, CreateConfigResponse> implements CreateConfigCmd {
 
     @JsonProperty("Name")
     private String name;
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectConfigCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectConfigCmdImpl.java
@@ -9,8 +9,7 @@
 /**
  * Inspect the details of a config.
  */
-public class InspectConfigCmdImpl extends AbstrDockerCmd<InspectConfigCmd, Config> implements
-        InspectConfigCmd {
+public class InspectConfigCmdImpl extends AbstrDockerCmd<InspectConfigCmd, Config> implements InspectConfigCmd {
 
     private String configId;
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListConfigsCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListConfigsCmdImpl.java
@@ -2,8 +2,8 @@
 
 import com.github.dockerjava.api.command.ListConfigsCmd;
 import com.github.dockerjava.api.model.Config;
-import com.github.dockerjava.core.util.FiltersBuilder;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -12,38 +12,22 @@
 /**
  * List configs.
  */
-public class ListConfigsCmdImpl extends AbstrDockerCmd<ListConfigsCmd, List<Config>> implements
-        ListConfigsCmd {
+public class ListConfigsCmdImpl extends AbstrDockerCmd<ListConfigsCmd, List<Config>> implements ListConfigsCmd {
 
-    private FiltersBuilder filters = new FiltersBuilder();
+    private Map<String, List<String>> filters = Collections.emptyMap();
 
     public ListConfigsCmdImpl(Exec exec) {
         super(exec);
     }
 
     @Override
     public Map<String, List<String>> getFilters() {
-        return filters.build();
+        return filters;
     }
 
-    @Override
-    public ListConfigsCmd withIdFilter(List<String> ids) {
-        checkNotNull(ids, "ids was not specified");
-        this.filters.withFilter("id", ids);
-        return this;
-    }
-
-    @Override
-    public ListConfigsCmd withNameFilter(List<String> names) {
-        checkNotNull(names, "names was not specified");
-        this.filters.withFilter("name", names);
-        return this;
-    }
-
-    @Override
-    public ListConfigsCmd withLabelFilter(Map<String, String> labels) {
-        checkNotNull(labels, "labels was not specified");
-        this.filters.withLabels(labels);
+    public ListConfigsCmd withFilters(Map<String, List<String>> filters) {
+        checkNotNull(filters, "filters was not specified");
+        this.filters = filters;
         return this;
     }
 }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListConfigsCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListConfigsCmdExec.java
@@ -12,8 +12,7 @@
 
 import java.util.List;
 
-public class ListConfigsCmdExec extends AbstrSyncDockerCmdExec<ListConfigsCmd, List<Config>> implements
-    ListConfigsCmd.Exec {
+public class ListConfigsCmdExec extends AbstrSyncDockerCmdExec<ListConfigsCmd, List<Config>> implements ListConfigsCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ListConfigsCmdExec.class);
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveConfigCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveConfigCmdExec.java
@@ -7,8 +7,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class RemoveConfigCmdExec extends AbstrSyncDockerCmdExec<RemoveConfigCmd, Void> implements
-        RemoveConfigCmd.Exec {
+public class RemoveConfigCmdExec extends AbstrSyncDockerCmdExec<RemoveConfigCmd, Void> implements RemoveConfigCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(RemoveConfigCmdExec.class);
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateConfigCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateConfigCmdExecIT.java
@@ -2,16 +2,11 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.CreateConfigResponse;
-import com.github.dockerjava.api.model.Config;
-import com.google.common.collect.Lists;
 import org.apache.commons.lang.RandomStringUtils;
-import org.hamcrest.collection.IsCollectionWithSize;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.List;
-
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.notNullValue;
 
@@ -27,23 +22,10 @@ public void testCreateConfig() {
             .withName(configName)
             .withData("configuration data".getBytes()).exec();
         assertThat(response, notNullValue());
-        assertThat(response.getId(), notNullValue());
-        LOG.info("Config created with ID {}", response.getId());
-
-        List<Config> configs = dockerClient.listConfigsCmd()
-                .withNameFilter(Lists.newArrayList(configName))
-                .exec();
-
-        assertThat(configs, IsCollectionWithSize.hasSize(1));
-
-        dockerClient.removeConfigCmd(configs.get(0).getId())
-                .exec();
-        LOG.info("Config removed with ID {}", response.getId());
-        List<Config> configsAfterRemoved = dockerClient.listConfigsCmd()
-                .withNameFilter(Lists.newArrayList(configName))
-                .exec();
+        String configId = response.getId();
+        assertThat(configId, notNullValue());
 
-        assertThat(configsAfterRemoved, IsCollectionWithSize.hasSize(0));
+        dockerClient.removeConfigCmd(configId).exec();
     }
 
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java
@@ -19,18 +19,17 @@ public class InspectConfigCmdIT extends SwarmCmdIT {
 
     @Test
     public void inspectConfig() throws DockerException {
+        DockerClient dockerClient = startSwarm();
 
         String configName = RandomStringUtils.random(10, true, false);
 
-        DockerClient dockerClient = startSwarm();
         CreateConfigResponse configResponse = dockerClient.createConfigCmd()
             .withName(configName)
             .withData("configuration data".getBytes()).exec();
-        assertThat(configResponse, notNullValue());
-        assertThat(configResponse.getId(), notNullValue());
         LOG.info("Config created with ID {}", configResponse.getId());
 
         Config config = dockerClient.inspectConfigCmd(configResponse.getId()).exec();
-        assertEquals(config.getId(), config.getId());
+        assertEquals(configResponse.getId(), config.getId());
+        assertEquals(configName, config.getSpec().getName());
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListConfigCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListConfigCmdExecIT.java
@@ -4,16 +4,16 @@
 import com.github.dockerjava.api.command.CreateConfigResponse;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.Config;
-import com.google.common.collect.Lists;
 import org.apache.commons.lang.RandomStringUtils;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
 
 public class ListConfigCmdExecIT extends SwarmCmdIT {
@@ -28,22 +28,24 @@ public void tesListConfig() throws DockerException {
             .withName(configName)
             .withData("configuration data".getBytes())
             .exec();
-        assertThat(response, notNullValue());
-        assertThat(response.getId(), notNullValue());
-        LOG.info("Config created with ID {}", response.getId());
+        String configId = response.getId();
 
-        List<Config> configs = dockerClient.listConfigsCmd()
-                .withNameFilter(Lists.newArrayList(configName))
+        try {
+            LOG.info("Config created with ID {}", configId);
+
+            List<Config> configs = dockerClient.listConfigsCmd()
+                .withFilters(Collections.singletonMap("name", Arrays.asList(configName)))
                 .exec();
 
-        assertThat(configs, hasSize(1));
+            assertThat(configs, hasSize(1));
+        } finally {
+            dockerClient.removeConfigCmd(configId).exec();
+            LOG.info("Config removed with ID {}", configId);
+        }
 
-        dockerClient.removeConfigCmd(configs.get(0).getId())
-                .exec();
-        LOG.info("Config removed with ID {}", response.getId());
         List<Config> configsAfterRemoved = dockerClient.listConfigsCmd()
-                .withNameFilter(Lists.newArrayList(configName))
-                .exec();
+            .withFilters(Collections.singletonMap("name", Arrays.asList(configName)))
+            .exec();
 
         assertThat(configsAfterRemoved, hasSize(0));
 
