From a0a165eaa38ab123114c8f03e2a4d2e2b1efeb4a Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Wed, 6 Aug 2014 16:28:57 -0700 Subject: [PATCH] JCLOUDS-653: Address Guava 18 deprecations Mostly renaming Objects.toStringHelper to MoreObjects.toStringHelper. --- .../docker/compute/options/DockerTemplateOptions.java | 3 ++- .../src/main/java/org/jclouds/docker/domain/Config.java | 3 ++- .../src/main/java/org/jclouds/docker/domain/Container.java | 3 ++- .../main/java/org/jclouds/docker/domain/ExposedPorts.java | 3 ++- .../src/main/java/org/jclouds/docker/domain/HostConfig.java | 3 ++- .../src/main/java/org/jclouds/docker/domain/Image.java | 3 ++- .../java/org/jclouds/docker/domain/NetworkSettings.java | 3 ++- .../src/main/java/org/jclouds/docker/domain/Port.java | 3 ++- .../src/main/java/org/jclouds/docker/domain/State.java | 3 ++- .../src/main/java/org/jclouds/docker/domain/Version.java | 3 ++- .../org/jclouds/docker/internal/BaseDockerMockTest.java | 6 +++--- 11 files changed, 23 insertions(+), 13 deletions(-) diff --git a/apis/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java b/apis/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java index 5e4669b9ea..36029da762 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java +++ b/apis/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java @@ -16,6 +16,7 @@ */ package org.jclouds.docker.compute.options; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; @@ -109,7 +110,7 @@ public class DockerTemplateOptions extends TemplateOptions implements Cloneable @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("dns", dns) .add("hostname", hostname) .add("memory", memory) diff --git a/apis/docker/src/main/java/org/jclouds/docker/domain/Config.java b/apis/docker/src/main/java/org/jclouds/docker/domain/Config.java index 9c80472d96..3674d6dece 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/domain/Config.java +++ b/apis/docker/src/main/java/org/jclouds/docker/domain/Config.java @@ -16,6 +16,7 @@ */ package org.jclouds.docker.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -245,7 +246,7 @@ public class Config { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("hostname", hostname) .add("domainName", domainName) .add("user", user) diff --git a/apis/docker/src/main/java/org/jclouds/docker/domain/Container.java b/apis/docker/src/main/java/org/jclouds/docker/domain/Container.java index 27525292e0..0f0c727b18 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/domain/Container.java +++ b/apis/docker/src/main/java/org/jclouds/docker/domain/Container.java @@ -16,6 +16,7 @@ */ package org.jclouds.docker.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -210,7 +211,7 @@ public class Container { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("name", name) .add("created", created) diff --git a/apis/docker/src/main/java/org/jclouds/docker/domain/ExposedPorts.java b/apis/docker/src/main/java/org/jclouds/docker/domain/ExposedPorts.java index b7a831a64c..347ad3a5ea 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/domain/ExposedPorts.java +++ b/apis/docker/src/main/java/org/jclouds/docker/domain/ExposedPorts.java @@ -22,6 +22,7 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; import com.google.gson.annotations.SerializedName; @@ -65,7 +66,7 @@ public class ExposedPorts { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("portAndProtocol", portAndProtocol) .add("hostPorts", hostPorts) .toString(); diff --git a/apis/docker/src/main/java/org/jclouds/docker/domain/HostConfig.java b/apis/docker/src/main/java/org/jclouds/docker/domain/HostConfig.java index 275961fe9e..94155c36fe 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/domain/HostConfig.java +++ b/apis/docker/src/main/java/org/jclouds/docker/domain/HostConfig.java @@ -23,6 +23,7 @@ import java.util.Map; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -135,7 +136,7 @@ public class HostConfig { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("containerIDFile", containerIDFile) .add("binds", binds) .add("lxcConf", lxcConf) diff --git a/apis/docker/src/main/java/org/jclouds/docker/domain/Image.java b/apis/docker/src/main/java/org/jclouds/docker/domain/Image.java index 186ece32f4..80d6f6818a 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/domain/Image.java +++ b/apis/docker/src/main/java/org/jclouds/docker/domain/Image.java @@ -16,6 +16,7 @@ */ package org.jclouds.docker.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.gson.annotations.SerializedName; @@ -132,7 +133,7 @@ public class Image { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("parent", parent) .add("created", created) diff --git a/apis/docker/src/main/java/org/jclouds/docker/domain/NetworkSettings.java b/apis/docker/src/main/java/org/jclouds/docker/domain/NetworkSettings.java index 23f3fbede1..0c60719bf1 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/domain/NetworkSettings.java +++ b/apis/docker/src/main/java/org/jclouds/docker/domain/NetworkSettings.java @@ -16,6 +16,7 @@ */ package org.jclouds.docker.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; import com.google.gson.annotations.SerializedName; @@ -99,7 +100,7 @@ public class NetworkSettings { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("ipAddress", ipAddress) .add("ipPrefixLen", ipPrefixLen) .add("gateway", gateway) diff --git a/apis/docker/src/main/java/org/jclouds/docker/domain/Port.java b/apis/docker/src/main/java/org/jclouds/docker/domain/Port.java index b49dfa6945..3a43ec55ec 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/domain/Port.java +++ b/apis/docker/src/main/java/org/jclouds/docker/domain/Port.java @@ -16,6 +16,7 @@ */ package org.jclouds.docker.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.gson.annotations.SerializedName; @@ -78,7 +79,7 @@ public class Port { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("privatePort", privatePort) .add("publicPort", publicPort) .add("type", type) diff --git a/apis/docker/src/main/java/org/jclouds/docker/domain/State.java b/apis/docker/src/main/java/org/jclouds/docker/domain/State.java index ac1ba85e01..cc665c8b09 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/domain/State.java +++ b/apis/docker/src/main/java/org/jclouds/docker/domain/State.java @@ -19,6 +19,7 @@ package org.jclouds.docker.domain; import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.gson.annotations.SerializedName; @@ -92,7 +93,7 @@ public class State { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("pid", pid) .add("running", running) .add("exitCode", exitCode) diff --git a/apis/docker/src/main/java/org/jclouds/docker/domain/Version.java b/apis/docker/src/main/java/org/jclouds/docker/domain/Version.java index 445a225c3d..f6dbb4942d 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/domain/Version.java +++ b/apis/docker/src/main/java/org/jclouds/docker/domain/Version.java @@ -19,6 +19,7 @@ package org.jclouds.docker.domain; import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.gson.annotations.SerializedName; @@ -92,7 +93,7 @@ public class Version { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("arch", arch) .add("gitCommit", gitCommit) .add("goVersion", goVersion) diff --git a/apis/docker/src/test/java/org/jclouds/docker/internal/BaseDockerMockTest.java b/apis/docker/src/test/java/org/jclouds/docker/internal/BaseDockerMockTest.java index 146b2a051d..04020b6275 100644 --- a/apis/docker/src/test/java/org/jclouds/docker/internal/BaseDockerMockTest.java +++ b/apis/docker/src/test/java/org/jclouds/docker/internal/BaseDockerMockTest.java @@ -16,7 +16,7 @@ */ package org.jclouds.docker.internal; -import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; +import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; import static org.jclouds.http.utils.Queries.encodeQueryLine; import static org.jclouds.util.Strings2.toStringAndClose; import static org.testng.Assert.assertEquals; @@ -45,8 +45,8 @@ import com.squareup.okhttp.mockwebserver.RecordedRequest; * Base class for all Docker mock tests. */ public class BaseDockerMockTest { - private final Set modules = ImmutableSet. of(new ExecutorServiceModule(sameThreadExecutor(), - sameThreadExecutor())); + private final Set modules = ImmutableSet. of(new ExecutorServiceModule(newDirectExecutorService(), + newDirectExecutorService())); protected String provider;