Repository: jclouds Updated Branches: refs/heads/master f26431b3e -> 95cfc0d95
http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/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/95cfc0d9/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..a39e9a5 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.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.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/95cfc0d9/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/95cfc0d9/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/95cfc0d9/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/95cfc0d9/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 28827fc..7cc1cc0 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/95cfc0d9/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/95cfc0d9/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/95cfc0d9/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/95cfc0d9/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/95cfc0d9/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 8bc6f13..b0128c8 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/95cfc0d9/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/95cfc0d9/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 b407bbb..39b99c1 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 @@ -24,6 +24,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.ImmutableSet; @@ -797,7 +798,7 @@ public class VirtualGuest { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("accountId", accountId) .add("createDate", createDate) .add("dedicatedAccountHostOnly", dedicatedAccountHostOnly) http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/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/95cfc0d9/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 f72f8cd..86080b8 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/95cfc0d9/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/95cfc0d9/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 760c70e..b36380f 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; /** @@ -232,7 +233,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/95cfc0d9/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/95cfc0d9/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/95cfc0d9/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/95cfc0d9/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/95cfc0d9/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/95cfc0d9/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/95cfc0d9/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/95cfc0d9/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/95cfc0d9/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; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ResourceRecordDetail.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ResourceRecordDetail.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ResourceRecordDetail.java index a29e103..fc80706 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ResourceRecordDetail.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ResourceRecordDetail.java @@ -17,7 +17,7 @@ package org.jclouds.ultradns.ws.domain; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import java.util.Date; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/RoundRobinPool.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/RoundRobinPool.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/RoundRobinPool.java index 2ae13c1..cefb52f 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/RoundRobinPool.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/RoundRobinPool.java @@ -18,6 +18,7 @@ package org.jclouds.ultradns.ws.domain; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; public final class RoundRobinPool { @@ -106,7 +107,7 @@ public final class RoundRobinPool { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("zoneId", zoneId).add("id", id).add("name", name) + return MoreObjects.toStringHelper(this).omitNullValues().add("zoneId", zoneId).add("id", id).add("name", name) .add("dname", dname).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Task.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Task.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Task.java index 6fc26b2..86af600 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Task.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Task.java @@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; @@ -82,7 +83,7 @@ public final class Task { @Override public String toString() { - return Objects.toStringHelper(this).add("guid", guid).add("statusCode", statusCode).add("message", message) + return MoreObjects.toStringHelper(this).add("guid", guid).add("statusCode", statusCode).add("message", message) .add("resultUrl", resultUrl).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPool.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPool.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPool.java index 6e69a3d..a80c127 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPool.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPool.java @@ -18,6 +18,7 @@ package org.jclouds.ultradns.ws.domain; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -143,7 +144,7 @@ public final class TrafficControllerPool { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("zoneId", zoneId).add("id", id).add("name", name) + return MoreObjects.toStringHelper(this).omitNullValues().add("zoneId", zoneId).add("id", id).add("name", name) .add("dname", dname).add("status", statusCode).add("failOverEnabled", failOverEnabled) .add("probingEnabled", probingEnabled).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecord.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecord.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecord.java index 4c30008..0f7952e 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecord.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecord.java @@ -17,7 +17,7 @@ package org.jclouds.ultradns.ws.domain; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecordDetail.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecordDetail.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecordDetail.java index bda5ffc..ae0a3d2 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecordDetail.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecordDetail.java @@ -19,6 +19,7 @@ package org.jclouds.ultradns.ws.domain; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; public final class TrafficControllerPoolRecordDetail { @@ -145,7 +146,7 @@ public final class TrafficControllerPoolRecordDetail { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("poolId", poolId).add("record", record) + return MoreObjects.toStringHelper(this).add("id", id).add("poolId", poolId).add("record", record) .add("weight", weight).add("priority", priority).add("forceAnswer", forceAnswer) .add("probingEnabled", probingEnabled).add("status", status).add("serving", serving) .add("description", description).toString(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/UpdatePoolRecord.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/UpdatePoolRecord.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/UpdatePoolRecord.java index 80b0c79..04f163b 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/UpdatePoolRecord.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/UpdatePoolRecord.java @@ -17,7 +17,7 @@ package org.jclouds.ultradns.ws.domain; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Zone.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Zone.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Zone.java index 50349bf..1aaeb78 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Zone.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Zone.java @@ -19,6 +19,7 @@ package org.jclouds.ultradns.ws.domain; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; @@ -122,7 +123,7 @@ public final class Zone { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("type", type) + return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("type", type) .add("accountId", accountId).add("ownerId", ownerId).add("dnssecStatus", dnssecStatus) .add("primarySrc", primarySrc.orNull()).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ZoneProperties.java ---------------------------------------------------------------------- diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ZoneProperties.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ZoneProperties.java index 58a6866..ab9bceb 100644 --- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ZoneProperties.java +++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ZoneProperties.java @@ -23,6 +23,7 @@ import java.util.Date; import org.jclouds.ultradns.ws.domain.Zone.Type; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; public final class ZoneProperties { @@ -94,7 +95,7 @@ public final class ZoneProperties { @Override public String toString() { - return Objects.toStringHelper(this).add("name", name).add("type", type) + return MoreObjects.toStringHelper(this).add("name", name).add("type", type) .add("modified", modified).add("resourceRecordCount", resourceRecordCount).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/InitScript.java ---------------------------------------------------------------------- diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/InitScript.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/InitScript.java index 6baa44c..3d47b54 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/InitScript.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/InitScript.java @@ -17,7 +17,7 @@ package org.jclouds.scriptbuilder; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.Iterables.concat; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/GitRepoAndRef.java ---------------------------------------------------------------------- diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/GitRepoAndRef.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/GitRepoAndRef.java index 5df47c6..b5bf0f2 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/GitRepoAndRef.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/GitRepoAndRef.java @@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; @@ -145,7 +146,7 @@ public class GitRepoAndRef { */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("repository", repository).add("branch", branch.orNull()) + return MoreObjects.toStringHelper(this).omitNullValues().add("repository", repository).add("branch", branch.orNull()) .add("tag", tag.orNull()).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/DataBag.java ---------------------------------------------------------------------- diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/DataBag.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/DataBag.java index dd3d264..be13c0d 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/DataBag.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/DataBag.java @@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ForwardingMap; import com.google.common.collect.ImmutableMap; @@ -104,7 +105,7 @@ public class DataBag extends ForwardingMap<String, String> { @Override public String toString() { - return Objects.toStringHelper(this).add("name", name).toString(); + return MoreObjects.toStringHelper(this).add("name", name).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/Role.java ---------------------------------------------------------------------- diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/Role.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/Role.java index 5adad79..7b383df 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/Role.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/Role.java @@ -18,6 +18,7 @@ package org.jclouds.scriptbuilder.domain.chef; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; @@ -139,7 +140,7 @@ public class Role { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("name", name).add("description", description.orNull()) + return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("description", description.orNull()) .toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/git/CloneGitRepo.java ---------------------------------------------------------------------- diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/git/CloneGitRepo.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/git/CloneGitRepo.java index 1300fca..4793f7a 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/git/CloneGitRepo.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/git/CloneGitRepo.java @@ -25,6 +25,7 @@ import org.jclouds.scriptbuilder.domain.OsFamily; import org.jclouds.scriptbuilder.domain.Statement; import org.jclouds.scriptbuilder.domain.Statements; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; import com.google.common.base.Splitter; @@ -190,7 +191,7 @@ public class CloneGitRepo implements Statement { */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("gitRepoAndRef", gitRepoAndRef) + return MoreObjects.toStringHelper(this).omitNullValues().add("gitRepoAndRef", gitRepoAndRef) .add("directory", directory.orNull()).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java ---------------------------------------------------------------------- diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java index 5f4aeeb..250727a 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java @@ -17,7 +17,7 @@ package org.jclouds.scriptbuilder.statements.login; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkArgument; import java.io.File; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/UserAdd.java ---------------------------------------------------------------------- diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/UserAdd.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/UserAdd.java index 2c551f9..dc2713f 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/UserAdd.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/UserAdd.java @@ -31,6 +31,7 @@ import org.jclouds.scriptbuilder.statements.ssh.InstallRSAPrivateKey; import com.google.common.base.Function; import com.google.common.base.Joiner; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Strings; import com.google.common.base.Throwables; @@ -253,6 +254,6 @@ public class UserAdd implements Statement { @Override public String toString() { - return Objects.toStringHelper("").add("login", login).toString(); + return MoreObjects.toStringHelper("").add("login", login).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Datacenter.java ---------------------------------------------------------------------- diff --git a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Datacenter.java b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Datacenter.java index 3283eee..b0ae298 100644 --- a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Datacenter.java +++ b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Datacenter.java @@ -16,6 +16,7 @@ */ package org.jclouds.servermanager; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -45,7 +46,7 @@ public class Datacenter { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("name", name).toString(); + return MoreObjects.toStringHelper(this).add("id", id).add("name", name).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Hardware.java ---------------------------------------------------------------------- diff --git a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Hardware.java b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Hardware.java index 6bc5c1c..c320961 100644 --- a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Hardware.java +++ b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Hardware.java @@ -16,6 +16,7 @@ */ package org.jclouds.servermanager; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -51,7 +52,7 @@ public class Hardware { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("name", name).add("cores", cores).add("ram", ram) + return MoreObjects.toStringHelper(this).add("id", id).add("name", name).add("cores", cores).add("ram", ram) .add("disk", disk).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Image.java ---------------------------------------------------------------------- diff --git a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Image.java b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Image.java index 9659f58..6b18e6c 100644 --- a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Image.java +++ b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Image.java @@ -16,6 +16,7 @@ */ package org.jclouds.servermanager; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -45,7 +46,7 @@ public class Image { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("name", name).toString(); + return MoreObjects.toStringHelper(this).add("id", id).add("name", name).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Server.java ---------------------------------------------------------------------- diff --git a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Server.java b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Server.java index e6577bd..df37dba 100644 --- a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Server.java +++ b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Server.java @@ -16,6 +16,7 @@ */ package org.jclouds.servermanager; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -53,7 +54,7 @@ public class Server { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("name", name).add("status", status) + return MoreObjects.toStringHelper(this).add("id", id).add("name", name).add("status", status) .add("datacenter", datacenter).add("imageId", imageId).add("hardwareId", hardwareId) .add("publicAddress", publicAddress).add("privateAddress", privateAddress).add("loginUser", loginUser) .toString();
