Revert "JCLOUDS-653: Address Guava 18 deprecations"

This reverts commit 710a778.
apache · Oct 24, 2014 · 63e2d9b2c4d701ee76701ea36be6a0ff7dd2d029 · 63e2d9b
1 parent 1c45642
commit 63e2d9b2c4d701ee76701ea36be6a0ff7dd2d029
Show file tree

Hide file tree

Showing 27 changed files with 33 additions and 54 deletions.
diff --git a/elb/src/main/java/org/jclouds/elb/domain/AttributeMetadata.java b/elb/src/main/java/org/jclouds/elb/domain/AttributeMetadata.java
@@ -18,9 +18,8 @@
 
 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;
 
 /**
@@ -224,7 +223,7 @@ public String toString() {
    }
 
    protected ToStringHelper string() {
-      return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("type", type).add("rawType", rawType)
+      return Objects.toStringHelper(this).omitNullValues().add("name", name).add("type", type).add("rawType", rawType)
                .add("cardinality", cardinality).add("defaultValue", defaultValue.orNull())
                .add("description", description.orNull());
    }

diff --git a/elb/src/main/java/org/jclouds/elb/domain/HealthCheck.java b/elb/src/main/java/org/jclouds/elb/domain/HealthCheck.java
@@ -19,9 +19,8 @@
 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
@@ -220,7 +219,7 @@ public String toString() {
    }
 
    protected ToStringHelper string() {
-      return MoreObjects.toStringHelper(this).omitNullValues().add("healthyThreshold", healthyThreshold).add("interval",
+      return Objects.toStringHelper(this).omitNullValues().add("healthyThreshold", healthyThreshold).add("interval",
                interval).add("target", target).add("timeout", timeout).add("unhealthyThreshold", unhealthyThreshold);
    }
 

diff --git a/elb/src/main/java/org/jclouds/elb/domain/InstanceHealth.java b/elb/src/main/java/org/jclouds/elb/domain/InstanceHealth.java
@@ -18,7 +18,6 @@
 
 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;
 
@@ -158,7 +157,7 @@ public boolean equals(Object obj) {
     */
    @Override
    public String toString() {
-      return MoreObjects.toStringHelper(this).omitNullValues().add("description", description)
+      return Objects.toStringHelper(this).omitNullValues().add("description", description)
                .add("instanceId", instanceId).add("reasonCode", reasonCode.orNull()).add("state", state).toString();
    }
 

diff --git a/elb/src/main/java/org/jclouds/elb/domain/Listener.java b/elb/src/main/java/org/jclouds/elb/domain/Listener.java
@@ -19,10 +19,9 @@
 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
@@ -217,7 +216,7 @@ public String toString() {
    }
 
    protected ToStringHelper string() {
-      return MoreObjects.toStringHelper(this).omitNullValues().add("instancePort", instancePort).add("instanceProtocol",
+      return Objects.toStringHelper(this).omitNullValues().add("instancePort", instancePort).add("instanceProtocol",
                instanceProtocol).add("port", port).add("protocol", protocol).add("SSLCertificateId",
                SSLCertificateId.orNull());
    }

diff --git 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 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 {

diff --git a/elb/src/main/java/org/jclouds/elb/domain/LoadBalancer.java b/elb/src/main/java/org/jclouds/elb/domain/LoadBalancer.java
@@ -21,7 +21,6 @@
 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;
@@ -420,7 +419,7 @@ public boolean equals(Object obj) {
     */
    @Override
    public String toString() {
-      return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("createdTime", createdTime)
+      return Objects.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())

diff --git a/elb/src/main/java/org/jclouds/elb/domain/Policy.java b/elb/src/main/java/org/jclouds/elb/domain/Policy.java
@@ -18,7 +18,6 @@
 
 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;
@@ -146,7 +145,7 @@ public boolean equals(Object obj) {
     */
    @Override
    public String toString() {
-      return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("typeName", typeName)
+      return Objects.toStringHelper(this).omitNullValues().add("name", name).add("typeName", typeName)
                .add("attributes", attributes).toString();
    }
 

diff --git a/elb/src/main/java/org/jclouds/elb/domain/PolicyType.java b/elb/src/main/java/org/jclouds/elb/domain/PolicyType.java
@@ -21,7 +21,6 @@
 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;
@@ -165,7 +164,7 @@ public boolean equals(Object obj) {
     */
    @Override
    public String toString() {
-      return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("description", description)
+      return Objects.toStringHelper(this).omitNullValues().add("name", name).add("description", description)
                .add("attributeMetadata", attributeMetadata).toString();
    }
 

diff --git a/elb/src/main/java/org/jclouds/elb/domain/SecurityGroupAndOwner.java b/elb/src/main/java/org/jclouds/elb/domain/SecurityGroupAndOwner.java
@@ -18,7 +18,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 
 /**
@@ -121,7 +120,7 @@ public boolean equals(Object obj) {
     */
    @Override
    public String toString() {
-      return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("owner", owner).toString();
+      return Objects.toStringHelper(this).omitNullValues().add("name", name).add("owner", owner).toString();
    }
 
 }
diff --git a/elb/src/main/java/org/jclouds/elb/options/ListLoadBalancersOptions.java b/elb/src/main/java/org/jclouds/elb/options/ListLoadBalancersOptions.java
@@ -20,7 +20,6 @@
 
 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;
@@ -135,6 +134,6 @@ public boolean equals(Object obj) {
     */
    @Override
    public String toString() {
-      return MoreObjects.toStringHelper(this).omitNullValues().add("marker", marker).add("names", names).toString();
+      return Objects.toStringHelper(this).omitNullValues().add("marker", marker).add("names", names).toString();
    }
 }
diff --git a/elb/src/main/java/org/jclouds/elb/options/ListPoliciesOptions.java b/elb/src/main/java/org/jclouds/elb/options/ListPoliciesOptions.java
@@ -20,7 +20,6 @@
 
 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;
@@ -150,7 +149,7 @@ public boolean equals(Object obj) {
     */
    @Override
    public String toString() {
-      return MoreObjects.toStringHelper(this).omitNullValues().add("loadBalancerName", loadBalancerName)
+      return Objects.toStringHelper(this).omitNullValues().add("loadBalancerName", loadBalancerName)
                .add("names", names).toString();
    }
 }
diff --git 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;

diff --git 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;

diff --git 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;

diff --git 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;

diff --git a/rds/src/main/java/org/jclouds/rds/domain/Authorization.java b/rds/src/main/java/org/jclouds/rds/domain/Authorization.java
@@ -19,7 +19,6 @@
 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 {
@@ -140,7 +139,7 @@ public boolean equals(Object obj) {
     */
    @Override
    public String toString() {
-      return MoreObjects.toStringHelper(this).omitNullValues().add("status", rawStatus).toString();
+      return Objects.toStringHelper(this).omitNullValues().add("status", rawStatus).toString();
    }
 
 }
diff --git a/rds/src/main/java/org/jclouds/rds/domain/EC2SecurityGroup.java b/rds/src/main/java/org/jclouds/rds/domain/EC2SecurityGroup.java
@@ -18,7 +18,6 @@
 
 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;
 
@@ -143,7 +142,7 @@ public boolean equals(Object obj) {
     */
    @Override
    public String toString() {
-      return MoreObjects.toStringHelper(this).omitNullValues().add("id", id.orNull()).add("name", name)
+      return Objects.toStringHelper(this).omitNullValues().add("id", id.orNull()).add("name", name)
                .add("ownerId", ownerId).add("status", rawStatus).toString();
    }
 

diff --git a/rds/src/main/java/org/jclouds/rds/domain/IPRange.java b/rds/src/main/java/org/jclouds/rds/domain/IPRange.java
@@ -18,7 +18,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 
 /**
@@ -104,7 +103,7 @@ public boolean equals(Object obj) {
     */
    @Override
    public String toString() {
-      return MoreObjects.toStringHelper(this).omitNullValues().add("cidrIp", cidrIp).add("status", rawStatus).toString();
+      return Objects.toStringHelper(this).omitNullValues().add("cidrIp", cidrIp).add("status", rawStatus).toString();
    }
 
 }
diff --git a/rds/src/main/java/org/jclouds/rds/domain/Instance.java b/rds/src/main/java/org/jclouds/rds/domain/Instance.java
@@ -24,7 +24,6 @@
 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;
@@ -366,7 +365,7 @@ public boolean equals(Object obj) {
     */
    @Override
    public String toString() {
-      return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("name", name.orNull())
+      return Objects.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)

diff --git 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 org.jclouds.rds.domain.internal.BaseInstance;
 
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableSet;
 

diff --git a/rds/src/main/java/org/jclouds/rds/domain/SecurityGroup.java b/rds/src/main/java/org/jclouds/rds/domain/SecurityGroup.java
@@ -20,9 +20,8 @@
 
 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;
 
@@ -239,7 +238,7 @@ public String toString() {
    }
 
    protected ToStringHelper string() {
-      return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("description", description)
+      return Objects.toStringHelper(this).omitNullValues().add("name", name).add("description", description)
                .add("ec2SecurityGroups", ec2SecurityGroups).add("ipRanges", ipRanges).add("ownerId", ownerId)
                .add("vpcId", vpcId.orNull());
    }

diff --git a/rds/src/main/java/org/jclouds/rds/domain/Subnet.java b/rds/src/main/java/org/jclouds/rds/domain/Subnet.java
@@ -18,7 +18,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 
 /**
@@ -134,7 +133,7 @@ public boolean equals(Object obj) {
     */
    @Override
    public String toString() {
-      return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("availabilityZone", availabilityZone)
+      return Objects.toStringHelper(this).omitNullValues().add("id", id).add("availabilityZone", availabilityZone)
                .add("status", status).toString();
    }
 

diff --git a/rds/src/main/java/org/jclouds/rds/domain/SubnetGroup.java b/rds/src/main/java/org/jclouds/rds/domain/SubnetGroup.java
@@ -20,9 +20,8 @@
 
 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;
 
@@ -202,7 +201,7 @@ public String toString() {
    }
 
    protected ToStringHelper string() {
-      return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("description", description)
+      return Objects.toStringHelper(this).omitNullValues().add("name", name).add("description", description)
                .add("status", status).add("subnets", subnets).add("vpcId", vpcId.orNull());
    }
 

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
@@ -18,9 +18,8 @@
 
 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 {
@@ -192,7 +191,7 @@ public String toString() {
    }
 
    protected ToStringHelper string() {
-      return MoreObjects.toStringHelper(this).omitNullValues().add("name", name.orNull()).add("instanceClass", instanceClass)
+      return Objects.toStringHelper(this).omitNullValues().add("name", name.orNull()).add("instanceClass", instanceClass)
                .add("engine", engine).add("masterUsername", masterUsername)
                .add("allocatedStorageGB", allocatedStorageGB);
    }

diff --git a/rds/src/main/java/org/jclouds/rds/options/ListInstancesOptions.java b/rds/src/main/java/org/jclouds/rds/options/ListInstancesOptions.java
@@ -20,7 +20,6 @@
 
 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;
@@ -135,6 +134,6 @@ public boolean equals(Object obj) {
     */
    @Override
    public String toString() {
-      return MoreObjects.toStringHelper(this).omitNullValues().add("marker", marker).add("names", names).toString();
+      return Objects.toStringHelper(this).omitNullValues().add("marker", marker).add("names", names).toString();
    }
 }