Merge pull request #579 from cirocosta/filter-by-image-name-listimages-netty

marcuslinke · marcuslinke · commit 1b9d427dcbd0 · 2016-05-12T23:50:04.000+02:00
Adds name filter to netty's image listing
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListImagesCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListImagesCmdExec.java
@@ -33,6 +33,10 @@ protected List<Image> execute(ListImagesCmd command) {
             webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
         }
 
+       if (command.getImageNameFilter() != null) {
+            webTarget = webTarget.queryParam("filter", urlPathSegmentEscaper().escape(command.getImageNameFilter()));
+       }
+
         LOGGER.trace("GET: {}", webTarget);
 
         List<Image> images = webTarget.request().accept(MediaType.APPLICATION_JSON)
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ListImagesCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ListImagesCmdExecTest.java
@@ -75,6 +75,18 @@ public void listImagesWithDanglingFilter() throws DockerException {
         assertTrue(imageInFilteredList);
     }
 
+    @Test
+    public void listImagesWithNameFilter() throws DockerException {
+        String imageId = createDanglingImage();
+        dockerClient.tagImageCmd(imageId, "test_repository", "latest").exec();
+        List<Image> images = dockerClient.listImagesCmd().withImageNameFilter("test_repository:latest").exec();
+        assertThat(images, notNullValue());
+        LOG.info("Images List: {}", images);
+        assertThat(images.size(), is(equalTo(1)));
+        Boolean imageInFilteredList = isImageInFilteredList(images, imageId);
+        assertTrue(imageInFilteredList);
+    }
+
     private boolean isImageInFilteredList(List<Image> images, String expectedImageId) {
         for (Image image : images) {
             if (expectedImageId.equals(image.getId())) {

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,10 @@ protected List<Image> execute(ListImagesCmd command) {`
`33`	`33`	`webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));`
`34`	`34`	`}`
`35`	`35`
	`36`	`+ if (command.getImageNameFilter() != null) {`
	`37`	`+ webTarget = webTarget.queryParam("filter", urlPathSegmentEscaper().escape(command.getImageNameFilter()));`
	`38`	`+ }`
	`39`	`+`
`36`	`40`	`LOGGER.trace("GET: {}", webTarget);`
`37`	`41`
`38`	`42`	`List<Image> images = webTarget.request().accept(MediaType.APPLICATION_JSON)`