http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Extension.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Extension.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Extension.java index c44b72f..68c10d1 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Extension.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Extension.java @@ -26,7 +26,7 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * The OpenStack Compute API is extensible. Extensions serve two purposes: They
http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limit.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limit.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limit.java index 10893d9..969f16a 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limit.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limit.java @@ -17,7 +17,7 @@ package org.jclouds.openstack.v2_0.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/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limits.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limits.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limits.java index 8899896..d7fa692 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limits.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limits.java @@ -17,7 +17,7 @@ package org.jclouds.openstack.v2_0.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/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Link.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Link.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Link.java index 46f5466..08f787d 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Link.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Link.java @@ -23,8 +23,9 @@ import java.net.URI; import javax.inject.Named; +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; /** @@ -196,7 +197,7 @@ public class Link { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("relation", relation).add("type", type.orNull()) + return MoreObjects.toStringHelper(this).omitNullValues().add("relation", relation).add("type", type.orNull()) .add("href", href); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/RateLimit.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/RateLimit.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/RateLimit.java index 9c4e72c..62918e8 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/RateLimit.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/RateLimit.java @@ -17,7 +17,7 @@ package org.jclouds.openstack.v2_0.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/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Resource.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Resource.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Resource.java index 1824835..73dea1b 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Resource.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/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; /** @@ -152,7 +153,7 @@ public class Resource implements Comparable<Resource> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("name", name).add("links", links); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/internal/BaseOpenStackMockTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/internal/BaseOpenStackMockTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/internal/BaseOpenStackMockTest.java index c865922..da62c36 100644 --- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/internal/BaseOpenStackMockTest.java +++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/internal/BaseOpenStackMockTest.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.v2_0.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.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; @@ -57,7 +57,7 @@ public class BaseOpenStackMockTest<A extends Closeable> { public static final String accessRackspace = "{\"access\":{\"token\":{\"id\":\"b84f4a37-5126-4603-9521-ccd0665fbde1\",\"expires\":\"2013-04-13T16:49:57.000-05:00\",\"tenant\":{\"id\":\"123123\",\"name\":\"123123\"}},\"serviceCatalog\":[{\"endpoints\":[{\"tenantId\":\"123123\",\"publicURL\":\"URL/v1.0/123123\"}],\"name\":\"cloudMonitoring\",\"type\":\"rax:monitor\"},{\"endpoints\":[{\"region\":\"DFW\",\"tenantId\":\"MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\",\"publicURL\":\"URL/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\"},{\"region\":\"ORD\",\"tenantId\":\"MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\",\"publicURL\":\"URL/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\"}],\"name\":\"cloudFilesCDN\",\"type\":\"rax:object-cdn\"},{\"endpoints\":[{\"region\":\"ORD\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v1.0/123123\"},{\"region\":\"DFW\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v1.0/123123\"}],\"name\":\"cloudLoadBalancers\",\"type\":\"rax:load- balancer\"},{\"endpoints\":[{\"region\":\"DFW\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v1.0/123123\"},{\"region\":\"ORD\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v1.0/123123\"}],\"name\":\"cloudDatabases\",\"type\":\"rax:database\"},{\"endpoints\":[{\"region\":\"DFW\",\"tenantId\":\"MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\",\"publicURL\":\"URL/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\",\"internalURL\":\"URL/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\"},{\"region\":\"ORD\",\"tenantId\":\"MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\",\"publicURL\":\"URL/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\",\"internalURL\":\"URL/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\"}],\"name\":\"cloudFiles\",\"type\":\"object-store\"},{\"endpoints\":[{\"tenantId\":\"123123\",\"publicURL\":\"URL/v1.0/123123\",\"versionInfo\":\"URL/v1.0\",\"versionList\":\"URL/\",\"versionId\":\"1.0\"}],\"name\":\"cloudServers\",\"type\":\"compute\"},{\"end points\":[{\"region\":\"DFW\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v2/123123\",\"versionInfo\":\"URL/v2\",\"versionList\":\"URL/\",\"versionId\":\"2\"},{\"region\":\"ORD\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v2/123123\",\"versionInfo\":\"URL/v2\",\"versionList\":\"URL/\",\"versionId\":\"2\"}],\"name\":\"cloudServersOpenStack\",\"type\":\"compute\"},{\"endpoints\":[{\"tenantId\":\"123123\",\"publicURL\":\"URL/v1.0/123123\"}],\"name\":\"cloudDNS\",\"type\":\"rax:dns\"},{\"endpoints\":[{\"tenantId\":\"123123\",\"publicURL\":\"URL/v1.0/123123\"}],\"name\":\"cloudBackup\",\"type\":\"rax:backup\"},{\"endpoints\":[{\"region\":\"DFW\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v1/123123\"},{\"region\":\"ORD\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v1/123123\"}],\"name\":\"cloudBlockStorage\",\"type\":\"volume\"},{\"endpoints\":[{\"region\":\"DFW\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v1/123123\",\"internalURL\":\"URL/v1/123123\"},{\"region\":\"ORD\",\"tenantId\": \"123123\",\"publicURL\":\"URL/v1/123123\",\"internalURL\":\"URL/v1/123123\"}],\"name\":\"marconi\",\"type\":\"queuing\"},{\"endpoints\":[{\"region\":\"DFW\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v1/123123\",\"internalURL\":\"URL/v1/123123\"},{\"region\":\"ORD\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v1/123123\",\"internalURL\":\"URL/v1/123123\"}],\"name\":\"autoscale\",\"type\":\"rax:autoscale\"}],\"user\":{\"id\":\"1234\",\"roles\":[{\"id\":\"3\",\"description\":\"User Admin Role.\",\"name\":\"identity:user-admin\"}],\"name\":\"jclouds-joe\",\"RAX-AUTH:defaultRegion\":\"DFW\"}}}"; private final Set<Module> modules = ImmutableSet.<Module> of( - new ExecutorServiceModule(sameThreadExecutor(), sameThreadExecutor())); + new ExecutorServiceModule(newDirectExecutorService(), newDirectExecutorService())); /** * Pattern for replacing the URL token with the correct local address. http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java index c068c6c..399da43 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java @@ -54,7 +54,7 @@ import org.jclouds.openstack.nova.v2_0.options.CreateServerOptions; import org.jclouds.openstack.nova.v2_0.predicates.ImagePredicates; 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; @@ -177,7 +177,7 @@ public class NovaComputeServiceAdapter implements @Override public String apply(Image input) { - return Objects.toStringHelper("").add("id", input.getId()).add("status", input.getStatus()) + return MoreObjects.toStringHelper("").add("id", input.getId()).add("status", input.getStatus()) .toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNode.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNode.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNode.java index 347510c..b734e07 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNode.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNode.java @@ -40,7 +40,7 @@ import org.jclouds.openstack.nova.v2_0.extensions.FloatingIPApi; import org.jclouds.rest.InsufficientResourcesException; 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.cache.LoadingCache; @@ -146,6 +146,6 @@ public class AllocateAndAddFloatingIpToNode implements @Override public String toString() { - return Objects.toStringHelper("AllocateAndAddFloatingIpToNode").toString(); + return MoreObjects.toStringHelper("AllocateAndAddFloatingIpToNode").toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageInZoneToImage.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageInZoneToImage.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageInZoneToImage.java index 0655c21..c2f6f6c 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageInZoneToImage.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageInZoneToImage.java @@ -31,7 +31,7 @@ import org.jclouds.openstack.nova.v2_0.domain.Image.Status; import org.jclouds.openstack.nova.v2_0.domain.zonescoped.ImageInZone; import com.google.common.base.Function; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Supplier; /** @@ -63,6 +63,6 @@ public class ImageInZoneToImage implements Function<ImageInZone, Image> { @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/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystem.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystem.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystem.java index 2781942..ca0d94d 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystem.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystem.java @@ -41,7 +41,7 @@ import org.jclouds.openstack.nova.v2_0.domain.Image; import com.google.common.base.CharMatcher; import com.google.common.base.Function; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Predicate; import com.google.common.base.Splitter; @@ -68,7 +68,7 @@ public class ImageToOperatingSystem implements Function<Image, OperatingSystem> OsFamily osFamily = null; String osVersion = null; - String imageName = Objects.firstNonNull(from.getName(), "unspecified"); + String imageName = MoreObjects.firstNonNull(from.getName(), "unspecified"); boolean is64Bit = true; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/RemoveFloatingIpFromNodeAndDeallocate.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/RemoveFloatingIpFromNodeAndDeallocate.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/RemoveFloatingIpFromNodeAndDeallocate.java index cee1305..cdbb0d9 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/RemoveFloatingIpFromNodeAndDeallocate.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/RemoveFloatingIpFromNodeAndDeallocate.java @@ -30,7 +30,7 @@ import org.jclouds.openstack.nova.v2_0.domain.zonescoped.ZoneAndId; import org.jclouds.openstack.nova.v2_0.extensions.FloatingIPApi; import com.google.common.base.Function; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.cache.LoadingCache; /** @@ -67,6 +67,6 @@ public class RemoveFloatingIpFromNodeAndDeallocate implements Function<ZoneAndId @Override public String toString() { - return Objects.toStringHelper("RemoveFloatingIpFromNodeAndDecreate").toString(); + return MoreObjects.toStringHelper("RemoveFloatingIpFromNodeAndDecreate").toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/options/NovaTemplateOptions.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/options/NovaTemplateOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/options/NovaTemplateOptions.java index 750b7c0..b6166bb 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/options/NovaTemplateOptions.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/options/NovaTemplateOptions.java @@ -31,7 +31,7 @@ import org.jclouds.openstack.nova.v2_0.domain.Network; 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.base.Optional; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Address.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Address.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Address.java index c57136c..86477ec 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Address.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Address.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; /** * IP address @@ -125,7 +126,7 @@ public class Address { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("addr", addr).add("version", version); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Console.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Console.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Console.java index 1c51fbf..18dcb90 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Console.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Console.java @@ -16,13 +16,13 @@ */ package org.jclouds.openstack.nova.v2_0.domain; -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 java.net.URI; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; /** http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Flavor.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Flavor.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Flavor.java index ce40d51..c33ffda 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Flavor.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Flavor.java @@ -28,7 +28,7 @@ import org.jclouds.openstack.v2_0.domain.Link; import org.jclouds.openstack.v2_0.domain.Resource; 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; /** http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FloatingIP.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FloatingIP.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FloatingIP.java index 76e1c26..405f18e 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FloatingIP.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FloatingIP.java @@ -24,8 +24,9 @@ import javax.inject.Named; 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; /** * A Floating IP is an IP address that can be created and associated with a @@ -172,7 +173,7 @@ public class FloatingIP implements Comparable<FloatingIP> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("ip", ip).add("fixedIp", fixedIp).add("instanceId", instanceId).add("pool", pool); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Host.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Host.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Host.java index 72df77d..3832c25 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Host.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Host.java @@ -22,8 +22,9 @@ import javax.inject.Named; 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; /** * Class Host @@ -115,7 +116,7 @@ public class Host { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("name", name).add("service", service); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java index 75d3b70..1c8673c 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java @@ -27,8 +27,9 @@ import javax.inject.Named; 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.Optional; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -238,7 +239,7 @@ public class HostAggregate { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("name", name).add("availabilityZone", availabilityZone).add("hosts", hosts).add("state", state).add("created", created).add("updated", updated).add("metadata", metadata); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostResourceUsage.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostResourceUsage.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostResourceUsage.java index 186fb33..7bb0a48 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostResourceUsage.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostResourceUsage.java @@ -24,8 +24,9 @@ import javax.inject.Named; 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; /** * Class HostResourceUsage @@ -168,7 +169,7 @@ public class HostResourceUsage { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("host", host).add("project", project).add("memoryMb", memoryMb).add("cpu", cpu).add("diskGb", diskGb); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Image.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Image.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Image.java index 7a73154..7f6fdbc 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Image.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Image.java @@ -29,7 +29,7 @@ import org.jclouds.openstack.v2_0.domain.Link; import org.jclouds.openstack.v2_0.domain.Resource; 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.ImmutableMap; /** http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Ingress.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Ingress.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Ingress.java index 38f4e90..172ea64 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Ingress.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Ingress.java @@ -24,8 +24,9 @@ import org.jclouds.javax.annotation.Nullable; import org.jclouds.net.domain.IpProtocol; 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; /** * Ingress access to a destination protocol on particular ports @@ -147,7 +148,7 @@ public class Ingress { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("ipProtocol", ipProtocol).add("fromPort", fromPort).add("toPort", toPort); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/KeyPair.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/KeyPair.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/KeyPair.java index aded550..e4f0802 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/KeyPair.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/KeyPair.java @@ -24,8 +24,9 @@ import javax.inject.Named; 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; /** * Class KeyPair @@ -172,7 +173,7 @@ public class KeyPair { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .omitNullValues() .add("public_key", publicKey) .add("private_key", privateKey) http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Network.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Network.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Network.java index 482ae0e..3249b1f 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Network.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Network.java @@ -18,8 +18,9 @@ package org.jclouds.openstack.nova.v2_0.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; import static com.google.common.base.Preconditions.checkArgument; @@ -81,7 +82,7 @@ public class Network implements Comparable<Network> { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("networkUuid", networkUuid) .add("portUuid", portUuid) .add("fixedIp", fixedIp); http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Quota.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Quota.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Quota.java index c16693e..6457e8b 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Quota.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Quota.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import javax.inject.Named; +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 the set of limits (quotas) returned by the Quota Extension @@ -344,7 +345,7 @@ public class Quota { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("metadataItems", metadataItems).add("injectedFileContentBytes", injectedFileContentBytes).add("volumes", volumes).add("gigabytes", gigabytes).add("ram", ram).add("floatingIps", floatingIps).add("instances", instances).add("injectedFiles", injectedFiles).add("cores", cores).add("securityGroups", securityGroups).add("securityGroupRules", securityGroupRules).add("keyPairs", keyPairs); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroup.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroup.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroup.java index a0e2085..97223a7 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroup.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroup.java @@ -25,8 +25,9 @@ import javax.inject.Named; 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; /** @@ -176,7 +177,7 @@ public class SecurityGroup { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("tenantId", tenantId).add("name", name).add("description", description).add("rules", rules); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroupRule.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroupRule.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroupRule.java index 92d58f7..15df347 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroupRule.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroupRule.java @@ -26,7 +26,7 @@ import org.jclouds.javax.annotation.Nullable; import org.jclouds.net.domain.IpProtocol; 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.ForwardingObject; /** http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Server.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Server.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Server.java index 220ff62..c462625 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Server.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Server.java @@ -28,7 +28,7 @@ import org.jclouds.javax.annotation.Nullable; import org.jclouds.openstack.v2_0.domain.Link; import org.jclouds.openstack.v2_0.domain.Resource; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Optional; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerCreated.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerCreated.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerCreated.java index 8b13ec8..6db9f5f 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerCreated.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerCreated.java @@ -24,7 +24,7 @@ import org.jclouds.openstack.v2_0.domain.Link; import org.jclouds.openstack.v2_0.domain.Resource; 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; /** http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedAttributes.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedAttributes.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedAttributes.java index 1dea7a5..eeb1f9b 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedAttributes.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedAttributes.java @@ -22,8 +22,9 @@ import javax.inject.Named; 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; /** * Additional attributes delivered by Extended Server Attributes extension (alias "OS-EXT-SRV-ATTR") @@ -143,7 +144,7 @@ public class ServerExtendedAttributes { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("instanceName", instanceName).add("hostName", hostName).add("hypervisorHostName", hypervisorHostName); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedStatus.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedStatus.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedStatus.java index 3116470..aa63fd6 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedStatus.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedStatus.java @@ -22,8 +22,9 @@ import javax.inject.Named; 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; /** * Additional attributes delivered by Extended Server Status extension (alias "OS-EXT-STS") @@ -142,7 +143,7 @@ public class ServerExtendedStatus { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("taskState", taskState).add("vmState", vmState).add("powerState", powerState); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerWithSecurityGroups.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerWithSecurityGroups.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerWithSecurityGroups.java index 64c01af..31d0fa6 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerWithSecurityGroups.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerWithSecurityGroups.java @@ -30,7 +30,7 @@ import org.jclouds.openstack.v2_0.domain.Link; import org.jclouds.openstack.v2_0.domain.Resource; 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.Multimap; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleServerUsage.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleServerUsage.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleServerUsage.java index f790d67..ee616b8 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleServerUsage.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleServerUsage.java @@ -25,8 +25,9 @@ import javax.inject.Named; 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; /** * Information the SimpleTenantUsage extension return data about each Server @@ -299,7 +300,7 @@ public class SimpleServerUsage { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("instanceName", instanceName).add("hours", hours).add("flavorMemoryMb", flavorMemoryMb).add("flavorLocalGb", flavorLocalGb).add("flavorVcpus", flavorVcpus).add("tenantId", tenantId).add("flavorName", flavorName).add("instanceCreated", instanceCreated).add("instanceTerminated", instanceTerminated).add("instanceStatus", instanceStatus).add("uptime", uptime); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleTenantUsage.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleTenantUsage.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleTenantUsage.java index 4b12743..75fe99f 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleTenantUsage.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleTenantUsage.java @@ -26,8 +26,9 @@ import javax.inject.Named; 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; /** @@ -232,7 +233,7 @@ public class SimpleTenantUsage { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("tenantId", tenantId).add("totalLocalGbUsage", totalLocalGbUsage).add("totalVcpusUsage", totalVcpusUsage).add("totalMemoryMbUsage", totalMemoryMbUsage).add("totalHours", totalHours).add("start", start).add("stop", stop).add("serverUsages", serverUsages); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/TenantIdAndName.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/TenantIdAndName.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/TenantIdAndName.java index b0b2164..2abd66e 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/TenantIdAndName.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/TenantIdAndName.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import javax.inject.Named; +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 TenantIdAndName @@ -114,7 +115,7 @@ public class TenantIdAndName { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("tenantId", tenantId).add("name", name); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VirtualInterface.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VirtualInterface.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VirtualInterface.java index 42b2fba..a6eca5b 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VirtualInterface.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VirtualInterface.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import javax.inject.Named; +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 a Virtual Interface (VIF) @@ -115,7 +116,7 @@ public class VirtualInterface { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("macAddress", macAddress); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Volume.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Volume.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Volume.java index 7fecfb2..371abd3 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Volume.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Volume.java @@ -28,8 +28,9 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; 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; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -334,7 +335,7 @@ public class Volume { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("status", status).add("size", size).add("zone", zone).add("created", created).add("attachments", attachments).add("volumeType", volumeType).add("snapshotId", snapshotId).add("name", name).add("description", description).add("metadata", metadata); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeAttachment.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeAttachment.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeAttachment.java index 894f85b..36e8140 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeAttachment.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeAttachment.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; /** * An OpenStack Nova Volume Attachment (describes how Volumes are attached to Servers) @@ -160,7 +161,7 @@ public class VolumeAttachment { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("volumeId", volumeId).add("serverId", serverId).add("device", device); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeSnapshot.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeSnapshot.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeSnapshot.java index bbd45a4..b716dfa 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeSnapshot.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeSnapshot.java @@ -25,8 +25,9 @@ import javax.inject.Named; 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; /** * An OpenStack Nova Volume Snapshot @@ -227,7 +228,7 @@ public class VolumeSnapshot { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("volumeId", volumeId).add("status", status).add("size", size).add("created", created).add("name", name).add("description", description); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeType.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeType.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeType.java index 43a0aba..51639dc 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeType.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeType.java @@ -26,8 +26,9 @@ import javax.inject.Named; 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.Optional; import com.google.common.collect.ImmutableMap; @@ -180,7 +181,7 @@ public class VolumeType { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("name", name).add("created", created).add("updated", updated).add("extraSpecs", extraSpecs); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/AvailabilityZone.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/AvailabilityZone.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/AvailabilityZone.java index ca83af7..a963dcd 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/AvailabilityZone.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/AvailabilityZone.java @@ -16,6 +16,7 @@ */ package org.jclouds.openstack.nova.v2_0.domain.zonescoped; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.gson.annotations.SerializedName; @@ -54,8 +55,8 @@ public class AvailabilityZone { return Objects.equal(this.name, that.name) && Objects.equal(this.state, that.state); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this) + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this) .add("name", name) .add("state", state); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneAndName.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneAndName.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneAndName.java index ef12fd9..cebf999 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneAndName.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneAndName.java @@ -23,7 +23,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.base.Function; import com.google.common.base.Objects; import com.google.common.base.Splitter; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.Iterables; /** @@ -104,6 +105,6 @@ public class ZoneAndName { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("zoneId", zoneId).add("name", name); + return MoreObjects.toStringHelper("").add("zoneId", zoneId).add("name", name); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneSecurityGroupNameAndPorts.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneSecurityGroupNameAndPorts.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneSecurityGroupNameAndPorts.java index a5c1c65..deaad97 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneSecurityGroupNameAndPorts.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneSecurityGroupNameAndPorts.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; 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; public class ZoneSecurityGroupNameAndPorts extends ZoneAndName { http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneState.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneState.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneState.java index d32c368..6beea92 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneState.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneState.java @@ -16,6 +16,7 @@ */ package org.jclouds.openstack.nova.v2_0.domain.zonescoped; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; public class ZoneState { @@ -43,8 +44,8 @@ public class ZoneState { return Objects.equal(this.available, that.available); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this) + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this) .add("available", available); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateBackupOfServerOptions.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateBackupOfServerOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateBackupOfServerOptions.java index c2d3809..1b1fbd7 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateBackupOfServerOptions.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateBackupOfServerOptions.java @@ -17,7 +17,7 @@ package org.jclouds.openstack.nova.v2_0.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 java.util.Map; @@ -28,7 +28,7 @@ import org.jclouds.rest.MapBinder; import org.jclouds.rest.binders.BindToJsonPayload; 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.ImmutableMap; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java index 8a8bd2c..29ade1d 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java @@ -17,7 +17,7 @@ package org.jclouds.openstack.nova.v2_0.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.Preconditions.checkState; @@ -37,8 +37,9 @@ import org.jclouds.openstack.nova.v2_0.domain.Network; import org.jclouds.rest.MapBinder; import org.jclouds.rest.binders.BindToJsonPayload; +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.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -133,7 +134,7 @@ public class CreateServerOptions implements MapBinder { } protected ToStringHelper string() { - ToStringHelper toString = Objects.toStringHelper("").omitNullValues(); + ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues(); toString.add("keyName", keyName); if (securityGroupNames.size() > 0) toString.add("securityGroupNames", securityGroupNames); http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeOptions.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeOptions.java index df9a879..7741c19 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeOptions.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeOptions.java @@ -17,7 +17,7 @@ package org.jclouds.openstack.nova.v2_0.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; @@ -31,7 +31,7 @@ import org.jclouds.rest.MapBinder; import org.jclouds.rest.binders.BindToJsonPayload; 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.ImmutableMap; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeSnapshotOptions.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeSnapshotOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeSnapshotOptions.java index c8a2fdd..3772434 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeSnapshotOptions.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeSnapshotOptions.java @@ -17,7 +17,7 @@ package org.jclouds.openstack.nova.v2_0.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 java.util.Map; @@ -28,7 +28,7 @@ import org.jclouds.rest.MapBinder; import org.jclouds.rest.binders.BindToJsonPayload; 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.ImmutableMap; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeTypeOptions.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeTypeOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeTypeOptions.java index a5b72e4..aeb870e 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeTypeOptions.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeTypeOptions.java @@ -17,7 +17,7 @@ package org.jclouds.openstack.nova.v2_0.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 java.util.Map; @@ -28,7 +28,7 @@ import org.jclouds.rest.MapBinder; import org.jclouds.rest.binders.BindToJsonPayload; 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.ImmutableMap; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/Flavor.java ---------------------------------------------------------------------- diff --git a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/Flavor.java b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/Flavor.java index 4bf9830..acf0b06 100644 --- a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/Flavor.java +++ b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/Flavor.java @@ -21,8 +21,9 @@ import java.util.List; import org.jclouds.openstack.v2_0.domain.Link; +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.ImmutableList; @@ -88,7 +89,7 @@ public class Flavor implements Comparable<Flavor>{ } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("name", name).add("ram", ram); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/Instance.java ---------------------------------------------------------------------- diff --git a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/Instance.java b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/Instance.java index d5afb53..691f97f 100644 --- a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/Instance.java +++ b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/Instance.java @@ -23,8 +23,9 @@ import java.util.List; import org.jclouds.openstack.trove.v1.internal.Volume; import org.jclouds.openstack.v2_0.domain.Link; +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; /** @@ -175,7 +176,7 @@ public class Instance implements Comparable<Instance>{ } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("name", name).add("flavor", flavor).add("volume size", volume.getSize()).add("links", links).add("hostname", hostname); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/User.java ---------------------------------------------------------------------- diff --git a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/User.java b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/User.java index 1012c74..5bd0b61 100644 --- a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/User.java +++ b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/User.java @@ -21,8 +21,9 @@ import java.beans.ConstructorProperties; import java.util.List; import java.util.Map; 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.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; @@ -138,7 +139,7 @@ public class User implements Comparable<User>{ } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("name", name) .add("password", password) .add("host", host) http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateDomain.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateDomain.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateDomain.java index 6425111..509b6bd 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateDomain.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateDomain.java @@ -18,8 +18,9 @@ package org.jclouds.rackspace.clouddns.v1.domain; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; @@ -106,7 +107,7 @@ public class CreateDomain { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("name", name).add("email", emailAddress) + return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("email", emailAddress) .add("ttl", ttl.orNull()).add("comment", comment.orNull()).add("subdomains", subdomains) .add("records", recordsList); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateSubdomain.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateSubdomain.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateSubdomain.java index d620bfa..2b443ec 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateSubdomain.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateSubdomain.java @@ -18,8 +18,9 @@ package org.jclouds.rackspace.clouddns.v1.domain; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.base.Optional; public class CreateSubdomain { @@ -80,7 +81,7 @@ public class CreateSubdomain { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("name", name).add("email", emailAddress) + return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("email", emailAddress) .add("ttl", ttl.orNull()).add("comment", comment.orNull()); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Domain.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Domain.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Domain.java index 382924a..4657da2 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Domain.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Domain.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.Optional; import com.google.common.collect.ImmutableSet; @@ -125,7 +126,7 @@ public class Domain { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("email", email) + return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("email", email) .add("comment", comment.orNull()).add("created", created).add("updated", updated) .add("accountId", accountId).add("ttl", ttl).add("nameservers", nameservers) .add("subdomains", subdomains).add("records", records); http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/DomainChange.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/DomainChange.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/DomainChange.java index 02972ad..6bc930d 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/DomainChange.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/DomainChange.java @@ -22,6 +22,7 @@ import java.beans.ConstructorProperties; import java.util.Date; import java.util.List; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; public class DomainChange { @@ -65,7 +66,7 @@ public class DomainChange { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("from", from).add("to", to).add("changes", changes) + return MoreObjects.toStringHelper(this).omitNullValues().add("from", from).add("to", to).add("changes", changes) .toString(); } @@ -131,7 +132,7 @@ public class DomainChange { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("domain", domain).add("action", action) + return MoreObjects.toStringHelper(this).omitNullValues().add("domain", domain).add("action", action) .add("targetType", targetType).add("accountId", accountId).add("targetId", targetId) .add("changeDetails", changeDetails).toString(); } @@ -179,7 +180,7 @@ public class DomainChange { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("field", field).add("originalValue", originalValue) + return MoreObjects.toStringHelper(this).omitNullValues().add("field", field).add("originalValue", originalValue) .add("newValue", newValue).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Job.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Job.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Job.java index a0a0b48..aea4bd2 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Job.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Job.java @@ -16,7 +16,7 @@ */ package org.jclouds.rackspace.clouddns.v1.domain; -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/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Record.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Record.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Record.java index 1d768bc..60b133a 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Record.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Record.java @@ -17,12 +17,12 @@ package org.jclouds.rackspace.clouddns.v1.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 org.jclouds.javax.annotation.Nullable; 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; public class Record { http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/RecordDetail.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/RecordDetail.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/RecordDetail.java index 8548550..ad588a0 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/RecordDetail.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/RecordDetail.java @@ -17,13 +17,13 @@ package org.jclouds.rackspace.clouddns.v1.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; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; public class RecordDetail { private final String id; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Subdomain.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Subdomain.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Subdomain.java index 13cf7b4..53f7591 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Subdomain.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Subdomain.java @@ -21,6 +21,7 @@ import java.util.Date; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; @@ -88,7 +89,7 @@ public class Subdomain { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("email", emailAddress) + return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("email", emailAddress) .add("comment", comment.orNull()).add("created", created).add("updated", updated).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/UpdateDomain.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/UpdateDomain.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/UpdateDomain.java index ce62c42..1c6cc46 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/UpdateDomain.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/UpdateDomain.java @@ -16,8 +16,9 @@ */ package org.jclouds.rackspace.clouddns.v1.domain; +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; /** @@ -64,7 +65,7 @@ public class UpdateDomain { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("email", emailAddress.orNull()).add("ttl", ttl.orNull()) + return MoreObjects.toStringHelper(this).omitNullValues().add("email", emailAddress.orNull()).add("ttl", ttl.orNull()) .add("comment", comment.orNull()); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Auth.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Auth.java b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Auth.java index 04bdba5..be320a3 100644 --- a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Auth.java +++ b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Auth.java @@ -17,7 +17,7 @@ package org.jclouds.rackspace.cloudidentity.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/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Endpoint.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Endpoint.java b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Endpoint.java index 020ed85..ee621c0 100644 --- a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Endpoint.java +++ b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Endpoint.java @@ -17,7 +17,7 @@ package org.jclouds.rackspace.cloudidentity.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/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Token.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Token.java b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Token.java index 9d9845b..bc39162 100644 --- a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Token.java +++ b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Token.java @@ -17,7 +17,7 @@ package org.jclouds.rackspace.cloudidentity.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/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/domain/ApiKeyCredentials.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/domain/ApiKeyCredentials.java b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/domain/ApiKeyCredentials.java index 0583856..4976ec2 100644 --- a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/domain/ApiKeyCredentials.java +++ b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/domain/ApiKeyCredentials.java @@ -17,7 +17,7 @@ package org.jclouds.rackspace.cloudidentity.v2_0.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 org.jclouds.openstack.keystone.v2_0.config.CredentialType; http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccessRule.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccessRule.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccessRule.java index 2398c43..0892ba1 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccessRule.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccessRule.java @@ -18,8 +18,9 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.domain; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; /** * The access rule management feature allows fine-grained network access controls to be applied to the load balancer's @@ -75,7 +76,7 @@ public class AccessRule { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("address", address).add("type", type); }
