Merge pull request #996 from fengxx/bugfix/issue-927

KostyaSha · web-flow · commit 360adaaed502 · 2018-04-14T16:36:08.000+03:00
fix #927 avoid double encoding for url query string, NettyWebTarget#r…
diff --git a/src/main/java/com/github/dockerjava/core/exec/ListServicesCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/ListServicesCmdExec.java
@@ -12,8 +12,6 @@
 
 import java.util.List;
 
-import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
-
 public class ListServicesCmdExec extends AbstrSyncDockerCmdExec<ListServicesCmd, List<Service>> implements
         ListServicesCmd.Exec {
 
@@ -29,7 +27,7 @@ protected List<Service> execute(ListServicesCmd command) {
 
         if (command.getFilters() != null && !command.getFilters().isEmpty()) {
             webTarget = webTarget
-                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+                    .queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters()));
         }
 
         LOGGER.trace("GET: {}", webTarget);
diff --git a/src/main/java/com/github/dockerjava/core/exec/ListSwarmNodesCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/ListSwarmNodesCmdExec.java
@@ -12,8 +12,6 @@
 
 import java.util.List;
 
-import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
-
 public class ListSwarmNodesCmdExec extends AbstrSyncDockerCmdExec<ListSwarmNodesCmd, List<SwarmNode>> implements
         ListSwarmNodesCmd.Exec {
 
@@ -30,7 +28,7 @@ protected List<SwarmNode> execute(ListSwarmNodesCmd command) {
 
         if (command.getFilters() != null && !command.getFilters().isEmpty()) {
             webTarget = webTarget
-                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+                    .queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters()));
         }
 
         LOGGER.trace("GET: {}", webTarget);
diff --git a/src/main/java/com/github/dockerjava/core/exec/ListTasksCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/ListTasksCmdExec.java
@@ -12,8 +12,6 @@
 
 import java.util.List;
 
-import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
-
 public class ListTasksCmdExec extends AbstrSyncDockerCmdExec<ListTasksCmd, List<Task>> implements
         ListTasksCmd.Exec {
 
@@ -29,7 +27,7 @@ protected List<Task> execute(ListTasksCmd command) {
 
         if (command.getFilters() != null && !command.getFilters().isEmpty()) {
             webTarget = webTarget
-                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+                    .queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters()));
         }
 
         LOGGER.trace("GET: {}", webTarget);
