http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PerformanceInfo.java ---------------------------------------------------------------------- diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PerformanceInfo.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PerformanceInfo.java index c33dee6..42da7a2 100644 --- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PerformanceInfo.java +++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PerformanceInfo.java @@ -18,6 +18,7 @@ package org.jclouds.fujitsu.fgcp.domain; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -125,7 +126,7 @@ public class PerformanceInfo implements Comparable<PerformanceInfo> { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("recordTime", recordTime) .add("cpuUtilization", cpuUtilization) .add("diskReadRequestCount", diskReadRequestCount)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Policy.java ---------------------------------------------------------------------- diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Policy.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Policy.java index 2a7f311..e92c479 100644 --- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Policy.java +++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Policy.java @@ -18,6 +18,7 @@ package org.jclouds.fujitsu.fgcp.domain; import javax.xml.bind.annotation.XmlEnumValue; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -170,7 +171,7 @@ public class Policy implements Comparable<Policy> { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("id", id) .add("src", src) .add("srcType", srcType) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Product.java ---------------------------------------------------------------------- diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Product.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Product.java index 590883d..b48364a 100644 --- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Product.java +++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Product.java @@ -18,6 +18,7 @@ package org.jclouds.fujitsu.fgcp.domain; import javax.xml.bind.annotation.XmlElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -73,7 +74,7 @@ public class Product { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("name", name) + return MoreObjects.toStringHelper(this).omitNullValues().add("name", name) .add("unitName", unitName).add("usedPoints", usedPoints) .toString(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PublicIP.java ---------------------------------------------------------------------- diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PublicIP.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PublicIP.java index ef9478e..d9d47da 100644 --- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PublicIP.java +++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PublicIP.java @@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import javax.xml.bind.annotation.XmlElement; import com.google.common.base.CaseFormat; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -84,7 +85,7 @@ public class PublicIP { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("address", address).add("version", version).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Rule.java ---------------------------------------------------------------------- diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Rule.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Rule.java index f39a54b..d06cf01 100644 --- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Rule.java +++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Rule.java @@ -16,6 +16,7 @@ */ package org.jclouds.fujitsu.fgcp.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -73,7 +74,7 @@ public class Rule { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("privateIp", privateIp).add("publicIp", publicIp) .add("snapt", snapt).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerCert.java ---------------------------------------------------------------------- diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerCert.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerCert.java index 5107fdb..7fdef2a 100644 --- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerCert.java +++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerCert.java @@ -18,6 +18,7 @@ package org.jclouds.fujitsu.fgcp.domain; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -102,7 +103,7 @@ public class ServerCert implements Comparable<ServerCert> { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("certNum", certNum).add("issuer", issuer) .add("subject", subject).add("validity", validity) .add("groupId", groupId).add("detail", detail).toString(); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerType.java ---------------------------------------------------------------------- diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerType.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerType.java index b5d2c8a..dd61424 100644 --- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerType.java +++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerType.java @@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; @@ -125,7 +126,7 @@ public class ServerType implements Comparable<ServerType> { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("id", id) + return MoreObjects.toStringHelper(this).omitNullValues().add("id", id) .add("name", name).add("label", label).add("comment", comment) .add("productId", productId).add("productName", productName) .add("price", price).add("chargeType", chargeType) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Software.java ---------------------------------------------------------------------- diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Software.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Software.java index 2df1f7e..b9fa1a3 100644 --- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Software.java +++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Software.java @@ -16,6 +16,7 @@ */ package org.jclouds.fujitsu.fgcp.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -89,7 +90,7 @@ public class Software { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("id", id) + return MoreObjects.toStringHelper(this).omitNullValues().add("id", id) .add("name", name).add("category", category) .add("version", version) .add("officialVersion", officialVersion) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Target.java ---------------------------------------------------------------------- diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Target.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Target.java index 5a8521c..2f043a7 100644 --- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Target.java +++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Target.java @@ -16,6 +16,7 @@ */ package org.jclouds.fujitsu.fgcp.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -113,7 +114,7 @@ public class Target { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("serverId", serverId).add("serverName", serverName) .add("ipAddress", ipAddress).add("port1", port1) .add("port2", port2).add("status", status).add("now", now) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/UsageInfo.java ---------------------------------------------------------------------- diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/UsageInfo.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/UsageInfo.java index 56730ee..afb40f2 100644 --- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/UsageInfo.java +++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/UsageInfo.java @@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; @@ -83,7 +84,7 @@ public class UsageInfo { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("systemId", systemId).add("systemName", systemName) .add("products", products).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VDisk.java ---------------------------------------------------------------------- diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VDisk.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VDisk.java index bb5a780..c5cf4e3 100644 --- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VDisk.java +++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VDisk.java @@ -19,6 +19,7 @@ package org.jclouds.fujitsu.fgcp.domain; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -74,7 +75,7 @@ public class VDisk { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("id", id) + return MoreObjects.toStringHelper(this).omitNullValues().add("id", id) .add("name", name).add("attachedServer", attachedServer) .add("creator", creator).add("size", size).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNIC.java ---------------------------------------------------------------------- diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNIC.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNIC.java index 8274cd9..9c10056 100644 --- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNIC.java +++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNIC.java @@ -18,6 +18,7 @@ package org.jclouds.fujitsu.fgcp.domain; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -62,7 +63,7 @@ public class VNIC { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("networkId", networkId).add("privateIp", privateIp) .add("nicNo", nicNo).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNet.java ---------------------------------------------------------------------- diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNet.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNet.java index 6151464..b20285a 100644 --- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNet.java +++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNet.java @@ -18,6 +18,7 @@ package org.jclouds.fujitsu.fgcp.domain; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -51,7 +52,7 @@ public class VNet { @Override public String toString() { - return Objects.toStringHelper(this).add("networkId", networkId) + return MoreObjects.toStringHelper(this).add("networkId", networkId) .toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServer.java ---------------------------------------------------------------------- diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServer.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServer.java index 292e72f..1c0b049 100644 --- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServer.java +++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServer.java @@ -18,6 +18,7 @@ package org.jclouds.fujitsu.fgcp.domain; import javax.xml.bind.annotation.XmlElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -72,7 +73,7 @@ public class VServer { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("id", id) + return MoreObjects.toStringHelper(this).omitNullValues().add("id", id) .add("name", name).add("type", type).add("creator", creator) .add("diskimageId", diskimageId).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithDetails.java ---------------------------------------------------------------------- diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithDetails.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithDetails.java index 081c30c..234eb3c 100644 --- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithDetails.java +++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithDetails.java @@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; @@ -47,7 +47,7 @@ public class VServerWithDetails extends VServerWithVNICs { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("id", id) + return MoreObjects.toStringHelper(this).omitNullValues().add("id", id) .add("name", name).add("type", type).add("creator", creator) .add("diskimageId", diskimageId).add("vdisks", vdisks) .add("vnics", vnics).add("image", image).toString(); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithVNICs.java ---------------------------------------------------------------------- diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithVNICs.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithVNICs.java index 4f57624..7e120c9 100644 --- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithVNICs.java +++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithVNICs.java @@ -21,7 +21,7 @@ import java.util.Set; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; @@ -38,7 +38,7 @@ public class VServerWithVNICs extends VServer { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("id", id) + return MoreObjects.toStringHelper(this).omitNullValues().add("id", id) .add("name", name).add("type", type).add("creator", creator) .add("diskimageId", diskimageId).add("vnics", vnics).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystem.java ---------------------------------------------------------------------- diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystem.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystem.java index 2ad2e29..c313a55 100644 --- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystem.java +++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystem.java @@ -18,6 +18,7 @@ package org.jclouds.fujitsu.fgcp.domain; import javax.xml.bind.annotation.XmlElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -72,7 +73,7 @@ public class VSystem { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("id", id) + return MoreObjects.toStringHelper(this).omitNullValues().add("id", id) .add("name", name).add("creator", creator) .add("template", template).add("description", description) .toString(); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystemWithDetails.java ---------------------------------------------------------------------- diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystemWithDetails.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystemWithDetails.java index 1509f2c..0efb873 100644 --- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystemWithDetails.java +++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystemWithDetails.java @@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; @@ -67,7 +67,7 @@ public class VSystemWithDetails extends VSystem { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("id", id) + return MoreObjects.toStringHelper(this).omitNullValues().add("id", id) .add("name", name).add("creator", creator) .add("template", template).add("description", description) .add("disks", disks).add("networks", networks) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/Blob.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/Blob.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/Blob.java index 2926263..1575caa 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/Blob.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/Blob.java @@ -16,6 +16,7 @@ */ package org.jclouds.blobstore.representations; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.io.Serializable; @@ -78,7 +79,7 @@ public class Blob implements Serializable { @Override public String toString() { - return Objects.toStringHelper(this).add("blobMetadata", blobMetadata).add("allHeaders", allHeaders) + return MoreObjects.toStringHelper(this).add("blobMetadata", blobMetadata).add("allHeaders", allHeaders) .toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/BlobMetadata.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/BlobMetadata.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/BlobMetadata.java index f110833..7b459ff 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/BlobMetadata.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/BlobMetadata.java @@ -16,6 +16,7 @@ */ package org.jclouds.blobstore.representations; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; @@ -207,7 +208,7 @@ public class BlobMetadata implements Serializable { @Override public String toString() { - return Objects.toStringHelper(this).add("type", type).add("providerId", providerId).add("name", name) + return MoreObjects.toStringHelper(this).add("type", type).add("providerId", providerId).add("name", name) .add("userMetadata", userMetadata).add("eTag", eTag).add("creationDate", creationDate) .add("lastModifiedDate", lastModifiedDate).add("publicUri", publicUri).add("contentMetadata", contentMetadata) .toString(); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/ContentMetadata.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/ContentMetadata.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/ContentMetadata.java index 46d3438..12628f3 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/ContentMetadata.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/ContentMetadata.java @@ -16,6 +16,7 @@ */ package org.jclouds.blobstore.representations; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.io.Serializable; @@ -145,7 +146,7 @@ public class ContentMetadata implements Serializable { @Override public String toString() { - return Objects.toStringHelper(this).add("length", language).add("disposition", disposition).add("encoding", encoding) + return MoreObjects.toStringHelper(this).add("length", language).add("disposition", disposition).add("encoding", encoding) .add("type", type).add("md5", md5).add("language", language) .add("expires", expires).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/StorageMetadata.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/StorageMetadata.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/StorageMetadata.java index aa5c45e..44595f3 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/StorageMetadata.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/StorageMetadata.java @@ -16,6 +16,7 @@ */ package org.jclouds.blobstore.representations; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; @@ -173,7 +174,7 @@ public class StorageMetadata implements Serializable { @Override public String toString() { - return Objects.toStringHelper(this).add("type", type).add("providerId", providerId).add("name", name) + return MoreObjects.toStringHelper(this).add("type", type).add("providerId", providerId).add("name", name) .add("userMetadata", userMetadata).add("eTag", eTag).add("creationDate", creationDate) .add("lastModifiedDate", lastModifiedDate).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/ExecResponse.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/ExecResponse.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/ExecResponse.java index 5464aee..c9c2694 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/ExecResponse.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/ExecResponse.java @@ -16,6 +16,7 @@ */ package org.jclouds.compute.representations; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.io.Serializable; @@ -89,6 +90,6 @@ public class ExecResponse implements Serializable { @Override public String toString() { - return Objects.toStringHelper(this).add("out", output).add("error", error).add("exitStatus", exitStatus).toString(); + return MoreObjects.toStringHelper(this).add("out", output).add("error", error).add("exitStatus", exitStatus).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Hardware.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Hardware.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Hardware.java index ec07985..0d80408 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Hardware.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Hardware.java @@ -16,6 +16,7 @@ */ package org.jclouds.compute.representations; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -143,7 +144,7 @@ public class Hardware implements Serializable { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("name", name) + return MoreObjects.toStringHelper(this).add("id", id).add("name", name) .add("processors", processors).add("ram", ram).add("volums", volumes).add("hypervisor", hypervisor) .toString(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Image.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Image.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Image.java index 1d361d0..524a522 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Image.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Image.java @@ -16,7 +16,7 @@ */ package org.jclouds.compute.representations; - +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; @@ -153,7 +153,7 @@ public class Image implements Serializable { @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("description", description) .add("tags", tags).add("os", operatingSystem).add("version", version) .add("defaultCredentials", defaultCredentials).toString(); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/LoginCredentials.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/LoginCredentials.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/LoginCredentials.java index 2a43343..a07fe51 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/LoginCredentials.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/LoginCredentials.java @@ -16,6 +16,7 @@ */ package org.jclouds.compute.representations; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.io.Serializable; @@ -119,7 +120,7 @@ public class LoginCredentials implements Serializable { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("username", username) .add("hasPassword", password != null || credentialUrl != null) .add("hasPrivateKey", privateKey != null) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/NodeMetadata.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/NodeMetadata.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/NodeMetadata.java index 8bc877e..ee4d2a7 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/NodeMetadata.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/NodeMetadata.java @@ -16,6 +16,7 @@ */ package org.jclouds.compute.representations; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -213,7 +214,7 @@ public class NodeMetadata implements Serializable { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("name", name).add("description", description).add("status", status) + return MoreObjects.toStringHelper(this).add("id", id).add("name", name).add("description", description).add("status", status) .add("locationId", locationId).add("imageId", imageId).add("hostname", hostname) .add("group", group).add("loginPort", loginPort).add("tags", tags).add("metadata", metadata) .add("defaultCredentials", defaultCredentials).toString(); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/OperatingSystem.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/OperatingSystem.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/OperatingSystem.java index 0e3026d..4b1054e 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/OperatingSystem.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/OperatingSystem.java @@ -16,6 +16,7 @@ */ package org.jclouds.compute.representations; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.io.Serializable; @@ -126,7 +127,7 @@ public class OperatingSystem implements Serializable { @Override public String toString() { - return Objects.toStringHelper(this).add("family", family).add("name", name).add("arch", arch) + return MoreObjects.toStringHelper(this).add("family", family).add("name", name).add("arch", arch) .add("version", version).add("description", description).add("is64bit", is64Bit).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Processor.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Processor.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Processor.java index e19a2c9..98e3384 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Processor.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Processor.java @@ -16,6 +16,7 @@ */ package org.jclouds.compute.representations; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.io.Serializable; @@ -78,6 +79,6 @@ public class Processor implements Serializable { @Override public String toString() { - return Objects.toStringHelper(this).add("cores", cores).add("spped", speed).toString(); + return MoreObjects.toStringHelper(this).add("cores", cores).add("spped", speed).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Volume.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Volume.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Volume.java index 31750a0..8b626b0 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Volume.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Volume.java @@ -16,6 +16,7 @@ */ package org.jclouds.compute.representations; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.io.Serializable; @@ -127,7 +128,7 @@ public class Volume implements Serializable { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("type", type).add("size", size) + return MoreObjects.toStringHelper(this).add("id", id).add("type", type).add("size", size) .add("device", device).add("isDurable", durable).add("bootDevice", bootDevice).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ApiMetadata.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ApiMetadata.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ApiMetadata.java index 0699ab1..e2ff923 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ApiMetadata.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ApiMetadata.java @@ -16,6 +16,7 @@ */ package org.jclouds.representations; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -247,7 +248,7 @@ public class ApiMetadata implements Serializable { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("name", name).add("endpointName", endpointName) + return MoreObjects.toStringHelper(this).add("id", id).add("name", name).add("endpointName", endpointName) .add("identityName", identityName).add("credentialName", credentialName).add("version", version) .add("defaultEndpoint", defaultEndpoint).add("defaultIdentity", defaultIdentity) .add("defaultCredential", defaultCredential).add("defaultProperties", defaultProperties).add("defaultModules", defaultModules) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Context.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Context.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Context.java index e1d8156..0e18409 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Context.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Context.java @@ -16,6 +16,7 @@ */ package org.jclouds.representations; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.io.Serializable; @@ -90,6 +91,6 @@ public class Context implements Serializable { @Override public String toString() { - return Objects.toStringHelper(this).add("name", name).add("providerId", providerId).add("identity", identity).toString(); + return MoreObjects.toStringHelper(this).add("name", name).add("providerId", providerId).add("identity", identity).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Location.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Location.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Location.java index eaa0585..6800e8a 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Location.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Location.java @@ -16,6 +16,7 @@ */ package org.jclouds.representations; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; @@ -117,7 +118,7 @@ public class Location implements Serializable { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("scope", scope).add("description", description) + return MoreObjects.toStringHelper(this).add("id", id).add("scope", scope).add("description", description) .add("perentId", parentId).add("iso3166Codes", iso3166Codes).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ProviderMetadata.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ProviderMetadata.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ProviderMetadata.java index 7fbf1ae..56f5f77 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ProviderMetadata.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ProviderMetadata.java @@ -16,6 +16,7 @@ */ package org.jclouds.representations; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -252,7 +253,7 @@ public class ProviderMetadata implements Serializable { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("name", name).add("endpointName", endpointName) + return MoreObjects.toStringHelper(this).add("id", id).add("name", name).add("endpointName", endpointName) .add("identityName", identityName).add("credentialName", credentialName).add("defaultModules", defaultModules) .add("documentation", documentation).add("views", views) .add("endpoint", endpoint).add("defaultProperties", defaultProperties).add("console", console) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Computer.java ---------------------------------------------------------------------- diff --git a/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Computer.java b/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Computer.java index e43a24d..66dd922 100644 --- a/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Computer.java +++ b/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Computer.java @@ -20,8 +20,9 @@ import static com.google.common.base.Objects.equal; import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; /** * @see <a http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/ComputerView.java ---------------------------------------------------------------------- diff --git a/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/ComputerView.java b/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/ComputerView.java index adebe45..81ff411 100644 --- a/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/ComputerView.java +++ b/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/ComputerView.java @@ -22,8 +22,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableSet; import com.google.gson.annotations.SerializedName; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Job.java ---------------------------------------------------------------------- diff --git a/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Job.java b/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Job.java index 257cf6d..d7ef342 100644 --- a/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Job.java +++ b/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Job.java @@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; /** * Minimal info about a Job @@ -147,7 +148,7 @@ public class Job { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("name", name).add("url", url).add("color", + return MoreObjects.toStringHelper("").add("name", name).add("url", url).add("color", color); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/JobDetails.java ---------------------------------------------------------------------- diff --git a/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/JobDetails.java b/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/JobDetails.java index 0d48a68..54a1bf4 100644 --- a/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/JobDetails.java +++ b/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/JobDetails.java @@ -16,7 +16,7 @@ */ package org.jclouds.jenkins.v1.domain; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; public class JobDetails extends Job { http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/LastBuild.java ---------------------------------------------------------------------- diff --git a/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/LastBuild.java b/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/LastBuild.java index c105b66..f97af6c 100644 --- a/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/LastBuild.java +++ b/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/LastBuild.java @@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; /** * Minimal info about a LastBuild @@ -272,7 +273,7 @@ public class LastBuild { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("id", id) .add("url", url) .add("description", description) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Node.java ---------------------------------------------------------------------- diff --git a/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Node.java b/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Node.java index c066426..dbb0504 100644 --- a/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Node.java +++ b/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Node.java @@ -22,8 +22,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableSet; import com.google.gson.annotations.SerializedName; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/options/JoyentCloudTemplateOptions.java ---------------------------------------------------------------------- diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/options/JoyentCloudTemplateOptions.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/options/JoyentCloudTemplateOptions.java index b1e401b..da65c0c 100644 --- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/options/JoyentCloudTemplateOptions.java +++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/options/JoyentCloudTemplateOptions.java @@ -25,7 +25,7 @@ import org.jclouds.domain.LoginCredentials; import org.jclouds.scriptbuilder.domain.Statement; 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.Optional; /** http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Dataset.java ---------------------------------------------------------------------- diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Dataset.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Dataset.java index 0655f52..d476904 100644 --- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Dataset.java +++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Dataset.java @@ -30,6 +30,7 @@ import org.jclouds.joyent.cloudapi.v6_5.domain.Machine.Type; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; import com.google.common.base.Functions; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ComparisonChain; import com.google.common.collect.ImmutableMap; @@ -313,7 +314,7 @@ public class Dataset implements Comparable<Dataset> { @Override public String toString() { - return Objects.toStringHelper("").omitNullValues() + return MoreObjects.toStringHelper("").omitNullValues() .add("id", id) .add("urn", urn) .add("name", name) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Key.java ---------------------------------------------------------------------- diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Key.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Key.java index e2ec1ff..84a3f2a 100644 --- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Key.java +++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Key.java @@ -21,6 +21,7 @@ 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.collect.ComparisonChain; @@ -131,7 +132,7 @@ public class Key implements Comparable<Key> { @Override public String toString() { - return Objects.toStringHelper("").omitNullValues() + return MoreObjects.toStringHelper("").omitNullValues() .add("name", name) .add("key", key) .add("created", created).toString(); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Machine.java ---------------------------------------------------------------------- diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Machine.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Machine.java index 7867fda..f33935e 100644 --- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Machine.java +++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Machine.java @@ -31,6 +31,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.CaseFormat; import com.google.common.base.Function; import com.google.common.base.Functions; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ComparisonChain; import com.google.common.collect.ImmutableMap; @@ -386,7 +387,7 @@ public class Machine implements Comparable<Machine> { @Override public String toString() { - return Objects.toStringHelper("").omitNullValues() + return MoreObjects.toStringHelper("").omitNullValues() .add("id", id) .add("name", name) .add("type", type) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Package.java ---------------------------------------------------------------------- diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Package.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Package.java index 17953b8..a9c20a1 100644 --- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Package.java +++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Package.java @@ -22,6 +22,7 @@ import java.beans.ConstructorProperties; import javax.inject.Named; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ComparisonChain; @@ -173,7 +174,7 @@ public class Package implements Comparable<Package> { @Override public String toString() { - return Objects.toStringHelper("").omitNullValues() + return MoreObjects.toStringHelper("").omitNullValues() .add("name", name) .add("memorySizeMb", memorySizeMb) .add("diskSizeGb", diskSizeGb) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/datacenterscoped/DatacenterAndName.java ---------------------------------------------------------------------- diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/datacenterscoped/DatacenterAndName.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/datacenterscoped/DatacenterAndName.java index cb10222..11e067d 100644 --- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/datacenterscoped/DatacenterAndName.java +++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/datacenterscoped/DatacenterAndName.java @@ -21,9 +21,10 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.base.Function; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Splitter; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.Iterables; /** @@ -104,6 +105,6 @@ public class DatacenterAndName { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("datacenterId", datacenterId).add("name", name); + return MoreObjects.toStringHelper("").add("datacenterId", datacenterId).add("name", name); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/options/CreateMachineOptions.java ---------------------------------------------------------------------- diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/options/CreateMachineOptions.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/options/CreateMachineOptions.java index 34730fa..23ba16f 100644 --- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/options/CreateMachineOptions.java +++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/options/CreateMachineOptions.java @@ -25,8 +25,9 @@ import org.jclouds.http.options.BaseHttpRequestOptions; import org.jclouds.util.Maps2; import com.google.common.base.Function; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; @@ -56,7 +57,7 @@ public class CreateMachineOptions extends BaseHttpRequestOptions { @Override public String toString() { - ToStringHelper toString = Objects.toStringHelper("").omitNullValues(); + ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues(); toString.add("name", name).add("package", name); if (metadata.size() > 0) toString.add("metadata", metadata); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Account.java ---------------------------------------------------------------------- diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Account.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Account.java index fe470b9..0cb7f0f 100644 --- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Account.java +++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Account.java @@ -22,6 +22,7 @@ import static org.jclouds.opsource.servers.OpSourceNameSpaces.DIRECTORY; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; @XmlRootElement(name = "Account", namespace = DIRECTORY) @@ -93,7 +94,7 @@ public class Account { @Override public String toString() { - return Objects.toStringHelper("").add("orgId", orgId).toString(); + return MoreObjects.toStringHelper("").add("orgId", orgId).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/BaseServer.java ---------------------------------------------------------------------- diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/BaseServer.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/BaseServer.java index 6729152..4bfae1f 100644 --- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/BaseServer.java +++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/BaseServer.java @@ -18,6 +18,7 @@ package org.jclouds.opsource.servers.domain; import static com.google.common.base.Objects.equal; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; public abstract class BaseServer { @@ -65,7 +66,7 @@ public abstract class BaseServer { @Override public String toString() { - return Objects.toStringHelper("").toString(); + return MoreObjects.toStringHelper("").toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DataCenter.java ---------------------------------------------------------------------- diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DataCenter.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DataCenter.java index 6678aba..27a64e8 100644 --- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DataCenter.java +++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DataCenter.java @@ -22,6 +22,7 @@ import static org.jclouds.opsource.servers.OpSourceNameSpaces.DATACENTER; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; @XmlRootElement(namespace = DATACENTER, name = "datacenterWithLimits") @@ -209,7 +210,7 @@ public class DataCenter { @Override public String toString() { - return Objects.toStringHelper("").add("location", location).add("displayName", displayName).add("city", city). + return MoreObjects.toStringHelper("").add("location", location).add("displayName", displayName).add("city", city). add("state", state).add("country", country).add("vpnUrl", vpnUrl).add("isDefault", isDefault). add("maxCpu", maxCpu).add("maxRamMb", maxRamMb).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DataCentersList.java ---------------------------------------------------------------------- diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DataCentersList.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DataCentersList.java index 8664920..ba7ab3e 100644 --- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DataCentersList.java +++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DataCentersList.java @@ -25,6 +25,7 @@ import java.util.Set; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; @@ -94,7 +95,7 @@ public class DataCentersList { @Override public String toString() { - return Objects.toStringHelper("").add("dataCenters", dataCenters).toString(); + return MoreObjects.toStringHelper("").add("dataCenters", dataCenters).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DeployedServer.java ---------------------------------------------------------------------- diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DeployedServer.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DeployedServer.java index 738fe35..715c16d 100644 --- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DeployedServer.java +++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DeployedServer.java @@ -21,6 +21,7 @@ import static org.jclouds.opsource.servers.OpSourceNameSpaces.SERVER; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; @XmlRootElement(namespace = SERVER, name = "DeployedServer") @@ -212,7 +213,7 @@ public class DeployedServer extends BaseServer{ @Override public String toString() { - return Objects.toStringHelper("").add("id", id).add("name", name).add("description", description). + return MoreObjects.toStringHelper("").add("id", id).add("name", name).add("description", description). add("machineSpecification", machineSpecification).add("sourceImageId", sourceImageId).add("networkId", networkId). add("privateIpAddress", privateIpAddress).add("publicIpAddress", publicIpAddress).add("machineName", machineName). add("isStarted", isStarted).add("deployedTime", deployedTime).add("status", status).toString(); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DeployedServersList.java ---------------------------------------------------------------------- diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DeployedServersList.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DeployedServersList.java index 689e9a8..e6efa4e 100644 --- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DeployedServersList.java +++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DeployedServersList.java @@ -25,6 +25,7 @@ import java.util.Set; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; @@ -94,7 +95,7 @@ public class DeployedServersList { @Override public String toString() { - return Objects.toStringHelper("").add("deployedServers", deployedServers).toString(); + return MoreObjects.toStringHelper("").add("deployedServers", deployedServers).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/MachineSpecification.java ---------------------------------------------------------------------- diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/MachineSpecification.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/MachineSpecification.java index 21a2e37..67236d4 100644 --- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/MachineSpecification.java +++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/MachineSpecification.java @@ -22,6 +22,7 @@ import static org.jclouds.opsource.servers.OpSourceNameSpaces.SERVER; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; @XmlRootElement(name = "machineSpecification", namespace = SERVER) @@ -137,7 +138,7 @@ public class MachineSpecification { @Override public String toString() { - return Objects.toStringHelper("").add("cpuCount", cpuCount).add("memoryMb", memoryMb).add("osStorageGb", osStorageGb) + return MoreObjects.toStringHelper("").add("cpuCount", cpuCount).add("memoryMb", memoryMb).add("osStorageGb", osStorageGb) .add("additionalLocalStorageGb", additionalLocalStorageGb).add("operatingSystem", operatingSystem).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/OperatingSystem.java ---------------------------------------------------------------------- diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/OperatingSystem.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/OperatingSystem.java index a0d0400..2894763 100644 --- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/OperatingSystem.java +++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/OperatingSystem.java @@ -22,6 +22,7 @@ import static org.jclouds.opsource.servers.OpSourceNameSpaces.SERVER; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -100,7 +101,7 @@ public class OperatingSystem { @Override public String toString() { - return Objects.toStringHelper("").add("osType", osType).add("displayName", displayName).toString(); + return MoreObjects.toStringHelper("").add("osType", osType).add("displayName", displayName).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/PendingDeployServer.java ---------------------------------------------------------------------- diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/PendingDeployServer.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/PendingDeployServer.java index 15098a6..3d362cc 100644 --- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/PendingDeployServer.java +++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/PendingDeployServer.java @@ -21,6 +21,7 @@ import static org.jclouds.opsource.servers.OpSourceNameSpaces.SERVER; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; @XmlRootElement(namespace = SERVER, name = "PendingDeployServer") @@ -159,7 +160,7 @@ public class PendingDeployServer extends BaseServer{ @Override public String toString() { - return Objects.toStringHelper("").add("id", id).add("name", name).add("description", description). + return MoreObjects.toStringHelper("").add("id", id).add("name", name).add("description", description). add("machineSpecification", machineSpecification).add("sourceImageId", sourceImageId).add("networkId", networkId). add("privateIpAddress", privateIpAddress).add("status", status).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/PendingDeployServersList.java ---------------------------------------------------------------------- diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/PendingDeployServersList.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/PendingDeployServersList.java index a2894ee..f5abed4 100644 --- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/PendingDeployServersList.java +++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/PendingDeployServersList.java @@ -25,6 +25,7 @@ import java.util.Set; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; @@ -94,7 +95,7 @@ public class PendingDeployServersList { @Override public String toString() { - return Objects.toStringHelper("").add("pendingDeployServers", pendingDeployServers).toString(); + return MoreObjects.toStringHelper("").add("pendingDeployServers", pendingDeployServers).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/ServerImage.java ---------------------------------------------------------------------- diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/ServerImage.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/ServerImage.java index 59e6a26..0b6163d 100644 --- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/ServerImage.java +++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/ServerImage.java @@ -22,6 +22,7 @@ import static org.jclouds.opsource.servers.OpSourceNameSpaces.SERVER; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; @XmlRootElement(namespace = SERVER, name = "ServerImage") @@ -206,7 +207,7 @@ public class ServerImage { @Override public String toString() { - return Objects.toStringHelper("").add("id", id).add("resourcePath", resourcePath).add("name", name). + return MoreObjects.toStringHelper("").add("id", id).add("resourcePath", resourcePath).add("name", name). add("description", description).add("operatingSystem", operatingSystem).add("location", location). add("cpuCount", cpuCount).add("memory", memory).add("osStorage", osStorage). add("additionalLocalStorage", additionalLocalStorage).toString(); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/ServerImagesList.java ---------------------------------------------------------------------- diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/ServerImagesList.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/ServerImagesList.java index fd9329c..8f5fe4e 100644 --- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/ServerImagesList.java +++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/ServerImagesList.java @@ -25,6 +25,7 @@ import java.util.Set; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; @@ -94,7 +95,7 @@ public class ServerImagesList { @Override public String toString() { - return Objects.toStringHelper("").add("serverImages", serverImages).toString(); + return MoreObjects.toStringHelper("").add("serverImages", serverImages).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Status.java ---------------------------------------------------------------------- diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Status.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Status.java index bdd8cea..e1ddb81 100644 --- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Status.java +++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Status.java @@ -22,6 +22,7 @@ import static org.jclouds.opsource.servers.OpSourceNameSpaces.SERVER; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; @XmlRootElement(namespace = SERVER, name = "status") @@ -164,7 +165,7 @@ public class Status { @Override public String toString() { - return Objects.toStringHelper("").add("action", action).add("requestTime", requestTime).add("userName", userName). + return MoreObjects.toStringHelper("").add("action", action).add("requestTime", requestTime).add("userName", userName). add("numberOfSteps", numberOfSteps).add("updateTime", updateTime).add("step", step).add("failureReason", failureReason).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Step.java ---------------------------------------------------------------------- diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Step.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Step.java index 684c4cc..a727fd7 100644 --- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Step.java +++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Step.java @@ -22,6 +22,7 @@ import static org.jclouds.opsource.servers.OpSourceNameSpaces.SERVER; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; @XmlRootElement(namespace = SERVER, name = "step") @@ -110,7 +111,7 @@ public class Step { @Override public String toString() { - return Objects.toStringHelper("").add("name", name).add("number", number).add("percentComplete", percentComplete).toString(); + return MoreObjects.toStringHelper("").add("name", name).add("number", number).add("percentComplete", percentComplete).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/config/VPDCRestClientModule.java ---------------------------------------------------------------------- diff --git a/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/config/VPDCRestClientModule.java b/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/config/VPDCRestClientModule.java index 955941f..9d8a444 100644 --- a/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/config/VPDCRestClientModule.java +++ b/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/config/VPDCRestClientModule.java @@ -63,6 +63,7 @@ import org.jclouds.savvis.vpdc.predicates.TaskSuccess; import org.jclouds.util.Strings2; 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.Supplier; @@ -167,7 +168,7 @@ public class VPDCRestClientModule extends RestClientModule<VPDCApi, VPDCAsyncApi } @Override public String toString() { - return Objects.toStringHelper(login).add("method", "login").toString(); + return MoreObjects.toStringHelper(login).add("method", "login").toString(); } }, seconds, TimeUnit.SECONDS); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/DataSet.java ---------------------------------------------------------------------- diff --git a/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/DataSet.java b/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/DataSet.java index 335aff6..e3a9c65 100644 --- a/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/DataSet.java +++ b/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/DataSet.java @@ -18,6 +18,7 @@ package org.jclouds.smartos.compute.domain; import java.util.UUID; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -141,7 +142,7 @@ public class DataSet { */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("uuid", uuid).add("os", os).add("published", published) + return MoreObjects.toStringHelper(this).omitNullValues().add("uuid", uuid).add("os", os).add("published", published) .add("urn", urn).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VM.java ---------------------------------------------------------------------- diff --git a/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VM.java b/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VM.java index 1af15be..d81127f 100644 --- a/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VM.java +++ b/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VM.java @@ -18,6 +18,7 @@ package org.jclouds.smartos.compute.domain; import java.util.UUID; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; @@ -180,7 +181,7 @@ public class VM { */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("uuid", uuid).add("type", type).add("ram", ram) + return MoreObjects.toStringHelper(this).omitNullValues().add("uuid", uuid).add("type", type).add("ram", ram) .add("alias", alias).add("publicAddress", publicAddress.orNull()).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VmNIC.java ---------------------------------------------------------------------- diff --git a/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VmNIC.java b/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VmNIC.java index 9c595b5..285b4c0 100644 --- a/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VmNIC.java +++ b/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VmNIC.java @@ -20,6 +20,7 @@ import java.beans.ConstructorProperties; import javax.inject.Named; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -128,7 +129,7 @@ public class VmNIC { */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("tag", tag).add("ip", ip).add("netmask", netmask) + return MoreObjects.toStringHelper(this).omitNullValues().add("tag", tag).add("ip", ip).add("netmask", netmask) .add("gateway", gateway).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VmSpecification.java ---------------------------------------------------------------------- diff --git a/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VmSpecification.java b/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VmSpecification.java index b328245..0aaf52c 100644 --- a/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VmSpecification.java +++ b/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VmSpecification.java @@ -21,6 +21,7 @@ import java.util.List; import javax.inject.Named; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; @@ -226,7 +227,7 @@ public class VmSpecification { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("alias", alias).add("brand", brand) + return MoreObjects.toStringHelper(this).omitNullValues().add("alias", alias).add("brand", brand) .add("dataset_uuid", dataset != null ? dataset.getUuid() : null).add("dns_domain", dnsDomain) .add("quota", quota).add("max_physical_memory", maxPhysicalMemory) .add("max_locked_memory", maxLockedMemory).add("max_swap", maxSwap).add("tmpfs", tmpFs) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVAppType.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVAppType.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVAppType.java index a02453b..810eaaa 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVAppType.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVAppType.java @@ -43,7 +43,7 @@ import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection; import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection; 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.collect.Sets; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AccessSetting.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AccessSetting.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AccessSetting.java index 5ee318a..a73b6b0 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AccessSetting.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AccessSetting.java @@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -121,6 +122,6 @@ public class AccessSetting { @Override public String toString() { - return Objects.toStringHelper("").add("subject", subject).add("accessLevel", accessLevel).toString(); + return MoreObjects.toStringHelper("").add("subject", subject).add("accessLevel", accessLevel).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java index 82b77bf..eeadb66 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java @@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Provides an administrative view of a vDC. Includes all members http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capabilities.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capabilities.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capabilities.java index 77a8ec2..a252234 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capabilities.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capabilities.java @@ -25,6 +25,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; @@ -131,7 +132,7 @@ public class Capabilities { @Override public String toString() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("supportedHardwareVersions", supportedHardwareVersions).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityType.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityType.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityType.java index 630d072..59a4f06 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityType.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityType.java @@ -22,9 +22,9 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; - /** * Represents a capacity of a given resource. * <p/> @@ -174,7 +174,7 @@ public class CapacityType<T extends CapacityType<T>> { @Override public String toString() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("units", units) .add("allocated", allocated) .add("limit", limit).toString();
