Merge pull request #558 from ylorenza/master

marcuslinke · marcuslinke · commit 983753419f62 · 2016-04-30T19:28:21.000+02:00
docker java generate empty filter instead of no filter #557
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
@@ -37,7 +37,7 @@ protected List<Container> execute(ListContainersCmd command) {
             webTarget = webTarget.queryParam("limit", String.valueOf(command.getLimit()));
         }
 
-        if (command.getFilters() != null) {
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
             webTarget = webTarget
                     .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
         }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java
@@ -36,7 +36,7 @@ protected List<Container> execute(ListContainersCmd command) {
             webTarget = webTarget.queryParam("limit", String.valueOf(command.getLimit()));
         }
 
-        if (command.getFilters() != null) {
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
             webTarget = webTarget
                     .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
         }

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ protected List<Container> execute(ListContainersCmd command) {`
`37`	`37`	`webTarget = webTarget.queryParam("limit", String.valueOf(command.getLimit()));`
`38`	`38`	`}`
`39`	`39`
`40`		`- if (command.getFilters() != null) {`
	`40`	`+ if (command.getFilters() != null && !command.getFilters().isEmpty()) {`
`41`	`41`	`webTarget = webTarget`
`42`	`42`	`.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ protected List<Container> execute(ListContainersCmd command) {`
`36`	`36`	`webTarget = webTarget.queryParam("limit", String.valueOf(command.getLimit()));`
`37`	`37`	`}`
`38`	`38`
`39`		`- if (command.getFilters() != null) {`
	`39`	`+ if (command.getFilters() != null && !command.getFilters().isEmpty()) {`
`40`	`40`	`webTarget = webTarget`
`41`	`41`	`.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));`
`42`	`42`	`}`