http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java index 1c7c7e4..56e297f 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java @@ -20,8 +20,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Describes the schedule of a snapshot policy. @@ -114,7 +115,7 @@ public class SnapshotPolicySchedule { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("interval", interval).add("time", time); }
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java index e02d13e..5c10a6af 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Class SshKeyPair @@ -131,7 +132,7 @@ public class SshKeyPair { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("fingerprint", fingerprint).add("name", name).add("privateKey", privateKey); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java index 35d33dc..3b1cbe7 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java @@ -25,8 +25,9 @@ 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.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; /** @@ -466,7 +467,7 @@ public class StoragePool implements Comparable<StoragePool> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("name", name).add("path", path).add("tags", tags).add("state", state).add("type", type).add("zoneId", zoneId).add("zoneName", zoneName).add("podId", podId).add("podName", podName).add("clusterId", clusterId).add("clusterName", clusterName).add("created", created).add("diskSizeAllocated", diskSizeAllocated).add("diskSizeTotal", diskSizeTotal).add("ipAddress", ipAddress).add("jobId", jobId).add("jobStatus", jobStatus); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Tag.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Tag.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Tag.java index b046251..af05e9b 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Tag.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Tag.java @@ -24,8 +24,9 @@ import java.util.Map; import org.jclouds.javax.annotation.Nullable; import com.google.common.base.Function; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; @@ -331,7 +332,7 @@ public class Tag { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("account", account) .add("customer", customer) .add("domain", domain) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java index 26ba3e3..56a7131 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java @@ -24,8 +24,9 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; @@ -878,7 +879,7 @@ public class Template implements Comparable<Template> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("displayText", displayText).add("domain", domain).add("domainId", domainId).add("account", account).add("accountId", accountId).add("zone", zone).add("zoneId", zoneId).add("OSType", OSType).add("OSTypeId", OSTypeId).add("name", name).add("type", type).add("status", status).add("format", format).add("hypervisor", hypervisor).add("size", size).add("created", created).add("removed", removed).add("crossZones", crossZones).add("bootable", bootable).add("extractable", extractable).add("featured", featured).add("ispublic", ispublic).add("ready", ready).add("passwordEnabled", passwordEnabled).add("jobId", jobId).add("jobStatus", jobStatus).add("checksum", checksum).add("hostId", hostId).add("hostName", hostName).add("sourceTemplateId", sourceTemplateId).add("templateTag", templateTag).add("tags", tags); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateExtraction.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateExtraction.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateExtraction.java index 2b3554a..60138f4 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateExtraction.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateExtraction.java @@ -23,8 +23,9 @@ import java.util.Date; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; public class TemplateExtraction implements Comparable<TemplateExtraction> { @@ -350,7 +351,7 @@ public class TemplateExtraction implements Comparable<TemplateExtraction> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("accountId", accountId).add("created", created).add("extractId", extractId).add("extractMode", extractMode).add("name", name).add("state", state).add("status", status).add("storageType", storageType).add("uploadPercentage", uploadPercentage).add("url", url).add("zoneId", zoneId).add("zoneName", zoneName); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateMetadata.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateMetadata.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateMetadata.java index 447b2bf..629c141 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateMetadata.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateMetadata.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Class TemplateMetadata @@ -222,7 +223,7 @@ public class TemplateMetadata { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("name", name).add("osTypeId", osTypeId).add("displayText", displayText).add("snapshotId", snapshotId) .add("volumeId", volumeId).add("virtualMachineId", virtualMachineId).add("passwordEnabled", passwordEnabled); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java index 1005e35..6917e16 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; public class TemplatePermission { @@ -165,7 +166,7 @@ public class TemplatePermission { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("account", account).add("domainId", domainId).add("isPublic", isPublic); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/UsageRecord.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/UsageRecord.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/UsageRecord.java index 30039c1..55adab9 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/UsageRecord.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/UsageRecord.java @@ -25,8 +25,9 @@ import java.util.Map; import org.jclouds.javax.annotation.Nullable; import com.google.common.base.Function; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; @@ -550,7 +551,7 @@ public class UsageRecord { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("description", description).add("accountId", accountId).add("accountName", accountName) .add("domainId", domainId).add("startDate", startDate).add("endDate", endDate).add("assignDate", assignDate) .add("releaseDate", releaseDate).add("zoneId", zoneId).add("virtualMachineId", virtualMachineId) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/User.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/User.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/User.java index 4fa6337..43511c2 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/User.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/User.java @@ -23,8 +23,9 @@ import java.util.Date; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Class User @@ -397,7 +398,7 @@ public class User { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("name", name).add("firstName", firstName).add("lastName", lastName).add("email", email) .add("created", created).add("state", state).add("account", account).add("accountType", accountType).add("domain", domain) .add("domainId", domainId).add("timeZone", timeZone).add("apiKey", apiKey).add("secretKey", secretKey); http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java index 6f5ae60..873e68d 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java @@ -23,8 +23,9 @@ import java.util.Date; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Class VMGroup @@ -204,7 +205,7 @@ public class VMGroup { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("account", account).add("created", created).add("domain", domain).add("domainId", domainId).add("name", name); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java index cd7e255..43d41e9 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java @@ -25,8 +25,9 @@ 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.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; @@ -1050,7 +1051,7 @@ public class VirtualMachine { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("account", account).add("cpuCount", cpuCount).add("cpuSpeed", cpuSpeed).add("cpuUsed", cpuUsed) .add("displayName", displayName).add("created", created).add("domain", domain).add("domainId", domainId) .add("usesVirtualNetwork", usesVirtualNetwork).add("group", group).add("groupId", groupId).add("guestOSId", guestOSId) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VlanIPRange.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VlanIPRange.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VlanIPRange.java index e9625f67..fc7dadc 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VlanIPRange.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VlanIPRange.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Represents the data object used in CloudStack's "Vlan" API. @@ -351,7 +352,7 @@ public class VlanIPRange implements Comparable<VlanIPRange> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("description", description).add("forVirtualNetwork", forVirtualNetwork).add("zoneId", zoneId) .add("vlan", vlan).add("account", account).add("domainId", domainId).add("domain", domain).add("podId", podId) .add("podName", podName).add("gateway", gateway).add("netmask", netmask).add("startIP", startIP).add("endIP", endIP) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Volume.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Volume.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Volume.java index 47dd9a1..32e9af7 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Volume.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Volume.java @@ -27,8 +27,9 @@ import org.jclouds.javax.annotation.Nullable; import com.google.common.base.CaseFormat; import com.google.common.base.Function; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; @@ -744,7 +745,7 @@ public class Volume { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("account", account).add("attached", attached).add("created", created).add("destroyed", destroyed) .add("deviceId", deviceId).add("diskOfferingDisplayText", diskOfferingDisplayText).add("diskOfferingId", diskOfferingId) .add("diskOfferingName", diskOfferingName).add("domain", domain).add("domainId", domainId).add("hypervisor", hypervisor) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Zone.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Zone.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Zone.java index ba99e0a..a47bb0b 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Zone.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Zone.java @@ -25,8 +25,9 @@ import java.util.Set; import com.google.common.collect.ImmutableSet; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableList; public class Zone implements Comparable<Zone> { @@ -440,7 +441,7 @@ public class Zone implements Comparable<Zone> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("description", description).add("displayText", displayText).add("DNS1", dns1).add("DNS2", dns2) .add("domain", domain).add("domainId", domainId).add("guestCIDRAddress", guestCIDRAddress).add("internalDNS1", internalDNS1) .add("internalDNS2", internalDNS2).add("name", name).add("networkType", networkType).add("VLAN", vlan) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneAndName.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneAndName.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneAndName.java index 0154051..9a6c472 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneAndName.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneAndName.java @@ -20,8 +20,9 @@ import static com.google.common.base.Objects.equal; 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.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Helpful when looking for resources by zone and name @@ -87,6 +88,6 @@ public class ZoneAndName { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("zoneId", zoneId).add("name", name); + return MoreObjects.toStringHelper("").add("zoneId", zoneId).add("name", name); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java index a269391..7e8fbc0 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java @@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; public class ZoneSecurityGroupNamePortsCidrs extends ZoneAndName { @@ -146,7 +147,7 @@ public class ZoneSecurityGroupNamePortsCidrs extends ZoneAndName { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("zoneId", zoneId).add("name", name).add("ports", ports).add("cidrs", cidrs); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Alarm.java ---------------------------------------------------------------------- diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Alarm.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Alarm.java index 1717d89..f723635 100644 --- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Alarm.java +++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Alarm.java @@ -17,7 +17,7 @@ package org.jclouds.cloudwatch.domain; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/AlarmHistoryItem.java ---------------------------------------------------------------------- diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/AlarmHistoryItem.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/AlarmHistoryItem.java index b9e05d2..7e1fc70 100644 --- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/AlarmHistoryItem.java +++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/AlarmHistoryItem.java @@ -17,7 +17,7 @@ package org.jclouds.cloudwatch.domain; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import java.util.Date; http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Datapoint.java ---------------------------------------------------------------------- diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Datapoint.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Datapoint.java index 2dffd0e..9cb2a17 100644 --- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Datapoint.java +++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Datapoint.java @@ -16,6 +16,7 @@ */ package org.jclouds.cloudwatch.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import org.jclouds.javax.annotation.Nullable; @@ -139,7 +140,7 @@ public class Datapoint { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("timestamp", timestamp) .add("customUnit", customUnit) .add("maximum", maximum) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Dimension.java ---------------------------------------------------------------------- diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Dimension.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Dimension.java index bd89f64..85437f6 100644 --- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Dimension.java +++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Dimension.java @@ -16,6 +16,7 @@ */ package org.jclouds.cloudwatch.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -74,7 +75,7 @@ public class Dimension { */ @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("name", name) .add("value", value).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/GetMetricStatisticsResponse.java ---------------------------------------------------------------------- diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/GetMetricStatisticsResponse.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/GetMetricStatisticsResponse.java index 5639f6a..8a87396 100644 --- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/GetMetricStatisticsResponse.java +++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/GetMetricStatisticsResponse.java @@ -20,6 +20,7 @@ import java.util.Iterator; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; @@ -80,7 +81,7 @@ public class GetMetricStatisticsResponse extends FluentIterable<Datapoint> { */ @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("label", label) .add("datapoints", datapoints).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/ListMetricsResponse.java ---------------------------------------------------------------------- diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/ListMetricsResponse.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/ListMetricsResponse.java index 3d6279c..5257ec6 100644 --- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/ListMetricsResponse.java +++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/ListMetricsResponse.java @@ -20,6 +20,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.ForwardingSet; import com.google.common.collect.ImmutableSet; @@ -80,7 +81,7 @@ public class ListMetricsResponse extends ForwardingSet<Metric> { */ @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("metrics", metrics) .add("nextToken", nextToken).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Metric.java ---------------------------------------------------------------------- diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Metric.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Metric.java index 18a4f33..c0329cb 100644 --- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Metric.java +++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Metric.java @@ -16,6 +16,7 @@ */ package org.jclouds.cloudwatch.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.Sets; import org.jclouds.javax.annotation.Nullable; @@ -95,7 +96,7 @@ public class Metric { */ @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("namespace", namespace) .add("metricName", metricName) .add("dimension", dimensions).toString(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/MetricDatum.java ---------------------------------------------------------------------- diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/MetricDatum.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/MetricDatum.java index 73e1ecc..e2b86a8 100644 --- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/MetricDatum.java +++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/MetricDatum.java @@ -22,8 +22,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Date; import java.util.Set; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -246,7 +247,7 @@ public class MetricDatum { } protected ToStringHelper string() { - return Objects.toStringHelper("").omitNullValues().add("dimensions", dimensions).add("metricName", metricName) + return MoreObjects.toStringHelper("").omitNullValues().add("dimensions", dimensions).add("metricName", metricName) .add("statisticValues", statisticValues.orNull()).add("timestamp", timestamp.orNull()).add("unit", unit) .add("value", value.orNull()); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java ---------------------------------------------------------------------- diff --git a/apis/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java b/apis/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java index 109d469..b223caa 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java +++ b/apis/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java @@ -21,6 +21,7 @@ import static com.google.common.base.Objects.equal; import java.util.List; import java.util.Map; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -169,7 +170,7 @@ public class DockerTemplateOptions extends TemplateOptions implements Cloneable @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("volumes", volumes) .add("hostname", hostname) .add("dns", dns) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/PasswordDataAndPrivateKey.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/PasswordDataAndPrivateKey.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/PasswordDataAndPrivateKey.java index b3d9100..05c3bf5 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/PasswordDataAndPrivateKey.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/PasswordDataAndPrivateKey.java @@ -18,6 +18,7 @@ package org.jclouds.ec2.compute.domain; import org.jclouds.ec2.domain.PasswordData; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -69,6 +70,6 @@ public class PasswordDataAndPrivateKey { */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("passwordData", passwordData).toString(); + return MoreObjects.toStringHelper(this).omitNullValues().add("passwordData", passwordData).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/RegionAndName.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/RegionAndName.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/RegionAndName.java index cf38056..14970b5 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/RegionAndName.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/RegionAndName.java @@ -19,8 +19,9 @@ package org.jclouds.ec2.compute.domain; 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.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; public class RegionAndName { @@ -67,7 +68,7 @@ public class RegionAndName { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("region", region).add("name", name); + return MoreObjects.toStringHelper("").add("region", region).add("name", name); } private static enum RegionFunction implements Function<RegionAndName, String> { http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java index 2a46b1a..734aaea 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java @@ -27,7 +27,7 @@ import java.util.Map; import java.util.Set; 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.Iterables; import com.google.common.hash.Hashing; http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/ec2/src/main/java/org/jclouds/ec2/domain/PasswordData.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/PasswordData.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/PasswordData.java index 4103286..bc65dfe 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/PasswordData.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/PasswordData.java @@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Date; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -144,7 +145,7 @@ public class PasswordData { */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("instanceId", instanceId).add("timestamp", timestamp) + return MoreObjects.toStringHelper(this).omitNullValues().add("instanceId", instanceId).add("timestamp", timestamp) .add("passwordData", passwordData).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/ec2/src/main/java/org/jclouds/ec2/domain/Reservation.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Reservation.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Reservation.java index 4fb7e22..336d623 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Reservation.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Reservation.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.ComparisonChain; import com.google.common.collect.ForwardingSet; @@ -214,7 +215,7 @@ public class Reservation<T extends RunningInstance> extends ForwardingSet<T> imp */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("region", region).add("reservationId", reservationId) + return MoreObjects.toStringHelper(this).omitNullValues().add("region", region).add("reservationId", reservationId) .add("requesterId", requesterId).add("instances", instances).add("groupNames", groupNames).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java index 00ab3e2..ca9b1e7 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java @@ -24,8 +24,9 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Strings; import com.google.common.collect.ComparisonChain; import com.google.common.collect.ImmutableMap; @@ -506,7 +507,7 @@ public class RunningInstance implements Comparable<RunningInstance> { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("region", region) + return MoreObjects.toStringHelper(this).omitNullValues().add("region", region) .add("availabilityZone", availabilityZone).add("id", instanceId).add("state", rawState) .add("type", instanceType).add("virtualizationType", virtualizationType).add("imageId", imageId) .add("ipAddress", ipAddress).add("dnsName", dnsName).add("privateIpAddress", privateIpAddress) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java index b497790..7b20559 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java @@ -23,8 +23,9 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; import org.jclouds.net.domain.IpPermission; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ForwardingSet; import com.google.common.collect.ImmutableSet; @@ -211,7 +212,7 @@ public class SecurityGroup extends ForwardingSet<IpPermission> { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("region", region).add("id", id).add("name", name) + return MoreObjects.toStringHelper(this).omitNullValues().add("region", region).add("id", id).add("name", name) .add("ownerId", ownerId).add("description", description) .add("ipPermissions", ipPermissions.isEmpty() ? null : ipPermissions); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/ec2/src/main/java/org/jclouds/ec2/domain/Subnet.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Subnet.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Subnet.java index eecc169..a7c8974 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Subnet.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Subnet.java @@ -20,8 +20,9 @@ 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.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableMap; /** @@ -143,7 +144,7 @@ public final class Subnet { } private ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("subnetId", subnetId).add("subnetState", subnetState) + return MoreObjects.toStringHelper(this).omitNullValues().add("subnetId", subnetId).add("subnetState", subnetState) .add("vpcId", vpcId).add("cidrBlock", cidrBlock).add("availableIpAddressCount", availableIpAddressCount) .add("availabilityZone", availabilityZone).add("tags", tags); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/ec2/src/main/java/org/jclouds/ec2/domain/Tag.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Tag.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Tag.java index e83b7da..7f6d13e 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Tag.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Tag.java @@ -18,8 +18,9 @@ package org.jclouds.ec2.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.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Optional; /** @@ -191,7 +192,7 @@ public class Tag { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("resourceId", resourceId) + return MoreObjects.toStringHelper(this).omitNullValues().add("resourceId", resourceId) .add("resourceType", resourceType).add("key", key).add("value", value.orNull()); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/WellKnownImage.java ---------------------------------------------------------------------- diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/WellKnownImage.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/WellKnownImage.java index 22ce5d4..41b2683 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/WellKnownImage.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/WellKnownImage.java @@ -16,12 +16,13 @@ */ package org.jclouds.elasticstack.domain; -import static com.google.common.base.Objects.firstNonNull; +import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkNotNull; import org.jclouds.compute.domain.OsFamily; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; public class WellKnownImage { @@ -152,7 +153,7 @@ public class WellKnownImage { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("uuid", uuid).add("description", description) + return MoreObjects.toStringHelper(this).omitNullValues().add("uuid", uuid).add("description", description) .add("osFamily", osFamily).add("osVersion", osVersion).add("size", size).add("is64bit", is64bit) .add("loginUser", loginUser).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/AvailabilityZone.java ---------------------------------------------------------------------- diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/AvailabilityZone.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/AvailabilityZone.java index d7d1bfb..ccd0e19 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/AvailabilityZone.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/AvailabilityZone.java @@ -16,6 +16,7 @@ */ package org.jclouds.openstack.cinder.v1.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.beans.ConstructorProperties; @@ -97,8 +98,8 @@ public class AvailabilityZone { return Objects.equal(this.name, that.name) && Objects.equal(this.state, that.state); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this) + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this) .add("name", name) .add("state", state); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java ---------------------------------------------------------------------- diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java index e601214..ab24788 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java @@ -26,8 +26,9 @@ import javax.inject.Named; import com.google.common.base.Optional; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * An Openstack Cinder Volume Snapshot. @@ -246,7 +247,7 @@ public class Snapshot { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("volumeId", volumeId).add("status", status).add("size", size).add("created", created).add("name", name).add("description", description).add("extendedAttributes", extendedAttributes); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/SnapshotExtendedAttributes.java ---------------------------------------------------------------------- diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/SnapshotExtendedAttributes.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/SnapshotExtendedAttributes.java index e6a4103..aec25dc 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/SnapshotExtendedAttributes.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/SnapshotExtendedAttributes.java @@ -17,6 +17,7 @@ package org.jclouds.openstack.cinder.v1.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import org.jclouds.javax.annotation.Nullable; @@ -112,8 +113,8 @@ public class SnapshotExtendedAttributes { && Objects.equal(this.progress, that.progress); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this) + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this) .add("projectId", projectId).add("progress", progress); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java ---------------------------------------------------------------------- diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java index e75ab06..edae69e 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java @@ -28,8 +28,9 @@ import javax.inject.Named; 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.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -366,7 +367,7 @@ public class Volume { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("status", status).add("size", size).add("zone", zone).add("created", created).add("attachments", attachments).add("volumeType", volumeType).add("snapshotId", snapshotId).add("name", name).add("description", description).add("metadata", metadata).add("extendedAttributes", tenantId); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java ---------------------------------------------------------------------- diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java index d86f23b..92008f3 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java @@ -24,8 +24,9 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * An OpenStack Cinder Volume Attachment (describes how Volumes are attached to Servers). @@ -164,7 +165,7 @@ public class VolumeAttachment { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("volumeId", volumeId).add("serverId", serverId).add("device", device); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeQuota.java ---------------------------------------------------------------------- diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeQuota.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeQuota.java index 78b5936..ae150e8 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeQuota.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeQuota.java @@ -16,6 +16,7 @@ */ package org.jclouds.openstack.cinder.v1.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import static com.google.common.base.Preconditions.checkNotNull; @@ -79,8 +80,8 @@ public class VolumeQuota { && Objects.equal(this.snapshots, that.snapshots); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this) + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this) .add("id", id).add("volumes", volumes).add("gigabytes", gigabytes).add("snapshots", snapshots); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java ---------------------------------------------------------------------- diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java index 6990381..d045bad 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java @@ -16,8 +16,9 @@ */ package org.jclouds.openstack.cinder.v1.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import org.jclouds.javax.annotation.Nullable; @@ -182,7 +183,7 @@ public class VolumeType { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("name", name).add("created", created).add("updated", updated).add("extraSpecs", extraSpecs); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/ZoneState.java ---------------------------------------------------------------------- diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/ZoneState.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/ZoneState.java index 0db5797..899a5dc 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/ZoneState.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/ZoneState.java @@ -16,6 +16,7 @@ */ package org.jclouds.openstack.cinder.v1.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.beans.ConstructorProperties; @@ -79,8 +80,8 @@ public class ZoneState { return Objects.equal(this.available, that.available); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this) + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this) .add("available", available); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java ---------------------------------------------------------------------- diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java index 5ce3fe0..f549b2f 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java @@ -17,7 +17,7 @@ package org.jclouds.openstack.cinder.v1.options; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import java.util.Map; @@ -28,7 +28,7 @@ import org.jclouds.rest.MapBinder; import org.jclouds.rest.binders.BindToJsonPayload; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java ---------------------------------------------------------------------- diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java index 6c5681b..1b986a1 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java @@ -17,7 +17,7 @@ package org.jclouds.openstack.cinder.v1.options; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -31,7 +31,7 @@ import org.jclouds.rest.MapBinder; import org.jclouds.rest.binders.BindToJsonPayload; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Access.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Access.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Access.java index e121745..eb63a31 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Access.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Access.java @@ -23,8 +23,9 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ForwardingSet; import com.google.common.collect.ImmutableSet; @@ -142,7 +143,7 @@ public class Access extends ForwardingSet<Service> implements Comparable<Access> } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("token", token).add("user", user) + return MoreObjects.toStringHelper(this).omitNullValues().add("token", token).add("user", user) .add("serviceCatalog", serviceCatalog); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiAccessKeyCredentials.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiAccessKeyCredentials.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiAccessKeyCredentials.java index f926083..b189a2f 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiAccessKeyCredentials.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiAccessKeyCredentials.java @@ -23,8 +23,9 @@ import java.beans.ConstructorProperties; import org.jclouds.openstack.keystone.v2_0.config.CredentialType; import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Api AccessKey Credentials @@ -127,7 +128,7 @@ public class ApiAccessKeyCredentials { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("accessKey", accessKey).add("secretKey", secretKey); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiMetadata.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiMetadata.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiMetadata.java index ad20938..fa354b8 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiMetadata.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiMetadata.java @@ -29,7 +29,7 @@ import org.jclouds.openstack.v2_0.domain.Link; import org.jclouds.openstack.v2_0.domain.Resource; 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; /** http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Endpoint.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Endpoint.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Endpoint.java index 4a71b1f..f5424bd 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Endpoint.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Endpoint.java @@ -21,8 +21,9 @@ import java.net.URI; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * An network-accessible address, usually described by URL, where a service may @@ -331,7 +332,7 @@ public class Endpoint { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("id", id).add("versionId", versionId) + return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("versionId", versionId) .add("region", region).add("publicURL", publicURL).add("internalURL", internalURL) .add("adminURL", adminURL).add("versionInfo", versionInfo).add("versionList", versionList) .add("tenantId", tenantId); http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/MediaType.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/MediaType.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/MediaType.java index 796eed5..46ca359 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/MediaType.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/MediaType.java @@ -20,8 +20,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Class MediaType @@ -112,7 +113,7 @@ public class MediaType { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("base", base).add("type", type); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/PasswordCredentials.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/PasswordCredentials.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/PasswordCredentials.java index 71381f0..68b5f99 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/PasswordCredentials.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/PasswordCredentials.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import org.jclouds.openstack.keystone.v2_0.config.CredentialType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Password Credentials @@ -126,7 +127,7 @@ public class PasswordCredentials { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("username", username) .add("password", password == null ? null : "*****"); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Role.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Role.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Role.java index be3c544..322bff9 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Role.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Role.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * A personality that a user assumes when performing a specific set of operations. A role includes a @@ -192,7 +193,7 @@ public class Role { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("id", id).add("name", name).add("description", description).add("serviceId", serviceId).add("tenantId", tenantId); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Service.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Service.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Service.java index 9d71a78..9453dd8 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Service.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Service.java @@ -23,8 +23,9 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ForwardingSet; import com.google.common.collect.ImmutableSet; @@ -191,7 +192,7 @@ public class Service extends ForwardingSet<Endpoint> { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("id", id).add("type", type).add("name", name) .add("description", description).add("endpoints", endpoints); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Tenant.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Tenant.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Tenant.java index adb71c4..5277a5d 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Tenant.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Tenant.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * A container used to group or isolate resources and/or identity objects. @@ -162,7 +163,7 @@ public class Tenant { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("id", id).add("name", name) + return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("name", name) .add("description", description).add("enabled", enabled); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Token.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Token.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Token.java index 52a5e0f..9b6d9c4 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Token.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Token.java @@ -23,8 +23,9 @@ import java.util.Date; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Optional; /** @@ -151,7 +152,7 @@ public class Token implements Comparable<Token> { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("id", id).add("expires", expires).add("tenant", tenant.orNull()); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/User.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/User.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/User.java index 8d4d90d..f1c8a29 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/User.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/User.java @@ -23,8 +23,9 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ForwardingSet; import com.google.common.collect.ImmutableSet; @@ -207,7 +208,7 @@ public class User extends ForwardingSet<Role> { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("email", email) + return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("email", email) .add("enabled", enabled).add("roles", roles).add("tenanId", tenantId); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateTenantOptions.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateTenantOptions.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateTenantOptions.java index 24b0523..398865f 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateTenantOptions.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateTenantOptions.java @@ -27,8 +27,9 @@ import org.jclouds.http.HttpRequest; import org.jclouds.rest.MapBinder; import org.jclouds.rest.binders.BindToJsonPayload; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableMap; public class CreateTenantOptions implements MapBinder { @@ -57,7 +58,7 @@ public class CreateTenantOptions implements MapBinder { } protected ToStringHelper string() { - ToStringHelper toString = Objects.toStringHelper("").omitNullValues(); + ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues(); toString.add("description", description); toString.add("enabled", Boolean.valueOf(enabled)); return toString; http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java index a9f5887..e2faf07 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java @@ -27,8 +27,9 @@ import org.jclouds.http.HttpRequest; import org.jclouds.rest.MapBinder; import org.jclouds.rest.binders.BindToJsonPayload; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableMap; public class CreateUserOptions implements MapBinder{ @@ -60,7 +61,7 @@ public class CreateUserOptions implements MapBinder{ } protected ToStringHelper string() { - ToStringHelper toString = Objects.toStringHelper("").omitNullValues(); + ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues(); toString.add("tenant", tenant); toString.add("password", password); toString.add("email", email); http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateTenantOptions.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateTenantOptions.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateTenantOptions.java index bfc2caa..7e57dec 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateTenantOptions.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateTenantOptions.java @@ -26,8 +26,9 @@ import org.jclouds.http.HttpRequest; import org.jclouds.rest.MapBinder; import org.jclouds.rest.binders.BindToJsonPayload; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableMap; public class UpdateTenantOptions implements MapBinder { @@ -57,7 +58,7 @@ public class UpdateTenantOptions implements MapBinder { } protected ToStringHelper string() { - ToStringHelper toString = Objects.toStringHelper("").omitNullValues(); + ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues(); toString.add("name", name); toString.add("description", description); toString.add("enabled", Boolean.valueOf(enabled)); http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateUserOptions.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateUserOptions.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateUserOptions.java index be9b561..dbc232c 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateUserOptions.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateUserOptions.java @@ -26,8 +26,9 @@ import org.jclouds.http.HttpRequest; import org.jclouds.rest.MapBinder; import org.jclouds.rest.binders.BindToJsonPayload; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableMap; public class UpdateUserOptions implements MapBinder{ @@ -59,7 +60,7 @@ public class UpdateUserOptions implements MapBinder{ } protected ToStringHelper string() { - ToStringHelper toString = Objects.toStringHelper("").omitNullValues(); + ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues(); toString.add("name", name); toString.add("email", email); toString.add("password", password); http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Extension.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Extension.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Extension.java index f2c5a3a..cfac867 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Extension.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Extension.java @@ -26,7 +26,7 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * The OpenStack Compute API is extensible. Extensions serve two purposes: They http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limit.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limit.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limit.java index 10893d9..969f16a 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limit.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limit.java @@ -17,7 +17,7 @@ package org.jclouds.openstack.v2_0.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.beans.ConstructorProperties; http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limits.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limits.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limits.java index 8899896..d7fa692 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limits.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limits.java @@ -17,7 +17,7 @@ package org.jclouds.openstack.v2_0.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.beans.ConstructorProperties; http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Link.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Link.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Link.java index 46f5466..0136b82 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Link.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Link.java @@ -23,8 +23,9 @@ import java.net.URI; import javax.inject.Named; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Optional; /** @@ -196,7 +197,7 @@ public class Link { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("relation", relation).add("type", type.orNull()) + return MoreObjects.toStringHelper(this).omitNullValues().add("relation", relation).add("type", type.orNull()) .add("href", href); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/RateLimit.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/RateLimit.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/RateLimit.java index 9c4e72c..62918e8 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/RateLimit.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/RateLimit.java @@ -17,7 +17,7 @@ package org.jclouds.openstack.v2_0.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.beans.ConstructorProperties; http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Resource.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Resource.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Resource.java index df5231a..b2a0bbc 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Resource.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Resource.java @@ -23,8 +23,9 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; /** @@ -153,7 +154,7 @@ public class Resource implements Comparable<Resource> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("name", name).add("links", links); }
