Repository: jclouds Updated Branches: refs/heads/master e331a000d -> 04a3f6fd8
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ResourceRecordDetail.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ResourceRecordDetail.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ResourceRecordDetail.java index a29e103..fc80706 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ResourceRecordDetail.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ResourceRecordDetail.java @@ -17,7 +17,7 @@ package org.jclouds.ultradns.ws.domain; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import java.util.Date; http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/RoundRobinPool.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/RoundRobinPool.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/RoundRobinPool.java index 2ae13c1..cefb52f 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/RoundRobinPool.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/RoundRobinPool.java @@ -18,6 +18,7 @@ package org.jclouds.ultradns.ws.domain; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; public final class RoundRobinPool { @@ -106,7 +107,7 @@ public final class RoundRobinPool { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("zoneId", zoneId).add("id", id).add("name", name) + return MoreObjects.toStringHelper(this).omitNullValues().add("zoneId", zoneId).add("id", id).add("name", name) .add("dname", dname).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Task.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Task.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Task.java index 6fc26b2..86af600 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Task.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Task.java @@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; @@ -82,7 +83,7 @@ public final class Task { @Override public String toString() { - return Objects.toStringHelper(this).add("guid", guid).add("statusCode", statusCode).add("message", message) + return MoreObjects.toStringHelper(this).add("guid", guid).add("statusCode", statusCode).add("message", message) .add("resultUrl", resultUrl).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPool.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPool.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPool.java index 6e69a3d..a80c127 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPool.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPool.java @@ -18,6 +18,7 @@ package org.jclouds.ultradns.ws.domain; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -143,7 +144,7 @@ public final class TrafficControllerPool { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("zoneId", zoneId).add("id", id).add("name", name) + return MoreObjects.toStringHelper(this).omitNullValues().add("zoneId", zoneId).add("id", id).add("name", name) .add("dname", dname).add("status", statusCode).add("failOverEnabled", failOverEnabled) .add("probingEnabled", probingEnabled).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecord.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecord.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecord.java index 4c30008..0f7952e 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecord.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecord.java @@ -17,7 +17,7 @@ package org.jclouds.ultradns.ws.domain; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecordDetail.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecordDetail.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecordDetail.java index bda5ffc..ae0a3d2 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecordDetail.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecordDetail.java @@ -19,6 +19,7 @@ package org.jclouds.ultradns.ws.domain; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; public final class TrafficControllerPoolRecordDetail { @@ -145,7 +146,7 @@ public final class TrafficControllerPoolRecordDetail { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("poolId", poolId).add("record", record) + return MoreObjects.toStringHelper(this).add("id", id).add("poolId", poolId).add("record", record) .add("weight", weight).add("priority", priority).add("forceAnswer", forceAnswer) .add("probingEnabled", probingEnabled).add("status", status).add("serving", serving) .add("description", description).toString(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/UpdatePoolRecord.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/UpdatePoolRecord.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/UpdatePoolRecord.java index 80b0c79..04f163b 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/UpdatePoolRecord.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/UpdatePoolRecord.java @@ -17,7 +17,7 @@ package org.jclouds.ultradns.ws.domain; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Zone.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Zone.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Zone.java index 50349bf..1aaeb78 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Zone.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Zone.java @@ -19,6 +19,7 @@ package org.jclouds.ultradns.ws.domain; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; @@ -122,7 +123,7 @@ public final class Zone { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("type", type) + return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("type", type) .add("accountId", accountId).add("ownerId", ownerId).add("dnssecStatus", dnssecStatus) .add("primarySrc", primarySrc.orNull()).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ZoneProperties.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ZoneProperties.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ZoneProperties.java index 972b42d..2061c12 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ZoneProperties.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ZoneProperties.java @@ -23,6 +23,7 @@ import java.util.Date; import org.jclouds.ultradns.ws.domain.Zone.Type; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; public final class ZoneProperties { @@ -94,7 +95,7 @@ public final class ZoneProperties { @Override public String toString() { - return Objects.toStringHelper(this).add("name", name).add("type", type) + return MoreObjects.toStringHelper(this).add("name", name).add("type", type) .add("modified", modified).add("resourceRecordCount", resourceRecordCount).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/InitScript.java ---------------------------------------------------------------------- diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/InitScript.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/InitScript.java index a684d02..a7fd425 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/InitScript.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/InitScript.java @@ -17,7 +17,7 @@ package org.jclouds.scriptbuilder; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.Iterables.concat; http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/GitRepoAndRef.java ---------------------------------------------------------------------- diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/GitRepoAndRef.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/GitRepoAndRef.java index 5df47c6..b5bf0f2 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/GitRepoAndRef.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/GitRepoAndRef.java @@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; @@ -145,7 +146,7 @@ public class GitRepoAndRef { */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("repository", repository).add("branch", branch.orNull()) + return MoreObjects.toStringHelper(this).omitNullValues().add("repository", repository).add("branch", branch.orNull()) .add("tag", tag.orNull()).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/DataBag.java ---------------------------------------------------------------------- diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/DataBag.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/DataBag.java index dd3d264..be13c0d 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/DataBag.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/DataBag.java @@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ForwardingMap; import com.google.common.collect.ImmutableMap; @@ -104,7 +105,7 @@ public class DataBag extends ForwardingMap<String, String> { @Override public String toString() { - return Objects.toStringHelper(this).add("name", name).toString(); + return MoreObjects.toStringHelper(this).add("name", name).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/Role.java ---------------------------------------------------------------------- diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/Role.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/Role.java index 5adad79..7b383df 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/Role.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/Role.java @@ -18,6 +18,7 @@ package org.jclouds.scriptbuilder.domain.chef; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; @@ -139,7 +140,7 @@ public class Role { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("name", name).add("description", description.orNull()) + return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("description", description.orNull()) .toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/git/CloneGitRepo.java ---------------------------------------------------------------------- diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/git/CloneGitRepo.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/git/CloneGitRepo.java index 1300fca..4793f7a 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/git/CloneGitRepo.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/git/CloneGitRepo.java @@ -25,6 +25,7 @@ import org.jclouds.scriptbuilder.domain.OsFamily; import org.jclouds.scriptbuilder.domain.Statement; import org.jclouds.scriptbuilder.domain.Statements; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; import com.google.common.base.Splitter; @@ -190,7 +191,7 @@ public class CloneGitRepo implements Statement { */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("gitRepoAndRef", gitRepoAndRef) + return MoreObjects.toStringHelper(this).omitNullValues().add("gitRepoAndRef", gitRepoAndRef) .add("directory", directory.orNull()).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java ---------------------------------------------------------------------- diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java index 5f4aeeb..250727a 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java @@ -17,7 +17,7 @@ package org.jclouds.scriptbuilder.statements.login; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkArgument; import java.io.File; http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/UserAdd.java ---------------------------------------------------------------------- diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/UserAdd.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/UserAdd.java index 4d12b86..f5ccc5e 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/UserAdd.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/UserAdd.java @@ -31,6 +31,7 @@ import org.jclouds.scriptbuilder.statements.ssh.InstallRSAPrivateKey; import com.google.common.base.Function; import com.google.common.base.Joiner; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Strings; import com.google.common.base.Throwables; @@ -256,6 +257,6 @@ public class UserAdd implements Statement { @Override public String toString() { - return Objects.toStringHelper("").add("login", login).toString(); + return MoreObjects.toStringHelper("").add("login", login).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Datacenter.java ---------------------------------------------------------------------- diff --git a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Datacenter.java b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Datacenter.java index bbed39a..92feb7b 100644 --- a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Datacenter.java +++ b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Datacenter.java @@ -16,6 +16,7 @@ */ package org.jclouds.servermanager; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -50,7 +51,7 @@ public class Datacenter { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("name", name).toString(); + return MoreObjects.toStringHelper(this).add("id", id).add("name", name).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Hardware.java ---------------------------------------------------------------------- diff --git a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Hardware.java b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Hardware.java index f17cace..f0068bd 100644 --- a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Hardware.java +++ b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Hardware.java @@ -16,6 +16,7 @@ */ package org.jclouds.servermanager; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -59,7 +60,7 @@ public class Hardware { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("name", name).add("cores", cores).add("ram", ram) + return MoreObjects.toStringHelper(this).add("id", id).add("name", name).add("cores", cores).add("ram", ram) .add("disk", disk).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Image.java ---------------------------------------------------------------------- diff --git a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Image.java b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Image.java index dc192cd..e187a03 100644 --- a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Image.java +++ b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Image.java @@ -16,6 +16,7 @@ */ package org.jclouds.servermanager; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -50,7 +51,7 @@ public class Image { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("name", name).toString(); + return MoreObjects.toStringHelper(this).add("id", id).add("name", name).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Server.java ---------------------------------------------------------------------- diff --git a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Server.java b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Server.java index ea8eac4..3c2a8dd 100644 --- a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Server.java +++ b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Server.java @@ -16,6 +16,7 @@ */ package org.jclouds.servermanager; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -66,7 +67,7 @@ public class Server { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("name", name).add("status", status) + return MoreObjects.toStringHelper(this).add("id", id).add("name", name).add("status", status) .add("datacenter", datacenter).add("imageId", imageId).add("hardwareId", hardwareId) .add("publicAddress", publicAddress).add("privateAddress", privateAddress).add("loginUser", loginUser) .toString();
