#1086: Address comments

exFalso · exFalso · commit c552bb04edfa · 2018-08-24T10:41:58.000+01:00
diff --git a/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
@@ -9,7 +9,7 @@
 import com.github.dockerjava.core.InvocationBuilder;
 import com.github.dockerjava.core.MediaType;
 import com.github.dockerjava.core.WebTarget;
-import com.google.common.base.Joiner;
+import com.github.dockerjava.core.util.CacheFromEncoder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -59,7 +59,7 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>
         }
 
         if (command.getCacheFrom() != null && !command.getCacheFrom().isEmpty()) {
-            webTarget = webTarget.queryParam("cachefrom", "[\"" + Joiner.on("\",\"").join(command.getCacheFrom()) + "\"]");
+            webTarget = webTarget.queryParam("cachefrom", CacheFromEncoder.jsonEncode(command.getCacheFrom()));
         }
 
         if (command.getRemote() != null) {
diff --git a/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java b/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java
@@ -0,0 +1,27 @@
+package com.github.dockerjava.core.util;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
+
+import javax.ws.rs.core.MediaType;
+import java.util.Collection;
+
+/**
+ * JSON Encoder for the docker --cache-from parameter.
+ */
+public class CacheFromEncoder {
+    private CacheFromEncoder() {
+    }
+
+    private static final ObjectMapper OBJECT_MAPPER = new JacksonJaxbJsonProvider().locateMapper(Collection.class,
+            MediaType.APPLICATION_JSON_TYPE);
+
+    public static String jsonEncode(Collection<String> imageIds) {
+        try {
+            return OBJECT_MAPPER.writeValueAsString(imageIds);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -7,9 +7,10 @@
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import com.google.common.base.Joiner;
+import com.github.dockerjava.core.util.CacheFromEncoder;
 import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.client.RequestEntityProcessing;
 import org.slf4j.Logger;
@@ -77,7 +78,7 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
         }
 
         if (command.getCacheFrom() != null && !command.getCacheFrom().isEmpty()) {
-            webTarget = webTarget.queryParam("cachefrom", "[\"" + Joiner.on("\",\"").join(command.getCacheFrom()) + "\"]");
+            webTarget = webTarget.queryParam("cachefrom", CacheFromEncoder.jsonEncode(command.getCacheFrom()));
         }
 
         if (command.getRemote() != null) {

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`import com.github.dockerjava.core.InvocationBuilder;`
`10`	`10`	`import com.github.dockerjava.core.MediaType;`
`11`	`11`	`import com.github.dockerjava.core.WebTarget;`
`12`		`-import com.google.common.base.Joiner;`
	`12`	`+import com.github.dockerjava.core.util.CacheFromEncoder;`
`13`	`13`	`import org.slf4j.Logger;`
`14`	`14`	`import org.slf4j.LoggerFactory;`
`15`	`15`
`@@ -59,7 +59,7 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`if (command.getCacheFrom() != null && !command.getCacheFrom().isEmpty()) {`
`62`		`- webTarget = webTarget.queryParam("cachefrom", "[\"" + Joiner.on("\",\"").join(command.getCacheFrom()) + "\"]");`
	`62`	`+ webTarget = webTarget.queryParam("cachefrom", CacheFromEncoder.jsonEncode(command.getCacheFrom()));`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`if (command.getRemote() != null) {`