Revert "JCLOUDS-653: Address Guava 18 deprecations" This reverts commit 65e1def4bdc1d763f505a8316dd6eb78f26300a8.
Many conflicts due to many changes between above commit and now. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/bec0a921 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/bec0a921 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/bec0a921 Branch: refs/heads/master Commit: bec0a921dad063934b13b34206bb76d652c10e39 Parents: a164c07 Author: Adrian Cole <[email protected]> Authored: Thu Oct 23 20:21:23 2014 -0700 Committer: Adrian Cole <[email protected]> Committed: Fri Oct 24 11:27:49 2014 -0700 ---------------------------------------------------------------------- .../openstack/neutron/v2/domain/AddressPair.java | 15 ++++++++------- .../openstack/neutron/v2/domain/AllocationPool.java | 10 +++++----- .../neutron/v2/domain/ExternalGatewayInfo.java | 11 ++++++----- .../openstack/neutron/v2/domain/ExtraDhcpOption.java | 13 +++++++------ .../openstack/neutron/v2/domain/FloatingIP.java | 5 +++-- .../openstack/neutron/v2/domain/HostRoute.java | 13 +++++++------ .../org/jclouds/openstack/neutron/v2/domain/IP.java | 13 +++++++------ .../jclouds/openstack/neutron/v2/domain/Network.java | 3 +-- .../openstack/neutron/v2/domain/NetworkSegment.java | 13 +++++++------ .../jclouds/openstack/neutron/v2/domain/Port.java | 3 +-- .../jclouds/openstack/neutron/v2/domain/Router.java | 3 +-- .../openstack/neutron/v2/domain/RouterInterface.java | 13 +++++++------ .../jclouds/openstack/neutron/v2/domain/Rule.java | 3 +-- .../jclouds/openstack/neutron/v2/domain/Rules.java | 1 + .../openstack/neutron/v2/domain/SecurityGroup.java | 4 ++-- .../jclouds/openstack/neutron/v2/domain/Subnet.java | 3 +-- .../neutron/v2/domain/lbaas/v1/HealthMonitor.java | 3 +-- .../v2/domain/lbaas/v1/HealthMonitorStatus.java | 5 ++--- .../openstack/neutron/v2/domain/lbaas/v1/Member.java | 3 +-- .../openstack/neutron/v2/domain/lbaas/v1/Pool.java | 3 +-- .../neutron/v2/domain/lbaas/v1/PoolStatus.java | 5 ++--- .../v2/domain/lbaas/v1/SessionPersistence.java | 5 ++--- .../openstack/neutron/v2/domain/lbaas/v1/VIP.java | 3 +-- .../neutron/v2_0/domain/AllocationPool.java | 5 ++--- .../openstack/neutron/v2_0/domain/BulkNetwork.java | 5 ++--- .../openstack/neutron/v2_0/domain/BulkPort.java | 5 ++--- .../openstack/neutron/v2_0/domain/BulkSubnet.java | 5 ++--- .../neutron/v2_0/domain/ExternalGatewayInfo.java | 5 ++--- .../openstack/neutron/v2_0/domain/HostRoute.java | 5 ++--- .../jclouds/openstack/neutron/v2_0/domain/IP.java | 5 ++--- .../openstack/neutron/v2_0/domain/Network.java | 3 +-- .../jclouds/openstack/neutron/v2_0/domain/Port.java | 3 +-- .../openstack/neutron/v2_0/domain/Reference.java | 5 ++--- .../neutron/v2_0/domain/ReferenceWithName.java | 2 +- .../openstack/neutron/v2_0/domain/Router.java | 3 +-- .../neutron/v2_0/domain/RouterInterface.java | 5 ++--- .../openstack/neutron/v2_0/domain/Subnet.java | 2 +- 37 files changed, 98 insertions(+), 113 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AddressPair.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AddressPair.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AddressPair.java index a222908..e2d888c 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AddressPair.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AddressPair.java @@ -16,14 +16,15 @@ */ 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; +import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Named; import java.beans.ConstructorProperties; -import static com.google.common.base.Preconditions.checkNotNull; +import javax.inject.Named; + +import org.jclouds.javax.annotation.Nullable; + +import com.google.common.base.Objects; /** * Contains a mapping between a MAC address and an IP address. @@ -87,8 +88,8 @@ public class AddressPair { return Objects.equal(this.macAddress, that.macAddress) && Objects.equal(this.ipAddress, that.ipAddress); } - protected MoreObjects.ToStringHelper string() { - return MoreObjects.toStringHelper(this).add("macAddress", macAddress).add("ipAddress", ipAddress); + protected Objects.ToStringHelper string() { + return Objects.toStringHelper(this).add("macAddress", macAddress).add("ipAddress", ipAddress); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AllocationPool.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AllocationPool.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AllocationPool.java index ef681e7..6d20999 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AllocationPool.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AllocationPool.java @@ -16,11 +16,11 @@ */ package org.jclouds.openstack.neutron.v2.domain; -import com.google.common.base.MoreObjects; -import com.google.common.base.Objects; +import java.beans.ConstructorProperties; + import org.jclouds.javax.annotation.Nullable; -import java.beans.ConstructorProperties; +import com.google.common.base.Objects; /** * A Neutron Subnet Allocation Pool @@ -72,8 +72,8 @@ public class AllocationPool { return Objects.equal(this.start, that.start) && Objects.equal(this.end, that.end); } - protected MoreObjects.ToStringHelper string() { - return MoreObjects.toStringHelper(this).add("start", start).add("end", end); + protected Objects.ToStringHelper string() { + return Objects.toStringHelper(this).add("start", start).add("end", end); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExternalGatewayInfo.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExternalGatewayInfo.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExternalGatewayInfo.java index 631e8af..9f538a5 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExternalGatewayInfo.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExternalGatewayInfo.java @@ -16,12 +16,13 @@ */ 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; +import java.beans.ConstructorProperties; import javax.inject.Named; -import java.beans.ConstructorProperties; + +import org.jclouds.javax.annotation.Nullable; + +import com.google.common.base.Objects; /** * Information on the external gateway for the router @@ -89,7 +90,7 @@ public class ExternalGatewayInfo { @Override public String toString() { - return MoreObjects.toStringHelper(this) + return Objects.toStringHelper(this) .add("networkId", networkId) .add("enableSnat", enableSnat) .toString(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java index 91ff9d9..cdc448e 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java @@ -16,12 +16,13 @@ */ 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; +import java.beans.ConstructorProperties; import javax.inject.Named; -import java.beans.ConstructorProperties; + +import org.jclouds.javax.annotation.Nullable; + +import com.google.common.base.Objects; /** * This is used to provide additional DHCP-related options to Subnet. This is @@ -88,8 +89,8 @@ public class ExtraDhcpOption { && Objects.equal(this.optionValue, that.optionValue); } - protected MoreObjects.ToStringHelper string() { - return MoreObjects.toStringHelper(this).add("id", id).add("optionName", optionName).add("optionValue", optionValue); + protected Objects.ToStringHelper string() { + return Objects.toStringHelper(this).add("id", id).add("optionName", optionName).add("optionValue", optionValue); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/FloatingIP.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/FloatingIP.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/FloatingIP.java index ea3fe87..9c1540c 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/FloatingIP.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/FloatingIP.java @@ -17,10 +17,11 @@ package org.jclouds.openstack.neutron.v2.domain; import java.beans.ConstructorProperties; + import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; -import com.google.common.base.MoreObjects; + import com.google.common.base.Objects; /** @@ -152,7 +153,7 @@ public class FloatingIP { @Override public String toString() { - return MoreObjects.toStringHelper(this) + return Objects.toStringHelper(this) .add("id", id) .add("routerId", routerId) .add("tenantId", tenantId) http://git-wip-us.apache.org/repos/asf/jclouds/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/HostRoute.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/HostRoute.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/HostRoute.java index 476a927..6ff0ddc 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/HostRoute.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/HostRoute.java @@ -16,13 +16,14 @@ */ 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 org.jclouds.javax.annotation.Nullable; +import java.beans.ConstructorProperties; import javax.inject.Named; -import java.beans.ConstructorProperties; + +import org.jclouds.javax.annotation.Nullable; + +import com.google.common.base.Objects; +import com.google.common.base.Objects.ToStringHelper; /** * A Neutron Subnet Host Route @@ -72,7 +73,7 @@ public class HostRoute { } protected ToStringHelper string() { - return MoreObjects.toStringHelper(this) + return Objects.toStringHelper(this) .add("destinationCidr", destinationCidr).add("nextHop", nextHop); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/IP.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/IP.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/IP.java index c8ff037..53c83ca 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/IP.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/IP.java @@ -16,12 +16,13 @@ */ 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; +import java.beans.ConstructorProperties; import javax.inject.Named; -import java.beans.ConstructorProperties; + +import org.jclouds.javax.annotation.Nullable; + +import com.google.common.base.Objects; /** * Describes an IP address @@ -70,8 +71,8 @@ public class IP { return Objects.equal(this.ipAddress, that.ipAddress) && Objects.equal(this.subnetId, that.subnetId); } - protected MoreObjects.ToStringHelper string() { - return MoreObjects.toStringHelper(this).add("ipAddress", ipAddress).add("subnetId", subnetId); + protected Objects.ToStringHelper string() { + return Objects.toStringHelper(this).add("ipAddress", ipAddress).add("subnetId", subnetId); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Network.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Network.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Network.java index c269593..ac40019 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Network.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Network.java @@ -24,7 +24,6 @@ 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; @@ -339,7 +338,7 @@ public class Network { @Override public String toString() { - return MoreObjects.toStringHelper(this) + return Objects.toStringHelper(this) .add("id", id) .add("status", status) .add("subnets", subnets) http://git-wip-us.apache.org/repos/asf/jclouds/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkSegment.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkSegment.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkSegment.java index 28f998b..4096e51 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkSegment.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkSegment.java @@ -16,12 +16,13 @@ */ 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; +import java.beans.ConstructorProperties; import javax.inject.Named; -import java.beans.ConstructorProperties; + +import org.jclouds.javax.annotation.Nullable; + +import com.google.common.base.Objects; /** * A Neutron Network Segment @@ -88,8 +89,8 @@ public class NetworkSegment { && Objects.equal(this.segmentationId, that.segmentationId); } - protected MoreObjects.ToStringHelper string() { - return MoreObjects.toStringHelper(this).add("networkType", networkType).add("physicalNetwork", physicalNetwork) + protected Objects.ToStringHelper string() { + return Objects.toStringHelper(this).add("networkType", networkType).add("physicalNetwork", physicalNetwork) .add("segmentationId", segmentationId); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Port.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Port.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Port.java index f22d2fa..a9ab61e 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Port.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Port.java @@ -24,7 +24,6 @@ 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; @@ -428,7 +427,7 @@ public class Port { @Override public String toString() { - return MoreObjects.toStringHelper(this) + return Objects.toStringHelper(this) .add("id", id) .add("status", status) .add("vifType", vifType) http://git-wip-us.apache.org/repos/asf/jclouds/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Router.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Router.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Router.java index 7330c9b..0b06531 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Router.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Router.java @@ -22,7 +22,6 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; -import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -162,7 +161,7 @@ public class Router { @Override public String toString() { - return MoreObjects.toStringHelper(this) + return Objects.toStringHelper(this) .add("id", id) .add("status", status) .add("name", name) http://git-wip-us.apache.org/repos/asf/jclouds/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RouterInterface.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RouterInterface.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RouterInterface.java index 9d5b93f..ff30dae 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RouterInterface.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RouterInterface.java @@ -16,12 +16,13 @@ */ 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; +import java.beans.ConstructorProperties; import javax.inject.Named; -import java.beans.ConstructorProperties; + +import org.jclouds.javax.annotation.Nullable; + +import com.google.common.base.Objects; /** * A Neutron Router Interface @@ -74,8 +75,8 @@ public class RouterInterface { return Objects.equal(this.subnetId, that.subnetId) && Objects.equal(this.portId, that.portId); } - protected MoreObjects.ToStringHelper string() { - return MoreObjects.toStringHelper(this).add("subnetId", subnetId).add("portId", portId); + protected Objects.ToStringHelper string() { + return Objects.toStringHelper(this).add("subnetId", subnetId).add("portId", portId); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Rule.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Rule.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Rule.java index 21e1eda..89e9d19 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Rule.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Rule.java @@ -25,7 +25,6 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; -import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -196,7 +195,7 @@ public class Rule { @Override public String toString() { - return MoreObjects.toStringHelper(this) + return Objects.toStringHelper(this) .add("id", id) .add("tenantId", tenantId) .add("direction", direction) http://git-wip-us.apache.org/repos/asf/jclouds/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Rules.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Rules.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Rules.java index 4794a18..505ff36 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Rules.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Rules.java @@ -20,6 +20,7 @@ import java.beans.ConstructorProperties; import org.jclouds.openstack.v2_0.domain.Link; import org.jclouds.openstack.v2_0.domain.PaginatedCollection; + import com.google.common.collect.ImmutableSet; /** http://git-wip-us.apache.org/repos/asf/jclouds/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/SecurityGroup.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/SecurityGroup.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/SecurityGroup.java index 1ade76e..5008c02 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/SecurityGroup.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/SecurityGroup.java @@ -19,9 +19,9 @@ package org.jclouds.openstack.neutron.v2.domain; import java.beans.ConstructorProperties; 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 +121,7 @@ public class SecurityGroup { @Override public String toString() { - return MoreObjects.toStringHelper(this) + return Objects.toStringHelper(this) .add("id", id) .add("tenantId", tenantId) .add("name", name) http://git-wip-us.apache.org/repos/asf/jclouds/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Subnet.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Subnet.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Subnet.java index 1f05709..6e0cfc0 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Subnet.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Subnet.java @@ -25,7 +25,6 @@ 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; @@ -244,7 +243,7 @@ public class Subnet { @Override public String toString() { - return MoreObjects.toStringHelper(this) + return Objects.toStringHelper(this) .add("id", id) .add("name", name) .add("networkId", networkId) http://git-wip-us.apache.org/repos/asf/jclouds/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitor.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitor.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitor.java index 29ec991..593690d 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitor.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitor.java @@ -22,7 +22,6 @@ 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; @@ -226,7 +225,7 @@ public class HealthMonitor { @Override public String toString() { - return MoreObjects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("type", type) + return Objects.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/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitorStatus.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitorStatus.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitorStatus.java index ad8d468..64e3aea 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitorStatus.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitorStatus.java @@ -22,7 +22,6 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; -import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -88,8 +87,8 @@ public class HealthMonitorStatus { && Objects.equal(this.statusDescription, that.statusDescription); } - protected MoreObjects.ToStringHelper string() { - return MoreObjects.toStringHelper(this).add("id", id).add("status", status) + protected Objects.ToStringHelper string() { + return Objects.toStringHelper(this).add("id", id).add("status", status) .add("statusDescription", statusDescription); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Member.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Member.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Member.java index bff6cfe..da53e23 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Member.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Member.java @@ -22,7 +22,6 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; -import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -179,7 +178,7 @@ public class Member { @Override public String toString() { - return MoreObjects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("poolId", poolId) + return Objects.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/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Pool.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Pool.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Pool.java index 5139141..c1aa88d 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Pool.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Pool.java @@ -22,7 +22,6 @@ 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; @@ -258,7 +257,7 @@ public class Pool { @Override public String toString() { - return MoreObjects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("vipId", vipId) + return Objects.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/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/PoolStatus.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/PoolStatus.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/PoolStatus.java index 07989e7..869eb81 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/PoolStatus.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/PoolStatus.java @@ -22,7 +22,6 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; -import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -88,8 +87,8 @@ public class PoolStatus { && Objects.equal(this.statusDescription, that.statusDescription); } - protected MoreObjects.ToStringHelper string() { - return MoreObjects.toStringHelper(this).add("id", id).add("status", status) + protected Objects.ToStringHelper string() { + return Objects.toStringHelper(this).add("id", id).add("status", status) .add("statusDescription", statusDescription); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/SessionPersistence.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/SessionPersistence.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/SessionPersistence.java index c984ac4..b1c49dd 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/SessionPersistence.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/SessionPersistence.java @@ -22,7 +22,6 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; -import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -74,8 +73,8 @@ public class SessionPersistence { return Objects.equal(this.type, that.type) && Objects.equal(this.cookieName, that.cookieName); } - protected MoreObjects.ToStringHelper string() { - return MoreObjects.toStringHelper(this).add("type", type).add("cookieName", cookieName); + protected Objects.ToStringHelper string() { + return Objects.toStringHelper(this).add("type", type).add("cookieName", cookieName); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/VIP.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/VIP.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/VIP.java index d3539a9..ae62625 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/VIP.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/VIP.java @@ -22,7 +22,6 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; -import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -251,7 +250,7 @@ public class VIP { @Override public String toString() { - return MoreObjects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("name", name) + return Objects.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/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/AllocationPool.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/AllocationPool.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/AllocationPool.java index b139a50..f81192e 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/AllocationPool.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/AllocationPool.java @@ -17,9 +17,8 @@ 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; @@ -69,7 +68,7 @@ public class AllocationPool { } protected ToStringHelper string() { - return MoreObjects.toStringHelper(this).add("start", start).add("end", end); + return Objects.toStringHelper(this).add("start", start).add("end", end); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkNetwork.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkNetwork.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkNetwork.java index d3e6438..f2e4a0e 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkNetwork.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkNetwork.java @@ -17,7 +17,6 @@ package org.jclouds.openstack.neutron.v2_0.domain; -import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.beans.ConstructorProperties; @@ -107,8 +106,8 @@ public class BulkNetwork { && Objects.equal(this.segmentationId, that.segmentationId); } - protected MoreObjects.ToStringHelper string() { - return MoreObjects.toStringHelper(this) + protected Objects.ToStringHelper string() { + return Objects.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/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkPort.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkPort.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkPort.java index ab5d733..91c2637 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkPort.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkPort.java @@ -17,7 +17,6 @@ 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; @@ -120,8 +119,8 @@ public class BulkPort { && Objects.equal(this.macAddress, that.macAddress); } - protected MoreObjects.ToStringHelper string() { - return MoreObjects.toStringHelper(this) + protected Objects.ToStringHelper string() { + return Objects.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/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkSubnet.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkSubnet.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkSubnet.java index 56d3b2a..c1eea45 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkSubnet.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkSubnet.java @@ -17,7 +17,6 @@ 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; @@ -142,8 +141,8 @@ public class BulkSubnet { && Objects.equal(this.hostRoutes, that.hostRoutes); } - protected MoreObjects.ToStringHelper string() { - return MoreObjects.toStringHelper(this) + protected Objects.ToStringHelper string() { + return Objects.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/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ExternalGatewayInfo.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ExternalGatewayInfo.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ExternalGatewayInfo.java index 1adc653..f5473ed 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ExternalGatewayInfo.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ExternalGatewayInfo.java @@ -17,7 +17,6 @@ package org.jclouds.openstack.neutron.v2_0.domain; -import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.beans.ConstructorProperties; @@ -54,8 +53,8 @@ public class ExternalGatewayInfo { return Objects.equal(this.networkId, that.networkId); } - protected MoreObjects.ToStringHelper string() { - return MoreObjects.toStringHelper(this).add("networkId", networkId); + protected Objects.ToStringHelper string() { + return Objects.toStringHelper(this).add("networkId", networkId); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/HostRoute.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/HostRoute.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/HostRoute.java index adbc802..c5dcb56 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/HostRoute.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/HostRoute.java @@ -17,9 +17,8 @@ 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; @@ -69,7 +68,7 @@ public class HostRoute { } protected ToStringHelper string() { - return MoreObjects.toStringHelper(this) + return Objects.toStringHelper(this) .add("destinationCidr", destinationCidr).add("nextHop", nextHop); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/IP.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/IP.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/IP.java index 286f1a0..689a53e 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/IP.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/IP.java @@ -17,7 +17,6 @@ package org.jclouds.openstack.neutron.v2_0.domain; -import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.beans.ConstructorProperties; @@ -62,8 +61,8 @@ public class IP { return Objects.equal(this.ipAddress, that.ipAddress) && Objects.equal(this.subnetId, that.subnetId); } - protected MoreObjects.ToStringHelper string() { - return MoreObjects.toStringHelper(this) + protected Objects.ToStringHelper string() { + return Objects.toStringHelper(this) .add("ipAddress", ipAddress).add("subnetId", subnetId); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Network.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Network.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Network.java index 227642c..3aa1804 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Network.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Network.java @@ -17,7 +17,6 @@ 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; @@ -136,7 +135,7 @@ public class Network extends ReferenceWithName { && Objects.equal(this.segmentationId, that.segmentationId); } - protected MoreObjects.ToStringHelper string() { + protected Objects.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/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Port.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Port.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Port.java index 38d0097..75f491f 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Port.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Port.java @@ -17,7 +17,6 @@ package org.jclouds.openstack.neutron.v2_0.domain; -import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.beans.ConstructorProperties; @@ -124,7 +123,7 @@ public class Port extends ReferenceWithName { && Objects.equal(this.macAddress, that.macAddress); } - protected MoreObjects.ToStringHelper string() { + protected Objects.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/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Reference.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Reference.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Reference.java index de79ec0..0458118 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Reference.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Reference.java @@ -17,7 +17,6 @@ package org.jclouds.openstack.neutron.v2_0.domain; -import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.beans.ConstructorProperties; @@ -69,8 +68,8 @@ public class Reference { return Objects.equal(this.id, that.id) && Objects.equal(this.tenantId, that.tenantId); } - protected MoreObjects.ToStringHelper string() { - return MoreObjects.toStringHelper(this) + protected Objects.ToStringHelper string() { + return Objects.toStringHelper(this) .add("id", id).add("tenantId", tenantId); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ReferenceWithName.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ReferenceWithName.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ReferenceWithName.java index 36d729a..28db0be 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ReferenceWithName.java +++ b/apis/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/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Router.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Router.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Router.java index 7d14dc4..5096ed9 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Router.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Router.java @@ -17,7 +17,6 @@ package org.jclouds.openstack.neutron.v2_0.domain; -import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.beans.ConstructorProperties; @@ -80,7 +79,7 @@ public class Router extends ReferenceWithName { && Objects.equal(this.externalGatewayInfo, that.externalGatewayInfo); } - protected MoreObjects.ToStringHelper string() { + protected Objects.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/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/RouterInterface.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/RouterInterface.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/RouterInterface.java index 05c8e5c..f1a9c70 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/RouterInterface.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/RouterInterface.java @@ -17,7 +17,6 @@ package org.jclouds.openstack.neutron.v2_0.domain; -import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.beans.ConstructorProperties; @@ -67,8 +66,8 @@ public class RouterInterface { return Objects.equal(this.subnetId, that.subnetId) && Objects.equal(this.portId, that.portId); } - protected MoreObjects.ToStringHelper string() { - return MoreObjects.toStringHelper(this) + protected Objects.ToStringHelper string() { + return Objects.toStringHelper(this) .add("subnetId", subnetId).add("portId", portId); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/bec0a921/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Subnet.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Subnet.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Subnet.java index a77afde..9faf8bd 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Subnet.java +++ b/apis/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;
