You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2020/06/25 10:30:40 UTC
[jclouds-labs-aws] 02/03: JCLOUDS-1333: Fix Guava 21 issues
This is an automated email from the ASF dual-hosted git repository.
gaul pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jclouds-labs-aws.git
commit 5c62466a4233923dcc908ef7afe78367b098eaab
Author: Andrew Gaul <ga...@apache.org>
AuthorDate: Thu Jun 25 19:26:46 2020 +0900
JCLOUDS-1333: Fix Guava 21 issues
---
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 | 1 +
elb/src/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 ++-
elb/src/main/java/org/jclouds/elb/domain/SecurityGroupAndOwner.java | 3 ++-
.../main/java/org/jclouds/elb/options/ListLoadBalancersOptions.java | 3 ++-
elb/src/main/java/org/jclouds/elb/options/ListPoliciesOptions.java | 3 ++-
elb/src/test/java/org/jclouds/elb/internal/BaseELBApiMockTest.java | 4 ++--
.../src/test/java/org/jclouds/glacier/GlacierClientMockTest.java | 6 +++---
.../strategy/internal/MultipartUploadStrategyMockTest.java | 6 +++---
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 +++--
rds/src/main/java/org/jclouds/rds/domain/internal/BaseInstance.java | 5 +++--
rds/src/main/java/org/jclouds/rds/options/ListInstancesOptions.java | 3 ++-
.../java/org/jclouds/rds/options/ListSecurityGroupsOptions.java | 3 ++-
.../main/java/org/jclouds/rds/options/ListSubnetGroupsOptions.java | 3 ++-
30 files changed, 60 insertions(+), 39 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
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());
}
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 eb109b1..915cb7f 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);
}
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();
}
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 b8a420c..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,6 +19,7 @@ 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;
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 {
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())
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();
}
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 73c0668..8ec4828 100644
--- a/elb/src/main/java/org/jclouds/elb/domain/PolicyType.java
+++ b/elb/src/main/java/org/jclouds/elb/domain/PolicyType.java
@@ -22,6 +22,7 @@ import java.util.Map;
import java.util.Set;
import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
@@ -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();
}
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();
}
}
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();
}
}
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();
}
}
diff --git a/elb/src/test/java/org/jclouds/elb/internal/BaseELBApiMockTest.java b/elb/src/test/java/org/jclouds/elb/internal/BaseELBApiMockTest.java
index bd839f1..73b3a36 100644
--- a/elb/src/test/java/org/jclouds/elb/internal/BaseELBApiMockTest.java
+++ b/elb/src/test/java/org/jclouds/elb/internal/BaseELBApiMockTest.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.elb.internal;
-import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
import static org.testng.Assert.assertEquals;
import java.io.IOException;
@@ -44,7 +44,7 @@ public class BaseELBApiMockTest {
private static final String DEFAULT_ENDPOINT = "http:";
//new AWSELBProviderMetadata().getEndpoint();
- private final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(sameThreadExecutor()));
+ private final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(newDirectExecutorService()));
protected MockWebServer server;
protected ELBApi api;
diff --git a/glacier/src/test/java/org/jclouds/glacier/GlacierClientMockTest.java b/glacier/src/test/java/org/jclouds/glacier/GlacierClientMockTest.java
index 4f5b9a3..f47606e 100644
--- a/glacier/src/test/java/org/jclouds/glacier/GlacierClientMockTest.java
+++ b/glacier/src/test/java/org/jclouds/glacier/GlacierClientMockTest.java
@@ -17,7 +17,7 @@
package org.jclouds.glacier;
import static com.google.common.base.Charsets.UTF_8;
-import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
import static org.assertj.core.api.Assertions.assertThat;
import static org.jclouds.Constants.PROPERTY_MAX_RETRIES;
import static org.jclouds.Constants.PROPERTY_SO_TIMEOUT;
@@ -95,8 +95,8 @@ public class GlacierClientMockTest {
private static final String MULTIPART_UPLOAD_ID = "OW2fM5iVylEpFEMM9_HpKowRapC3vn5sSL39_396UW9zLFUWVrnRHaPjUJddQ5OxSHVXjYtrN47NBZ-khxOjyEXAMPLE";
private static final String MARKER = "xsQdFIRsfJr20CW2AbZBKpRZAFTZSJIMtL2hYf8mvp8dM0m4RUzlaqoEye6g3h3ecqB_zqwB7zLDMeSWhwo65re4C4Ev";
private static final String JOB_ID = "HkF9p6o7yjhFx-K3CGl6fuSm6VzW9T7esGQfco8nUXVYwS0jlb5gq1JZ55yHgt5vP54ZShjoQzQVVh7vEXAMPLEjobID";
- private static final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(sameThreadExecutor(),
- sameThreadExecutor()));
+ private static final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(newDirectExecutorService(),
+ newDirectExecutorService()));
private MockWebServer server;
private GlacierClient client;
diff --git a/glacier/src/test/java/org/jclouds/glacier/blobstore/strategy/internal/MultipartUploadStrategyMockTest.java b/glacier/src/test/java/org/jclouds/glacier/blobstore/strategy/internal/MultipartUploadStrategyMockTest.java
index 3a4bebf..54639c8 100644
--- a/glacier/src/test/java/org/jclouds/glacier/blobstore/strategy/internal/MultipartUploadStrategyMockTest.java
+++ b/glacier/src/test/java/org/jclouds/glacier/blobstore/strategy/internal/MultipartUploadStrategyMockTest.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.glacier.blobstore.strategy.internal;
-import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
import static org.assertj.core.api.Assertions.assertThat;
import static org.jclouds.Constants.PROPERTY_MAX_RETRIES;
import static org.jclouds.Constants.PROPERTY_SO_TIMEOUT;
@@ -54,8 +54,8 @@ import com.squareup.okhttp.mockwebserver.RecordedRequest;
@Test(groups = {"mock"}, singleThreaded = true)
public class MultipartUploadStrategyMockTest {
- private static final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(sameThreadExecutor(),
- sameThreadExecutor()));
+ private static final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(newDirectExecutorService(),
+ newDirectExecutorService()));
private static HashCode hash8 = HashCode.fromString("c87a460c93d4a8ffcf09a9a236cc17a486d7ed8a1a2f48e9c361c5f7ac0f1280");
private static HashCode hash4 = HashCode.fromString("9491cb2ed1d4e7cd53215f4017c23ec4ad21d7050a1e6bb636c4f67e8cddb844");
private static HashCode hcomp = HashCode.fromString("e196b8ae66b4e55a10c84647957c1291c84ffafa44bfdb88d87f0456e5399e46");
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;
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;
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;
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;
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();
}
}
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();
}
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();
}
}
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)
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 da9513d..69d9d47 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;
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());
}
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();
}
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());
}
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);
}
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();
}
}
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();
}
}
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();
}
}