Skip to content

Commit a5de1f9

Browse files
committed
Fix filter double encoding.
Jersey do contextual encoding and doesn’t fail. Netty impl has fair encoders, so double encoding causing docker to fail. Signed-off-by: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
1 parent 23d7e80 commit a5de1f9

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
package com.github.dockerjava.netty.exec;
22

3-
import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
4-
5-
import java.util.List;
6-
7-
import org.slf4j.Logger;
8-
import org.slf4j.LoggerFactory;
9-
103
import com.fasterxml.jackson.core.type.TypeReference;
114
import com.github.dockerjava.api.command.ListContainersCmd;
125
import com.github.dockerjava.api.model.Container;
136
import com.github.dockerjava.core.DockerClientConfig;
147
import com.github.dockerjava.core.util.FiltersEncoder;
158
import com.github.dockerjava.netty.MediaType;
169
import com.github.dockerjava.netty.WebTarget;
10+
import org.slf4j.Logger;
11+
import org.slf4j.LoggerFactory;
12+
13+
import java.util.List;
1714

1815
public class ListContainersCmdExec extends AbstrSyncDockerCmdExec<ListContainersCmd, List<Container>> implements
1916
ListContainersCmd.Exec {
@@ -38,7 +35,7 @@ protected List<Container> execute(ListContainersCmd command) {
3835

3936
if (command.getFilters() != null && !command.getFilters().isEmpty()) {
4037
webTarget = webTarget
41-
.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
38+
.queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters()));
4239
}
4340

4441
LOGGER.trace("GET: {}", webTarget);

0 commit comments

Comments
 (0)