Merge pull request #1209 from hugares/remove-deprecated

KostyaSha · web-flow · commit e95adcdd5a76 · 2019-07-10T22:15:39.000+03:00
Remove usage of deprecated Objects.toStringHelper
diff --git a/src/main/java/com/github/dockerjava/api/model/Identifier.java b/src/main/java/com/github/dockerjava/api/model/Identifier.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.api.model;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Optional;
 
 import java.io.Serializable;
@@ -55,6 +55,6 @@ public static Identifier fromCompoundString(String identifier) {
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(this).add("repository", repository).add("tag", tag).toString();
+        return MoreObjects.toStringHelper(this).add("repository", repository).add("tag", tag).toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Repository.java b/src/main/java/com/github/dockerjava/api/model/Repository.java
@@ -4,7 +4,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 
 /**
  * A repository or image name.
@@ -36,7 +36,7 @@ public URL getURL() throws MalformedURLException {
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(this).add("name", name).toString();
+        return MoreObjects.toStringHelper(this).add("name", name).toString();
     }
 
     public String getPath() {
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -19,7 +19,7 @@
 import com.github.dockerjava.core.util.CompressArchiveUtil;
 import com.github.dockerjava.core.util.FilePathUtil;
 import com.google.common.base.Function;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Optional;
 import com.google.common.collect.Collections2;
 
@@ -171,7 +171,7 @@ public void close() throws IOException {
 
         @Override
         public String toString() {
-            return Objects.toStringHelper(this).add("ignores", ignores).add("filesToAdd", filesToAdd).toString();
+            return MoreObjects.toStringHelper(this).add("ignores", ignores).add("filesToAdd", filesToAdd).toString();
         }
 
         public ScannedResult() throws IOException {
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java b/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
@@ -12,7 +12,7 @@
 
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.google.common.base.Function;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
@@ -155,7 +155,7 @@ public static Optional<Add> create(String statement) {
 
         @Override
         public String toString() {
-            return Objects.toStringHelper(this).add("sources", sources).add("destination", destination).toString();
+            return MoreObjects.toStringHelper(this).add("sources", sources).add("destination", destination).toString();
         }
     }
 
@@ -192,7 +192,7 @@ public static Optional<Env> create(String statement) {
 
         @Override
         public String toString() {
-            return Objects.toStringHelper(this).add("variable", variable).add("value", value).toString();
+            return MoreObjects.toStringHelper(this).add("variable", variable).add("value", value).toString();
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package com.github.dockerjava.api.model;`
`2`	`2`
`3`		`-import com.google.common.base.Objects;`
	`3`	`+import com.google.common.base.MoreObjects;`
`4`	`4`	`import com.google.common.base.Optional;`
`5`	`5`
`6`	`6`	`import java.io.Serializable;`
`@@ -55,6 +55,6 @@ public static Identifier fromCompoundString(String identifier) {`
`55`	`55`
`56`	`56`	`@Override`
`57`	`57`	`public String toString() {`
`58`		`- return Objects.toStringHelper(this).add("repository", repository).add("tag", tag).toString();`
	`58`	`+ return MoreObjects.toStringHelper(this).add("repository", repository).add("tag", tag).toString();`
`59`	`59`	`}`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`
`13`	`13`	`import com.github.dockerjava.api.exception.DockerClientException;`
`14`	`14`	`import com.google.common.base.Function;`
`15`		`-import com.google.common.base.Objects;`
	`15`	`+import com.google.common.base.MoreObjects;`
`16`	`16`	`import com.google.common.base.Optional;`
`17`	`17`	`import com.google.common.base.Predicate;`
`18`	`18`	`import com.google.common.collect.Collections2;`
`@@ -155,7 +155,7 @@ public static Optional<Add> create(String statement) {`
`155`	`155`
`156`	`156`	`@Override`
`157`	`157`	`public String toString() {`
`158`		`- return Objects.toStringHelper(this).add("sources", sources).add("destination", destination).toString();`
	`158`	`+ return MoreObjects.toStringHelper(this).add("sources", sources).add("destination", destination).toString();`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`
`@@ -192,7 +192,7 @@ public static Optional<Env> create(String statement) {`
`192`	`192`
`193`	`193`	`@Override`
`194`	`194`	`public String toString() {`
`195`		`- return Objects.toStringHelper(this).add("variable", variable).add("value", value).toString();`
	`195`	`+ return MoreObjects.toStringHelper(this).add("variable", variable).add("value", value).toString();`
`196`	`196`	`}`
`197`	`197`	`}`
`198`	`198`