Repository: jclouds-labs-aws Updated Branches: refs/heads/master add9335c8 -> 710a7784e
JCLOUDS-653: Address Guava 18 deprecations Mostly renaming Objects.toStringHelper to MoreObjects.toStringHelper. Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/commit/710a7784 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/tree/710a7784 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/diff/710a7784 Branch: refs/heads/master Commit: 710a7784eae58129a7796ac06c5e7b1d231ab4cf Parents: add9335 Author: Andrew Gaul <[email protected]> Authored: Wed Aug 6 17:08:44 2014 -0700 Committer: Andrew Gaul <[email protected]> Committed: Fri Aug 8 11:18:12 2014 -0700 ---------------------------------------------------------------------- elb/src/main/java/org/jclouds/elb/domain/AttributeMetadata.java | 5 +++-- elb/src/main/java/org/jclouds/elb/domain/HealthCheck.java | 5 +++-- elb/src/main/java/org/jclouds/elb/domain/InstanceHealth.java | 3 ++- elb/src/main/java/org/jclouds/elb/domain/Listener.java | 5 +++-- .../main/java/org/jclouds/elb/domain/ListenerWithPolicies.java | 2 +- elb/src/main/java/org/jclouds/elb/domain/LoadBalancer.java | 3 ++- elb/src/main/java/org/jclouds/elb/domain/Policy.java | 3 ++- elb/src/main/java/org/jclouds/elb/domain/PolicyType.java | 3 ++- .../main/java/org/jclouds/elb/domain/SecurityGroupAndOwner.java | 3 ++- .../java/org/jclouds/elb/options/ListLoadBalancersOptions.java | 3 ++- .../main/java/org/jclouds/elb/options/ListPoliciesOptions.java | 3 ++- iam/src/main/java/org/jclouds/iam/domain/InstanceProfile.java | 2 +- iam/src/main/java/org/jclouds/iam/domain/Policy.java | 2 +- iam/src/main/java/org/jclouds/iam/domain/Role.java | 2 +- iam/src/main/java/org/jclouds/iam/domain/User.java | 2 +- rds/src/main/java/org/jclouds/rds/domain/Authorization.java | 3 ++- rds/src/main/java/org/jclouds/rds/domain/EC2SecurityGroup.java | 3 ++- rds/src/main/java/org/jclouds/rds/domain/IPRange.java | 3 ++- rds/src/main/java/org/jclouds/rds/domain/Instance.java | 3 ++- rds/src/main/java/org/jclouds/rds/domain/InstanceRequest.java | 2 +- rds/src/main/java/org/jclouds/rds/domain/SecurityGroup.java | 5 +++-- rds/src/main/java/org/jclouds/rds/domain/Subnet.java | 3 ++- rds/src/main/java/org/jclouds/rds/domain/SubnetGroup.java | 5 +++-- .../main/java/org/jclouds/rds/domain/internal/BaseInstance.java | 5 +++-- .../main/java/org/jclouds/rds/options/ListInstancesOptions.java | 3 ++- .../java/org/jclouds/rds/options/ListSecurityGroupsOptions.java | 3 ++- .../java/org/jclouds/rds/options/ListSubnetGroupsOptions.java | 3 ++- 27 files changed, 54 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/elb/src/main/java/org/jclouds/elb/domain/AttributeMetadata.java ---------------------------------------------------------------------- diff --git a/elb/src/main/java/org/jclouds/elb/domain/AttributeMetadata.java b/elb/src/main/java/org/jclouds/elb/domain/AttributeMetadata.java index 42f1b2c..e44da6c 100644 --- a/elb/src/main/java/org/jclouds/elb/domain/AttributeMetadata.java +++ b/elb/src/main/java/org/jclouds/elb/domain/AttributeMetadata.java @@ -18,8 +18,9 @@ package org.jclouds.elb.domain; import static com.google.common.base.Preconditions.checkNotNull; +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; /** @@ -223,7 +224,7 @@ public class AttributeMetadata<V> { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("name", name).add("type", type).add("rawType", rawType) + return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("type", type).add("rawType", rawType) .add("cardinality", cardinality).add("defaultValue", defaultValue.orNull()) .add("description", description.orNull()); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/elb/src/main/java/org/jclouds/elb/domain/HealthCheck.java ---------------------------------------------------------------------- diff --git a/elb/src/main/java/org/jclouds/elb/domain/HealthCheck.java b/elb/src/main/java/org/jclouds/elb/domain/HealthCheck.java index 43fc3a5..9f969ad 100644 --- a/elb/src/main/java/org/jclouds/elb/domain/HealthCheck.java +++ b/elb/src/main/java/org/jclouds/elb/domain/HealthCheck.java @@ -19,8 +19,9 @@ package org.jclouds.elb.domain; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +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; /** * Elastic Load Balancing routinely checks the health of each load-balanced Amazon EC2 instance @@ -219,7 +220,7 @@ public class HealthCheck { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("healthyThreshold", healthyThreshold).add("interval", + return MoreObjects.toStringHelper(this).omitNullValues().add("healthyThreshold", healthyThreshold).add("interval", interval).add("target", target).add("timeout", timeout).add("unhealthyThreshold", unhealthyThreshold); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/elb/src/main/java/org/jclouds/elb/domain/InstanceHealth.java ---------------------------------------------------------------------- diff --git a/elb/src/main/java/org/jclouds/elb/domain/InstanceHealth.java b/elb/src/main/java/org/jclouds/elb/domain/InstanceHealth.java index 7662a1a..0a211d7 100644 --- a/elb/src/main/java/org/jclouds/elb/domain/InstanceHealth.java +++ b/elb/src/main/java/org/jclouds/elb/domain/InstanceHealth.java @@ -18,6 +18,7 @@ package org.jclouds.elb.domain; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; @@ -157,7 +158,7 @@ public class InstanceHealth { */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("description", description) + return MoreObjects.toStringHelper(this).omitNullValues().add("description", description) .add("instanceId", instanceId).add("reasonCode", reasonCode.orNull()).add("state", state).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/elb/src/main/java/org/jclouds/elb/domain/Listener.java ---------------------------------------------------------------------- diff --git a/elb/src/main/java/org/jclouds/elb/domain/Listener.java b/elb/src/main/java/org/jclouds/elb/domain/Listener.java index 0d18efa..a5499ff 100644 --- a/elb/src/main/java/org/jclouds/elb/domain/Listener.java +++ b/elb/src/main/java/org/jclouds/elb/domain/Listener.java @@ -19,9 +19,10 @@ package org.jclouds.elb.domain; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; import com.google.common.base.Optional; -import com.google.common.base.Objects.ToStringHelper; /** * Listener is a process that listens for api connection requests. It is configured with a @@ -216,7 +217,7 @@ public class Listener { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("instancePort", instancePort).add("instanceProtocol", + return MoreObjects.toStringHelper(this).omitNullValues().add("instancePort", instancePort).add("instanceProtocol", instanceProtocol).add("port", port).add("protocol", protocol).add("SSLCertificateId", SSLCertificateId.orNull()); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/elb/src/main/java/org/jclouds/elb/domain/ListenerWithPolicies.java ---------------------------------------------------------------------- diff --git a/elb/src/main/java/org/jclouds/elb/domain/ListenerWithPolicies.java b/elb/src/main/java/org/jclouds/elb/domain/ListenerWithPolicies.java index 88b9c88..467d638 100644 --- a/elb/src/main/java/org/jclouds/elb/domain/ListenerWithPolicies.java +++ b/elb/src/main/java/org/jclouds/elb/domain/ListenerWithPolicies.java @@ -21,9 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; import com.google.common.base.Optional; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableSet; public class ListenerWithPolicies extends Listener { http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/elb/src/main/java/org/jclouds/elb/domain/LoadBalancer.java ---------------------------------------------------------------------- diff --git a/elb/src/main/java/org/jclouds/elb/domain/LoadBalancer.java b/elb/src/main/java/org/jclouds/elb/domain/LoadBalancer.java index d3ea72b..9d71a66 100644 --- a/elb/src/main/java/org/jclouds/elb/domain/LoadBalancer.java +++ b/elb/src/main/java/org/jclouds/elb/domain/LoadBalancer.java @@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Date; import java.util.Set; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; @@ -419,7 +420,7 @@ public class LoadBalancer { */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("name", name).add("createdTime", createdTime) + return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("createdTime", createdTime) .add("dnsName", dnsName).add("healthCheck", healthCheck).add("instanceIds", instanceIds) .add("listeners", listeners).add("availabilityZones", availabilityZones).add("scheme", scheme.orNull()) .add("sourceSecurityGroup", sourceSecurityGroup.orNull()).add("VPCId", VPCId.orNull()) http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/elb/src/main/java/org/jclouds/elb/domain/Policy.java ---------------------------------------------------------------------- diff --git a/elb/src/main/java/org/jclouds/elb/domain/Policy.java b/elb/src/main/java/org/jclouds/elb/domain/Policy.java index 8ff1040..5a25dd8 100644 --- a/elb/src/main/java/org/jclouds/elb/domain/Policy.java +++ b/elb/src/main/java/org/jclouds/elb/domain/Policy.java @@ -18,6 +18,7 @@ package org.jclouds.elb.domain; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; @@ -145,7 +146,7 @@ public class Policy { */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("name", name).add("typeName", typeName) + return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("typeName", typeName) .add("attributes", attributes).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/elb/src/main/java/org/jclouds/elb/domain/PolicyType.java ---------------------------------------------------------------------- diff --git a/elb/src/main/java/org/jclouds/elb/domain/PolicyType.java b/elb/src/main/java/org/jclouds/elb/domain/PolicyType.java index a4057ed..cae1c27 100644 --- a/elb/src/main/java/org/jclouds/elb/domain/PolicyType.java +++ b/elb/src/main/java/org/jclouds/elb/domain/PolicyType.java @@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; import java.util.Set; +import com.google.common.base.MoreObjects; import com.google.common.base.Function; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; @@ -164,7 +165,7 @@ public class PolicyType { */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("name", name).add("description", description) + return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("description", description) .add("attributeMetadata", attributeMetadata).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/elb/src/main/java/org/jclouds/elb/domain/SecurityGroupAndOwner.java ---------------------------------------------------------------------- diff --git a/elb/src/main/java/org/jclouds/elb/domain/SecurityGroupAndOwner.java b/elb/src/main/java/org/jclouds/elb/domain/SecurityGroupAndOwner.java index 3aa1a71..234f758 100644 --- a/elb/src/main/java/org/jclouds/elb/domain/SecurityGroupAndOwner.java +++ b/elb/src/main/java/org/jclouds/elb/domain/SecurityGroupAndOwner.java @@ -18,6 +18,7 @@ package org.jclouds.elb.domain; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -120,7 +121,7 @@ public class SecurityGroupAndOwner { */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("name", name).add("owner", owner).toString(); + return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("owner", owner).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/elb/src/main/java/org/jclouds/elb/options/ListLoadBalancersOptions.java ---------------------------------------------------------------------- diff --git a/elb/src/main/java/org/jclouds/elb/options/ListLoadBalancersOptions.java b/elb/src/main/java/org/jclouds/elb/options/ListLoadBalancersOptions.java index 7f65083..fcec8c8 100644 --- a/elb/src/main/java/org/jclouds/elb/options/ListLoadBalancersOptions.java +++ b/elb/src/main/java/org/jclouds/elb/options/ListLoadBalancersOptions.java @@ -20,6 +20,7 @@ import java.util.Set; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; @@ -134,6 +135,6 @@ public class ListLoadBalancersOptions extends BaseHttpRequestOptions implements */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("marker", marker).add("names", names).toString(); + return MoreObjects.toStringHelper(this).omitNullValues().add("marker", marker).add("names", names).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/elb/src/main/java/org/jclouds/elb/options/ListPoliciesOptions.java ---------------------------------------------------------------------- diff --git a/elb/src/main/java/org/jclouds/elb/options/ListPoliciesOptions.java b/elb/src/main/java/org/jclouds/elb/options/ListPoliciesOptions.java index 9dd1c17..ec1e88e 100644 --- a/elb/src/main/java/org/jclouds/elb/options/ListPoliciesOptions.java +++ b/elb/src/main/java/org/jclouds/elb/options/ListPoliciesOptions.java @@ -20,6 +20,7 @@ import java.util.Set; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; @@ -149,7 +150,7 @@ public class ListPoliciesOptions extends BaseHttpRequestOptions implements Clone */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("loadBalancerName", loadBalancerName) + return MoreObjects.toStringHelper(this).omitNullValues().add("loadBalancerName", loadBalancerName) .add("names", names).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/iam/src/main/java/org/jclouds/iam/domain/InstanceProfile.java ---------------------------------------------------------------------- diff --git a/iam/src/main/java/org/jclouds/iam/domain/InstanceProfile.java b/iam/src/main/java/org/jclouds/iam/domain/InstanceProfile.java index c1630fe..0e2589f 100644 --- a/iam/src/main/java/org/jclouds/iam/domain/InstanceProfile.java +++ b/iam/src/main/java/org/jclouds/iam/domain/InstanceProfile.java @@ -16,8 +16,8 @@ */ package org.jclouds.iam.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.Date; http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/iam/src/main/java/org/jclouds/iam/domain/Policy.java ---------------------------------------------------------------------- diff --git a/iam/src/main/java/org/jclouds/iam/domain/Policy.java b/iam/src/main/java/org/jclouds/iam/domain/Policy.java index 0ac64aa..18a1ac2 100644 --- a/iam/src/main/java/org/jclouds/iam/domain/Policy.java +++ b/iam/src/main/java/org/jclouds/iam/domain/Policy.java @@ -16,8 +16,8 @@ */ package org.jclouds.iam.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 com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/iam/src/main/java/org/jclouds/iam/domain/Role.java ---------------------------------------------------------------------- diff --git a/iam/src/main/java/org/jclouds/iam/domain/Role.java b/iam/src/main/java/org/jclouds/iam/domain/Role.java index 9e63c97..85fbd3e 100644 --- a/iam/src/main/java/org/jclouds/iam/domain/Role.java +++ b/iam/src/main/java/org/jclouds/iam/domain/Role.java @@ -16,8 +16,8 @@ */ package org.jclouds.iam.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.Date; http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/iam/src/main/java/org/jclouds/iam/domain/User.java ---------------------------------------------------------------------- diff --git a/iam/src/main/java/org/jclouds/iam/domain/User.java b/iam/src/main/java/org/jclouds/iam/domain/User.java index a798bb2..12f9f32 100644 --- a/iam/src/main/java/org/jclouds/iam/domain/User.java +++ b/iam/src/main/java/org/jclouds/iam/domain/User.java @@ -16,8 +16,8 @@ */ package org.jclouds.iam.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.Date; http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/rds/src/main/java/org/jclouds/rds/domain/Authorization.java ---------------------------------------------------------------------- diff --git a/rds/src/main/java/org/jclouds/rds/domain/Authorization.java b/rds/src/main/java/org/jclouds/rds/domain/Authorization.java index 9a879ea..d611b5b 100644 --- a/rds/src/main/java/org/jclouds/rds/domain/Authorization.java +++ b/rds/src/main/java/org/jclouds/rds/domain/Authorization.java @@ -19,6 +19,7 @@ package org.jclouds.rds.domain; import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.base.CaseFormat; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; public class Authorization { @@ -139,7 +140,7 @@ public class Authorization { */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("status", rawStatus).toString(); + return MoreObjects.toStringHelper(this).omitNullValues().add("status", rawStatus).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/rds/src/main/java/org/jclouds/rds/domain/EC2SecurityGroup.java ---------------------------------------------------------------------- diff --git a/rds/src/main/java/org/jclouds/rds/domain/EC2SecurityGroup.java b/rds/src/main/java/org/jclouds/rds/domain/EC2SecurityGroup.java index 9dccc42..043e8ac 100644 --- a/rds/src/main/java/org/jclouds/rds/domain/EC2SecurityGroup.java +++ b/rds/src/main/java/org/jclouds/rds/domain/EC2SecurityGroup.java @@ -18,6 +18,7 @@ package org.jclouds.rds.domain; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; @@ -142,7 +143,7 @@ public class EC2SecurityGroup extends Authorization { */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("id", id.orNull()).add("name", name) + return MoreObjects.toStringHelper(this).omitNullValues().add("id", id.orNull()).add("name", name) .add("ownerId", ownerId).add("status", rawStatus).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/rds/src/main/java/org/jclouds/rds/domain/IPRange.java ---------------------------------------------------------------------- diff --git a/rds/src/main/java/org/jclouds/rds/domain/IPRange.java b/rds/src/main/java/org/jclouds/rds/domain/IPRange.java index 32fdea9..138fb30 100644 --- a/rds/src/main/java/org/jclouds/rds/domain/IPRange.java +++ b/rds/src/main/java/org/jclouds/rds/domain/IPRange.java @@ -18,6 +18,7 @@ package org.jclouds.rds.domain; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -103,7 +104,7 @@ public class IPRange extends Authorization { */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("cidrIp", cidrIp).add("status", rawStatus).toString(); + return MoreObjects.toStringHelper(this).omitNullValues().add("cidrIp", cidrIp).add("status", rawStatus).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/rds/src/main/java/org/jclouds/rds/domain/Instance.java ---------------------------------------------------------------------- diff --git a/rds/src/main/java/org/jclouds/rds/domain/Instance.java b/rds/src/main/java/org/jclouds/rds/domain/Instance.java index d5d3956..7491009 100644 --- a/rds/src/main/java/org/jclouds/rds/domain/Instance.java +++ b/rds/src/main/java/org/jclouds/rds/domain/Instance.java @@ -24,6 +24,7 @@ import java.util.Map; import org.jclouds.rds.domain.internal.BaseInstance; import com.google.common.base.CaseFormat; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; @@ -365,7 +366,7 @@ public class Instance extends BaseInstance { */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("id", id).add("name", name.orNull()) + return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("name", name.orNull()) .add("instanceClass", instanceClass).add("endpoint", endpoint.orNull()).add("status", rawStatus) .add("availabilityZone", availabilityZone.orNull()).add("multiAZ", multiAZ).add("engine", engine) .add("engineVersion", engineVersion).add("licenseModel", licenseModel) http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/rds/src/main/java/org/jclouds/rds/domain/InstanceRequest.java ---------------------------------------------------------------------- diff --git a/rds/src/main/java/org/jclouds/rds/domain/InstanceRequest.java b/rds/src/main/java/org/jclouds/rds/domain/InstanceRequest.java index 13267e5..fe59cf4 100644 --- a/rds/src/main/java/org/jclouds/rds/domain/InstanceRequest.java +++ b/rds/src/main/java/org/jclouds/rds/domain/InstanceRequest.java @@ -22,7 +22,7 @@ import java.util.Set; import org.jclouds.rds.domain.internal.BaseInstance; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/rds/src/main/java/org/jclouds/rds/domain/SecurityGroup.java ---------------------------------------------------------------------- diff --git a/rds/src/main/java/org/jclouds/rds/domain/SecurityGroup.java b/rds/src/main/java/org/jclouds/rds/domain/SecurityGroup.java index 14a3055..9ec1c80 100644 --- a/rds/src/main/java/org/jclouds/rds/domain/SecurityGroup.java +++ b/rds/src/main/java/org/jclouds/rds/domain/SecurityGroup.java @@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; +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.ImmutableSet; @@ -238,7 +239,7 @@ public class SecurityGroup { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("name", name).add("description", description) + return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("description", description) .add("ec2SecurityGroups", ec2SecurityGroups).add("ipRanges", ipRanges).add("ownerId", ownerId) .add("vpcId", vpcId.orNull()); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/rds/src/main/java/org/jclouds/rds/domain/Subnet.java ---------------------------------------------------------------------- diff --git a/rds/src/main/java/org/jclouds/rds/domain/Subnet.java b/rds/src/main/java/org/jclouds/rds/domain/Subnet.java index 78fe871..cd8e07a 100644 --- a/rds/src/main/java/org/jclouds/rds/domain/Subnet.java +++ b/rds/src/main/java/org/jclouds/rds/domain/Subnet.java @@ -18,6 +18,7 @@ package org.jclouds.rds.domain; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -133,7 +134,7 @@ public class Subnet { */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("id", id).add("availabilityZone", availabilityZone) + return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("availabilityZone", availabilityZone) .add("status", status).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/rds/src/main/java/org/jclouds/rds/domain/SubnetGroup.java ---------------------------------------------------------------------- diff --git a/rds/src/main/java/org/jclouds/rds/domain/SubnetGroup.java b/rds/src/main/java/org/jclouds/rds/domain/SubnetGroup.java index 276b831..4043aeb 100644 --- a/rds/src/main/java/org/jclouds/rds/domain/SubnetGroup.java +++ b/rds/src/main/java/org/jclouds/rds/domain/SubnetGroup.java @@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; +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.ImmutableSet; @@ -201,7 +202,7 @@ public class SubnetGroup { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("name", name).add("description", description) + return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("description", description) .add("status", status).add("subnets", subnets).add("vpcId", vpcId.orNull()); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/rds/src/main/java/org/jclouds/rds/domain/internal/BaseInstance.java ---------------------------------------------------------------------- diff --git a/rds/src/main/java/org/jclouds/rds/domain/internal/BaseInstance.java b/rds/src/main/java/org/jclouds/rds/domain/internal/BaseInstance.java index ab7fd1e..067d2be 100644 --- a/rds/src/main/java/org/jclouds/rds/domain/internal/BaseInstance.java +++ b/rds/src/main/java/org/jclouds/rds/domain/internal/BaseInstance.java @@ -18,8 +18,9 @@ package org.jclouds.rds.domain.internal; import static com.google.common.base.Preconditions.checkNotNull; +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; public class BaseInstance { @@ -191,7 +192,7 @@ public class BaseInstance { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("name", name.orNull()).add("instanceClass", instanceClass) + return MoreObjects.toStringHelper(this).omitNullValues().add("name", name.orNull()).add("instanceClass", instanceClass) .add("engine", engine).add("masterUsername", masterUsername) .add("allocatedStorageGB", allocatedStorageGB); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/rds/src/main/java/org/jclouds/rds/options/ListInstancesOptions.java ---------------------------------------------------------------------- diff --git a/rds/src/main/java/org/jclouds/rds/options/ListInstancesOptions.java b/rds/src/main/java/org/jclouds/rds/options/ListInstancesOptions.java index 79ad654..e564c49 100644 --- a/rds/src/main/java/org/jclouds/rds/options/ListInstancesOptions.java +++ b/rds/src/main/java/org/jclouds/rds/options/ListInstancesOptions.java @@ -20,6 +20,7 @@ import java.util.Set; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; @@ -134,6 +135,6 @@ public class ListInstancesOptions extends BaseHttpRequestOptions implements Clon */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("marker", marker).add("names", names).toString(); + return MoreObjects.toStringHelper(this).omitNullValues().add("marker", marker).add("names", names).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/rds/src/main/java/org/jclouds/rds/options/ListSecurityGroupsOptions.java ---------------------------------------------------------------------- diff --git a/rds/src/main/java/org/jclouds/rds/options/ListSecurityGroupsOptions.java b/rds/src/main/java/org/jclouds/rds/options/ListSecurityGroupsOptions.java index 4243544..1a74955 100644 --- a/rds/src/main/java/org/jclouds/rds/options/ListSecurityGroupsOptions.java +++ b/rds/src/main/java/org/jclouds/rds/options/ListSecurityGroupsOptions.java @@ -18,6 +18,7 @@ package org.jclouds.rds.options; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.Multimap; @@ -93,6 +94,6 @@ public class ListSecurityGroupsOptions extends BaseHttpRequestOptions implements */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("marker", marker).toString(); + return MoreObjects.toStringHelper(this).omitNullValues().add("marker", marker).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/710a7784/rds/src/main/java/org/jclouds/rds/options/ListSubnetGroupsOptions.java ---------------------------------------------------------------------- diff --git a/rds/src/main/java/org/jclouds/rds/options/ListSubnetGroupsOptions.java b/rds/src/main/java/org/jclouds/rds/options/ListSubnetGroupsOptions.java index 17d2d69..64c53bf 100644 --- a/rds/src/main/java/org/jclouds/rds/options/ListSubnetGroupsOptions.java +++ b/rds/src/main/java/org/jclouds/rds/options/ListSubnetGroupsOptions.java @@ -18,6 +18,7 @@ package org.jclouds.rds.options; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.Multimap; @@ -93,6 +94,6 @@ public class ListSubnetGroupsOptions extends BaseHttpRequestOptions implements C */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("marker", marker).toString(); + return MoreObjects.toStringHelper(this).omitNullValues().add("marker", marker).toString(); } }
