Revert "JCLOUDS-653: Address Guava 18 deprecations"
This reverts commit 710a7784eae58129a7796ac06c5e7b1d231ab4cf.
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 e44da6c..42f1b2c 100644
--- 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 @@
}
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
index 9f969ad..43fc3a5 100644
--- 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 @@
}
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
index 0a211d7..7662a1a 100644
--- 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 @@
*/
@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
index a5499ff..0d18efa 100644
--- 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 @@
}
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
index 467d638..88b9c88 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 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
index 9d71a66..d3ea72b 100644
--- 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 @@
*/
@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
index 5a25dd8..8ff1040 100644
--- 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 @@
*/
@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
index cae1c27..a4057ed 100644
--- 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 @@
*/
@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
index 234f758..3aa1a71 100644
--- 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 @@
*/
@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
index fcec8c8..7f65083 100644
--- 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 @@
*/
@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
index ec1e88e..9dd1c17 100644
--- 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 @@
*/
@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
index 0e2589f..c1630fe 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;
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 18a1ac2..0ac64aa 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;
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 85fbd3e..9e63c97 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;
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 12f9f32..a798bb2 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;
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 d611b5b..9a879ea 100644
--- 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 @@
*/
@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
index 043e8ac..9dccc42 100644
--- 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 @@
*/
@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
index 138fb30..32fdea9 100644
--- 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 @@
*/
@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
index 7491009..d5d3956 100644
--- 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 @@
*/
@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
index fe59cf4..13267e5 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 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
index 9ec1c80..14a3055 100644
--- 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 @@
}
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
index cd8e07a..78fe871 100644
--- 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 @@
*/
@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
index 4043aeb..276b831 100644
--- 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 @@
}
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
index 067d2be..ab7fd1e 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,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 @@
}
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
index e564c49..79ad654 100644
--- 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 @@
*/
@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/rds/src/main/java/org/jclouds/rds/options/ListSecurityGroupsOptions.java b/rds/src/main/java/org/jclouds/rds/options/ListSecurityGroupsOptions.java
index 1a74955..4243544 100644
--- a/rds/src/main/java/org/jclouds/rds/options/ListSecurityGroupsOptions.java
+++ b/rds/src/main/java/org/jclouds/rds/options/ListSecurityGroupsOptions.java
@@ -18,7 +18,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;
@@ -94,6 +93,6 @@
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("marker", marker).toString();
+ return Objects.toStringHelper(this).omitNullValues().add("marker", marker).toString();
}
}
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 64c53bf..17d2d69 100644
--- a/rds/src/main/java/org/jclouds/rds/options/ListSubnetGroupsOptions.java
+++ b/rds/src/main/java/org/jclouds/rds/options/ListSubnetGroupsOptions.java
@@ -18,7 +18,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;
@@ -94,6 +93,6 @@
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("marker", marker).toString();
+ return Objects.toStringHelper(this).omitNullValues().add("marker", marker).toString();
}
}
