Merge pull request docker-java#916 from orzeh/space_url_encoding

KostyaSha · web-flow · commit 943cc6f2502a · 2017-09-22T00:15:32.000+03:00
Encode spaces as %20 rather than + in URL params
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -137,7 +137,7 @@ private WebTarget writeMap(WebTarget webTarget, String name, Map<String, String>
         if (value != null && !value.isEmpty()) {
             try {
                 return webTarget.queryParam(name,
-                        URLEncoder.encode(MAPPER.writeValueAsString(value), "UTF-8"));
+                        URLEncoder.encode(MAPPER.writeValueAsString(value), "UTF-8").replaceAll("\\+", "%20"));
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -260,15 +260,15 @@ public void fromPrivateRegistry() throws Exception {
     public void buildArgs() throws Exception {
         File baseDir = fileFromBuildTestResource("buildArgs");
 
-        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true).withBuildArg("testArg", "abc")
+        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true).withBuildArg("testArg", "abc !@#$%^&*()_+")
                 .exec(new BuildImageResultCallback())
                 .awaitImageId();
 
         InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
         assertThat(inspectImageResponse, not(nullValue()));
         LOG.info("Image Inspect: {}", inspectImageResponse.toString());
 
-        assertThat(inspectImageResponse.getConfig().getLabels().get("test"), equalTo("abc"));
+        assertThat(inspectImageResponse.getConfig().getLabels().get("test"), equalTo("abc !@#$%^&*()_+"));
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
@@ -265,15 +265,15 @@ public void fromPrivateRegistry() throws Exception {
     public void buildArgs() throws Exception {
         File baseDir = fileFromBuildTestResource("buildArgs");
 
-        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true).withBuildArg("testArg", "abc")
+        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true).withBuildArg("testArg", "abc !@#$%^&*()_+")
                 .exec(new BuildImageResultCallback())
                 .awaitImageId();
 
         InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
         assertThat(inspectImageResponse, not(nullValue()));
         LOG.info("Image Inspect: {}", inspectImageResponse.toString());
 
-        assertThat(inspectImageResponse.getConfig().getLabels().get("test"), equalTo("abc"));
+        assertThat(inspectImageResponse.getConfig().getLabels().get("test"), equalTo("abc !@#$%^&*()_+"));
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ private WebTarget writeMap(WebTarget webTarget, String name, Map<String, String>`
`137`	`137`	`if (value != null && !value.isEmpty()) {`
`138`	`138`	`try {`
`139`	`139`	`return webTarget.queryParam(name,`
`140`		`- URLEncoder.encode(MAPPER.writeValueAsString(value), "UTF-8"));`
	`140`	`+ URLEncoder.encode(MAPPER.writeValueAsString(value), "UTF-8").replaceAll("\\+", "%20"));`
`141`	`141`	`} catch (IOException e) {`
`142`	`142`	`throw new RuntimeException(e);`
`143`	`143`	`}`