JCLOUDS-1225: Address Guava 18 Objects changes Fixed with:
find -name \*.java | xargs sed -i 's/Objects.[Tt]oStringHelper/More&/g' find -name \*.java | xargs sed -i 's/Objects.firstNonNull/More&/g' find -name \*.java | xargs sed -i 's/^\(import com.google.common.base.\)\(Objects.*\)/\1More\2\n\1\2/g' find -name \*.java | xargs java -jar google-java-format-1.3-all-deps.jar -i --fix-imports-only --skip-sorting-imports Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/6b8a8133 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/6b8a8133 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/6b8a8133 Branch: refs/heads/master Commit: 6b8a81335d80fc1aaea2b40714f67abd0915b068 Parents: d03f061 Author: Andrew Gaul <[email protected]> Authored: Thu Aug 24 18:31:07 2017 -0700 Committer: Andrew Gaul <[email protected]> Committed: Thu Aug 24 18:31:07 2017 -0700 ---------------------------------------------------------------------- .../org/jclouds/openstack/neutron/v2/domain/AddressPair.java | 5 +++-- .../org/jclouds/openstack/neutron/v2/domain/AllocationPool.java | 5 +++-- .../openstack/neutron/v2/domain/ExternalGatewayInfo.java | 3 ++- .../jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java | 5 +++-- .../org/jclouds/openstack/neutron/v2/domain/FloatingIP.java | 3 ++- .../java/org/jclouds/openstack/neutron/v2/domain/HostRoute.java | 5 +++-- .../main/java/org/jclouds/openstack/neutron/v2/domain/IP.java | 5 +++-- .../java/org/jclouds/openstack/neutron/v2/domain/Network.java | 3 ++- .../org/jclouds/openstack/neutron/v2/domain/NetworkSegment.java | 5 +++-- .../main/java/org/jclouds/openstack/neutron/v2/domain/Port.java | 3 ++- .../java/org/jclouds/openstack/neutron/v2/domain/Router.java | 3 ++- .../jclouds/openstack/neutron/v2/domain/RouterInterface.java | 5 +++-- .../main/java/org/jclouds/openstack/neutron/v2/domain/Rule.java | 3 ++- .../org/jclouds/openstack/neutron/v2/domain/SecurityGroup.java | 3 ++- .../java/org/jclouds/openstack/neutron/v2/domain/Subnet.java | 3 ++- .../openstack/neutron/v2/domain/lbaas/v1/HealthMonitor.java | 3 ++- .../neutron/v2/domain/lbaas/v1/HealthMonitorStatus.java | 5 +++-- .../jclouds/openstack/neutron/v2/domain/lbaas/v1/Member.java | 3 ++- .../org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Pool.java | 3 ++- .../openstack/neutron/v2/domain/lbaas/v1/PoolStatus.java | 5 +++-- .../neutron/v2/domain/lbaas/v1/SessionPersistence.java | 5 +++-- .../org/jclouds/openstack/neutron/v2/domain/lbaas/v1/VIP.java | 3 ++- 22 files changed, 54 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/6b8a8133/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 e2d888c..289efe5 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 @@ -24,6 +24,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -88,8 +89,8 @@ public class AddressPair { return Objects.equal(this.macAddress, that.macAddress) && Objects.equal(this.ipAddress, that.ipAddress); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this).add("macAddress", macAddress).add("ipAddress", ipAddress); + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this).add("macAddress", macAddress).add("ipAddress", ipAddress); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/6b8a8133/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 6d20999..335bfb5 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 @@ -20,6 +20,7 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -72,8 +73,8 @@ public class AllocationPool { return Objects.equal(this.start, that.start) && Objects.equal(this.end, that.end); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this).add("start", start).add("end", end); + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this).add("start", start).add("end", end); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/6b8a8133/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 9f538a5..dd89a2f 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 @@ -22,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -90,7 +91,7 @@ public class ExternalGatewayInfo { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("networkId", networkId) .add("enableSnat", enableSnat) .toString(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/6b8a8133/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 cdc448e..3cfe064 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 @@ -22,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -89,8 +90,8 @@ public class ExtraDhcpOption { && Objects.equal(this.optionValue, that.optionValue); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this).add("id", id).add("optionName", optionName).add("optionValue", optionValue); + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this).add("id", id).add("optionName", optionName).add("optionValue", optionValue); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/6b8a8133/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 9c1540c..be61ad3 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 @@ -22,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -153,7 +154,7 @@ public class FloatingIP { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("routerId", routerId) .add("tenantId", tenantId) http://git-wip-us.apache.org/repos/asf/jclouds/blob/6b8a8133/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 6ff0ddc..0d7cf4c 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 @@ -22,8 +22,9 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * A Neutron Subnet Host Route @@ -73,7 +74,7 @@ public class HostRoute { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("destinationCidr", destinationCidr).add("nextHop", nextHop); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/6b8a8133/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 53c83ca..cb4264a 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 @@ -22,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -71,8 +72,8 @@ public class IP { return Objects.equal(this.ipAddress, that.ipAddress) && Objects.equal(this.subnetId, that.subnetId); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this).add("ipAddress", ipAddress).add("subnetId", subnetId); + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this).add("ipAddress", ipAddress).add("subnetId", subnetId); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/6b8a8133/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 ac40019..c269593 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,6 +24,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; @@ -338,7 +339,7 @@ public class Network { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("status", status) .add("subnets", subnets) http://git-wip-us.apache.org/repos/asf/jclouds/blob/6b8a8133/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 4096e51..8add465 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 @@ -22,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -89,8 +90,8 @@ public class NetworkSegment { && Objects.equal(this.segmentationId, that.segmentationId); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this).add("networkType", networkType).add("physicalNetwork", physicalNetwork) + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this).add("networkType", networkType).add("physicalNetwork", physicalNetwork) .add("segmentationId", segmentationId); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/6b8a8133/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 a9ab61e..f22d2fa 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,6 +24,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -427,7 +428,7 @@ public class Port { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("status", status) .add("vifType", vifType) http://git-wip-us.apache.org/repos/asf/jclouds/blob/6b8a8133/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 0b06531..7330c9b 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,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -161,7 +162,7 @@ public class Router { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("status", status) .add("name", name) http://git-wip-us.apache.org/repos/asf/jclouds/blob/6b8a8133/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 ff30dae..710c0bf 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 @@ -22,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -75,8 +76,8 @@ public class RouterInterface { return Objects.equal(this.subnetId, that.subnetId) && Objects.equal(this.portId, that.portId); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this).add("subnetId", subnetId).add("portId", portId); + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this).add("subnetId", subnetId).add("portId", portId); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/6b8a8133/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 e72a3e9..ae4b913 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,6 +25,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -195,7 +196,7 @@ public class Rule { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("tenantId", tenantId) .add("direction", direction) http://git-wip-us.apache.org/repos/asf/jclouds/blob/6b8a8133/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 5008c02..6a1b8b7 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 @@ -22,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; @@ -121,7 +122,7 @@ public class SecurityGroup { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("tenantId", tenantId) .add("name", name) http://git-wip-us.apache.org/repos/asf/jclouds/blob/6b8a8133/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 6e0cfc0..1f05709 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,6 +25,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; @@ -243,7 +244,7 @@ public class Subnet { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("name", name) .add("networkId", networkId) http://git-wip-us.apache.org/repos/asf/jclouds/blob/6b8a8133/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 593690d..29ec991 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,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; @@ -225,7 +226,7 @@ public class HealthMonitor { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("type", type) + return MoreObjects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("type", type) .add("delay", delay).add("timeout", timeout).add("maxRetries", maxRetries).add("httpMethod", httpMethod) .add("urlPath", urlPath).add("expectedCodes", expectedCodes).add("pools", pools) .add("adminStateUp", adminStateUp).add("status", status).add("statusDescription", statusDescription) http://git-wip-us.apache.org/repos/asf/jclouds/blob/6b8a8133/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 64e3aea..ad8d468 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,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -87,8 +88,8 @@ public class HealthMonitorStatus { && Objects.equal(this.statusDescription, that.statusDescription); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this).add("id", id).add("status", status) + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this).add("id", id).add("status", status) .add("statusDescription", statusDescription); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/6b8a8133/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 da53e23..bff6cfe 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,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -178,7 +179,7 @@ public class Member { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("poolId", poolId) + return MoreObjects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("poolId", poolId) .add("address", address).add("protocolPort", protocolPort).add("weight", weight) .add("adminStateUp", adminStateUp).add("status", status).add("statusDescription", statusDescription) .toString(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/6b8a8133/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 c1aa88d..5139141 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,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -257,7 +258,7 @@ public class Pool { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("vipId", vipId) + return MoreObjects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("vipId", vipId) .add("name", name).add("description", description).add("subnetId", subnetId).add("protocol", protocol) .add("provider", provider).add("lbMethod", lbMethod).add("healthMonitors", healthMonitors) .add("healthMonitorsStatus", healthMonitorsStatus).add("members", members) http://git-wip-us.apache.org/repos/asf/jclouds/blob/6b8a8133/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 869eb81..07989e7 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,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -87,8 +88,8 @@ public class PoolStatus { && Objects.equal(this.statusDescription, that.statusDescription); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this).add("id", id).add("status", status) + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this).add("id", id).add("status", status) .add("statusDescription", statusDescription); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/6b8a8133/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 b1c49dd..c984ac4 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,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -73,8 +74,8 @@ public class SessionPersistence { return Objects.equal(this.type, that.type) && Objects.equal(this.cookieName, that.cookieName); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this).add("type", type).add("cookieName", cookieName); + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this).add("type", type).add("cookieName", cookieName); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/6b8a8133/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 ae62625..d3539a9 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,6 +22,7 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -250,7 +251,7 @@ public class VIP { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("name", name) + return MoreObjects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("name", name) .add("description", description).add("subnetId", subnetId).add("address", address).add("portId", portId) .add("protocol", protocol).add("protocolPort", protocolPort).add("poolId", poolId) .add("sessionPersistence", sessionPersistence).add("connectionLimit", connectionLimit)
