http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/test/java/org/jclouds/rest/internal/BaseRestApiTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/jclouds/rest/internal/BaseRestApiTest.java b/core/src/test/java/org/jclouds/rest/internal/BaseRestApiTest.java index 114bf5b..c151c4e 100644 --- a/core/src/test/java/org/jclouds/rest/internal/BaseRestApiTest.java +++ b/core/src/test/java/org/jclouds/rest/internal/BaseRestApiTest.java @@ -18,7 +18,7 @@ package org.jclouds.rest.internal; import static com.google.common.base.Throwables.propagate; import static com.google.common.hash.Hashing.md5; import static com.google.common.net.HttpHeaders.TRANSFER_ENCODING; -import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; +import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; import static com.google.inject.name.Names.named; import static org.easymock.EasyMock.createMock; import static org.jclouds.Constants.PROPERTY_IO_WORKER_THREADS; @@ -78,8 +78,8 @@ public abstract class BaseRestApiTest { @Override protected void configure() { - bind(ListeningExecutorService.class).annotatedWith(named(PROPERTY_USER_THREADS)).toInstance(sameThreadExecutor()); - bind(ListeningExecutorService.class).annotatedWith(named(PROPERTY_IO_WORKER_THREADS)).toInstance(sameThreadExecutor()); + bind(ListeningExecutorService.class).annotatedWith(named(PROPERTY_USER_THREADS)).toInstance(newDirectExecutorService()); + bind(ListeningExecutorService.class).annotatedWith(named(PROPERTY_IO_WORKER_THREADS)).toInstance(newDirectExecutorService()); bind(HttpCommandExecutorService.class).toInstance(mock); }
http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/test/java/org/jclouds/rest/internal/InvokeMappedHttpMethodTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/jclouds/rest/internal/InvokeMappedHttpMethodTest.java b/core/src/test/java/org/jclouds/rest/internal/InvokeMappedHttpMethodTest.java index 5b56ea2..44a53e2 100644 --- a/core/src/test/java/org/jclouds/rest/internal/InvokeMappedHttpMethodTest.java +++ b/core/src/test/java/org/jclouds/rest/internal/InvokeMappedHttpMethodTest.java @@ -82,7 +82,7 @@ public class InvokeMappedHttpMethodTest { @SuppressWarnings("unchecked") private Function<HttpRequest, Function<HttpResponse, ?>> transformerForRequest = Function.class.cast(Functions .constant(Functions.identity())); - private ListeningExecutorService userThreads = MoreExecutors.sameThreadExecutor(); + private ListeningExecutorService userThreads = MoreExecutors.newDirectExecutorService(); private HttpResponse response = HttpResponse.builder().statusCode(200).payload("foo").build(); private HttpCommandExecutorService http; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/drivers/gae/src/main/java/org/jclouds/gae/config/GoogleAppEngineConfigurationModule.java ---------------------------------------------------------------------- diff --git a/drivers/gae/src/main/java/org/jclouds/gae/config/GoogleAppEngineConfigurationModule.java b/drivers/gae/src/main/java/org/jclouds/gae/config/GoogleAppEngineConfigurationModule.java index 9c7a540..e3264a3 100644 --- a/drivers/gae/src/main/java/org/jclouds/gae/config/GoogleAppEngineConfigurationModule.java +++ b/drivers/gae/src/main/java/org/jclouds/gae/config/GoogleAppEngineConfigurationModule.java @@ -16,7 +16,7 @@ */ package org.jclouds.gae.config; -import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; +import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; import org.jclouds.concurrent.SingleThreaded; import org.jclouds.concurrent.config.ConfiguresExecutorService; @@ -46,7 +46,7 @@ public class GoogleAppEngineConfigurationModule extends AbstractModule { private final Module userExecutorModule; public GoogleAppEngineConfigurationModule() { - this(new ExecutorServiceModule(sameThreadExecutor(), sameThreadExecutor())); + this(new ExecutorServiceModule(newDirectExecutorService(), newDirectExecutorService())); } /** http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/SessionConnection.java ---------------------------------------------------------------------- diff --git a/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/SessionConnection.java b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/SessionConnection.java index 987d8b9..c7e1eb5 100644 --- a/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/SessionConnection.java +++ b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/SessionConnection.java @@ -25,6 +25,7 @@ import org.jclouds.javax.annotation.Nullable; import org.jclouds.proxy.ProxyConfig; import org.jclouds.ssh.jsch.JschSshClient.Connection; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; import com.google.common.net.HostAndPort; @@ -253,7 +254,7 @@ public final class SessionConnection implements Connection<Session> { @Override public String toString() { - return Objects.toStringHelper("").omitNullValues() + return MoreObjects.toStringHelper("").omitNullValues() .add("hostAndPort", hostAndPort).add("loginUser", loginCredentials.getUser()) .add("session", session != null ? session.hashCode() : null) .add("connectTimeout", connectTimeout) http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java ---------------------------------------------------------------------- diff --git a/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java b/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java index 68754e9..4337ad0 100644 --- a/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java +++ b/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java @@ -36,6 +36,7 @@ import org.jclouds.logging.Logger; import org.jclouds.sshj.SshjSshClient.Connection; import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; @@ -235,7 +236,7 @@ public class SSHClientConnection implements Connection<SSHClient> { @Override public String toString() { - return Objects.toStringHelper("").add("hostAndPort", hostAndPort).add("loginUser", loginCredentials.getUser()) + return MoreObjects.toStringHelper("").add("hostAndPort", hostAndPort).add("loginUser", loginCredentials.getUser()) .add("ssh", ssh != null ? ssh.hashCode() : null).add("connectTimeout", connectTimeout).add( "sessionTimeout", sessionTimeout).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java index 1e75329..d1ec773 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java @@ -35,7 +35,7 @@ import org.jclouds.rest.annotations.SinceApiVersion; import org.jclouds.scriptbuilder.domain.Statement; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java index f3ffc0b..ba75584 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java @@ -17,7 +17,7 @@ package org.jclouds.aws.ec2.domain; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import java.util.Date; @@ -33,7 +33,7 @@ import org.jclouds.javax.annotation.Nullable; import org.jclouds.rest.annotations.SinceApiVersion; import com.google.common.base.Objects; -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.ImmutableMap; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java index 2972dd5..1b9a47a 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java @@ -17,7 +17,7 @@ package org.jclouds.aws.ec2.domain; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/aws-s3/src/main/java/org/jclouds/aws/s3/domain/DeleteResult.java ---------------------------------------------------------------------- diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/domain/DeleteResult.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/domain/DeleteResult.java index f338962..13b0d38 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/domain/DeleteResult.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/domain/DeleteResult.java @@ -16,6 +16,7 @@ */ package org.jclouds.aws.s3.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ForwardingSet; import com.google.common.collect.ImmutableMap; @@ -71,7 +72,7 @@ public class DeleteResult extends ForwardingSet<String> { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("code", code).add("message", message).toString(); } } @@ -183,7 +184,7 @@ public class DeleteResult extends ForwardingSet<String> { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("deleted", deleted).add("errors", errors).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java ---------------------------------------------------------------------- diff --git a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java index f8fb581..d96c311 100644 --- a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java +++ b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java @@ -16,7 +16,7 @@ */ package org.jclouds.aws.s3.blobstore.strategy.internal; -import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; +import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; import static org.jclouds.Constants.PROPERTY_MAX_RETRIES; import static org.jclouds.Constants.PROPERTY_SO_TIMEOUT; import static org.jclouds.s3.reference.S3Constants.PROPERTY_S3_VIRTUAL_HOST_BUCKETS; @@ -127,8 +127,8 @@ public class SequentialMultipartUploadStrategyMockTest { } } - 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())); static SequentialMultipartUploadStrategy mockSequentialMultipartUploadStrategy(String uri, int partSize) { Properties overrides = new Properties(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreatePrimaryZone.java ---------------------------------------------------------------------- diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreatePrimaryZone.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreatePrimaryZone.java index 5dac001..6edb52d 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreatePrimaryZone.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreatePrimaryZone.java @@ -17,7 +17,7 @@ package org.jclouds.dynect.v3.domain; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import javax.inject.Named; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreateRecord.java ---------------------------------------------------------------------- diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreateRecord.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreateRecord.java index 5d76f8f..e80eb1c 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreateRecord.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreateRecord.java @@ -17,7 +17,7 @@ package org.jclouds.dynect.v3.domain; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoRegionGroup.java ---------------------------------------------------------------------- diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoRegionGroup.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoRegionGroup.java index 0910036..c9d027b 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoRegionGroup.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoRegionGroup.java @@ -17,7 +17,7 @@ package org.jclouds.dynect.v3.domain; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoService.java ---------------------------------------------------------------------- diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoService.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoService.java index 20b81e5..3bd3be0 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoService.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoService.java @@ -17,7 +17,7 @@ package org.jclouds.dynect.v3.domain; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Job.java ---------------------------------------------------------------------- diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Job.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Job.java index 5bbafb8..54c52ea 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Job.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Job.java @@ -17,7 +17,7 @@ package org.jclouds.dynect.v3.domain; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Node.java ---------------------------------------------------------------------- diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Node.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Node.java index 24e122c..576d33a 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Node.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Node.java @@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; public class Node { @@ -70,6 +71,6 @@ public class Node { @Override public String toString() { - return Objects.toStringHelper("").add("zone", zone).add("fqdn", fqdn).toString(); + return MoreObjects.toStringHelper("").add("zone", zone).add("fqdn", fqdn).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Record.java ---------------------------------------------------------------------- diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Record.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Record.java index 084dc6a..ec6aeeb 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Record.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Record.java @@ -24,7 +24,7 @@ import java.util.Map; import javax.inject.Named; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; public class Record<D extends Map<String, Object>> extends RecordId { http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordId.java ---------------------------------------------------------------------- diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordId.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordId.java index 20ad13d..33d75ca 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordId.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordId.java @@ -17,13 +17,13 @@ package org.jclouds.dynect.v3.domain; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; public class RecordId extends Node { http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordSet.java ---------------------------------------------------------------------- diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordSet.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordSet.java index aeed65e..8131317 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordSet.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordSet.java @@ -17,7 +17,7 @@ package org.jclouds.dynect.v3.domain; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SOARecord.java ---------------------------------------------------------------------- diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SOARecord.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SOARecord.java index b64e139..08fa9ca 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SOARecord.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SOARecord.java @@ -25,7 +25,7 @@ import javax.inject.Named; import org.jclouds.dynect.v3.domain.Zone.SerialStyle; import org.jclouds.dynect.v3.domain.rdata.SOAData; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Start of Authority per RFC 1035 http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Session.java ---------------------------------------------------------------------- diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Session.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Session.java index 3cc7ecc..fda4736 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Session.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Session.java @@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; public final class Session { @@ -70,6 +71,6 @@ public final class Session { @Override public String toString() { - return Objects.toStringHelper(this).add("token", token).add("version", version).toString(); + return MoreObjects.toStringHelper(this).add("token", token).add("version", version).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SessionCredentials.java ---------------------------------------------------------------------- diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SessionCredentials.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SessionCredentials.java index 752bf5c..2347899 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SessionCredentials.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SessionCredentials.java @@ -24,6 +24,7 @@ import javax.inject.Named; import org.jclouds.domain.Credentials; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -144,6 +145,6 @@ public final class SessionCredentials extends Credentials { @Override public String toString() { - return Objects.toStringHelper(this).add("userName", identity).add("customerName", customerName).toString(); + return MoreObjects.toStringHelper(this).add("userName", identity).add("customerName", customerName).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Zone.java ---------------------------------------------------------------------- diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Zone.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Zone.java index 6ac5c56..c932266 100644 --- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Zone.java +++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Zone.java @@ -17,7 +17,7 @@ package org.jclouds.dynect.v3.domain; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/dynect/src/test/java/org/jclouds/dynect/v3/DynectApiMockTest.java ---------------------------------------------------------------------- diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/DynectApiMockTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/DynectApiMockTest.java index a8b874d..97c7611 100644 --- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/DynectApiMockTest.java +++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/DynectApiMockTest.java @@ -16,7 +16,7 @@ */ package org.jclouds.dynect.v3; -import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; +import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; import static javax.ws.rs.core.Response.Status.OK; import static org.jclouds.Constants.PROPERTY_MAX_RETRIES; @@ -39,7 +39,7 @@ import com.squareup.okhttp.mockwebserver.MockWebServer; public class DynectApiMockTest { private static final Set<Module> modules = ImmutableSet.<Module> of( - new ExecutorServiceModule(sameThreadExecutor(), sameThreadExecutor())); + new ExecutorServiceModule(newDirectExecutorService(), newDirectExecutorService())); static DynECTApi mockDynectApi(String uri) { Properties overrides = new Properties(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/compute/options/GleSYSTemplateOptions.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/compute/options/GleSYSTemplateOptions.java b/providers/glesys/src/main/java/org/jclouds/glesys/compute/options/GleSYSTemplateOptions.java index d85a455..912d716 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/compute/options/GleSYSTemplateOptions.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/compute/options/GleSYSTemplateOptions.java @@ -23,7 +23,7 @@ import java.util.Map; import org.jclouds.compute.options.TemplateOptions; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.net.InetAddresses; /** http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArguments.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArguments.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArguments.java index 9e3d968..d80a86a 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArguments.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArguments.java @@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; 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.collect.ImmutableSet; /** @@ -122,7 +123,7 @@ public class AllowedArguments { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("costPerUnit", this.costPerUnit) + return MoreObjects.toStringHelper("").add("costPerUnit", this.costPerUnit) .add("allowedUnits", this.allowedUnits); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArgumentsForCreateServer.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArgumentsForCreateServer.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArgumentsForCreateServer.java index 5eb568f..accb9af 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArgumentsForCreateServer.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArgumentsForCreateServer.java @@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; 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.collect.ImmutableSet; /** @@ -205,7 +206,7 @@ public class AllowedArgumentsForCreateServer { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("diskSizesInGB", diskSizesInGB).add("memorySizesInMB", memorySizesInMB) + return MoreObjects.toStringHelper("").add("diskSizesInGB", diskSizesInGB).add("memorySizesInMB", memorySizesInMB) .add("cpuCoreOptions", cpuCoreOptions).add("templateNames", templateNames) .add("transfersInGB", transfersInGB).add("dataCenters", dataCenters); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/Archive.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Archive.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Archive.java index 6141782..b35631a 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Archive.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Archive.java @@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; +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; /** * Information about an archive @@ -158,7 +159,7 @@ public class Archive { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("username", username).add("totalSize", totalSize).add("freeSize", freeSize).add("locked", locked); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveAllowedArguments.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveAllowedArguments.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveAllowedArguments.java index b93332b..d072007 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveAllowedArguments.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveAllowedArguments.java @@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import java.util.List; +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.collect.ImmutableList; /** @@ -103,7 +104,7 @@ public class ArchiveAllowedArguments { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("archiveSizes", archiveSizes); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/Console.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Console.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Console.java index aee64a7..3d508b7 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Console.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Console.java @@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; +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; /** * Connection information to connect to a server with VNC. @@ -153,7 +154,7 @@ public class Console { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("host", host).add("port", port).add("protocol", protocol) + return MoreObjects.toStringHelper("").add("host", host).add("port", port).add("protocol", protocol) .add("password", password); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/Cost.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Cost.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Cost.java index 160758a..27e6622 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Cost.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Cost.java @@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; +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; /** * The Cost class contains information about the cost of a server @@ -135,7 +136,7 @@ public class Cost { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("amount", amount).add("currency", currency).add("timePeriod", timePeriod); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/Domain.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Domain.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Domain.java index 9633165..3283da1 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Domain.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Domain.java @@ -23,8 +23,9 @@ import java.util.Date; import org.jclouds.javax.annotation.Nullable; +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; /** * Domain data for a Glesys account. @@ -294,7 +295,7 @@ public class Domain { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("domainName", domainName).add("createTime", createTime).add("recordCount", recordCount).add("useGlesysNameServer", useGlesysNameServer); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/DomainRecord.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/DomainRecord.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/DomainRecord.java index 9a3dd6b..2b1b761 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/DomainRecord.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/DomainRecord.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +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; /** * DNS record data. @@ -196,7 +197,7 @@ public class DomainRecord { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("id", id).add("domainname", domainname).add("host", host).add("type", type).add("data", data) .add("ttl", ttl); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAccount.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAccount.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAccount.java index b564cc4..3ed90da 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAccount.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAccount.java @@ -23,8 +23,9 @@ import java.util.Date; import org.jclouds.javax.annotation.Nullable; +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; /** * Detailed information on an Email Account @@ -255,7 +256,7 @@ public class EmailAccount { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("account", account).add("quota", quota).add("antispamLevel", antispamLevel).add("antiVirus", antiVirus).add("autoRespond", autoRespond).add("autoRespondMessage", autoRespondMessage).add("autoRespondSaveEmail", autoRespondSaveEmail).add("created", created).add("modified", modified); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAlias.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAlias.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAlias.java index 426e942..5d14d5f 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAlias.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAlias.java @@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; +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; /** * Detailed information on an Email Account @@ -115,7 +116,7 @@ public class EmailAlias { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("alias", alias).add("forwardTo", forwardTo); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverview.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverview.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverview.java index 32353ab..2a08e6a 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverview.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverview.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import java.util.Set; import com.google.common.annotations.Beta; +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.collect.ImmutableSet; /** @@ -125,7 +126,7 @@ public class EmailOverview { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("summary", summary).add("domains", domains); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewDomain.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewDomain.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewDomain.java index 8376721..ea7ccb7 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewDomain.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewDomain.java @@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import com.google.common.annotations.Beta; +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; /** * Detailed information about e-mail settings for a single domain @@ -129,7 +130,7 @@ public class EmailOverviewDomain { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("domain", domain).add("accounts", accounts).add("aliases", aliases); + return MoreObjects.toStringHelper("").add("domain", domain).add("accounts", accounts).add("aliases", aliases); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewSummary.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewSummary.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewSummary.java index f99b233..5717d70 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewSummary.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewSummary.java @@ -19,8 +19,9 @@ package org.jclouds.glesys.domain; import java.beans.ConstructorProperties; import com.google.common.annotations.Beta; +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; /** * Summary information of e-mail settings and limits for a GleSYS account @@ -158,7 +159,7 @@ public class EmailOverviewSummary { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("accounts", accounts).add("maxAccounts", maxAccounts).add("aliases", aliases).add("maxAliases", maxAliases); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailQuota.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailQuota.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailQuota.java index 96686f5..0b8772c 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailQuota.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailQuota.java @@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; +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; /** * Information on an Email Account Quota size @@ -116,7 +117,7 @@ public class EmailQuota { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("max", max).add("unit", unit); + return MoreObjects.toStringHelper("").add("max", max).add("unit", unit); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/Ip.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Ip.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Ip.java index 401929d..8575a12 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Ip.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Ip.java @@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; +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; /** * Represents an ip address used by a server. @@ -171,7 +172,7 @@ public class Ip { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("ip", ip).add("version", version).add("cost", cost).add("currency", currency); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/IpDetails.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/IpDetails.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/IpDetails.java index 4197cf7..0b1d547 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/IpDetails.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/IpDetails.java @@ -23,8 +23,9 @@ import java.util.List; import org.jclouds.javax.annotation.Nullable; +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.collect.ImmutableList; /** @@ -310,7 +311,7 @@ public class IpDetails { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("datacenter", datacenter).add("ipversion", version).add("ptr", ptr).add("platform", platform) .add("address", address).add("netmask", netmask).add("broadcast", broadcast).add("gateway", gateway) .add("nameServers", nameServers).add("serverId", serverId).add("cost", cost).add("reserved", reserved); http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/OSTemplate.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/OSTemplate.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/OSTemplate.java index f11a691..a0744c0 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/OSTemplate.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/OSTemplate.java @@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; +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; /** * Operating system template @@ -175,7 +176,7 @@ public class OSTemplate { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("name", name).add("minDiskSize", minDiskSize).add("minMemSize", minMemSize).add("os", os).add("platform", platform); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceStatus.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceStatus.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceStatus.java index fafc6ec..c183fed 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceStatus.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceStatus.java @@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; +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; /** * Detailed information on usage @@ -135,7 +136,7 @@ public class ResourceStatus { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("usage", usage).add("max", max).add("unit", unit); + return MoreObjects.toStringHelper("").add("usage", usage).add("max", max).add("unit", unit); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsage.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsage.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsage.java index 989bd83..2910a77 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsage.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsage.java @@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; 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.collect.ImmutableSet; /** @@ -122,7 +123,7 @@ public class ResourceUsage { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("info", info).add("values", values); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageInfo.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageInfo.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageInfo.java index c4517bc..b96fd07 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageInfo.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageInfo.java @@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; +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; /** * Detailed information on usage @@ -129,7 +130,7 @@ public class ResourceUsageInfo { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("resource", resource).add("resolution", resolution).add("unit", unit); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageValue.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageValue.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageValue.java index e49a0cb..06c789b 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageValue.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageValue.java @@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import java.util.Date; +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; /** * Detailed information on usage @@ -114,7 +115,7 @@ public class ResourceUsageValue { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("value", value).add("timestamp", timestamp); + return MoreObjects.toStringHelper("").add("value", value).add("timestamp", timestamp); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/Server.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Server.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Server.java index 7d700d4..80b64e4 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Server.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Server.java @@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import com.google.common.base.CaseFormat; +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; /** * Listing of a server. @@ -176,7 +177,7 @@ public class Server { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("id", id).add("hostname", hostname).add("datacenter", datacenter) + return MoreObjects.toStringHelper("").add("id", id).add("hostname", hostname).add("datacenter", datacenter) .add("platform", platform); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerDetails.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerDetails.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerDetails.java index cb35e99..781443f 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerDetails.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerDetails.java @@ -23,7 +23,7 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; /** http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerLimit.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerLimit.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerLimit.java index 8c6b112..c0a6e1a 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerLimit.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerLimit.java @@ -18,8 +18,9 @@ package org.jclouds.glesys.domain; import java.beans.ConstructorProperties; +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; /** * Detailed information about an OpenVZ server's limits @@ -160,7 +161,7 @@ public class ServerLimit { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("held", held).add("maxHeld", maxHeld).add("barrier", barrier) + return MoreObjects.toStringHelper("").add("held", held).add("maxHeld", maxHeld).add("barrier", barrier) .add("limit", limit).add("failCount", failCount); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerSpec.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerSpec.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerSpec.java index 5ca4cb1..4315374 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerSpec.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerSpec.java @@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; +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; /** * Class ServerSpec @@ -215,7 +216,7 @@ public class ServerSpec { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("platform", platform).add("datacenter", datacenter) + return MoreObjects.toStringHelper("").add("platform", platform).add("datacenter", datacenter) .add("memorySizeMB", memorySizeMB).add("diskSizeGB", diskSizeGB).add("templateName", templateName) .add("cpuCores", cpuCores).add("transferGB", transferGB); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerStatus.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerStatus.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerStatus.java index 912a7f6..e18f1d1 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerStatus.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerStatus.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +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; /** * Detailed information server status including hardware usage (cpu, memory and disk), bandwidth and up-time. @@ -181,7 +182,7 @@ public class ServerStatus { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("state", state).add("cpu", cpu).add("memory", memory).add("disk", disk).add("uptime", uptime); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerUptime.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerUptime.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerUptime.java index 8eac4ae..3f63926 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerUptime.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerUptime.java @@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; +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; /** * Represents an 'uptime' duration of server in a Glesys cloud @@ -115,7 +116,7 @@ public class ServerUptime { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("current", current).add("unit", unit); + return MoreObjects.toStringHelper("").add("current", current).add("unit", unit); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java ---------------------------------------------------------------------- diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java b/providers/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java index c956860..05af302 100644 --- a/providers/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java +++ b/providers/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java @@ -17,7 +17,7 @@ package org.jclouds.glesys.options; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Predicates.instanceOf; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/BillingToken.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/BillingToken.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/BillingToken.java index 84e0248..6a87fee 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/BillingToken.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/BillingToken.java @@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; +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.primitives.Longs; /** @@ -129,7 +130,7 @@ public class BillingToken implements Comparable<BillingToken> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("name", name).add("price", price); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Customer.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Customer.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Customer.java index 98274de..7ce48bb 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Customer.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Customer.java @@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; +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; /** * Class Customer @@ -111,7 +112,7 @@ public class Customer { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("name", name); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Ip.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Ip.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Ip.java index bbbeeeb..73a713b 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Ip.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Ip.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +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.primitives.Longs; /** @@ -184,7 +185,7 @@ public class Ip implements Comparable<Ip> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("ip", ip).add("subnet", subnet).add("isPublic", isPublic).add("state", state).add("datacenter", datacenter); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/IpPortPair.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/IpPortPair.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/IpPortPair.java index ca90764..74ea67bc 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/IpPortPair.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/IpPortPair.java @@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; +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.primitives.Ints; import com.google.common.primitives.Longs; @@ -113,7 +114,7 @@ public class IpPortPair implements Comparable<IpPortPair> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("ip", ip).add("port", port); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Job.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Job.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Job.java index 3639b8d..8af0b9a 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Job.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Job.java @@ -25,8 +25,9 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; +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.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.primitives.Longs; @@ -264,7 +265,7 @@ public class Job implements Comparable<Job> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("command", command).add("objectType", objectType).add("createdOn", createdOn).add("lastUpdatedOn", lastUpdatedOn).add("currentState", currentState).add("attempts", attempts).add("owner", owner).add("history", history).add("details", details); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/JobProperties.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/JobProperties.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/JobProperties.java index 897b73e..98a116d 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/JobProperties.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/JobProperties.java @@ -23,8 +23,9 @@ import java.util.Date; import org.jclouds.javax.annotation.Nullable; +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.primitives.Longs; /** @@ -151,7 +152,7 @@ public class JobProperties implements Comparable<JobProperties> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("updatedOn", updatedOn).add("state", state).add("note", note); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/LoadBalancer.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/LoadBalancer.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/LoadBalancer.java index 9fcb8b8..3c5006d 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/LoadBalancer.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/LoadBalancer.java @@ -23,8 +23,9 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; +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.collect.ImmutableSet; import com.google.common.primitives.Longs; @@ -257,7 +258,7 @@ public class LoadBalancer implements Comparable<LoadBalancer> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("name", name).add("description", description).add("virtualIp", virtualIp).add("realIpList", realIpList).add("type", type).add("persistence", persistence).add("os", os).add("state", state).add("datacenter", datacenter); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Option.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Option.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Option.java index a65acfa..520ce4c 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Option.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Option.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +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.primitives.Longs; /** @@ -136,7 +137,7 @@ public class Option implements Comparable<Option> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("name", name).add("description", description); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Server.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Server.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Server.java index 2c85fab..970129b 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Server.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Server.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +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.primitives.Longs; /** @@ -270,7 +271,7 @@ public class Server implements Comparable<Server> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("isSandbox", isSandbox).add("name", name).add("description", description).add("state", state).add("datacenter", datacenter).add("type", type).add("ram", ram).add("os", os).add("ip", ip).add("image", image); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/ServerImage.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/ServerImage.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/ServerImage.java index b8a7966..63b41cf 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/ServerImage.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/ServerImage.java @@ -24,8 +24,9 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; +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.Strings; import com.google.common.collect.ImmutableSet; import com.google.common.primitives.Longs; @@ -365,7 +366,7 @@ public class ServerImage implements Comparable<ServerImage> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("name", name).add("friendlyName", friendlyName).add("description", description).add("os", os).add("architecture", architecture).add("type", type).add("state", state).add("price", price).add("location", location).add("isActive", isActive).add("isPublic", isPublic).add("createdTime", createdTime).add("updatedTime", updatedTime).add("billingTokens", billingTokens).add("owner", owner); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/internal/ErrorResponse.java ---------------------------------------------------------------------- diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/internal/ErrorResponse.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/internal/ErrorResponse.java index 6a3e639..19578d5 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/internal/ErrorResponse.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/internal/ErrorResponse.java @@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; +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.collect.ComparisonChain; /** @@ -119,7 +120,7 @@ public class ErrorResponse implements Comparable<ErrorResponse> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("message", message).add("errorCode", errorCode); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/domain/CDNContainer.java ---------------------------------------------------------------------- diff --git a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/domain/CDNContainer.java b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/domain/CDNContainer.java index e674b27..58bb631 100644 --- a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/domain/CDNContainer.java +++ b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/domain/CDNContainer.java @@ -21,9 +21,10 @@ import java.net.URI; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; import com.google.common.base.Strings; -import com.google.common.base.Objects.ToStringHelper; public class CDNContainer implements Comparable<CDNContainer> { @@ -203,7 +204,7 @@ public class CDNContainer implements Comparable<CDNContainer> { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("name", name).add("cdnEnabled", cdnEnabled) + return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("cdnEnabled", cdnEnabled) .add("ttl", ttl).add("CDNUri", CDNUri).add("CDNSslUri", CDNSslUri).add("referrerAcl", referrerAcl) .add("useragentAcl", useragentAcl).add("logRetention", logRetention); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/internal/BaseHPCloudObjectStorageMockTest.java ---------------------------------------------------------------------- diff --git a/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/internal/BaseHPCloudObjectStorageMockTest.java b/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/internal/BaseHPCloudObjectStorageMockTest.java index 46e76b9..fa6105f 100644 --- a/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/internal/BaseHPCloudObjectStorageMockTest.java +++ b/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/internal/BaseHPCloudObjectStorageMockTest.java @@ -16,7 +16,7 @@ */ package org.jclouds.hpcloud.objectstorage.internal; -import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; +import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; import static org.jclouds.Constants.PROPERTY_MAX_RETRIES; import java.io.IOException; @@ -46,7 +46,7 @@ public class BaseHPCloudObjectStorageMockTest { .credentials("jclouds:joe", "letmein") // .endpoint(uri) // .overrides(overrides) // - .modules(ImmutableSet.<Module> of(new ExecutorServiceModule(sameThreadExecutor(), sameThreadExecutor()))) // + .modules(ImmutableSet.<Module> of(new ExecutorServiceModule(newDirectExecutorService(), newDirectExecutorService()))) // .buildApi(HPCloudObjectStorageApi.class); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java index e2bf26a..825a733 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java @@ -46,7 +46,7 @@ import org.jclouds.softlayer.domain.OperatingSystem; import org.jclouds.softlayer.domain.VirtualGuest; import com.google.common.base.Function; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Supplier; import com.google.inject.Provides; import com.google.inject.TypeLiteral; @@ -90,7 +90,7 @@ public class SoftLayerComputeServiceContextModule extends @Override public String toString() { - return Objects.toStringHelper(api) + return MoreObjects.toStringHelper(api) .add("method", "virtualGuestApi.getCreateObjectOptions") .toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java index 82ea706..a026d4e 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java @@ -16,6 +16,7 @@ */ package org.jclouds.softlayer.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.inject.name.Named; import org.jclouds.javax.annotation.Nullable; @@ -306,7 +307,7 @@ public class Address { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("country", country) .add("state", state) http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfiguration.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfiguration.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfiguration.java index 6834d31..8219bc9 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfiguration.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfiguration.java @@ -17,6 +17,7 @@ package org.jclouds.softlayer.domain; import com.google.common.base.Function; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; @@ -258,7 +259,7 @@ public class ContainerVirtualGuestConfiguration { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("blockDevices", blockDevices) .add("datacenters", datacenters) .add("memory", memory) http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfigurationOption.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfigurationOption.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfigurationOption.java index c2201d3..28e9673 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfigurationOption.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfigurationOption.java @@ -21,6 +21,7 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.inject.name.Named; @@ -101,7 +102,7 @@ public class ContainerVirtualGuestConfigurationOption { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("productItemPrice", productItemPrice) .add("template", template) .toString(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Datacenter.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Datacenter.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Datacenter.java index 5180ab6..9e02856 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Datacenter.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Datacenter.java @@ -22,6 +22,7 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; @@ -196,7 +197,7 @@ public class Datacenter { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("name", name) .add("longName", longName) http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/OperatingSystem.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/OperatingSystem.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/OperatingSystem.java index 053a91a..1132cee 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/OperatingSystem.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/OperatingSystem.java @@ -22,6 +22,7 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; @@ -151,7 +152,7 @@ public class OperatingSystem { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("softwareLicense", softwareLicense) .add("operatingSystemReferenceCode", operatingSystemReferenceCode)
