Repository: jclouds-labs-openstack Updated Branches: refs/heads/master e0e64fcc7 -> 65e1def4b
JCLOUDS-653: Address Guava 18 deprecations Mostly renaming Objects.toStringHelper to MoreObjects.toStringHelper. 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/65e1def4 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/65e1def4 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/65e1def4 Branch: refs/heads/master Commit: 65e1def4bdc1d763f505a8316dd6eb78f26300a8 Parents: e0e64fc Author: Andrew Gaul <[email protected]> Authored: Fri Aug 8 11:29:10 2014 -0700 Committer: Andrew Gaul <[email protected]> Committed: Fri Aug 8 11:34:44 2014 -0700 ---------------------------------------------------------------------- .../java/org/jclouds/openstack/glance/v1_0/domain/Image.java | 2 +- .../org/jclouds/openstack/glance/v1_0/domain/ImageDetails.java | 2 +- .../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 +++-- .../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/HostRoute.java | 5 +++-- .../main/java/org/jclouds/openstack/neutron/v2/domain/IP.java | 5 +++-- .../java/org/jclouds/openstack/neutron/v2/domain/Network.java | 3 ++- .../jclouds/openstack/neutron/v2/domain/NetworkSegment.java | 5 +++-- .../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 +++-- .../java/org/jclouds/openstack/neutron/v2/domain/Subnet.java | 3 ++- .../jclouds/openstack/neutron/v2_0/domain/AllocationPool.java | 5 +++-- .../org/jclouds/openstack/neutron/v2_0/domain/BulkNetwork.java | 5 +++-- .../org/jclouds/openstack/neutron/v2_0/domain/BulkPort.java | 5 +++-- .../org/jclouds/openstack/neutron/v2_0/domain/BulkSubnet.java | 5 +++-- .../openstack/neutron/v2_0/domain/ExternalGatewayInfo.java | 5 +++-- .../org/jclouds/openstack/neutron/v2_0/domain/HostRoute.java | 5 +++-- .../java/org/jclouds/openstack/neutron/v2_0/domain/IP.java | 5 +++-- .../org/jclouds/openstack/neutron/v2_0/domain/Network.java | 3 ++- .../java/org/jclouds/openstack/neutron/v2_0/domain/Port.java | 3 ++- .../org/jclouds/openstack/neutron/v2_0/domain/Reference.java | 5 +++-- .../openstack/neutron/v2_0/domain/ReferenceWithName.java | 2 +- .../java/org/jclouds/openstack/neutron/v2_0/domain/Router.java | 3 ++- .../jclouds/openstack/neutron/v2_0/domain/RouterInterface.java | 5 +++-- .../java/org/jclouds/openstack/neutron/v2_0/domain/Subnet.java | 2 +- .../java/org/jclouds/openstack/swift/v1/domain/Account.java | 4 ++-- .../jclouds/openstack/swift/v1/domain/BulkDeleteResponse.java | 4 ++-- .../java/org/jclouds/openstack/swift/v1/domain/Container.java | 4 ++-- .../openstack/swift/v1/domain/ExtractArchiveResponse.java | 4 ++-- .../java/org/jclouds/openstack/swift/v1/domain/Segment.java | 4 ++-- .../org/jclouds/openstack/swift/v1/domain/SwiftObject.java | 4 ++-- .../rackspace/autoscale/v1/domain/CreateScalingPolicy.java | 6 +++--- .../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 +++-- .../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 +- .../org/jclouds/rackspace/autoscale/v1/domain/Webhook.java | 2 +- .../org/jclouds/rackspace/cloudbigdata/v1/domain/Cluster.java | 2 +- .../rackspace/cloudbigdata/v1/domain/CreateCluster.java | 5 +++-- .../rackspace/cloudbigdata/v1/domain/CreateProfile.java | 5 +++-- .../org/jclouds/rackspace/cloudbigdata/v1/domain/Profile.java | 2 +- .../rackspace/cloudbigdata/v1/domain/ProfileSSHKey.java | 5 +++-- .../jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java | 4 ++-- 59 files changed, 146 insertions(+), 103 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/65e1def4/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..5682074 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 @@ -25,8 +25,8 @@ import org.jclouds.javax.annotation.Nullable; import org.jclouds.openstack.v2_0.domain.Link; import org.jclouds.openstack.v2_0.domain.Resource; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.base.Optional; /** http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/65e1def4/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..9b3719d 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 @@ -28,8 +28,8 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; import org.jclouds.openstack.v2_0.domain.Link; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.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/65e1def4/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/65e1def4/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/65e1def4/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/65e1def4/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/65e1def4/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/65e1def4/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/65e1def4/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/65e1def4/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/65e1def4/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 4e222af..97bbdaa 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 @@ -18,6 +18,7 @@ */ package org.jclouds.openstack.neutron.v2.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import javax.inject.Named; @@ -85,8 +86,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/65e1def4/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 fa910e7..82cb977 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 @@ -18,6 +18,7 @@ */ package org.jclouds.openstack.neutron.v2.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.beans.ConstructorProperties; @@ -70,8 +71,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/65e1def4/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 6084251..6ef6841 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 @@ -18,6 +18,7 @@ */ package org.jclouds.openstack.neutron.v2.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import javax.inject.Named; @@ -87,7 +88,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/65e1def4/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 f1947bf..f16427c 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 @@ -18,6 +18,7 @@ */ package org.jclouds.openstack.neutron.v2.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import javax.inject.Named; @@ -85,8 +86,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/65e1def4/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 538699f..a6b2a59 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 @@ -18,8 +18,9 @@ */ package org.jclouds.openstack.neutron.v2.domain; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; import javax.inject.Named; import java.beans.ConstructorProperties; @@ -70,7 +71,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/65e1def4/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 86aa9e7..e607132 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 @@ -18,6 +18,7 @@ */ package org.jclouds.openstack.neutron.v2.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import javax.inject.Named; @@ -68,8 +69,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/65e1def4/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 1810fa2..1710e9c 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 @@ -18,6 +18,7 @@ */ package org.jclouds.openstack.neutron.v2.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; import org.jclouds.javax.annotation.Nullable; @@ -339,7 +340,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/65e1def4/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 e7c0315..c32912a 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 @@ -18,6 +18,7 @@ */ package org.jclouds.openstack.neutron.v2.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import javax.inject.Named; @@ -85,8 +86,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/65e1def4/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 6ed3b98..b8ebf0e 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 @@ -18,6 +18,7 @@ */ package org.jclouds.openstack.neutron.v2.domain; +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/65e1def4/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 fb50d07..48143f6 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 @@ -18,6 +18,7 @@ */ package org.jclouds.openstack.neutron.v2.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import org.jclouds.javax.annotation.Nullable; @@ -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/65e1def4/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 9f328d6..f97cf27 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 @@ -18,6 +18,7 @@ */ package org.jclouds.openstack.neutron.v2.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import javax.inject.Named; @@ -72,8 +73,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/65e1def4/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 31d3327..bbbf134 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 @@ -18,6 +18,7 @@ */ package org.jclouds.openstack.neutron.v2.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; import org.jclouds.javax.annotation.Nullable; @@ -244,7 +245,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/65e1def4/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/AllocationPool.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/AllocationPool.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/AllocationPool.java index f81192e..b139a50 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/AllocationPool.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/AllocationPool.java @@ -17,8 +17,9 @@ package org.jclouds.openstack.neutron.v2_0.domain; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; import java.beans.ConstructorProperties; @@ -68,7 +69,7 @@ public class AllocationPool { } protected ToStringHelper string() { - return Objects.toStringHelper(this).add("start", start).add("end", end); + return MoreObjects.toStringHelper(this).add("start", start).add("end", end); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/65e1def4/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkNetwork.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkNetwork.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkNetwork.java index f2e4a0e..d3e6438 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkNetwork.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkNetwork.java @@ -17,6 +17,7 @@ package org.jclouds.openstack.neutron.v2_0.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.beans.ConstructorProperties; @@ -106,8 +107,8 @@ public class BulkNetwork { && Objects.equal(this.segmentationId, that.segmentationId); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this) + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this) .add("name", name).add("adminStateUp", adminStateUp).add("external", external) .add("networkType", networkType).add("physicalNetworkName", physicalNetworkName) .add("segmentationId", segmentationId); http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/65e1def4/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkPort.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkPort.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkPort.java index 91c2637..ab5d733 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkPort.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkPort.java @@ -17,6 +17,7 @@ package org.jclouds.openstack.neutron.v2_0.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; @@ -119,8 +120,8 @@ public class BulkPort { && Objects.equal(this.macAddress, that.macAddress); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this) + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this) .add("name", name).add("networkId", networkId).add("adminStateUp", adminStateUp) .add("deviceId", deviceId).add("deviceOwner", deviceOwner).add("fixedIps", fixedIps).add("macAddress", macAddress); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/65e1def4/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkSubnet.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkSubnet.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkSubnet.java index c1eea45..56d3b2a 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkSubnet.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkSubnet.java @@ -17,6 +17,7 @@ package org.jclouds.openstack.neutron.v2_0.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; @@ -141,8 +142,8 @@ public class BulkSubnet { && Objects.equal(this.hostRoutes, that.hostRoutes); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this) + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this) .add("name", name).add("networkId", networkId).add("gatewayIp", gatewayIp).add("ipVersion", ipVersion) .add("cidr", cidr).add("enableDhcp", enableDhcp).add("allocationPools", allocationPools) .add("dnsNameServers", dnsNameServers).add("hostRoutes", hostRoutes); http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/65e1def4/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ExternalGatewayInfo.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ExternalGatewayInfo.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ExternalGatewayInfo.java index f5473ed..1adc653 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ExternalGatewayInfo.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ExternalGatewayInfo.java @@ -17,6 +17,7 @@ package org.jclouds.openstack.neutron.v2_0.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.beans.ConstructorProperties; @@ -53,8 +54,8 @@ public class ExternalGatewayInfo { return Objects.equal(this.networkId, that.networkId); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this).add("networkId", networkId); + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this).add("networkId", networkId); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/65e1def4/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/HostRoute.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/HostRoute.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/HostRoute.java index c5dcb56..adbc802 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/HostRoute.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/HostRoute.java @@ -17,8 +17,9 @@ package org.jclouds.openstack.neutron.v2_0.domain; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; import java.beans.ConstructorProperties; @@ -68,7 +69,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/65e1def4/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/IP.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/IP.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/IP.java index 689a53e..286f1a0 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/IP.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/IP.java @@ -17,6 +17,7 @@ package org.jclouds.openstack.neutron.v2_0.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.beans.ConstructorProperties; @@ -61,8 +62,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) + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this) .add("ipAddress", ipAddress).add("subnetId", subnetId); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/65e1def4/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Network.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Network.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Network.java index 3aa1804..227642c 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Network.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Network.java @@ -17,6 +17,7 @@ package org.jclouds.openstack.neutron.v2_0.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; @@ -135,7 +136,7 @@ public class Network extends ReferenceWithName { && Objects.equal(this.segmentationId, that.segmentationId); } - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return super.string() .add("state", state).add("subnets", subnets).add("adminStateUp", adminStateUp).add("shared", shared).add("external", external) .add("networkType", networkType).add("physicalNetworkName", physicalNetworkName).add("segmentationId", segmentationId); http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/65e1def4/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Port.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Port.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Port.java index 75f491f..38d0097 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Port.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Port.java @@ -17,6 +17,7 @@ package org.jclouds.openstack.neutron.v2_0.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.beans.ConstructorProperties; @@ -123,7 +124,7 @@ public class Port extends ReferenceWithName { && Objects.equal(this.macAddress, that.macAddress); } - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return super.string() .add("state", state).add("adminStateUp", adminStateUp).add("networkId", networkId).add("deviceId", deviceId) .add("deviceOwner", deviceOwner).add("fixedIps", fixedIps).add("macAddress", macAddress); http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/65e1def4/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Reference.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Reference.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Reference.java index 0458118..de79ec0 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Reference.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Reference.java @@ -17,6 +17,7 @@ package org.jclouds.openstack.neutron.v2_0.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.beans.ConstructorProperties; @@ -68,8 +69,8 @@ public class Reference { return Objects.equal(this.id, that.id) && Objects.equal(this.tenantId, that.tenantId); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this) + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this) .add("id", id).add("tenantId", tenantId); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/65e1def4/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ReferenceWithName.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ReferenceWithName.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ReferenceWithName.java index 28db0be..36d729a 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ReferenceWithName.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ReferenceWithName.java @@ -17,8 +17,8 @@ package org.jclouds.openstack.neutron.v2_0.domain; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.base.Strings; import java.beans.ConstructorProperties; http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/65e1def4/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Router.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Router.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Router.java index 5096ed9..7d14dc4 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Router.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Router.java @@ -17,6 +17,7 @@ package org.jclouds.openstack.neutron.v2_0.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.beans.ConstructorProperties; @@ -79,7 +80,7 @@ public class Router extends ReferenceWithName { && Objects.equal(this.externalGatewayInfo, that.externalGatewayInfo); } - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return super.string() .add("adminStateUp", adminStateUp).add("state", state).add("externalGatewayInfo", externalGatewayInfo != null ? externalGatewayInfo.toString() : ""); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/65e1def4/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/RouterInterface.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/RouterInterface.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/RouterInterface.java index f1a9c70..05c8e5c 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/RouterInterface.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/RouterInterface.java @@ -17,6 +17,7 @@ package org.jclouds.openstack.neutron.v2_0.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.beans.ConstructorProperties; @@ -66,8 +67,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) + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this) .add("subnetId", subnetId).add("portId", portId); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/65e1def4/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Subnet.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Subnet.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Subnet.java index 9faf8bd..a77afde 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Subnet.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Subnet.java @@ -17,8 +17,8 @@ package org.jclouds.openstack.neutron.v2_0.domain; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableSet; import java.beans.ConstructorProperties; http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/65e1def4/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Account.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Account.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Account.java index 34b63bc..b52907c 100644 --- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Account.java +++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Account.java @@ -16,15 +16,15 @@ */ package org.jclouds.openstack.swift.v1.domain; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; import java.util.Map.Entry; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/65e1def4/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/BulkDeleteResponse.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/BulkDeleteResponse.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/BulkDeleteResponse.java index 9933a1c..4f79044 100644 --- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/BulkDeleteResponse.java +++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/BulkDeleteResponse.java @@ -16,14 +16,14 @@ */ package org.jclouds.openstack.swift.v1.domain; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; /** * Represents a response from a Bulk Delete request. http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/65e1def4/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Container.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Container.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Container.java index cc671de..4a31ab7 100644 --- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Container.java +++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Container.java @@ -16,16 +16,16 @@ */ package org.jclouds.openstack.swift.v1.domain; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import java.util.Map; import java.util.Map.Entry; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/65e1def4/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/ExtractArchiveResponse.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/ExtractArchiveResponse.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/ExtractArchiveResponse.java index e569cf4..7e06e0e 100644 --- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/ExtractArchiveResponse.java +++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/ExtractArchiveResponse.java @@ -16,14 +16,14 @@ */ package org.jclouds.openstack.swift.v1.domain; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; /** * Represents a response from an Extract Archive request. http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/65e1def4/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Segment.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Segment.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Segment.java index ee4bc58..977d789 100644 --- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Segment.java +++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Segment.java @@ -16,14 +16,14 @@ */ package org.jclouds.openstack.swift.v1.domain; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import javax.inject.Named; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; /** * Represents a single segment of a multi-part upload. http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/65e1def4/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java index 375f89a..2184ff2 100644 --- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java +++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java @@ -16,8 +16,8 @@ */ package org.jclouds.openstack.swift.v1.domain; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; @@ -27,8 +27,8 @@ import java.util.Map.Entry; import org.jclouds.io.Payload; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/65e1def4/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 6160378..8ed7e1d 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 @@ -23,9 +23,9 @@ import java.beans.ConstructorProperties; import java.util.EnumSet; import java.util.Map; - +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; @@ -156,7 +156,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/65e1def4/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..bfe5a82 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.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.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/65e1def4/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 27b1619..d397a8b 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.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.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/65e1def4/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 f6b7876..478e172 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 @@ -23,8 +23,9 @@ import java.beans.ConstructorProperties; import java.util.Map; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableMap; /** @@ -116,7 +117,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/65e1def4/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..43932a1 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.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.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/65e1def4/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 cee92c7..346b9f0 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 @@ -21,8 +21,9 @@ import java.util.List; import org.jclouds.openstack.v2_0.domain.Link; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableList; import com.google.gson.annotations.SerializedName; @@ -134,7 +135,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/65e1def4/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 803d508..0ba1c11 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 @@ -22,8 +22,9 @@ import java.util.List; import java.util.Map; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -157,7 +158,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/65e1def4/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 3ef6641..a24f04b 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.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.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/65e1def4/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 b1526d1..0cbaba8 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.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; /** * Autoscale Personality. Part of the launch configuration. @@ -70,7 +71,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/65e1def4/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 e047040..0a1c4bb 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 @@ -24,8 +24,8 @@ import java.util.Map; import org.jclouds.openstack.v2_0.domain.Link; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableList; /** http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/65e1def4/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..4ec7d8a 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 @@ -27,8 +27,8 @@ import org.jclouds.javax.annotation.Nullable; import org.jclouds.openstack.v2_0.domain.Link; import org.jclouds.openstack.v2_0.domain.Link.Relation; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.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/65e1def4/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..e2b893c 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 @@ -24,8 +24,8 @@ import java.util.Date; import org.jclouds.openstack.v2_0.domain.Link; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableList; /** http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/65e1def4/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..9336fac 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.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.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/65e1def4/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..f8109e7 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.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.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/65e1def4/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..615b875 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 @@ -22,8 +22,8 @@ import java.beans.ConstructorProperties; import org.jclouds.openstack.v2_0.domain.Link; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableList; /** http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/65e1def4/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..a2b0d7b 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.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.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); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/65e1def4/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java index d987f88..9a80b10 100644 --- a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java +++ b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java @@ -16,7 +16,7 @@ */ package org.jclouds.rackspace.cloudfiles.v1.domain; -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; @@ -24,8 +24,8 @@ import java.net.URI; import javax.inject.Named; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; /** * Represents a CDN Container in Rackspace Cloud Files.
