http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/VmRule.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/VmRule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/VmRule.java index 8793a58..1d2e443 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/VmRule.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/VmRule.java @@ -23,6 +23,7 @@ import org.jclouds.javax.annotation.Nullable; import org.jclouds.vcloud.domain.network.nat.NatProtocol; import org.jclouds.vcloud.domain.network.nat.NatRule; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -119,7 +120,7 @@ public class VmRule implements NatRule { @Override public String toString() { - return Objects.toStringHelper("").omitNullValues().add("externalIP", externalIP) + return MoreObjects.toStringHelper("").omitNullValues().add("externalIP", externalIP) .add("externalPort", externalPort).add("vAppScopedLocalId", vAppScopedLocalId).add("vmNicId", vmNicId) .add("internalPort", internalPort).add("protocol", protocol).toString(); }
http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/vcloud/src/main/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptions.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptions.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptions.java index 8d35d1d..9a21caf 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptions.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptions.java @@ -23,8 +23,9 @@ import java.util.Set; import org.jclouds.vcloud.domain.network.NetworkConfig; +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.Sets; public class InstantiateVAppTemplateOptions { @@ -159,7 +160,7 @@ public class InstantiateVAppTemplateOptions { } protected ToStringHelper string() { - ToStringHelper toString = Objects.toStringHelper("").omitNullValues(); + ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues(); toString.add("customizeOnInstantiate", customizeOnInstantiate).add("description", description); if (networkConfig.size() > 0) toString.add("networkConfig", networkConfig); http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/common/openstack/src/main/java/org/jclouds/openstack/domain/AuthenticationResponse.java ---------------------------------------------------------------------- diff --git a/common/openstack/src/main/java/org/jclouds/openstack/domain/AuthenticationResponse.java b/common/openstack/src/main/java/org/jclouds/openstack/domain/AuthenticationResponse.java index a26fe44..c76dca8 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/domain/AuthenticationResponse.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/domain/AuthenticationResponse.java @@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; import java.util.Map; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; @@ -55,7 +56,7 @@ public class AuthenticationResponse { @Override public String toString() { - return Objects.toStringHelper(this).add("authToken", authToken).add("services", services).toString(); + return MoreObjects.toStringHelper(this).add("authToken", authToken).add("services", services).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/common/openstack/src/main/java/org/jclouds/openstack/domain/Link.java ---------------------------------------------------------------------- diff --git a/common/openstack/src/main/java/org/jclouds/openstack/domain/Link.java b/common/openstack/src/main/java/org/jclouds/openstack/domain/Link.java index a8f00a9..04828dd 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/domain/Link.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/domain/Link.java @@ -17,7 +17,7 @@ package org.jclouds.openstack.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/common/openstack/src/main/java/org/jclouds/openstack/domain/Resource.java ---------------------------------------------------------------------- diff --git a/common/openstack/src/main/java/org/jclouds/openstack/domain/Resource.java b/common/openstack/src/main/java/org/jclouds/openstack/domain/Resource.java index 2cc629e..70610e6 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/domain/Resource.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/domain/Resource.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; /** @@ -149,7 +150,7 @@ public class Resource implements Comparable<Resource> { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("id", getId()) .add("name", name) .add("links", links); http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Auth.java ---------------------------------------------------------------------- diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Auth.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Auth.java index 2f94619..3580738 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Auth.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Auth.java @@ -17,7 +17,7 @@ package org.jclouds.openstack.keystone.v1_1.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 com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Endpoint.java ---------------------------------------------------------------------- diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Endpoint.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Endpoint.java index 79a25d2..18115be 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Endpoint.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Endpoint.java @@ -17,7 +17,7 @@ package org.jclouds.openstack.keystone.v1_1.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.net.URI; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Token.java ---------------------------------------------------------------------- diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Token.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Token.java index 0e4edff..4fac522 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Token.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Token.java @@ -17,7 +17,7 @@ package org.jclouds.openstack.keystone.v1_1.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; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/main/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutput.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutput.java b/compute/src/main/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutput.java index 4d46015..5d3a977 100644 --- a/compute/src/main/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutput.java +++ b/compute/src/main/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutput.java @@ -35,6 +35,7 @@ import org.jclouds.compute.reference.ComputeServiceConstants; import org.jclouds.logging.Logger; import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Predicate; import com.google.common.base.Predicates; @@ -166,7 +167,7 @@ public class BlockUntilInitScriptStatusIsZeroThenReturnOutput extends AbstractFu @Override public String toString() { - return Objects.toStringHelper(this).add("commandRunner", commandRunner).toString(); + return MoreObjects.toStringHelper(this).add("commandRunner", commandRunner).toString(); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeUsingSsh.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeUsingSsh.java b/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeUsingSsh.java index 419109d..2d72e3a 100644 --- a/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeUsingSsh.java +++ b/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeUsingSsh.java @@ -36,7 +36,7 @@ import org.jclouds.ssh.SshClient; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Throwables; import com.google.common.eventbus.EventBus; import com.google.inject.assistedinject.Assisted; @@ -129,7 +129,7 @@ public class RunScriptOnNodeUsingSsh implements RunScriptOnNode { @Override public String toString() { - return Objects.toStringHelper(this).add("node", node).add("name", statement).add("runAsRoot", runAsRoot) + return MoreObjects.toStringHelper(this).add("node", node).add("name", statement).add("runAsRoot", runAsRoot) .toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/main/java/org/jclouds/compute/callables/SudoAwareInitManager.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/callables/SudoAwareInitManager.java b/compute/src/main/java/org/jclouds/compute/callables/SudoAwareInitManager.java index cef8056..03e691f 100644 --- a/compute/src/main/java/org/jclouds/compute/callables/SudoAwareInitManager.java +++ b/compute/src/main/java/org/jclouds/compute/callables/SudoAwareInitManager.java @@ -31,7 +31,7 @@ import org.jclouds.ssh.SshClient; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableSet; @@ -131,7 +131,7 @@ public class SudoAwareInitManager { @Override public String toString() { - return Objects.toStringHelper(this).add("node", node.getId()).add("name", init.getInstanceName()) + return MoreObjects.toStringHelper(this).add("node", node.getId()).add("name", init.getInstanceName()) .add("runAsRoot", runAsRoot).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/main/java/org/jclouds/compute/config/ComputeServiceAdapterContextModule.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/config/ComputeServiceAdapterContextModule.java b/compute/src/main/java/org/jclouds/compute/config/ComputeServiceAdapterContextModule.java index 343ed0d..bfc1e03 100644 --- a/compute/src/main/java/org/jclouds/compute/config/ComputeServiceAdapterContextModule.java +++ b/compute/src/main/java/org/jclouds/compute/config/ComputeServiceAdapterContextModule.java @@ -17,7 +17,7 @@ package org.jclouds.compute.config; import static com.google.common.base.Functions.compose; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Predicates.notNull; import java.util.Set; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/main/java/org/jclouds/compute/domain/CIMOperatingSystem.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/domain/CIMOperatingSystem.java b/compute/src/main/java/org/jclouds/compute/domain/CIMOperatingSystem.java index b743a71..fefa100 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/CIMOperatingSystem.java +++ b/compute/src/main/java/org/jclouds/compute/domain/CIMOperatingSystem.java @@ -21,7 +21,7 @@ import org.jclouds.javax.annotation.Nullable; import org.jclouds.ovf.Envelope; import com.google.common.annotations.Beta; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Operating system based on DMTF CIM model. http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/main/java/org/jclouds/compute/domain/ExecResponse.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/domain/ExecResponse.java b/compute/src/main/java/org/jclouds/compute/domain/ExecResponse.java index 345d6da..baf7dcb 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/ExecResponse.java +++ b/compute/src/main/java/org/jclouds/compute/domain/ExecResponse.java @@ -18,6 +18,7 @@ package org.jclouds.compute.domain; import org.jclouds.compute.config.CustomizationResponse; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; public class ExecResponse implements CustomizationResponse { @@ -62,7 +63,7 @@ public class ExecResponse implements CustomizationResponse { @Override public String toString() { - return Objects.toStringHelper("").add("output", output).add("error", error).add("exitStatus", exitStatus) + return MoreObjects.toStringHelper("").add("output", output).add("error", error).add("exitStatus", exitStatus) .toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/main/java/org/jclouds/compute/domain/OperatingSystem.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/domain/OperatingSystem.java b/compute/src/main/java/org/jclouds/compute/domain/OperatingSystem.java index 64fab3d..70c3e2f 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/OperatingSystem.java +++ b/compute/src/main/java/org/jclouds/compute/domain/OperatingSystem.java @@ -22,8 +22,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import org.jclouds.javax.annotation.Nullable; 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; /** * Running Operating system @@ -117,7 +118,7 @@ public class OperatingSystem { } protected ToStringHelper string() { - return Objects.toStringHelper("").omitNullValues().add("family", family).add("name", name).add("arch", arch) + return MoreObjects.toStringHelper("").omitNullValues().add("family", family).add("name", name).add("arch", arch) .add("version", version).add("description", description).add("is64Bit", is64Bit); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/main/java/org/jclouds/compute/domain/Processor.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/domain/Processor.java b/compute/src/main/java/org/jclouds/compute/domain/Processor.java index 932e635..d95688e 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/Processor.java +++ b/compute/src/main/java/org/jclouds/compute/domain/Processor.java @@ -18,8 +18,9 @@ package org.jclouds.compute.domain; import static com.google.common.base.Objects.equal; +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; /** @@ -80,7 +81,7 @@ public class Processor implements Comparable<Processor> { } protected ToStringHelper string() { - return Objects.toStringHelper("").omitNullValues().add("cores", cores).add("speed", speed); + return MoreObjects.toStringHelper("").omitNullValues().add("cores", cores).add("speed", speed); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/main/java/org/jclouds/compute/domain/SecurityGroup.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/domain/SecurityGroup.java b/compute/src/main/java/org/jclouds/compute/domain/SecurityGroup.java index 927cd9d..811a84d 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/SecurityGroup.java +++ b/compute/src/main/java/org/jclouds/compute/domain/SecurityGroup.java @@ -27,7 +27,7 @@ import org.jclouds.domain.Location; import org.jclouds.javax.annotation.Nullable; import org.jclouds.net.domain.IpPermission; -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/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilderSpec.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilderSpec.java b/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilderSpec.java index 5a073e0..e5d7e0c 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilderSpec.java +++ b/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilderSpec.java @@ -17,7 +17,7 @@ package org.jclouds.compute.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 java.util.List; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/main/java/org/jclouds/compute/domain/internal/ComputeMetadataImpl.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/ComputeMetadataImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/ComputeMetadataImpl.java index e19ecfd..74882d3 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/internal/ComputeMetadataImpl.java +++ b/compute/src/main/java/org/jclouds/compute/domain/internal/ComputeMetadataImpl.java @@ -31,8 +31,9 @@ import org.jclouds.domain.Location; import org.jclouds.domain.ResourceMetadata; import org.jclouds.domain.internal.ResourceMetadataImpl; +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; public class ComputeMetadataImpl extends ResourceMetadataImpl<ComputeType> implements ComputeMetadata { @@ -106,7 +107,7 @@ public class ComputeMetadataImpl extends ResourceMetadataImpl<ComputeType> imple } protected ToStringHelper computeToStringPrefix() { - return Objects.toStringHelper("").omitNullValues().add("id", getId()).add("providerId", getProviderId()) + return MoreObjects.toStringHelper("").omitNullValues().add("id", getId()).add("providerId", getProviderId()) .add("uri", getUri()).add("name", getName()).add("uri", getUri()).add("location", getLocation()); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java index 2b1b870..40b3cf3 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java +++ b/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java @@ -34,7 +34,7 @@ import org.jclouds.domain.Location; import org.jclouds.domain.ResourceMetadata; import org.jclouds.javax.annotation.Nullable; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Predicate; import com.google.common.collect.ComparisonChain; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java index d6ee20d..453b4cb 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java +++ b/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java @@ -30,7 +30,7 @@ import org.jclouds.domain.Location; import org.jclouds.domain.LoginCredentials; import org.jclouds.javax.annotation.Nullable; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; public class ImageImpl extends ComputeMetadataImpl implements Image { http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java index 4b5c089..e2ed8fc 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java +++ b/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java @@ -31,7 +31,7 @@ import org.jclouds.domain.Location; import org.jclouds.domain.LoginCredentials; 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; public class NodeMetadataImpl extends ComputeMetadataImpl implements NodeMetadata { http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java index 8287e41..83ba8e7 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java +++ b/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java @@ -60,8 +60,8 @@ import org.jclouds.logging.Logger; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; -import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.base.Predicates; @@ -1121,7 +1121,7 @@ public class TemplateBuilderImpl implements TemplateBuilder { * @since 1.5 */ protected ToStringHelper string() { - ToStringHelper toString = Objects.toStringHelper("").omitNullValues(); + ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues(); if (biggest) toString.add("biggest", biggest); if (fastest) http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateImpl.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateImpl.java index 4c71e9a..598376b 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateImpl.java +++ b/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateImpl.java @@ -25,8 +25,9 @@ import org.jclouds.compute.domain.Template; import org.jclouds.compute.options.TemplateOptions; import org.jclouds.domain.Location; +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; public class TemplateImpl implements Template { @@ -96,7 +97,7 @@ public class TemplateImpl implements Template { } protected ToStringHelper string() { - ToStringHelper helper = Objects.toStringHelper("").omitNullValues().add("image", image).add("hardware", hardware) + ToStringHelper helper = MoreObjects.toStringHelper("").omitNullValues().add("image", image).add("hardware", hardware) .add("location", location); if (!options.equals(defaultOptions())) helper.add("options", options); http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/main/java/org/jclouds/compute/domain/internal/VolumeImpl.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/VolumeImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/VolumeImpl.java index f8c5d5f..bd3c1ee 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/internal/VolumeImpl.java +++ b/compute/src/main/java/org/jclouds/compute/domain/internal/VolumeImpl.java @@ -22,8 +22,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import org.jclouds.compute.domain.Volume; 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; public class VolumeImpl implements Volume { @@ -60,7 +61,7 @@ public class VolumeImpl implements Volume { } protected ToStringHelper string() { - return Objects.toStringHelper("").omitNullValues().add("id", id).add("type", getType()).add("size", size) + return MoreObjects.toStringHelper("").omitNullValues().add("id", id).add("type", getType()).add("size", size) .add("device", device).add("bootDevice", bootDevice).add("durable", durable); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/main/java/org/jclouds/compute/events/StatementOnNode.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/events/StatementOnNode.java b/compute/src/main/java/org/jclouds/compute/events/StatementOnNode.java index cf89b79..8dfbaf5 100644 --- a/compute/src/main/java/org/jclouds/compute/events/StatementOnNode.java +++ b/compute/src/main/java/org/jclouds/compute/events/StatementOnNode.java @@ -22,8 +22,9 @@ import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.scriptbuilder.domain.Statement; 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; /** @@ -67,7 +68,7 @@ public class StatementOnNode { } protected ToStringHelper string() { - return Objects.toStringHelper(this).add("statement", statement).add("node", node.getId()); + return MoreObjects.toStringHelper(this).add("statement", statement).add("node", node.getId()); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeCompletion.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeCompletion.java b/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeCompletion.java index 0d92915..9a8cf19 100644 --- a/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeCompletion.java +++ b/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeCompletion.java @@ -23,7 +23,7 @@ import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.scriptbuilder.domain.Statement; import com.google.common.annotations.Beta; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * A statement that completed execution on a node. http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeFailure.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeFailure.java b/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeFailure.java index e4d0685..93bfab8 100644 --- a/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeFailure.java +++ b/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeFailure.java @@ -22,7 +22,7 @@ import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.scriptbuilder.domain.Statement; import com.google.common.annotations.Beta; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * A statement that failed execution on a node. http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/main/java/org/jclouds/compute/options/RunScriptOptions.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/options/RunScriptOptions.java b/compute/src/main/java/org/jclouds/compute/options/RunScriptOptions.java index 2e072b9..df7a0d7 100644 --- a/compute/src/main/java/org/jclouds/compute/options/RunScriptOptions.java +++ b/compute/src/main/java/org/jclouds/compute/options/RunScriptOptions.java @@ -23,9 +23,10 @@ import static com.google.common.base.Preconditions.checkNotNull; import org.jclouds.domain.LoginCredentials; 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.Optional; -import com.google.common.base.Objects.ToStringHelper; /** * Enables additional options for running a script. @@ -451,7 +452,7 @@ public class RunScriptOptions { } protected ToStringHelper string() { - ToStringHelper toString = Objects.toStringHelper("").omitNullValues(); + ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues(); toString.add("loginUser", loginUser); if (loginPassword != null) toString.add("loginPasswordPresent", true); http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/main/java/org/jclouds/compute/options/TemplateOptions.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/options/TemplateOptions.java b/compute/src/main/java/org/jclouds/compute/options/TemplateOptions.java index e1e8822..d7c6716 100644 --- a/compute/src/main/java/org/jclouds/compute/options/TemplateOptions.java +++ b/compute/src/main/java/org/jclouds/compute/options/TemplateOptions.java @@ -29,7 +29,7 @@ import org.jclouds.scriptbuilder.domain.Statement; import org.jclouds.scriptbuilder.domain.Statements; 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.Maps; import com.google.common.primitives.Ints; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/main/java/org/jclouds/compute/strategy/InitializeRunScriptOnNodeOrPlaceInBadMap.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/strategy/InitializeRunScriptOnNodeOrPlaceInBadMap.java b/compute/src/main/java/org/jclouds/compute/strategy/InitializeRunScriptOnNodeOrPlaceInBadMap.java index 4bd7e98..a601bf5 100644 --- a/compute/src/main/java/org/jclouds/compute/strategy/InitializeRunScriptOnNodeOrPlaceInBadMap.java +++ b/compute/src/main/java/org/jclouds/compute/strategy/InitializeRunScriptOnNodeOrPlaceInBadMap.java @@ -28,7 +28,7 @@ import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.options.RunScriptOptions; import org.jclouds.scriptbuilder.domain.Statement; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.inject.assistedinject.Assisted; public class InitializeRunScriptOnNodeOrPlaceInBadMap implements Callable<RunScriptOnNode> { @@ -67,6 +67,6 @@ public class InitializeRunScriptOnNodeOrPlaceInBadMap implements Callable<RunScr @Override public String toString() { - return Objects.toStringHelper(this).add("node", node).add("options", options).toString(); + return MoreObjects.toStringHelper(this).add("node", node).add("options", options).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/main/java/org/jclouds/compute/strategy/RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/strategy/RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java b/compute/src/main/java/org/jclouds/compute/strategy/RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java index 91c01f5..a9bbb0f 100644 --- a/compute/src/main/java/org/jclouds/compute/strategy/RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java +++ b/compute/src/main/java/org/jclouds/compute/strategy/RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java @@ -32,7 +32,7 @@ import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.reference.ComputeServiceConstants; import org.jclouds.logging.Logger; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.inject.assistedinject.AssistedInject; public class RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap implements Callable<ExecResponse> { @@ -75,7 +75,7 @@ public class RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap implements C @Override public String toString() { - return Objects.toStringHelper(this).add("runScriptOnNode", runScriptOnNode).add("goodNodes", goodNodes).add( + return MoreObjects.toStringHelper(this).add("runScriptOnNode", runScriptOnNode).add("goodNodes", goodNodes).add( "badNodes", badNodes).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/main/java/org/jclouds/compute/strategy/impl/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/strategy/impl/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java b/compute/src/main/java/org/jclouds/compute/strategy/impl/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java index e7f3384..986ed3b 100644 --- a/compute/src/main/java/org/jclouds/compute/strategy/impl/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java +++ b/compute/src/main/java/org/jclouds/compute/strategy/impl/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java @@ -16,7 +16,7 @@ */ package org.jclouds.compute.strategy.impl; -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 static com.google.common.collect.Iterables.any; import static com.google.common.collect.Maps.newLinkedHashMap; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/main/java/org/jclouds/compute/strategy/impl/ReturnCredentialsBoundToImage.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/strategy/impl/ReturnCredentialsBoundToImage.java b/compute/src/main/java/org/jclouds/compute/strategy/impl/ReturnCredentialsBoundToImage.java index f45426f..1b51a74 100644 --- a/compute/src/main/java/org/jclouds/compute/strategy/impl/ReturnCredentialsBoundToImage.java +++ b/compute/src/main/java/org/jclouds/compute/strategy/impl/ReturnCredentialsBoundToImage.java @@ -31,7 +31,7 @@ import org.jclouds.domain.Credentials; import org.jclouds.domain.LoginCredentials; import org.jclouds.javax.annotation.Nullable; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; @Singleton public class ReturnCredentialsBoundToImage implements PopulateDefaultLoginCredentialsForImageStrategy { @@ -67,6 +67,6 @@ public class ReturnCredentialsBoundToImage implements PopulateDefaultLoginCreden @Override public String toString() { - return Objects.toStringHelper(this).toString(); + return MoreObjects.toStringHelper(this).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/main/java/org/jclouds/net/domain/IpPermission.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/net/domain/IpPermission.java b/compute/src/main/java/org/jclouds/net/domain/IpPermission.java index 8fe2b5b..fa2cea6 100644 --- a/compute/src/main/java/org/jclouds/net/domain/IpPermission.java +++ b/compute/src/main/java/org/jclouds/net/domain/IpPermission.java @@ -26,8 +26,9 @@ import java.util.Set; import com.google.common.annotations.Beta; import com.google.common.base.Function; +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.ImmutableMultimap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; @@ -239,7 +240,7 @@ public class IpPermission implements Comparable<IpPermission> { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("ipProtocol", ipProtocol).add("fromPort", fromPort).add("toPort", toPort) + return MoreObjects.toStringHelper("").add("ipProtocol", ipProtocol).add("fromPort", fromPort).add("toPort", toPort) .add("tenantIdGroupNamePairs", tenantIdGroupNamePairs).add("groupIds", groupIds).add("cidrBlocks", cidrBlocks); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/test/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutputTest.java ---------------------------------------------------------------------- diff --git a/compute/src/test/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutputTest.java b/compute/src/test/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutputTest.java index 7d71e4c..fe3803d 100644 --- a/compute/src/test/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutputTest.java +++ b/compute/src/test/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutputTest.java @@ -132,7 +132,7 @@ public class BlockUntilInitScriptStatusIsZeroThenReturnOutputTest { EventBus eventBus = new EventBus(); public void testExitStatusZeroReturnsExecResponse() throws InterruptedException, ExecutionException { - ListeningExecutorService userExecutor = MoreExecutors.sameThreadExecutor(); + ListeningExecutorService userExecutor = MoreExecutors.newDirectExecutorService(); Predicate<String> notRunningAnymore = Predicates.alwaysTrue(); SudoAwareInitManager commandRunner = createMockBuilder(SudoAwareInitManager.class).addMockedMethod("runAction") .addMockedMethod("getStatement").addMockedMethod("getNode").addMockedMethod("toString") @@ -160,7 +160,7 @@ public class BlockUntilInitScriptStatusIsZeroThenReturnOutputTest { public void testFirstExitStatusOneButSecondExitStatusZeroReturnsExecResponse() throws InterruptedException, ExecutionException { - ListeningExecutorService userExecutor = MoreExecutors.sameThreadExecutor(); + ListeningExecutorService userExecutor = MoreExecutors.newDirectExecutorService(); Predicate<String> notRunningAnymore = Predicates.alwaysTrue(); SudoAwareInitManager commandRunner = createMockBuilder(SudoAwareInitManager.class).addMockedMethod("runAction") @@ -194,7 +194,7 @@ public class BlockUntilInitScriptStatusIsZeroThenReturnOutputTest { } public void testCancelInterruptStopsCommand() throws InterruptedException, ExecutionException { - ListeningExecutorService userExecutor = MoreExecutors.sameThreadExecutor(); + ListeningExecutorService userExecutor = MoreExecutors.newDirectExecutorService(); Predicate<String> notRunningAnymore = Predicates.alwaysTrue(); SudoAwareInitManager commandRunner = createMockBuilder(SudoAwareInitManager.class).addMockedMethod( "refreshAndRunAction").addMockedMethod("runAction").addMockedMethod("getStatement").addMockedMethod( @@ -239,7 +239,7 @@ public class BlockUntilInitScriptStatusIsZeroThenReturnOutputTest { public void testCancelDontInterruptLeavesCommandRunningAndReturnsLastStatus() throws InterruptedException, ExecutionException { - ListeningExecutorService userExecutor = MoreExecutors.sameThreadExecutor(); + ListeningExecutorService userExecutor = MoreExecutors.newDirectExecutorService(); Predicate<String> notRunningAnymore = Predicates.alwaysTrue(); SudoAwareInitManager commandRunner = createMockBuilder(SudoAwareInitManager.class).addMockedMethod("runAction") .addMockedMethod("getStatement").addMockedMethod("getNode").addMockedMethod("toString") http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/compute/src/test/java/org/jclouds/compute/callables/RunScriptOnNodeAsInitScriptUsingSshAndBlockUntilCompleteTest.java ---------------------------------------------------------------------- diff --git a/compute/src/test/java/org/jclouds/compute/callables/RunScriptOnNodeAsInitScriptUsingSshAndBlockUntilCompleteTest.java b/compute/src/test/java/org/jclouds/compute/callables/RunScriptOnNodeAsInitScriptUsingSshAndBlockUntilCompleteTest.java index 854ca56..afc88e0 100644 --- a/compute/src/test/java/org/jclouds/compute/callables/RunScriptOnNodeAsInitScriptUsingSshAndBlockUntilCompleteTest.java +++ b/compute/src/test/java/org/jclouds/compute/callables/RunScriptOnNodeAsInitScriptUsingSshAndBlockUntilCompleteTest.java @@ -16,7 +16,7 @@ */ package org.jclouds.compute.callables; -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.easymock.EasyMock.expect; @@ -52,7 +52,7 @@ import com.google.inject.assistedinject.FactoryModuleBuilder; @Test(groups = "unit", singleThreaded = true, testName = "RunScriptOnNodeAsInitScriptUsingSshAndBlockUntilCompleteTest") public class RunScriptOnNodeAsInitScriptUsingSshAndBlockUntilCompleteTest { - Injector injector = Guice.createInjector(new ExecutorServiceModule(sameThreadExecutor(), sameThreadExecutor()), + Injector injector = Guice.createInjector(new ExecutorServiceModule(newDirectExecutorService(), newDirectExecutorService()), new AbstractModule() { protected void configure() { bindConstant().annotatedWith(named(PROPERTY_USER_THREADS)).to(1); http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/ContextBuilder.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/ContextBuilder.java b/core/src/main/java/org/jclouds/ContextBuilder.java index 5524c67..8e98b64 100644 --- a/core/src/main/java/org/jclouds/ContextBuilder.java +++ b/core/src/main/java/org/jclouds/ContextBuilder.java @@ -16,7 +16,7 @@ */ package org.jclouds; -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 static com.google.common.base.Predicates.and; import static com.google.common.base.Predicates.containsPattern; @@ -33,7 +33,7 @@ import static com.google.common.collect.Iterables.transform; import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Lists.newArrayListWithCapacity; import static com.google.common.collect.Maps.filterKeys; -import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; +import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; import static org.jclouds.Constants.PROPERTY_API; import static org.jclouds.Constants.PROPERTY_API_VERSION; import static org.jclouds.Constants.PROPERTY_BUILD_VERSION; @@ -552,7 +552,7 @@ public class ContextBuilder { return input.getClass().isAnnotationPresent(SingleThreaded.class); } })) { - modules.add(new ExecutorServiceModule(sameThreadExecutor(), sameThreadExecutor())); + modules.add(new ExecutorServiceModule(newDirectExecutorService(), newDirectExecutorService())); } else { modules.add(new ExecutorServiceModule()); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/apis/internal/BaseApiMetadata.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/apis/internal/BaseApiMetadata.java b/core/src/main/java/org/jclouds/apis/internal/BaseApiMetadata.java index 34b4c44..5fd88e3 100644 --- a/core/src/main/java/org/jclouds/apis/internal/BaseApiMetadata.java +++ b/core/src/main/java/org/jclouds/apis/internal/BaseApiMetadata.java @@ -42,8 +42,9 @@ import org.jclouds.Context; import org.jclouds.View; import org.jclouds.apis.ApiMetadata; +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; import com.google.common.reflect.TypeToken; @@ -339,7 +340,7 @@ public abstract class BaseApiMetadata implements ApiMetadata { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("id", getId()).add("name", getName()).add("views", getViews()).add( + return MoreObjects.toStringHelper("").add("id", getId()).add("name", getName()).add("views", getViews()).add( "endpointName", getEndpointName()).add("identityName", getIdentityName()).add("credentialName", getCredentialName()).add("documentation", getDocumentation()); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/collect/AdvanceUntilEmptyIterable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/collect/AdvanceUntilEmptyIterable.java b/core/src/main/java/org/jclouds/collect/AdvanceUntilEmptyIterable.java index ff9d55b..b78d953 100644 --- a/core/src/main/java/org/jclouds/collect/AdvanceUntilEmptyIterable.java +++ b/core/src/main/java/org/jclouds/collect/AdvanceUntilEmptyIterable.java @@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Iterator; import com.google.common.annotations.Beta; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Supplier; import com.google.common.collect.AbstractIterator; @@ -104,7 +105,7 @@ public class AdvanceUntilEmptyIterable<E> extends FluentIterable<FluentIterable< */ @Override public String toString() { - return Objects.toStringHelper("").omitNullValues().add("current", current).add("unread", unread).toString(); + return MoreObjects.toStringHelper("").omitNullValues().add("current", current).add("unread", unread).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/collect/PagedIterables.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/collect/PagedIterables.java b/core/src/main/java/org/jclouds/collect/PagedIterables.java index 90ad17f..69421fa 100644 --- a/core/src/main/java/org/jclouds/collect/PagedIterables.java +++ b/core/src/main/java/org/jclouds/collect/PagedIterables.java @@ -22,6 +22,7 @@ import java.util.Iterator; import com.google.common.annotations.Beta; import com.google.common.base.Function; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.AbstractIterator; import com.google.common.collect.ImmutableSet; @@ -115,7 +116,7 @@ public class PagedIterables { @Override public String toString() { - return Objects.toStringHelper("").add("current", current).add("unread", unread).toString(); + return MoreObjects.toStringHelper("").add("current", current).add("unread", unread).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java b/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java index ab58ecd..5af7b2d 100644 --- a/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java +++ b/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java @@ -26,8 +26,9 @@ import org.jclouds.domain.Location; import org.jclouds.domain.LocationScope; 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; @@ -57,7 +58,7 @@ public class LocationImpl implements Location { @Override public String toString() { - ToStringHelper helper = Objects.toStringHelper("").omitNullValues().add("scope", scope).add("id", id) + ToStringHelper helper = MoreObjects.toStringHelper("").omitNullValues().add("scope", scope).add("id", id) .add("description", description); if (parent != null) helper.add("parent", parent.getId()); http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java b/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java index 220732d..99ab643 100644 --- a/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java +++ b/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java @@ -28,8 +28,9 @@ import org.jclouds.domain.Location; import org.jclouds.domain.ResourceMetadata; 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.Maps; /** @@ -128,7 +129,7 @@ public abstract class ResourceMetadataImpl<T extends Enum<T>> implements Resourc } protected ToStringHelper string() { - return Objects.toStringHelper("").omitNullValues().add("type", getType()).add("providerId", providerId) + return MoreObjects.toStringHelper("").omitNullValues().add("type", getType()).add("providerId", providerId) .add("name", name).add("location", location).add("uri", uri).add("userMetadata", userMetadata); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/http/HttpMessage.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/http/HttpMessage.java b/core/src/main/java/org/jclouds/http/HttpMessage.java index df3f578..7719215 100644 --- a/core/src/main/java/org/jclouds/http/HttpMessage.java +++ b/core/src/main/java/org/jclouds/http/HttpMessage.java @@ -29,8 +29,9 @@ import org.jclouds.io.Payloads; import org.jclouds.javax.annotation.Nullable; import org.jclouds.util.Multimaps2; +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.ImmutableMultimap; import com.google.common.collect.Multimap; import com.google.common.io.ByteSource; @@ -224,7 +225,7 @@ public class HttpMessage extends PayloadEnclosingImpl { } protected ToStringHelper string() { - return Objects.toStringHelper("").omitNullValues() + return MoreObjects.toStringHelper("").omitNullValues() .add("headers", headers) .add("payload", payload); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/http/HttpRequest.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/http/HttpRequest.java b/core/src/main/java/org/jclouds/http/HttpRequest.java index 80b235e..9721240 100644 --- a/core/src/main/java/org/jclouds/http/HttpRequest.java +++ b/core/src/main/java/org/jclouds/http/HttpRequest.java @@ -31,8 +31,9 @@ import java.util.Set; import org.jclouds.io.Payload; 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; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableSet; @@ -285,7 +286,7 @@ public class HttpRequest extends HttpMessage { @Override protected ToStringHelper string() { - return Objects.toStringHelper("").omitNullValues() + return MoreObjects.toStringHelper("").omitNullValues() .add("method", method) .add("endpoint", endpoint) .add("headers", headers) http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/http/HttpResponse.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/http/HttpResponse.java b/core/src/main/java/org/jclouds/http/HttpResponse.java index 2f894a9..7dcdd3a 100644 --- a/core/src/main/java/org/jclouds/http/HttpResponse.java +++ b/core/src/main/java/org/jclouds/http/HttpResponse.java @@ -19,8 +19,9 @@ package org.jclouds.http; import org.jclouds.io.Payload; 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.Multimap; /** @@ -114,7 +115,7 @@ public class HttpResponse extends HttpMessage { @Override protected ToStringHelper string() { - return Objects.toStringHelper("").omitNullValues() + return MoreObjects.toStringHelper("").omitNullValues() .add("statusCode", statusCode) .add("message", message) .add("headers", headers) http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/http/options/BaseHttpRequestOptions.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/http/options/BaseHttpRequestOptions.java b/core/src/main/java/org/jclouds/http/options/BaseHttpRequestOptions.java index 1c5528e..776df12 100644 --- a/core/src/main/java/org/jclouds/http/options/BaseHttpRequestOptions.java +++ b/core/src/main/java/org/jclouds/http/options/BaseHttpRequestOptions.java @@ -18,7 +18,7 @@ package org.jclouds.http.options; import java.util.Collection; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; @@ -131,7 +131,7 @@ public class BaseHttpRequestOptions implements HttpRequestOptions { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("formParameters", formParameters) + return MoreObjects.toStringHelper(this).omitNullValues().add("formParameters", formParameters) .add("headers", headers).add("pathSuffix", pathSuffix).add("payload", payload) .add("queryParameters", queryParameters).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/internal/BaseView.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/internal/BaseView.java b/core/src/main/java/org/jclouds/internal/BaseView.java index e7ab845..59526c9 100644 --- a/core/src/main/java/org/jclouds/internal/BaseView.java +++ b/core/src/main/java/org/jclouds/internal/BaseView.java @@ -28,8 +28,9 @@ import org.jclouds.View; import org.jclouds.location.Provider; import org.jclouds.rest.ApiContext; +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.ForwardingObject; import com.google.common.reflect.TypeParameter; import com.google.common.reflect.TypeToken; @@ -100,7 +101,7 @@ public abstract class BaseView extends ForwardingObject implements View { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("backend", delegate()).add("backendType", getBackendType()); + return MoreObjects.toStringHelper("").add("backend", delegate()).add("backendType", getBackendType()); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/internal/ContextImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/internal/ContextImpl.java b/core/src/main/java/org/jclouds/internal/ContextImpl.java index 374710c..533d4df 100644 --- a/core/src/main/java/org/jclouds/internal/ContextImpl.java +++ b/core/src/main/java/org/jclouds/internal/ContextImpl.java @@ -17,7 +17,7 @@ package org.jclouds.internal; 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 static org.jclouds.lifecycle.Closer.State.AVAILABLE; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java b/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java index e00f57c..e24d902 100644 --- a/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java +++ b/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java @@ -27,6 +27,7 @@ import java.util.Map; import org.jclouds.json.internal.NamingStrategies.AnnotationConstructorNamingStrategy; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; @@ -238,7 +239,7 @@ public final class DeserializationConstructorAndReflectiveTypeAdapterFactory imp @Override public String toString() { - return Objects.toStringHelper(this).add("parameterizedCtor", parameterizedCtor) + return MoreObjects.toStringHelper(this).add("parameterizedCtor", parameterizedCtor) .add("parameterReaders", parameterReaders).add("serializer", serializer).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/json/internal/NullFilteringTypeAdapterFactories.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/json/internal/NullFilteringTypeAdapterFactories.java b/core/src/main/java/org/jclouds/json/internal/NullFilteringTypeAdapterFactories.java index 0479d87..d883ca7 100644 --- a/core/src/main/java/org/jclouds/json/internal/NullFilteringTypeAdapterFactories.java +++ b/core/src/main/java/org/jclouds/json/internal/NullFilteringTypeAdapterFactories.java @@ -42,7 +42,7 @@ import java.util.Map.Entry; import java.util.Set; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; /** * Eliminates null values when deserializing Collections, Maps, and Multimaps http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/lifecycle/config/LifeCycleModule.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/lifecycle/config/LifeCycleModule.java b/core/src/main/java/org/jclouds/lifecycle/config/LifeCycleModule.java index 88b4ffc..ef4cabc 100644 --- a/core/src/main/java/org/jclouds/lifecycle/config/LifeCycleModule.java +++ b/core/src/main/java/org/jclouds/lifecycle/config/LifeCycleModule.java @@ -18,7 +18,7 @@ package org.jclouds.lifecycle.config; import static com.google.common.base.Throwables.propagate; import static com.google.common.collect.Iterables.filter; -import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; +import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; import static com.google.inject.matcher.Matchers.any; import static org.jclouds.Constants.PROPERTY_IO_WORKER_THREADS; import static org.jclouds.Constants.PROPERTY_SCHEDULER_THREADS; @@ -123,7 +123,7 @@ public class LifeCycleModule extends AbstractModule { invokeOnInjectee(method, injectee); } - }, sameThreadExecutor()); + }, newDirectExecutorService()); } }); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/providers/internal/BaseProviderMetadata.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/providers/internal/BaseProviderMetadata.java b/core/src/main/java/org/jclouds/providers/internal/BaseProviderMetadata.java index fea73ed..c22b289 100644 --- a/core/src/main/java/org/jclouds/providers/internal/BaseProviderMetadata.java +++ b/core/src/main/java/org/jclouds/providers/internal/BaseProviderMetadata.java @@ -29,9 +29,10 @@ import org.jclouds.apis.ApiMetadata; import org.jclouds.javax.annotation.Nullable; import org.jclouds.providers.ProviderMetadata; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; import com.google.common.base.Optional; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableSet; /** @@ -246,7 +247,7 @@ public abstract class BaseProviderMetadata implements ProviderMetadata { } public ToStringHelper string() { - return Objects.toStringHelper("").add("id", getId()).add("name", getName()).add("api", getApiMetadata()).add( + return MoreObjects.toStringHelper("").add("id", getId()).add("name", getName()).add("api", getApiMetadata()).add( "endpoint", getEndpoint()).add("console", getConsole()).add("homepage", getHomepage()).add( "linkedServices", getLinkedServices()).add("iso3166Codes", getIso3166Codes()); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/proxy/internal/GuiceProxyConfig.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/proxy/internal/GuiceProxyConfig.java b/core/src/main/java/org/jclouds/proxy/internal/GuiceProxyConfig.java index c3406b4..4f4219a 100644 --- a/core/src/main/java/org/jclouds/proxy/internal/GuiceProxyConfig.java +++ b/core/src/main/java/org/jclouds/proxy/internal/GuiceProxyConfig.java @@ -33,7 +33,7 @@ import javax.inject.Singleton; import org.jclouds.domain.Credentials; import org.jclouds.proxy.ProxyConfig; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Optional; import com.google.common.base.Strings; import com.google.common.net.HostAndPort; @@ -112,7 +112,7 @@ public class GuiceProxyConfig implements ProxyConfig { */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("systemProxies", systemProxies ? "true" : null) + return MoreObjects.toStringHelper(this).omitNullValues().add("systemProxies", systemProxies ? "true" : null) .add("proxy", getProxy().orNull()).add("user", user).add("type", host != null ? type : null).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/reflect/InvocationSuccess.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/reflect/InvocationSuccess.java b/core/src/main/java/org/jclouds/reflect/InvocationSuccess.java index a1e1381..b39fc55 100644 --- a/core/src/main/java/org/jclouds/reflect/InvocationSuccess.java +++ b/core/src/main/java/org/jclouds/reflect/InvocationSuccess.java @@ -22,8 +22,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import org.jclouds.javax.annotation.Nullable; 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.base.Optional; /** @@ -75,6 +76,6 @@ public final class InvocationSuccess { } protected ToStringHelper string() { - return Objects.toStringHelper("").omitNullValues().add("invocation", invocation).add("result", result.orNull()); + return MoreObjects.toStringHelper("").omitNullValues().add("invocation", invocation).add("result", result.orNull()); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/reflect/Reflection2.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/reflect/Reflection2.java b/core/src/main/java/org/jclouds/reflect/Reflection2.java index 7246f64..d98944e 100644 --- a/core/src/main/java/org/jclouds/reflect/Reflection2.java +++ b/core/src/main/java/org/jclouds/reflect/Reflection2.java @@ -32,6 +32,7 @@ import java.util.concurrent.ExecutionException; import com.google.common.annotations.Beta; import com.google.common.base.Function; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; import com.google.common.base.Predicate; @@ -237,7 +238,7 @@ public class Reflection2 { } public String toString() { - return Objects.toStringHelper("").add("type", type).add("parameterTypes", parameterTypes).toString(); + return MoreObjects.toStringHelper("").add("type", type).add("parameterTypes", parameterTypes).toString(); } } @@ -286,7 +287,7 @@ public class Reflection2 { } public String toString() { - return Objects.toStringHelper("").add("type", type).add("name", name).add("parameterTypes", parameterTypes) + return MoreObjects.toStringHelper("").add("type", type).add("name", name).add("parameterTypes", parameterTypes) .toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/rest/internal/BaseHttpApiMetadata.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/rest/internal/BaseHttpApiMetadata.java b/core/src/main/java/org/jclouds/rest/internal/BaseHttpApiMetadata.java index 3d52021..110e7d5 100644 --- a/core/src/main/java/org/jclouds/rest/internal/BaseHttpApiMetadata.java +++ b/core/src/main/java/org/jclouds/rest/internal/BaseHttpApiMetadata.java @@ -28,7 +28,7 @@ import org.jclouds.rest.ApiContext; import org.jclouds.rest.HttpApiMetadata; import com.google.common.annotations.Beta; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.reflect.TypeParameter; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/rest/internal/BaseRestApiMetadata.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/rest/internal/BaseRestApiMetadata.java b/core/src/main/java/org/jclouds/rest/internal/BaseRestApiMetadata.java index b43a190..f2a6c48 100644 --- a/core/src/main/java/org/jclouds/rest/internal/BaseRestApiMetadata.java +++ b/core/src/main/java/org/jclouds/rest/internal/BaseRestApiMetadata.java @@ -26,7 +26,7 @@ import org.jclouds.apis.internal.BaseApiMetadata; import org.jclouds.rest.RestApiMetadata; import com.google.common.annotations.Beta; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.reflect.TypeParameter; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java b/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java index 8d94c3e..da2a8a9 100644 --- a/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java +++ b/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java @@ -52,7 +52,7 @@ import org.jclouds.rest.config.SetCaller; import com.google.common.annotations.Beta; import com.google.common.base.Function; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.base.Supplier; @@ -282,7 +282,7 @@ public class DelegatesToInvocationFunction<S, F extends Function<Invocation, Obj @Override public String toString() { - return Objects.toStringHelper("").omitNullValues().add("ownerType", ownerType.getRawType().getSimpleName()) + return MoreObjects.toStringHelper("").omitNullValues().add("ownerType", ownerType.getRawType().getSimpleName()) .add("methodInvoker", methodInvoker).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/rest/internal/InvokeHttpMethod.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/rest/internal/InvokeHttpMethod.java b/core/src/main/java/org/jclouds/rest/internal/InvokeHttpMethod.java index 9aa3330..064e500 100644 --- a/core/src/main/java/org/jclouds/rest/internal/InvokeHttpMethod.java +++ b/core/src/main/java/org/jclouds/rest/internal/InvokeHttpMethod.java @@ -17,7 +17,7 @@ package org.jclouds.rest.internal; 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.Throwables.propagate; import static java.util.concurrent.TimeUnit.NANOSECONDS; @@ -37,6 +37,7 @@ import org.jclouds.rest.config.InvocationConfig; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; import com.google.common.util.concurrent.TimeLimiter; @@ -214,6 +215,6 @@ public class InvokeHttpMethod implements Function<Invocation, Object> { @Override public String toString() { - return Objects.toStringHelper("").omitNullValues().add("annotationParser", annotationProcessor).toString(); + return MoreObjects.toStringHelper("").omitNullValues().add("annotationParser", annotationProcessor).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/rest/internal/InvokeSyncToAsyncHttpMethod.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/rest/internal/InvokeSyncToAsyncHttpMethod.java b/core/src/main/java/org/jclouds/rest/internal/InvokeSyncToAsyncHttpMethod.java index 0d2adf2..1aa5b68 100644 --- a/core/src/main/java/org/jclouds/rest/internal/InvokeSyncToAsyncHttpMethod.java +++ b/core/src/main/java/org/jclouds/rest/internal/InvokeSyncToAsyncHttpMethod.java @@ -17,7 +17,7 @@ package org.jclouds.rest.internal; 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.checkState; import static com.google.common.base.Throwables.propagate; import static com.google.common.util.concurrent.Futures.transform; @@ -42,6 +42,7 @@ import org.jclouds.rest.config.InvocationConfig; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; import com.google.common.reflect.Invokable; @@ -267,6 +268,6 @@ public class InvokeSyncToAsyncHttpMethod implements Function<Invocation, Object> @Override public String toString() { - return Objects.toStringHelper("").omitNullValues().add("annotationParser", annotationProcessor).toString(); + return MoreObjects.toStringHelper("").omitNullValues().add("annotationParser", annotationProcessor).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java index ed40a32..a106868 100644 --- a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java +++ b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java @@ -102,7 +102,7 @@ import org.jclouds.rest.binders.BindToJsonPayloadWrappedWith; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.base.Supplier; @@ -829,6 +829,6 @@ public class RestAnnotationProcessor implements Function<Invocation, HttpRequest public String toString() { String callerString = caller != null ? String.format("%s.%s%s", caller.getInvokable().getOwnerType().getRawType().getSimpleName(), caller.getInvokable().getName(), caller.getArgs()) : null; - return Objects.toStringHelper("").omitNullValues().add("caller", callerString).toString(); + return MoreObjects.toStringHelper("").omitNullValues().add("caller", callerString).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/rest/suppliers/MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/rest/suppliers/MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.java b/core/src/main/java/org/jclouds/rest/suppliers/MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.java index 0750a1f..081c3cd 100644 --- a/core/src/main/java/org/jclouds/rest/suppliers/MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.java +++ b/core/src/main/java/org/jclouds/rest/suppliers/MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.java @@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.jclouds.rest.AuthorizationException; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Optional; import com.google.common.base.Supplier; import com.google.common.cache.CacheBuilder; @@ -83,7 +83,7 @@ public class MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<T> ext @Override public String toString() { - return Objects.toStringHelper(this).add("delegate", delegate).toString(); + return MoreObjects.toStringHelper(this).add("delegate", delegate).toString(); } } @@ -126,7 +126,7 @@ public class MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<T> ext @Override public String toString() { - return Objects.toStringHelper(this).add("delegate", delegate).add("duration", duration).add("unit", unit) + return MoreObjects.toStringHelper(this).add("delegate", delegate).add("duration", duration).add("unit", unit) .toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/rest/suppliers/URIFromStringSupplier.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/rest/suppliers/URIFromStringSupplier.java b/core/src/main/java/org/jclouds/rest/suppliers/URIFromStringSupplier.java index 8d54d9b..5736412 100644 --- a/core/src/main/java/org/jclouds/rest/suppliers/URIFromStringSupplier.java +++ b/core/src/main/java/org/jclouds/rest/suppliers/URIFromStringSupplier.java @@ -17,7 +17,7 @@ package org.jclouds.rest.suppliers; 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.net.URI; @@ -25,7 +25,7 @@ import java.net.URI; import javax.inject.Inject; 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.Supplier; public class URIFromStringSupplier implements Supplier<URI> { http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/main/java/org/jclouds/util/Suppliers2.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/util/Suppliers2.java b/core/src/main/java/org/jclouds/util/Suppliers2.java index df0e4f2..783fd23 100644 --- a/core/src/main/java/org/jclouds/util/Suppliers2.java +++ b/core/src/main/java/org/jclouds/util/Suppliers2.java @@ -20,7 +20,7 @@ import java.util.Map; import com.google.common.annotations.Beta; 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.common.base.Suppliers; import com.google.common.base.Throwables; @@ -91,7 +91,7 @@ public class Suppliers2 { @Override public String toString() { - return Objects.toStringHelper(this).add("unlessNull", unlessNull).add("fallback", fallback).toString(); + return MoreObjects.toStringHelper(this).add("unlessNull", unlessNull).add("fallback", fallback).toString(); } }; } @@ -117,7 +117,7 @@ public class Suppliers2 { @Override public String toString() { - return Objects.toStringHelper(this).add("unlessThrowable", unlessThrowable) + return MoreObjects.toStringHelper(this).add("unlessThrowable", unlessThrowable) .add("throwable", throwable.getSimpleName()).add("fallback", fallback).toString(); } }; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/test/java/org/jclouds/concurrent/FutureIterablesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/jclouds/concurrent/FutureIterablesTest.java b/core/src/test/java/org/jclouds/concurrent/FutureIterablesTest.java index 4e815f1..b40584a 100644 --- a/core/src/test/java/org/jclouds/concurrent/FutureIterablesTest.java +++ b/core/src/test/java/org/jclouds/concurrent/FutureIterablesTest.java @@ -18,7 +18,7 @@ package org.jclouds.concurrent; import static com.google.common.collect.Maps.newHashMap; import static com.google.common.util.concurrent.Futures.immediateFailedFuture; -import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; +import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; import static org.jclouds.concurrent.FutureIterables.transformParallel; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; @@ -53,7 +53,7 @@ public class FutureIterablesTest { counter.incrementAndGet(); return immediateFailedFuture(new AuthorizationException()); } - }, sameThreadExecutor(), null, Logger.NULL, ""); + }, newDirectExecutorService(), null, Logger.NULL, ""); fail("Expected AuthorizationException"); } catch (AuthorizationException e) { assertEquals(counter.get(), 2); @@ -70,7 +70,7 @@ public class FutureIterablesTest { counter.incrementAndGet(); return immediateFailedFuture(new RuntimeException()); } - }, sameThreadExecutor(), null, Logger.CONSOLE, ""); + }, newDirectExecutorService(), null, Logger.CONSOLE, ""); fail("Expected TransformParallelException"); } catch (TransformParallelException e) { assertEquals(e.getFromToException().size(), 2); http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/core/src/test/java/org/jclouds/rest/internal/BaseRestApiExpectTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/jclouds/rest/internal/BaseRestApiExpectTest.java b/core/src/test/java/org/jclouds/rest/internal/BaseRestApiExpectTest.java index fe09a0b..0a1f5c2 100644 --- a/core/src/test/java/org/jclouds/rest/internal/BaseRestApiExpectTest.java +++ b/core/src/test/java/org/jclouds/rest/internal/BaseRestApiExpectTest.java @@ -17,7 +17,7 @@ package org.jclouds.rest.internal; import static com.google.common.base.Preconditions.checkNotNull; -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.jclouds.Constants.PROPERTY_IO_WORKER_THREADS; import static org.jclouds.Constants.PROPERTY_MAX_RETRIES; @@ -227,8 +227,8 @@ public abstract class BaseRestApiExpectTest<S> { @Override public 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(new TypeLiteral<Function<HttpRequest, HttpResponse>>() { }).toInstance(fn); bind(HttpCommandExecutorService.class).to(ExpectHttpCommandExecutorService.class);
