http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/Console.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Console.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Console.java index aee64a7..f9f9377 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Console.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Console.java @@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Connection information to connect to a server with VNC. @@ -153,7 +154,7 @@ public class Console { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("host", host).add("port", port).add("protocol", protocol) + return MoreObjects.toStringHelper("").add("host", host).add("port", port).add("protocol", protocol) .add("password", password); }
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/Cost.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Cost.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Cost.java index 160758a..26afb9d 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Cost.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Cost.java @@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * The Cost class contains information about the cost of a server @@ -135,7 +136,7 @@ public class Cost { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("amount", amount).add("currency", currency).add("timePeriod", timePeriod); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/Domain.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Domain.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Domain.java index 9633165..af38c6f 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Domain.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Domain.java @@ -23,8 +23,9 @@ import java.util.Date; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Domain data for a Glesys account. @@ -294,7 +295,7 @@ public class Domain { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("domainName", domainName).add("createTime", createTime).add("recordCount", recordCount).add("useGlesysNameServer", useGlesysNameServer); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/DomainRecord.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/DomainRecord.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/DomainRecord.java index 9a3dd6b..c04d073 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/DomainRecord.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/DomainRecord.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * DNS record data. @@ -196,7 +197,7 @@ public class DomainRecord { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("id", id).add("domainname", domainname).add("host", host).add("type", type).add("data", data) .add("ttl", ttl); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAccount.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAccount.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAccount.java index b564cc4..968ee5e 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAccount.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAccount.java @@ -23,8 +23,9 @@ import java.util.Date; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Detailed information on an Email Account @@ -255,7 +256,7 @@ public class EmailAccount { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("account", account).add("quota", quota).add("antispamLevel", antispamLevel).add("antiVirus", antiVirus).add("autoRespond", autoRespond).add("autoRespondMessage", autoRespondMessage).add("autoRespondSaveEmail", autoRespondSaveEmail).add("created", created).add("modified", modified); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAlias.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAlias.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAlias.java index 426e942..f349822 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAlias.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAlias.java @@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Detailed information on an Email Account @@ -115,7 +116,7 @@ public class EmailAlias { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("alias", alias).add("forwardTo", forwardTo); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverview.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverview.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverview.java index 32353ab..ee2fcc2 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverview.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverview.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import java.util.Set; import com.google.common.annotations.Beta; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; /** @@ -125,7 +126,7 @@ public class EmailOverview { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("summary", summary).add("domains", domains); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewDomain.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewDomain.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewDomain.java index 8376721..b201c8a 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewDomain.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewDomain.java @@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import com.google.common.annotations.Beta; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Detailed information about e-mail settings for a single domain @@ -129,7 +130,7 @@ public class EmailOverviewDomain { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("domain", domain).add("accounts", accounts).add("aliases", aliases); + return MoreObjects.toStringHelper("").add("domain", domain).add("accounts", accounts).add("aliases", aliases); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewSummary.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewSummary.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewSummary.java index f99b233..8d1f35e 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewSummary.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewSummary.java @@ -19,8 +19,9 @@ package org.jclouds.glesys.domain; import java.beans.ConstructorProperties; import com.google.common.annotations.Beta; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Summary information of e-mail settings and limits for a GleSYS account @@ -158,7 +159,7 @@ public class EmailOverviewSummary { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("accounts", accounts).add("maxAccounts", maxAccounts).add("aliases", aliases).add("maxAliases", maxAliases); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailQuota.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailQuota.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailQuota.java index 96686f5..4eb548f 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailQuota.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailQuota.java @@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Information on an Email Account Quota size @@ -116,7 +117,7 @@ public class EmailQuota { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("max", max).add("unit", unit); + return MoreObjects.toStringHelper("").add("max", max).add("unit", unit); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/Ip.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Ip.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Ip.java index 401929d..296ba63 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Ip.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Ip.java @@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Represents an ip address used by a server. @@ -171,7 +172,7 @@ public class Ip { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("ip", ip).add("version", version).add("cost", cost).add("currency", currency); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/IpDetails.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/IpDetails.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/IpDetails.java index c7b12b6..19e7f81 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/IpDetails.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/IpDetails.java @@ -23,8 +23,9 @@ import java.util.List; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableList; /** @@ -310,7 +311,7 @@ public class IpDetails { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("datacenter", datacenter).add("ipversion", version).add("ptr", ptr).add("platform", platform) .add("address", address).add("netmask", netmask).add("broadcast", broadcast).add("gateway", gateway) .add("nameServers", nameServers).add("serverId", serverId).add("cost", cost).add("reserved", reserved); http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/OSTemplate.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/OSTemplate.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/OSTemplate.java index f11a691..c0c4f18 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/OSTemplate.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/OSTemplate.java @@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Operating system template @@ -175,7 +176,7 @@ public class OSTemplate { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("name", name).add("minDiskSize", minDiskSize).add("minMemSize", minMemSize).add("os", os).add("platform", platform); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceStatus.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceStatus.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceStatus.java index fafc6ec..e79aa2d 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceStatus.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceStatus.java @@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Detailed information on usage @@ -135,7 +136,7 @@ public class ResourceStatus { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("usage", usage).add("max", max).add("unit", unit); + return MoreObjects.toStringHelper("").add("usage", usage).add("max", max).add("unit", unit); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsage.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsage.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsage.java index 989bd83..e637ef8 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsage.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsage.java @@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import java.util.Set; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; /** @@ -122,7 +123,7 @@ public class ResourceUsage { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("info", info).add("values", values); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageInfo.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageInfo.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageInfo.java index c4517bc..f2c51df 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageInfo.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageInfo.java @@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Detailed information on usage @@ -129,7 +130,7 @@ public class ResourceUsageInfo { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("resource", resource).add("resolution", resolution).add("unit", unit); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageValue.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageValue.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageValue.java index e49a0cb..5ed4e73 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageValue.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageValue.java @@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import java.util.Date; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Detailed information on usage @@ -114,7 +115,7 @@ public class ResourceUsageValue { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("value", value).add("timestamp", timestamp); + return MoreObjects.toStringHelper("").add("value", value).add("timestamp", timestamp); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/Server.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Server.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Server.java index 7d700d4..d31b1d3 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Server.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Server.java @@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import com.google.common.base.CaseFormat; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Listing of a server. @@ -176,7 +177,7 @@ public class Server { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("id", id).add("hostname", hostname).add("datacenter", datacenter) + return MoreObjects.toStringHelper("").add("id", id).add("hostname", hostname).add("datacenter", datacenter) .add("platform", platform); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerDetails.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerDetails.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerDetails.java index cb35e99..781443f 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerDetails.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerDetails.java @@ -23,7 +23,7 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; /** http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerLimit.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerLimit.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerLimit.java index 8c6b112..477e584 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerLimit.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerLimit.java @@ -18,8 +18,9 @@ package org.jclouds.glesys.domain; import java.beans.ConstructorProperties; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Detailed information about an OpenVZ server's limits @@ -160,7 +161,7 @@ public class ServerLimit { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("held", held).add("maxHeld", maxHeld).add("barrier", barrier) + return MoreObjects.toStringHelper("").add("held", held).add("maxHeld", maxHeld).add("barrier", barrier) .add("limit", limit).add("failCount", failCount); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerSpec.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerSpec.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerSpec.java index 5ca4cb1..74b841d 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerSpec.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerSpec.java @@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Class ServerSpec @@ -215,7 +216,7 @@ public class ServerSpec { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("platform", platform).add("datacenter", datacenter) + return MoreObjects.toStringHelper("").add("platform", platform).add("datacenter", datacenter) .add("memorySizeMB", memorySizeMB).add("diskSizeGB", diskSizeGB).add("templateName", templateName) .add("cpuCores", cpuCores).add("transferGB", transferGB); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerStatus.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerStatus.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerStatus.java index 912a7f6..b146b82 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerStatus.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerStatus.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Detailed information server status including hardware usage (cpu, memory and disk), bandwidth and up-time. @@ -181,7 +182,7 @@ public class ServerStatus { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("state", state).add("cpu", cpu).add("memory", memory).add("disk", disk).add("uptime", uptime); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerUptime.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerUptime.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerUptime.java index 8eac4ae..4bd6272 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerUptime.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerUptime.java @@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Represents an 'uptime' duration of server in a Glesys cloud @@ -115,7 +116,7 @@ public class ServerUptime { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("current", current).add("unit", unit); + return MoreObjects.toStringHelper("").add("current", current).add("unit", unit); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java b/providers/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java index c956860..05af302 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java @@ -17,7 +17,7 @@ package org.jclouds.glesys.options; 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.base.Predicates.instanceOf; http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/BillingToken.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/BillingToken.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/BillingToken.java index 84e0248..e2b3fcf 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/BillingToken.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/BillingToken.java @@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.primitives.Longs; /** @@ -129,7 +130,7 @@ public class BillingToken implements Comparable<BillingToken> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("name", name).add("price", price); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Customer.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Customer.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Customer.java index 98274de..a82218c 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Customer.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Customer.java @@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Class Customer @@ -111,7 +112,7 @@ public class Customer { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("name", name); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Ip.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Ip.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Ip.java index bbbeeeb..4581428 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Ip.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Ip.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.primitives.Longs; /** @@ -184,7 +185,7 @@ public class Ip implements Comparable<Ip> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("ip", ip).add("subnet", subnet).add("isPublic", isPublic).add("state", state).add("datacenter", datacenter); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/IpPortPair.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/IpPortPair.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/IpPortPair.java index ca90764..2e74b74 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/IpPortPair.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/IpPortPair.java @@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.primitives.Ints; import com.google.common.primitives.Longs; @@ -113,7 +114,7 @@ public class IpPortPair implements Comparable<IpPortPair> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("ip", ip).add("port", port); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Job.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Job.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Job.java index 3639b8d..e30750c 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Job.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Job.java @@ -25,8 +25,9 @@ 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.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.primitives.Longs; @@ -264,7 +265,7 @@ public class Job implements Comparable<Job> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("command", command).add("objectType", objectType).add("createdOn", createdOn).add("lastUpdatedOn", lastUpdatedOn).add("currentState", currentState).add("attempts", attempts).add("owner", owner).add("history", history).add("details", details); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/JobProperties.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/JobProperties.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/JobProperties.java index 897b73e..42bbdcf 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/JobProperties.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/JobProperties.java @@ -23,8 +23,9 @@ import java.util.Date; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.primitives.Longs; /** @@ -151,7 +152,7 @@ public class JobProperties implements Comparable<JobProperties> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("updatedOn", updatedOn).add("state", state).add("note", note); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/LoadBalancer.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/LoadBalancer.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/LoadBalancer.java index 9fcb8b8..866a2aa 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/LoadBalancer.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/LoadBalancer.java @@ -23,8 +23,9 @@ 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.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; import com.google.common.primitives.Longs; @@ -257,7 +258,7 @@ public class LoadBalancer implements Comparable<LoadBalancer> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("name", name).add("description", description).add("virtualIp", virtualIp).add("realIpList", realIpList).add("type", type).add("persistence", persistence).add("os", os).add("state", state).add("datacenter", datacenter); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Option.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Option.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Option.java index a65acfa..da98cf7 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Option.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Option.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.primitives.Longs; /** @@ -136,7 +137,7 @@ public class Option implements Comparable<Option> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("name", name).add("description", description); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Server.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Server.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Server.java index 2c85fab..3f4222e 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Server.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Server.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.primitives.Longs; /** @@ -270,7 +271,7 @@ public class Server implements Comparable<Server> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("isSandbox", isSandbox).add("name", name).add("description", description).add("state", state).add("datacenter", datacenter).add("type", type).add("ram", ram).add("os", os).add("ip", ip).add("image", image); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/ServerImage.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/ServerImage.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/ServerImage.java index b8a7966..f6442a1 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/ServerImage.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/ServerImage.java @@ -24,8 +24,9 @@ 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.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; import com.google.common.primitives.Longs; @@ -365,7 +366,7 @@ public class ServerImage implements Comparable<ServerImage> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("name", name).add("friendlyName", friendlyName).add("description", description).add("os", os).add("architecture", architecture).add("type", type).add("state", state).add("price", price).add("location", location).add("isActive", isActive).add("isPublic", isPublic).add("createdTime", createdTime).add("updatedTime", updatedTime).add("billingTokens", billingTokens).add("owner", owner); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/internal/ErrorResponse.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/internal/ErrorResponse.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/internal/ErrorResponse.java index 6a3e639..34be975 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/internal/ErrorResponse.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/internal/ErrorResponse.java @@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ComparisonChain; /** @@ -119,7 +120,7 @@ public class ErrorResponse implements Comparable<ErrorResponse> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("message", message).add("errorCode", errorCode); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/templates/ObjectTemplate.java ---------------------------------------------------------------------- diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/templates/ObjectTemplate.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/templates/ObjectTemplate.java index 1cd5aaf..e3737af 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/templates/ObjectTemplate.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/templates/ObjectTemplate.java @@ -22,7 +22,7 @@ import java.util.Map; import org.jclouds.googlecloudstorage.domain.ObjectAccessControls; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.net.MediaType; @@ -161,7 +161,7 @@ public class ObjectTemplate { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("name", name) .add("size", size) .add("cacheControl", cacheControl) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineTemplateBuilderLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineTemplateBuilderLiveTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineTemplateBuilderLiveTest.java index a954e21..c644c40 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineTemplateBuilderLiveTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineTemplateBuilderLiveTest.java @@ -16,7 +16,7 @@ */ package org.jclouds.googlecomputeengine.compute; -import static com.google.common.base.Objects.firstNonNull; +import static com.google.common.base.MoreObjects.firstNonNull; import static org.assertj.core.api.Assertions.assertThat; import static org.jclouds.compute.domain.OsFamily.COREOS; import static org.jclouds.compute.domain.OsFamily.DEBIAN; http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/packet/src/main/java/org/jclouds/packet/compute/options/PacketTemplateOptions.java ---------------------------------------------------------------------- diff --git a/providers/packet/src/main/java/org/jclouds/packet/compute/options/PacketTemplateOptions.java b/providers/packet/src/main/java/org/jclouds/packet/compute/options/PacketTemplateOptions.java index 30cef45..4d7c2da 100644 --- a/providers/packet/src/main/java/org/jclouds/packet/compute/options/PacketTemplateOptions.java +++ b/providers/packet/src/main/java/org/jclouds/packet/compute/options/PacketTemplateOptions.java @@ -21,7 +21,7 @@ import java.util.Map; import org.jclouds.compute.options.TemplateOptions; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableMap; import static com.google.common.base.Objects.equal; http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java index c69376e..23e026d 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java @@ -46,7 +46,7 @@ import org.jclouds.softlayer.domain.OperatingSystem; import org.jclouds.softlayer.domain.VirtualGuest; import com.google.common.base.Function; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Supplier; import com.google.inject.Provides; import com.google.inject.TypeLiteral; @@ -91,7 +91,7 @@ public class SoftLayerComputeServiceContextModule extends @Override public String toString() { - return Objects.toStringHelper(api) + return MoreObjects.toStringHelper(api) .add("method", "virtualGuestApi.getCreateObjectOptions") .toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java index 57471b9..a1caa78 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java @@ -22,6 +22,7 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.inject.name.Named; @@ -303,7 +304,7 @@ public class Address { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("country", country) .add("state", state) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfiguration.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfiguration.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfiguration.java index 09bb0de..5bbc1a8 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfiguration.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfiguration.java @@ -17,6 +17,7 @@ package org.jclouds.softlayer.domain; import com.google.common.base.Function; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Predicate; import com.google.common.base.Predicates; @@ -264,7 +265,7 @@ public class ContainerVirtualGuestConfiguration { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("blockDevices", blockDevices) .add("datacenters", datacenters) .add("memory", memory) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfigurationOption.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfigurationOption.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfigurationOption.java index c2201d3..28e9673 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfigurationOption.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfigurationOption.java @@ -21,6 +21,7 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.inject.name.Named; @@ -101,7 +102,7 @@ public class ContainerVirtualGuestConfigurationOption { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("productItemPrice", productItemPrice) .add("template", template) .toString(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Datacenter.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Datacenter.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Datacenter.java index 5180ab6..9e02856 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Datacenter.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Datacenter.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; @@ -196,7 +197,7 @@ public class Datacenter { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("name", name) .add("longName", longName) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/NetworkVlan.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/NetworkVlan.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/NetworkVlan.java index bf9018e..b7bd352 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/NetworkVlan.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/NetworkVlan.java @@ -20,6 +20,7 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; public class NetworkVlan { @@ -98,7 +99,7 @@ public class NetworkVlan { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("accountId", accountId) .add("name", name) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/OperatingSystem.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/OperatingSystem.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/OperatingSystem.java index 053a91a..1132cee 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/OperatingSystem.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/OperatingSystem.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; @@ -151,7 +152,7 @@ public class OperatingSystem { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("softwareLicense", softwareLicense) .add("operatingSystemReferenceCode", operatingSystemReferenceCode) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Password.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Password.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Password.java index 49ff2cd..29af98c 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Password.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Password.java @@ -22,6 +22,7 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -139,7 +140,7 @@ public class Password { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("username", username) .add("password", password) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/PowerState.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/PowerState.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/PowerState.java index 81e8af2..248a67c 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/PowerState.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/PowerState.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * The power state class provides a common set of values for which a guest's power state will be presented in the SoftLayer API. @@ -102,7 +103,7 @@ public class PowerState { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("keyName", keyName); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItem.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItem.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItem.java index 79c8d5b..221d2fa 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItem.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItem.java @@ -20,6 +20,7 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -78,7 +79,7 @@ public class ProductItem { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("description", description) .add("softwareDescriptionId", softwareDescriptionId) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemPrice.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemPrice.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemPrice.java index 8bfc0ec..295e288 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemPrice.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemPrice.java @@ -19,6 +19,7 @@ package org.jclouds.softlayer.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; /** @@ -76,7 +77,7 @@ public class ProductItemPrice { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("hourlyRecurringFee", hourlyRecurringFee) .add("recurringFee", recurringFee) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Region.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Region.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Region.java index fa91e82..fca375c 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Region.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Region.java @@ -22,6 +22,7 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -114,7 +115,7 @@ public class Region implements Comparable<Region> { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("sortOrder", sortOrder) .add("keyname", keyname) .add("description", description) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SecuritySshKey.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SecuritySshKey.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SecuritySshKey.java index 0947975..10e1035 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SecuritySshKey.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SecuritySshKey.java @@ -20,6 +20,7 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; public class SecuritySshKey { @@ -187,7 +188,7 @@ public class SecuritySshKey { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("key", key) .add("label", label) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SoftwareDescription.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SoftwareDescription.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SoftwareDescription.java index 11adef6..5aa74ee 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SoftwareDescription.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SoftwareDescription.java @@ -20,6 +20,7 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; public class SoftwareDescription { @@ -282,7 +283,7 @@ public class SoftwareDescription { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("longDescription", longDescription) .add("manufacturer", manufacturer) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SoftwareLicense.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SoftwareLicense.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SoftwareLicense.java index 78f8431..20b9085 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SoftwareLicense.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SoftwareLicense.java @@ -16,6 +16,7 @@ */ package org.jclouds.softlayer.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import org.jclouds.javax.annotation.Nullable; @@ -71,7 +72,7 @@ public class SoftwareLicense { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("softwareDescription", softwareDescription) .add("softwareDescriptionId", softwareDescriptionId) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Tag.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Tag.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Tag.java index 719f110..252c3e3 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Tag.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Tag.java @@ -19,6 +19,7 @@ package org.jclouds.softlayer.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; public class Tag { @@ -71,7 +72,7 @@ public class Tag { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("accountId", accountId) .add("id", id) .add("internal", internal) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/TagReference.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/TagReference.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/TagReference.java index 924e5bc..ef9edff 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/TagReference.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/TagReference.java @@ -20,6 +20,7 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -105,7 +106,7 @@ public class TagReference { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("usrRecordId", usrRecordId) .add("tagTypeId", tagTypeId) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/TagType.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/TagType.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/TagType.java index 8fbe417..ac250a6 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/TagType.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/TagType.java @@ -16,6 +16,7 @@ */ package org.jclouds.softlayer.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import org.jclouds.javax.annotation.Nullable; @@ -57,7 +58,7 @@ public class TagType { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("keyName", keyName) .add("description", description) .toString(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImage.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImage.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImage.java index 3315b4b..2ca3bbf 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImage.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImage.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; @@ -234,7 +235,7 @@ public class VirtualDiskImage { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("uuid", uuid) .add("capacity", capacity) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImageSoftware.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImageSoftware.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImageSoftware.java index 3378d75..e85690d 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImageSoftware.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImageSoftware.java @@ -20,6 +20,7 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; public class VirtualDiskImageSoftware { @@ -117,7 +118,7 @@ public class VirtualDiskImageSoftware { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("softwareDescriptionId", softwareDescriptionId) .add("softwareDescription", softwareDescription) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuest.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuest.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuest.java index 66f99a6..6a2afce 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuest.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuest.java @@ -25,6 +25,7 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; import com.google.common.base.CaseFormat; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -909,7 +910,7 @@ public class VirtualGuest { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("accountId", accountId) .add("createDate", createDate) .add("domain", domain) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestAttribute.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestAttribute.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestAttribute.java index 374b5ef..4a922b8 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestAttribute.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestAttribute.java @@ -19,6 +19,7 @@ package org.jclouds.softlayer.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; public class VirtualGuestAttribute { @@ -50,7 +51,7 @@ public class VirtualGuestAttribute { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("value", value) .toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDevice.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDevice.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDevice.java index 9216634..f4f57b5 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDevice.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDevice.java @@ -21,6 +21,7 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -226,7 +227,7 @@ public class VirtualGuestBlockDevice { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("uuid", uuid) .add("statusId", statusId) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplate.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplate.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplate.java index aa4aed5..fbe08a7 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplate.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplate.java @@ -19,6 +19,7 @@ package org.jclouds.softlayer.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; /** @@ -189,7 +190,7 @@ public class VirtualGuestBlockDeviceTemplate { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("device", device) .add("diskImageId", diskImageId) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplateGroup.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplateGroup.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplateGroup.java index 09587a6..d1b2b33 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplateGroup.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplateGroup.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; @@ -241,7 +242,7 @@ public class VirtualGuestBlockDeviceTemplateGroup { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("name", name) .add("globalIdentifier", globalIdentifier) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestNetworkComponent.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestNetworkComponent.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestNetworkComponent.java index 82a28e5..843b044 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestNetworkComponent.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestNetworkComponent.java @@ -20,6 +20,7 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -247,7 +248,7 @@ public class VirtualGuestNetworkComponent { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("uuid", uuid) .add("guestId", guestId) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/AccountLevelGroup.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/AccountLevelGroup.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/AccountLevelGroup.java index d23c78a..8e89f56 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/AccountLevelGroup.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/AccountLevelGroup.java @@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import org.jclouds.ultradns.ws.domain.DirectionalPool.Type; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; public final class AccountLevelGroup { @@ -74,7 +75,7 @@ public final class AccountLevelGroup { @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("recordCount", recordCount).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalGroup.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalGroup.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalGroup.java index fea2f45..a6864d7 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalGroup.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalGroup.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/DirectionalGroupCoordinates.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalGroupCoordinates.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalGroupCoordinates.java index 320ca8a..3527721 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalGroupCoordinates.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalGroupCoordinates.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/DirectionalPool.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPool.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPool.java index 7db64d9..6e41c5e 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPool.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPool.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; import com.google.common.base.Optional; @@ -147,7 +148,7 @@ public final class DirectionalPool { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("zoneId", zoneId).add("id", id).add("dname", dname) + return MoreObjects.toStringHelper(this).omitNullValues().add("zoneId", zoneId).add("id", id).add("dname", dname) .add("name", name.orNull()).add("type", type).add("tieBreak", tieBreak).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPoolRecord.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPoolRecord.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPoolRecord.java index 1db37f0..9f3c77d 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPoolRecord.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPoolRecord.java @@ -18,7 +18,7 @@ package org.jclouds.ultradns.ws.domain; import static com.google.common.base.Functions.toStringFunction; 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.transform; http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPoolRecordDetail.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPoolRecordDetail.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPoolRecordDetail.java index a7dc449..ee30287 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPoolRecordDetail.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPoolRecordDetail.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/IdAndName.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/IdAndName.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/IdAndName.java index 972a3d3..21c181f 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/IdAndName.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/IdAndName.java @@ -21,6 +21,7 @@ import static com.google.common.base.Predicates.compose; import static com.google.common.base.Predicates.equalTo; import com.google.common.base.Function; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Predicate; @@ -71,7 +72,7 @@ public final class IdAndName { @Override public String toString() { - return Objects.toStringHelper("").add("id", id).add("name", name).toString(); + return MoreObjects.toStringHelper("").add("id", id).add("name", name).toString(); } /** http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/PoolRecordSpec.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/PoolRecordSpec.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/PoolRecordSpec.java index d6e4b0b..b0c29f1 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/PoolRecordSpec.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/PoolRecordSpec.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/ResourceRecord.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ResourceRecord.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ResourceRecord.java index fcb85ab..07dfbda 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ResourceRecord.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ResourceRecord.java @@ -18,7 +18,7 @@ package org.jclouds.ultradns.ws.domain; import static com.google.common.base.Functions.toStringFunction; 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.transform;
