Unify utils. Remove deprecated class.

KostyaSha · KostyaSha · commit 944ad11e977e · 2018-11-25T03:20:19.000+03: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
@@ -13,6 +13,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static com.github.dockerjava.core.util.CacheFromEncoder.*;
 import static org.apache.commons.lang.StringUtils.isNotBlank;
 
 public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec<BuildImageCmd, BuildResponseItem> implements
@@ -59,7 +60,7 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>
         }
 
         if (command.getCacheFrom() != null && !command.getCacheFrom().isEmpty()) {
-            webTarget = webTarget.queryParam("cachefrom", CacheFromEncoder.jsonEncode(command.getCacheFrom()));
+            webTarget = webTarget.queryParam("cachefrom", 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
@@ -11,15 +11,15 @@
  * 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);
+    private static final ObjectMapper MAPPER = new JacksonJaxbJsonProvider().locateMapper(Collection.class, MediaType.APPLICATION_JSON_TYPE);
 
     public static String jsonEncode(Collection<String> imageIds) {
         try {
-            return OBJECT_MAPPER.writeValueAsString(imageIds);
+            return MAPPER.writeValueAsString(imageIds);
         } catch (JsonProcessingException e) {
             throw new RuntimeException(e);
         }
diff --git a/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java b/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
@@ -13,20 +13,20 @@
  * JSON Encoder for docker filters.
  *
  * @author Carlos Sanchez <carlos@apache.org>
- *
  */
 public class FiltersEncoder {
+
     private FiltersEncoder() {
     }
 
-    private static final ObjectMapper OBJECT_MAPPER = new JacksonJaxbJsonProvider().locateMapper(Map.class,
-            MediaType.APPLICATION_JSON_TYPE);
+    private static final ObjectMapper MAPPER = new JacksonJaxbJsonProvider().locateMapper(Map.class, MediaType.APPLICATION_JSON_TYPE);
 
-    public static String jsonEncode(Map<String, List<String>> filters) {
+    public static String jsonEncode(Map<String, List<String>> mapStringListString) {
         try {
-            return OBJECT_MAPPER.writeValueAsString(filters);
+            return MAPPER.writeValueAsString(mapStringListString);
         } catch (JsonProcessingException e) {
             throw new RuntimeException(e);
         }
     }
+
 }
diff --git a/src/main/java/com/github/dockerjava/core/util/ServiceFiltersBuilder.java b/src/main/java/com/github/dockerjava/core/util/ServiceFiltersBuilder.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -7,7 +7,6 @@
 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.github.dockerjava.core.util.CacheFromEncoder;

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`import org.slf4j.Logger;`
`14`	`14`	`import org.slf4j.LoggerFactory;`
`15`	`15`
	`16`	`+import static com.github.dockerjava.core.util.CacheFromEncoder.*;`
`16`	`17`	`import static org.apache.commons.lang.StringUtils.isNotBlank;`
`17`	`18`
`18`	`19`	`public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec<BuildImageCmd, BuildResponseItem> implements`
`@@ -59,7 +60,7 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>`
`59`	`60`	`}`
`60`	`61`
`61`	`62`	`if (command.getCacheFrom() != null && !command.getCacheFrom().isEmpty()) {`
`62`		`- webTarget = webTarget.queryParam("cachefrom", CacheFromEncoder.jsonEncode(command.getCacheFrom()));`
	`63`	`+ webTarget = webTarget.queryParam("cachefrom", jsonEncode(command.getCacheFrom()));`
`63`	`64`	`}`
`64`	`65`
`65`	`66`	`if (command.getRemote() != null) {`
Original file line number	Diff line number	Diff line change
`@@ -13,20 +13,20 @@`
`13`	`13`	`* JSON Encoder for docker filters.`
`14`	`14`	`*`
`15`	`15`	`* @author Carlos Sanchez <carlos@apache.org>`
`16`		`- *`
`17`	`16`	`*/`
`18`	`17`	`public class FiltersEncoder {`
	`18`	`+`
`19`	`19`	`private FiltersEncoder() {`
`20`	`20`	`}`
`21`	`21`
`22`		`- private static final ObjectMapper OBJECT_MAPPER = new JacksonJaxbJsonProvider().locateMapper(Map.class,`
`23`		`- MediaType.APPLICATION_JSON_TYPE);`
	`22`	`+ private static final ObjectMapper MAPPER = new JacksonJaxbJsonProvider().locateMapper(Map.class, MediaType.APPLICATION_JSON_TYPE);`
`24`	`23`
`25`		`- public static String jsonEncode(Map<String, List<String>> filters) {`
	`24`	`+ public static String jsonEncode(Map<String, List<String>> mapStringListString) {`
`26`	`25`	`try {`
`27`		`- return OBJECT_MAPPER.writeValueAsString(filters);`
	`26`	`+ return MAPPER.writeValueAsString(mapStringListString);`
`28`	`27`	`} catch (JsonProcessingException e) {`
`29`	`28`	`throw new RuntimeException(e);`
`30`	`29`	`}`
`31`	`30`	`}`
	`31`	`+`
`32`	`32`	`}`