Repository: jclouds-labs-openstack Updated Branches: refs/heads/master 6965d70d3 -> 041cd8d2f
JCLOUDS-1225: Address Guava 18 Objects changes Fixed with: find -name \*.java | xargs sed -i 's/Objects.[Tt]oStringHelper/More&/g' find -name \*.java | xargs sed -i 's/Objects.firstNonNull/More&/g' find -name \*.java | xargs sed -i 's/^\(import com.google.common.base.\)\(Objects.*\)/\1More\2\n\1\2/g' find -name \*.java | xargs java -jar google-java-format-1.3-all-deps.jar -i --fix-imports-only --skip-sorting-imports Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/041cd8d2 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/041cd8d2 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/041cd8d2 Branch: refs/heads/master Commit: 041cd8d2f775ac409ccb162c423b503ffa58b0a8 Parents: 6965d70 Author: Andrew Gaul <[email protected]> Authored: Thu Aug 24 18:31:07 2017 -0700 Committer: Andrew Gaul <[email protected]> Committed: Thu Aug 24 18:31:07 2017 -0700 ---------------------------------------------------------------------- .../java/org/jclouds/openstack/glance/v1_0/domain/Image.java | 2 +- .../org/jclouds/openstack/glance/v1_0/domain/ImageDetails.java | 2 +- .../main/java/org/jclouds/openstack/marconi/v1/domain/Aged.java | 5 +++-- .../java/org/jclouds/openstack/marconi/v1/domain/Claim.java | 5 +++-- .../org/jclouds/openstack/marconi/v1/domain/CreateMessage.java | 5 +++-- .../java/org/jclouds/openstack/marconi/v1/domain/Message.java | 5 +++-- .../jclouds/openstack/marconi/v1/domain/MessagesCreated.java | 5 +++-- .../org/jclouds/openstack/marconi/v1/domain/MessagesStats.java | 5 +++-- .../java/org/jclouds/openstack/marconi/v1/domain/Queue.java | 5 +++-- .../org/jclouds/openstack/marconi/v1/domain/QueueStats.java | 5 +++-- .../org/jclouds/openstack/neutron/v2/domain/AddressPair.java | 5 +++-- .../org/jclouds/openstack/neutron/v2/domain/AllocationPool.java | 5 +++-- .../openstack/neutron/v2/domain/ExternalGatewayInfo.java | 3 ++- .../jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java | 5 +++-- .../org/jclouds/openstack/neutron/v2/domain/FloatingIP.java | 3 ++- .../java/org/jclouds/openstack/neutron/v2/domain/HostRoute.java | 5 +++-- .../main/java/org/jclouds/openstack/neutron/v2/domain/IP.java | 5 +++-- .../java/org/jclouds/openstack/neutron/v2/domain/Network.java | 3 ++- .../org/jclouds/openstack/neutron/v2/domain/NetworkSegment.java | 5 +++-- .../main/java/org/jclouds/openstack/neutron/v2/domain/Port.java | 3 ++- .../java/org/jclouds/openstack/neutron/v2/domain/Router.java | 3 ++- .../jclouds/openstack/neutron/v2/domain/RouterInterface.java | 5 +++-- .../main/java/org/jclouds/openstack/neutron/v2/domain/Rule.java | 3 ++- .../org/jclouds/openstack/neutron/v2/domain/SecurityGroup.java | 3 ++- .../java/org/jclouds/openstack/neutron/v2/domain/Subnet.java | 3 ++- .../openstack/neutron/v2/domain/lbaas/v1/HealthMonitor.java | 3 ++- .../neutron/v2/domain/lbaas/v1/HealthMonitorStatus.java | 5 +++-- .../jclouds/openstack/neutron/v2/domain/lbaas/v1/Member.java | 3 ++- .../org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Pool.java | 3 ++- .../openstack/neutron/v2/domain/lbaas/v1/PoolStatus.java | 5 +++-- .../neutron/v2/domain/lbaas/v1/SessionPersistence.java | 5 +++-- .../org/jclouds/openstack/neutron/v2/domain/lbaas/v1/VIP.java | 3 ++- .../rackspace/autoscale/v1/domain/CreateScalingPolicy.java | 5 +++-- .../jclouds/rackspace/autoscale/v1/domain/CreateWebhook.java | 5 +++-- .../java/org/jclouds/rackspace/autoscale/v1/domain/Group.java | 5 +++-- .../rackspace/autoscale/v1/domain/GroupConfiguration.java | 5 +++-- .../jclouds/rackspace/autoscale/v1/domain/GroupInstance.java | 5 +++-- .../org/jclouds/rackspace/autoscale/v1/domain/GroupState.java | 5 +++-- .../rackspace/autoscale/v1/domain/LaunchConfiguration.java | 5 +++-- .../org/jclouds/rackspace/autoscale/v1/domain/LoadBalancer.java | 5 +++-- .../org/jclouds/rackspace/autoscale/v1/domain/Personality.java | 5 +++-- .../jclouds/rackspace/autoscale/v1/domain/ScalingPolicy.java | 2 +- .../java/org/jclouds/rackspace/autoscale/v1/domain/Webhook.java | 2 +- .../org/jclouds/rackspace/cloudbigdata/v1/domain/Cluster.java | 2 +- .../jclouds/rackspace/cloudbigdata/v1/domain/CreateCluster.java | 5 +++-- .../jclouds/rackspace/cloudbigdata/v1/domain/CreateProfile.java | 5 +++-- .../org/jclouds/rackspace/cloudbigdata/v1/domain/Profile.java | 2 +- .../jclouds/rackspace/cloudbigdata/v1/domain/ProfileSSHKey.java | 5 +++-- 48 files changed, 120 insertions(+), 78 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/Image.java ---------------------------------------------------------------------- diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/Image.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/Image.java index 6b91df6..7e71299 100644 --- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/Image.java +++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/Image.java @@ -26,7 +26,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.base.Optional; /** http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/ImageDetails.java ---------------------------------------------------------------------- diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/ImageDetails.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/ImageDetails.java index d950556..e95c88f 100644 --- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/ImageDetails.java +++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/ImageDetails.java @@ -29,7 +29,7 @@ import org.jclouds.javax.annotation.Nullable; import org.jclouds.openstack.v2_0.domain.Link; 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; http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Aged.java ---------------------------------------------------------------------- diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Aged.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Aged.java index 4ab6d14..7c4ad9d 100644 --- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Aged.java +++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Aged.java @@ -17,6 +17,7 @@ package org.jclouds.openstack.marconi.v1.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import javax.inject.Named; @@ -79,8 +80,8 @@ public class Aged { && Objects.equal(this.id, that.id); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this) + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this) .add("age", age).add("created", created).add("id", id); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Claim.java ---------------------------------------------------------------------- diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Claim.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Claim.java index ee70e4e..c5aca93 100644 --- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Claim.java +++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Claim.java @@ -17,6 +17,7 @@ package org.jclouds.openstack.marconi.v1.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import org.jclouds.javax.annotation.Nullable; @@ -83,8 +84,8 @@ public class Claim { return Objects.equal(this.id, that.id); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this) + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this) .add("id", id).add("ttl", ttl).add("age", age).add("messages", messages); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/CreateMessage.java ---------------------------------------------------------------------- diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/CreateMessage.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/CreateMessage.java index 2421e09..6ad0bec 100644 --- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/CreateMessage.java +++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/CreateMessage.java @@ -17,6 +17,7 @@ package org.jclouds.openstack.marconi.v1.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import org.jclouds.domain.JsonBall; @@ -62,8 +63,8 @@ public class CreateMessage { return Objects.equal(this.ttl, that.ttl) && Objects.equal(this.body, that.body); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this) + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this) .add("ttl", ttl).add("body", body); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Message.java ---------------------------------------------------------------------- diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Message.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Message.java index e780bf5..c2c6a02 100644 --- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Message.java +++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Message.java @@ -17,6 +17,7 @@ package org.jclouds.openstack.marconi.v1.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; import org.jclouds.javax.annotation.Nullable; @@ -90,8 +91,8 @@ public class Message { return Objects.equal(this.id, that.id); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues() + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this).omitNullValues() .add("id", id).add("ttl", ttl).add("body", body).add("age", age).add("claimId", claimId); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/MessagesCreated.java ---------------------------------------------------------------------- diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/MessagesCreated.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/MessagesCreated.java index 912b4e9..0427d0e 100644 --- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/MessagesCreated.java +++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/MessagesCreated.java @@ -17,6 +17,7 @@ package org.jclouds.openstack.marconi.v1.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import javax.inject.Named; @@ -60,8 +61,8 @@ public class MessagesCreated { return Objects.equal(this.messageIds, that.messageIds); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this).add("messageIds", messageIds); + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this).add("messageIds", messageIds); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/MessagesStats.java ---------------------------------------------------------------------- diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/MessagesStats.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/MessagesStats.java index 33ef63d..92164ca 100644 --- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/MessagesStats.java +++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/MessagesStats.java @@ -17,6 +17,7 @@ package org.jclouds.openstack.marconi.v1.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; import org.jclouds.javax.annotation.Nullable; @@ -97,8 +98,8 @@ public class MessagesStats { && Objects.equal(this.newest, that.newest); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues() + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this).omitNullValues() .add("claimed", claimed).add("free", free).add("total", total).add("oldest", oldest).add("newest", newest); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Queue.java ---------------------------------------------------------------------- diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Queue.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Queue.java index d2069a2..8d25ad4 100644 --- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Queue.java +++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Queue.java @@ -17,6 +17,7 @@ package org.jclouds.openstack.marconi.v1.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; import org.jclouds.javax.annotation.Nullable; @@ -65,8 +66,8 @@ public class Queue { return Objects.equal(this.name, that.name); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues() + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this).omitNullValues() .add("name", name).add("metadata", metadata); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/QueueStats.java ---------------------------------------------------------------------- diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/QueueStats.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/QueueStats.java index f62c34b..b5b0f92 100644 --- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/QueueStats.java +++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/QueueStats.java @@ -17,6 +17,7 @@ package org.jclouds.openstack.marconi.v1.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import static com.google.common.base.Preconditions.checkNotNull; @@ -52,8 +53,8 @@ public class QueueStats { return Objects.equal(this.messages, that.messages); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this) + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this) .add("messagesStats", messages); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AddressPair.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AddressPair.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AddressPair.java index e2d888c..289efe5 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AddressPair.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AddressPair.java @@ -24,6 +24,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -88,8 +89,8 @@ public class AddressPair { return Objects.equal(this.macAddress, that.macAddress) && Objects.equal(this.ipAddress, that.ipAddress); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this).add("macAddress", macAddress).add("ipAddress", ipAddress); + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this).add("macAddress", macAddress).add("ipAddress", ipAddress); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AllocationPool.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AllocationPool.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AllocationPool.java index 6d20999..335bfb5 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AllocationPool.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AllocationPool.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; /** @@ -72,8 +73,8 @@ public class AllocationPool { return Objects.equal(this.start, that.start) && Objects.equal(this.end, that.end); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this).add("start", start).add("end", end); + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this).add("start", start).add("end", end); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExternalGatewayInfo.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExternalGatewayInfo.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExternalGatewayInfo.java index 9f538a5..dd89a2f 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExternalGatewayInfo.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExternalGatewayInfo.java @@ -22,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -90,7 +91,7 @@ public class ExternalGatewayInfo { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("networkId", networkId) .add("enableSnat", enableSnat) .toString(); http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java index cdc448e..3cfe064 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java @@ -22,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -89,8 +90,8 @@ public class ExtraDhcpOption { && Objects.equal(this.optionValue, that.optionValue); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this).add("id", id).add("optionName", optionName).add("optionValue", optionValue); + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this).add("id", id).add("optionName", optionName).add("optionValue", optionValue); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/FloatingIP.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/FloatingIP.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/FloatingIP.java index 9c1540c..be61ad3 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/FloatingIP.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/FloatingIP.java @@ -22,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -153,7 +154,7 @@ public class FloatingIP { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("routerId", routerId) .add("tenantId", tenantId) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/HostRoute.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/HostRoute.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/HostRoute.java index 6ff0ddc..0d7cf4c 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/HostRoute.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/HostRoute.java @@ -22,8 +22,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; /** * A Neutron Subnet Host Route @@ -73,7 +74,7 @@ public class HostRoute { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("destinationCidr", destinationCidr).add("nextHop", nextHop); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/IP.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/IP.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/IP.java index 53c83ca..cb4264a 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/IP.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/IP.java @@ -22,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -71,8 +72,8 @@ public class IP { return Objects.equal(this.ipAddress, that.ipAddress) && Objects.equal(this.subnetId, that.subnetId); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this).add("ipAddress", ipAddress).add("subnetId", subnetId); + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this).add("ipAddress", ipAddress).add("subnetId", subnetId); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Network.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Network.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Network.java index ac40019..c269593 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Network.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Network.java @@ -24,6 +24,7 @@ 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.collect.ImmutableSet; @@ -338,7 +339,7 @@ public class Network { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("status", status) .add("subnets", subnets) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkSegment.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkSegment.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkSegment.java index 4096e51..8add465 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkSegment.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkSegment.java @@ -22,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -89,8 +90,8 @@ public class NetworkSegment { && Objects.equal(this.segmentationId, that.segmentationId); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this).add("networkType", networkType).add("physicalNetwork", physicalNetwork) + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this).add("networkType", networkType).add("physicalNetwork", physicalNetwork) .add("segmentationId", segmentationId); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Port.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Port.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Port.java index a9ab61e..f22d2fa 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Port.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Port.java @@ -24,6 +24,7 @@ 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.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -427,7 +428,7 @@ public class Port { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("status", status) .add("vifType", vifType) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Router.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Router.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Router.java index 0b06531..7330c9b 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Router.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Router.java @@ -22,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -161,7 +162,7 @@ public class Router { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("status", status) .add("name", name) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RouterInterface.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RouterInterface.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RouterInterface.java index ff30dae..710c0bf 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RouterInterface.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RouterInterface.java @@ -22,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -75,8 +76,8 @@ public class RouterInterface { return Objects.equal(this.subnetId, that.subnetId) && Objects.equal(this.portId, that.portId); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this).add("subnetId", subnetId).add("portId", portId); + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this).add("subnetId", subnetId).add("portId", portId); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Rule.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Rule.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Rule.java index e72a3e9..ae4b913 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Rule.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Rule.java @@ -25,6 +25,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -195,7 +196,7 @@ public class Rule { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("tenantId", tenantId) .add("direction", direction) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/SecurityGroup.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/SecurityGroup.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/SecurityGroup.java index 5008c02..6a1b8b7 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/SecurityGroup.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/SecurityGroup.java @@ -22,6 +22,7 @@ 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.collect.ImmutableList; @@ -121,7 +122,7 @@ public class SecurityGroup { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("tenantId", tenantId) .add("name", name) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Subnet.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Subnet.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Subnet.java index 6e0cfc0..1f05709 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Subnet.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Subnet.java @@ -25,6 +25,7 @@ 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.collect.ImmutableSet; @@ -243,7 +244,7 @@ public class Subnet { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("name", name) .add("networkId", networkId) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitor.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitor.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitor.java index 593690d..29ec991 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitor.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitor.java @@ -22,6 +22,7 @@ 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.collect.ImmutableList; @@ -225,7 +226,7 @@ public class HealthMonitor { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("type", type) + return MoreObjects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("type", type) .add("delay", delay).add("timeout", timeout).add("maxRetries", maxRetries).add("httpMethod", httpMethod) .add("urlPath", urlPath).add("expectedCodes", expectedCodes).add("pools", pools) .add("adminStateUp", adminStateUp).add("status", status).add("statusDescription", statusDescription) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitorStatus.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitorStatus.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitorStatus.java index 64e3aea..ad8d468 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitorStatus.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitorStatus.java @@ -22,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -87,8 +88,8 @@ public class HealthMonitorStatus { && Objects.equal(this.statusDescription, that.statusDescription); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this).add("id", id).add("status", status) + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this).add("id", id).add("status", status) .add("statusDescription", statusDescription); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Member.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Member.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Member.java index da53e23..bff6cfe 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Member.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Member.java @@ -22,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -178,7 +179,7 @@ public class Member { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("poolId", poolId) + return MoreObjects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("poolId", poolId) .add("address", address).add("protocolPort", protocolPort).add("weight", weight) .add("adminStateUp", adminStateUp).add("status", status).add("statusDescription", statusDescription) .toString(); http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Pool.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Pool.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Pool.java index c1aa88d..5139141 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Pool.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Pool.java @@ -22,6 +22,7 @@ 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.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -257,7 +258,7 @@ public class Pool { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("vipId", vipId) + return MoreObjects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("vipId", vipId) .add("name", name).add("description", description).add("subnetId", subnetId).add("protocol", protocol) .add("provider", provider).add("lbMethod", lbMethod).add("healthMonitors", healthMonitors) .add("healthMonitorsStatus", healthMonitorsStatus).add("members", members) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/PoolStatus.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/PoolStatus.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/PoolStatus.java index 869eb81..07989e7 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/PoolStatus.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/PoolStatus.java @@ -22,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -87,8 +88,8 @@ public class PoolStatus { && Objects.equal(this.statusDescription, that.statusDescription); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this).add("id", id).add("status", status) + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this).add("id", id).add("status", status) .add("statusDescription", statusDescription); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/SessionPersistence.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/SessionPersistence.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/SessionPersistence.java index b1c49dd..c984ac4 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/SessionPersistence.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/SessionPersistence.java @@ -22,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -73,8 +74,8 @@ public class SessionPersistence { return Objects.equal(this.type, that.type) && Objects.equal(this.cookieName, that.cookieName); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this).add("type", type).add("cookieName", cookieName); + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this).add("type", type).add("cookieName", cookieName); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/VIP.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/VIP.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/VIP.java index ae62625..d3539a9 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/VIP.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/VIP.java @@ -22,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -250,7 +251,7 @@ public class VIP { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("name", name) + return MoreObjects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("name", name) .add("description", description).add("subnetId", subnetId).add("address", address).add("portId", portId) .add("protocol", protocol).add("protocolPort", protocolPort).add("poolId", poolId) .add("sessionPersistence", sessionPersistence).add("connectionLimit", connectionLimit) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/CreateScalingPolicy.java ---------------------------------------------------------------------- diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/CreateScalingPolicy.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/CreateScalingPolicy.java index e6b8107..d1cb410 100644 --- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/CreateScalingPolicy.java +++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/CreateScalingPolicy.java @@ -25,8 +25,9 @@ import java.util.Map; import org.jclouds.rackspace.autoscale.v1.features.GroupApi; +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; @@ -157,7 +158,7 @@ public class CreateScalingPolicy implements Comparable<CreateScalingPolicy> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("name", name) .add("type", type) .add("cooldown", cooldown) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/CreateWebhook.java ---------------------------------------------------------------------- diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/CreateWebhook.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/CreateWebhook.java index 2f63867..38424a2 100644 --- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/CreateWebhook.java +++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/CreateWebhook.java @@ -23,8 +23,9 @@ import java.util.Map; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableMap; /** @@ -79,7 +80,7 @@ public class CreateWebhook { } protected ToStringHelper string() { - return Objects.toStringHelper(this).add("name", name).add("metadata", metadata); + return MoreObjects.toStringHelper(this).add("name", name).add("metadata", metadata); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Group.java ---------------------------------------------------------------------- diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Group.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Group.java index 59bac88..08a37ae 100644 --- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Group.java +++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Group.java @@ -20,8 +20,9 @@ import java.util.List; import org.jclouds.openstack.v2_0.domain.Link; +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; /** @@ -107,7 +108,7 @@ public class Group { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("links", links) .add("scalingPolicy", scalingPolicy) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupConfiguration.java ---------------------------------------------------------------------- diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupConfiguration.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupConfiguration.java index 5bda01d..4439d7e 100644 --- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupConfiguration.java +++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupConfiguration.java @@ -24,8 +24,9 @@ import java.util.Map; import org.jclouds.rackspace.autoscale.v1.features.GroupApi; +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; /** @@ -117,7 +118,7 @@ public class GroupConfiguration implements Comparable<GroupConfiguration>{ } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("name", name) .add("cooldown", cooldown) .add("minEntities", minEntities) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupInstance.java ---------------------------------------------------------------------- diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupInstance.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupInstance.java index 4cda920..2d3301f 100644 --- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupInstance.java +++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupInstance.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import org.jclouds.openstack.v2_0.domain.Link; +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; /** @@ -71,7 +72,7 @@ public class GroupInstance { } protected ToStringHelper string() { - return Objects.toStringHelper(this).add("id", id).add("links", links); + return MoreObjects.toStringHelper(this).add("id", id).add("links", links); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupState.java ---------------------------------------------------------------------- diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupState.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupState.java index 42c45db..d1a0490 100644 --- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupState.java +++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupState.java @@ -22,8 +22,9 @@ import java.util.List; import org.jclouds.openstack.v2_0.domain.Link; import org.jclouds.rackspace.autoscale.v1.features.GroupApi; +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; import com.google.gson.annotations.SerializedName; @@ -135,7 +136,7 @@ public class GroupState implements Comparable<GroupState> { } protected ToStringHelper string() { - return Objects.toStringHelper(this).add("id", id).add("links", links).add("activeCapacity", activeCapacity) + return MoreObjects.toStringHelper(this).add("id", id).add("links", links).add("activeCapacity", activeCapacity) .add("pendingCapacity", pendingCapacity).add("desiredCapacity", "desiredCapacity").add("paused", "paused") .add("groupInstances", "groupInstances"); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/LaunchConfiguration.java ---------------------------------------------------------------------- diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/LaunchConfiguration.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/LaunchConfiguration.java index e781d4f..ae46a32 100644 --- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/LaunchConfiguration.java +++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/LaunchConfiguration.java @@ -23,8 +23,9 @@ import java.util.Map; import org.jclouds.rackspace.autoscale.v1.features.GroupApi; +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.ImmutableMap; @@ -161,7 +162,7 @@ public class LaunchConfiguration implements Comparable<LaunchConfiguration>{ } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("loadBalancers", loadBalancers) .add("type", type) .add("networks", networks) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/LoadBalancer.java ---------------------------------------------------------------------- diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/LoadBalancer.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/LoadBalancer.java index 6bc4b58..7abf32f 100644 --- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/LoadBalancer.java +++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/LoadBalancer.java @@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkArgument; import java.beans.ConstructorProperties; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.gson.annotations.SerializedName; /** @@ -74,7 +75,7 @@ public class LoadBalancer { } protected ToStringHelper string() { - return Objects.toStringHelper(this).add("port", port).add("id", id); + return MoreObjects.toStringHelper(this).add("port", port).add("id", id); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Personality.java ---------------------------------------------------------------------- diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Personality.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Personality.java index 8eb52bd..78bf5db 100644 --- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Personality.java +++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Personality.java @@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Autoscale Personality. Part of the launch configuration. @@ -78,7 +79,7 @@ public class Personality { } protected ToStringHelper string() { - return Objects.toStringHelper(this).add("path", path).add("contents", contents); + return MoreObjects.toStringHelper(this).add("path", path).add("contents", contents); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/ScalingPolicy.java ---------------------------------------------------------------------- diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/ScalingPolicy.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/ScalingPolicy.java index 76844a1..7d1ba22 100644 --- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/ScalingPolicy.java +++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/ScalingPolicy.java @@ -25,7 +25,7 @@ import java.util.Map; import org.jclouds.openstack.v2_0.domain.Link; 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; /** http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Webhook.java ---------------------------------------------------------------------- diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Webhook.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Webhook.java index 24760fd..f0767e5 100644 --- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Webhook.java +++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Webhook.java @@ -28,7 +28,7 @@ import org.jclouds.openstack.v2_0.domain.Link; import org.jclouds.openstack.v2_0.domain.Link.Relation; 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; http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/Cluster.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/Cluster.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/Cluster.java index d9335b9..51dfae7 100644 --- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/Cluster.java +++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/Cluster.java @@ -25,7 +25,7 @@ import java.util.Date; import org.jclouds.openstack.v2_0.domain.Link; 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; /** http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/CreateCluster.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/CreateCluster.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/CreateCluster.java index dff90b9..847acf3 100644 --- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/CreateCluster.java +++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/CreateCluster.java @@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import java.net.URI; +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; /** * Cloud Big Data CreateCluster. @@ -107,7 +108,7 @@ public class CreateCluster implements Comparable<CreateCluster> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("name", name) .add("clusterType", clusterType) .add("flavorId", flavorId) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/CreateProfile.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/CreateProfile.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/CreateProfile.java index de07a1f..2fdf359 100644 --- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/CreateProfile.java +++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/CreateProfile.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; 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.collect.ImmutableList; /** @@ -107,7 +108,7 @@ public class CreateProfile implements Comparable<CreateProfile> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("username", username) .add("password", password) .add("credentialsUsername", cloudCredentials.username) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/Profile.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/Profile.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/Profile.java index e7a96ab..cb8e845 100644 --- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/Profile.java +++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/Profile.java @@ -23,7 +23,7 @@ import java.beans.ConstructorProperties; import org.jclouds.openstack.v2_0.domain.Link; 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; /** http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/041cd8d2/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/ProfileSSHKey.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/ProfileSSHKey.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/ProfileSSHKey.java index 421881e..d462fb9 100644 --- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/ProfileSSHKey.java +++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/ProfileSSHKey.java @@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Cloud Big Data ProfileSSHKey. @@ -68,7 +69,7 @@ public class ProfileSSHKey implements Comparable<ProfileSSHKey> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("name", name) .add("publicKey", publicKey); }
