Merge branch 'list-containers-filters' of https://github.com/carlossg/docker-java into carlossg-list-containers-filters

Marcus Linke · Marcus Linke · commit eeaeaf01a889 · 2015-07-10T20:23:10.000+02:00
diff --git a/src/main/java/com/github/dockerjava/api/model/Filters.java b/src/main/java/com/github/dockerjava/api/model/Filters.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.api.model;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -21,7 +22,7 @@ public class Filters {
     private static ObjectMapper OBJECT_MAPPER = new JacksonJaxbJsonProvider().locateMapper(Map.class,
             MediaType.APPLICATION_JSON_TYPE);
 
-    private Map<String, String[]> filters = new HashMap<String, String[]>();
+    private Map<String, List<String>> filters = new HashMap<String, List<String>>();
 
     public Filters() {
     }
@@ -40,42 +41,41 @@ public Filters(String image, String container) {
     }
 
     public Filters withFilter(String key, String... value) {
-        filters.put(key, value);
+        filters.put(key, Arrays.asList(value));
         return this;
     }
 
-    public String[] getFilter(String key) {
+    public List<String> getFilter(String key) {
         return filters.get(key);
     }
 
     public Filters withImage(String... image) {
-        filters.put("image", image);
+        filters.put("image", Arrays.asList(image));
         return this;
     }
 
-    public String[] getImage() {
+    public List<String> getImage() {
         return getFilter("image");
     }
 
     public Filters withContainer(String... container) {
-        filters.put("container", container);
+        filters.put("container", Arrays.asList(container));
         return this;
     }
 
-    public String[] getContainer() {
+    public List<String> getContainer() {
         return getFilter("container");
     }
 
-    public Filters withLabel(String label) {
-        return withLabel(label, (String[]) null);
-    }
-
-    public Filters withLabel(String label, String... value) {
-        if (value != null) {
-            filters.put(label, value);
-        } else {
-            filters.put("label", new String[] { label });
-        }
+    /**
+     * Filter by labels
+     * 
+     * @param labels
+     *            string array in the form ["key"] or ["key=value"] or a mix of both
+     * @return
+     */
+    public Filters withLabel(String... labels) {
+        filters.put("label", Arrays.asList(labels));
         return this;
     }
 
@@ -87,4 +87,4 @@ public String toString() {
             throw new RuntimeException(e);
         }
     }
-}
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
@@ -111,8 +111,8 @@ public ListContainersCmd withFilters(Filters filters) {
     @Override
     public String toString() {
         return new StringBuilder("ps ").append(showAll ? "--all=true" : "").append(showSize ? "--size=true" : "")
-                .append(sinceId != null ? "--since " + sinceId : "")
-                .append(beforeId != null ? "--before " + beforeId : "").append(limit != -1 ? "-n " + limit : "")
-                .append(filters != null ? "--filters " + filters : "").toString();
+                .append(sinceId != null ? " --since " + sinceId : "")
+                .append(beforeId != null ? " --before " + beforeId : "").append(limit != -1 ? "-n " + limit : "")
+                .append(filters != null ? " --filters " + filters : "").toString();
     }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
@@ -67,8 +67,7 @@ public void testListContainers() throws DockerException {
 
         int size = containers.size();
 
-        CreateContainerResponse container1 = dockerClient.createContainerCmd(testImage).withCmd("echo")
-                .withLabels(ImmutableMap.of("test", "docker-java")).exec();
+        CreateContainerResponse container1 = dockerClient.createContainerCmd(testImage).withCmd("echo").exec();
 
         assertThat(container1.getId(), not(isEmptyString()));
 
@@ -102,8 +101,10 @@ public void testListContainers() throws DockerException {
         assertThat(container2.getImage(), startsWith(testImage));
 
         // list with filter by label
+        dockerClient.createContainerCmd(testImage).withCmd("echo").withLabels(ImmutableMap.of("test", "docker-java"))
+                .exec();
         filteredContainers = dockerClient.listContainersCmd().withShowAll(true)
-                .withFilters(new Filters().withLabel("test", "docker-java")).exec();
+                .withFilters(new Filters().withLabel("test=docker-java")).exec();
         assertThat(filteredContainers.size(), is(equalTo(1)));
         Container container3 = filteredContainers.get(0);
         assertThat(container3.getCommand(), not(isEmptyString()));

Original file line number	Diff line number	Diff line change
`@@ -111,8 +111,8 @@ public ListContainersCmd withFilters(Filters filters) {`
`111`	`111`	`@Override`
`112`	`112`	`public String toString() {`
`113`	`113`	`return new StringBuilder("ps ").append(showAll ? "--all=true" : "").append(showSize ? "--size=true" : "")`
`114`		`- .append(sinceId != null ? "--since " + sinceId : "")`
`115`		`- .append(beforeId != null ? "--before " + beforeId : "").append(limit != -1 ? "-n " + limit : "")`
`116`		`- .append(filters != null ? "--filters " + filters : "").toString();`
	`114`	`+ .append(sinceId != null ? " --since " + sinceId : "")`
	`115`	`+ .append(beforeId != null ? " --before " + beforeId : "").append(limit != -1 ? "-n " + limit : "")`
	`116`	`+ .append(filters != null ? " --filters " + filters : "").toString();`
`117`	`117`	`}`
`118`	`118`	`}`