http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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..a13d6c7 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.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; @@ -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/a493e2ca/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/a493e2ca/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/a493e2ca/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/a493e2ca/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/a493e2ca/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/a493e2ca/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..c7c904f 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.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.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/a493e2ca/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java b/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java index d987f88..7d18eef 100644 --- a/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java +++ b/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java @@ -16,7 +16,7 @@ */ package org.jclouds.rackspace.cloudfiles.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; @@ -25,7 +25,7 @@ import java.net.URI; import javax.inject.Named; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Represents a CDN Container in Rackspace Cloud Files. http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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/a493e2ca/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..6a35976 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.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.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); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccessRuleWithId.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccessRuleWithId.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccessRuleWithId.java index 78cff08..d875407 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccessRuleWithId.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccessRuleWithId.java @@ -16,8 +16,9 @@ */ package org.jclouds.rackspace.cloudloadbalancers.v1.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * The same as {@link AccessRule} but this will have an id as assigned by the Cloud Load Balancers service. @@ -50,7 +51,7 @@ public class AccessRuleWithId extends AccessRule { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("id", id).add("address", getAddress()).add("type", getType()); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccountUsage.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccountUsage.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccountUsage.java index 89e506c..1839cb2 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccountUsage.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccountUsage.java @@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import java.util.Date; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; @@ -82,7 +83,7 @@ public final class AccountUsage { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("numPublicVIPs", numPublicVIPs) + return MoreObjects.toStringHelper(this).omitNullValues().add("numPublicVIPs", numPublicVIPs) .add("numServiceNetVIPs", numServiceNetVIPs).add("numLoadBalancers", numLoadBalancers) .add("startTime", startTime).add("endTime", endTime.orNull()).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AddNode.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AddNode.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AddNode.java index ff84867..a72c71a 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AddNode.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AddNode.java @@ -18,8 +18,9 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.domain; import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseNode; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * The nodes defined by the load balancer are responsible for servicing the requests received @@ -56,7 +57,7 @@ public class AddNode extends BaseNode<AddNode> { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("address", address).add("port", port).add("condition", condition).add("type", type).add("weight", weight); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/ConnectionThrottle.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/ConnectionThrottle.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/ConnectionThrottle.java index cbdb847..185de00 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/ConnectionThrottle.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/ConnectionThrottle.java @@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkArgument; import java.beans.ConstructorProperties; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * The connection throttling feature imposes limits on the number of connections per IP address to help mitigate @@ -87,7 +88,7 @@ public class ConnectionThrottle { } protected ToStringHelper string() { - return Objects.toStringHelper(this).add("maxConnections", maxConnections).add("minConnections", minConnections) + return MoreObjects.toStringHelper(this).add("maxConnections", maxConnections).add("minConnections", minConnections) .add("maxConnectionRate", maxConnectionRate).add("rateInterval", rateInterval); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/CreateLoadBalancer.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/CreateLoadBalancer.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/CreateLoadBalancer.java index d3153f7..fd3be7a 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/CreateLoadBalancer.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/CreateLoadBalancer.java @@ -25,8 +25,8 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseLoadBalancer; -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.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -83,7 +83,7 @@ public class CreateLoadBalancer extends BaseLoadBalancer<AddNode, CreateLoadBala } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("name", name).add("protocol", protocol) + return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("protocol", protocol) .add("port", port).add("nodes", nodes).add("timeout", timeout).add("algorithm", algorithm) .add("timeout", timeout).add("sessionPersistenceType", getSessionPersistenceType()) .add("connectionLogging", isConnectionLogging()).add("connectionThrottle", connectionThrottle) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/HealthMonitor.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/HealthMonitor.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/HealthMonitor.java index 8970c34..71194d4 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/HealthMonitor.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/HealthMonitor.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.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Optional; /** @@ -139,7 +140,7 @@ public class HealthMonitor { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("type", type).add("delay", delay) + return MoreObjects.toStringHelper(this).omitNullValues().add("type", type).add("delay", delay) .add("timeout", timeout).add("attemptsBeforeDeactivation", attemptsBeforeDeactivation) .add("bodyRegex", bodyRegex.orNull()).add("statusRegex", statusRegex.orNull()).add("path", path.orNull()) .add("hostHeader", hostHeader.orNull()); http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/HistoricalUsage.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/HistoricalUsage.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/HistoricalUsage.java index 64b7e6f..332c2cb 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/HistoricalUsage.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/HistoricalUsage.java @@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import java.util.Map; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.Iterables; @@ -67,7 +68,7 @@ public final class HistoricalUsage { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("accountId", accountId) + return MoreObjects.toStringHelper(this).omitNullValues().add("accountId", accountId) .add("accountUsage", getAccountUsage()).add("loadBalancerInfo", loadBalancerUsages).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancer.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancer.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancer.java index 74c6bcf..ef1bab4 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancer.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancer.java @@ -27,8 +27,9 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseLoadBalancer; +import com.google.common.base.MoreObjects; 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 LoadBalancer extends BaseLoadBalancer<Node, LoadBalancer> { @@ -170,7 +171,7 @@ public class LoadBalancer extends BaseLoadBalancer<Node, LoadBalancer> { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("id", id).add("region", region).add("status", status) + return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("region", region).add("status", status) .add("name", name).add("protocol", protocol).add("port", port).add("nodeCount", getNodeCount()) .add("nodes", nodes).add("timeout", timeout).add("algorithm", algorithm).add("halfClosed", halfClosed) .add("clusterName", clusterName).add("created", created).add("updated", updated) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerInfo.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerInfo.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerInfo.java index 0c2372f..bf9b3a2 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerInfo.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerInfo.java @@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; public final class LoadBalancerInfo { @@ -64,7 +65,7 @@ public final class LoadBalancerInfo { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("loadBalancerId", loadBalancerId) + return MoreObjects.toStringHelper(this).omitNullValues().add("loadBalancerId", loadBalancerId) .add("loadBalancerName", loadBalancerName).add("loadBalancerUsage", loadBalancerUsageRecords).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerStats.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerStats.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerStats.java index b73992a..822edb2 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerStats.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerStats.java @@ -18,7 +18,7 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.domain; import java.beans.ConstructorProperties; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; public final class LoadBalancerStats { private final int connectTimeOut; @@ -84,7 +84,7 @@ public final class LoadBalancerStats { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("connectTimeOut", connectTimeOut) + return MoreObjects.toStringHelper(this).omitNullValues().add("connectTimeOut", connectTimeOut) .add("connectError", connectError).add("connectFailure", connectFailure).add("dataTimedOut", dataTimedOut) .add("keepAliveTimedOut", keepAliveTimedOut).add("maxConn", maxConn).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerUsage.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerUsage.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerUsage.java index 0137002..1b6b61c 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerUsage.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerUsage.java @@ -23,6 +23,7 @@ import java.util.Date; import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; @@ -139,7 +140,7 @@ public final class LoadBalancerUsage { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("averageNumConnections", averageNumConnections) .add("averageNumConnectionsSsl", averageNumConnectionsSsl) .add("incomingTransferInBytes", incomingTransferInBytes) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Node.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Node.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Node.java index 5088e24..b925971 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Node.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Node.java @@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseNode; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * The nodes defined by the load balancer are responsible for servicing the requests received @@ -79,7 +80,7 @@ public class Node extends BaseNode<Node> { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("id", id).add("address", address).add("port", port).add("condition", condition) .add("type", type).add("weight", weight).add("status", status).add("metadata", metadata); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Protocol.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Protocol.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Protocol.java index 9a80126..b823aae 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Protocol.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Protocol.java @@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; public final class Protocol { @@ -58,6 +59,6 @@ public final class Protocol { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("name", name).add("port", port).toString(); + return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("port", port).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SSLTermination.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SSLTermination.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SSLTermination.java index 0fead4d..d42ade4 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SSLTermination.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SSLTermination.java @@ -20,8 +20,9 @@ import java.beans.ConstructorProperties; import javax.inject.Named; +import com.google.common.base.MoreObjects; 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; /** @@ -186,7 +187,7 @@ public class SSLTermination { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("enabled", enabled) + return MoreObjects.toStringHelper(this).omitNullValues().add("enabled", enabled) .add("secureTrafficOnly", secureTrafficOnly).add("securePort", securePort) .add("certificate", certificate.orNull()).add("privateKey", privateKey.orNull()) .add("intermediateCertificate", intermediateCertificate.orNull()); http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SourceAddresses.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SourceAddresses.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SourceAddresses.java index a968c04..d08c931 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SourceAddresses.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SourceAddresses.java @@ -16,8 +16,9 @@ */ package org.jclouds.rackspace.cloudloadbalancers.v1.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * The load balancer source IP addresses are useful for customers who are automating the deployment of infrastructure @@ -65,7 +66,7 @@ public class SourceAddresses { } protected ToStringHelper string() { - return Objects.toStringHelper(this).add("ipv6Public", ipv6Public).add("ipv4Public", ipv4Public) + return MoreObjects.toStringHelper(this).add("ipv6Public", ipv6Public).add("ipv4Public", ipv4Public) .add("ipv4Servicenet", ipv4Servicenet); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateLoadBalancer.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateLoadBalancer.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateLoadBalancer.java index c09976e..8f8a753 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateLoadBalancer.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateLoadBalancer.java @@ -19,8 +19,9 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.domain; import org.jclouds.javax.annotation.Nullable; import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseLoadBalancer.Algorithm; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Used to update Load Balancers. @@ -68,7 +69,7 @@ public class UpdateLoadBalancer { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("name", name).add("algorithm", algorithm) + return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("algorithm", algorithm) .add("port", port).add("protocol", protocol).add("timeout", timeout).add("halfClosed", halfClosed); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateNode.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateNode.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateNode.java index e38561e..a6a5df5 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateNode.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateNode.java @@ -20,8 +20,9 @@ import org.jclouds.javax.annotation.Nullable; import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseNode.Condition; import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseNode.Type; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Used to update Nodes. @@ -50,7 +51,7 @@ public class UpdateNode { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("condition", condition).add("type", type).add("weight", weight); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/VirtualIP.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/VirtualIP.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/VirtualIP.java index 6506071..b3c84ee 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/VirtualIP.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/VirtualIP.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.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * A virtual IP (VIP) makes a load balancer accessible by clients. The load balancing service @@ -52,7 +53,7 @@ public class VirtualIP { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("ipVersion", ipVersion).add("type", type); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/VirtualIPWithId.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/VirtualIPWithId.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/VirtualIPWithId.java index 372d1ff..a6d1260 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/VirtualIPWithId.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/VirtualIPWithId.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.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * @see VirtualIP @@ -44,7 +45,7 @@ public class VirtualIPWithId extends VirtualIP { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("id", id).add("address", address).add("ipVersion", getIpVersion()).add("type", getType()); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseLoadBalancer.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseLoadBalancer.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseLoadBalancer.java index 4cb6154..7f6c0fe 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseLoadBalancer.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseLoadBalancer.java @@ -29,8 +29,9 @@ import org.jclouds.rackspace.cloudloadbalancers.v1.domain.HealthMonitor; import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; import org.jclouds.rackspace.cloudloadbalancers.v1.domain.SessionPersistence; +import com.google.common.base.MoreObjects; 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.ImmutableSortedSet; import com.google.common.collect.Maps; @@ -161,7 +162,7 @@ public class BaseLoadBalancer<N extends BaseNode<N>, T extends BaseLoadBalancer< } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("name", name).add("protocol", protocol) + return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("protocol", protocol) .add("port", port).add("nodes", nodes).add("timeout", timeout).add("algorithm", algorithm) .add("timeout", timeout).add("sessionPersistenceType", getSessionPersistenceType()) .add("connectionLogging", connectionLogging).add("connectionThrottle", connectionThrottle) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseNode.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseNode.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseNode.java index 926ca89..c28e44f 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseNode.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseNode.java @@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * The nodes defined by the load balancer are responsible for servicing the requests received @@ -97,7 +98,7 @@ public class BaseNode<T extends BaseNode<T>> implements Comparable<BaseNode<T>> } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues().add("address", address).add("port", port) + return MoreObjects.toStringHelper(this).omitNullValues().add("address", address).add("port", port) .add("condition", condition).add("type", type).add("weight", weight); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/route53/src/main/java/org/jclouds/route53/domain/Change.java ---------------------------------------------------------------------- diff --git a/apis/route53/src/main/java/org/jclouds/route53/domain/Change.java b/apis/route53/src/main/java/org/jclouds/route53/domain/Change.java index 470a6f2..1f16993 100644 --- a/apis/route53/src/main/java/org/jclouds/route53/domain/Change.java +++ b/apis/route53/src/main/java/org/jclouds/route53/domain/Change.java @@ -17,7 +17,7 @@ package org.jclouds.route53.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/a493e2ca/apis/route53/src/main/java/org/jclouds/route53/domain/ChangeBatch.java ---------------------------------------------------------------------- diff --git a/apis/route53/src/main/java/org/jclouds/route53/domain/ChangeBatch.java b/apis/route53/src/main/java/org/jclouds/route53/domain/ChangeBatch.java index 184c525..4865b13 100644 --- a/apis/route53/src/main/java/org/jclouds/route53/domain/ChangeBatch.java +++ b/apis/route53/src/main/java/org/jclouds/route53/domain/ChangeBatch.java @@ -17,7 +17,7 @@ package org.jclouds.route53.domain; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/route53/src/main/java/org/jclouds/route53/domain/HostedZone.java ---------------------------------------------------------------------- diff --git a/apis/route53/src/main/java/org/jclouds/route53/domain/HostedZone.java b/apis/route53/src/main/java/org/jclouds/route53/domain/HostedZone.java index db6c8e7..32ee7a1 100644 --- a/apis/route53/src/main/java/org/jclouds/route53/domain/HostedZone.java +++ b/apis/route53/src/main/java/org/jclouds/route53/domain/HostedZone.java @@ -17,7 +17,7 @@ package org.jclouds.route53.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/a493e2ca/apis/route53/src/main/java/org/jclouds/route53/domain/HostedZoneAndNameServers.java ---------------------------------------------------------------------- diff --git a/apis/route53/src/main/java/org/jclouds/route53/domain/HostedZoneAndNameServers.java b/apis/route53/src/main/java/org/jclouds/route53/domain/HostedZoneAndNameServers.java index f8c3eda..f339b32 100644 --- a/apis/route53/src/main/java/org/jclouds/route53/domain/HostedZoneAndNameServers.java +++ b/apis/route53/src/main/java/org/jclouds/route53/domain/HostedZoneAndNameServers.java @@ -17,7 +17,7 @@ package org.jclouds.route53.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/a493e2ca/apis/route53/src/main/java/org/jclouds/route53/domain/NewHostedZone.java ---------------------------------------------------------------------- diff --git a/apis/route53/src/main/java/org/jclouds/route53/domain/NewHostedZone.java b/apis/route53/src/main/java/org/jclouds/route53/domain/NewHostedZone.java index 5d978b1..20722a0 100644 --- a/apis/route53/src/main/java/org/jclouds/route53/domain/NewHostedZone.java +++ b/apis/route53/src/main/java/org/jclouds/route53/domain/NewHostedZone.java @@ -17,7 +17,7 @@ package org.jclouds.route53.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/a493e2ca/apis/route53/src/main/java/org/jclouds/route53/domain/ResourceRecordSet.java ---------------------------------------------------------------------- diff --git a/apis/route53/src/main/java/org/jclouds/route53/domain/ResourceRecordSet.java b/apis/route53/src/main/java/org/jclouds/route53/domain/ResourceRecordSet.java index 20e225f..9b67d59 100644 --- a/apis/route53/src/main/java/org/jclouds/route53/domain/ResourceRecordSet.java +++ b/apis/route53/src/main/java/org/jclouds/route53/domain/ResourceRecordSet.java @@ -17,7 +17,7 @@ package org.jclouds.route53.domain; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -27,7 +27,7 @@ import org.jclouds.route53.domain.ResourceRecordSet.RecordSubset.Latency; import org.jclouds.route53.domain.ResourceRecordSet.RecordSubset.Weighted; 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.ImmutableList; http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/route53/src/main/java/org/jclouds/route53/domain/ResourceRecordSetIterable.java ---------------------------------------------------------------------- diff --git a/apis/route53/src/main/java/org/jclouds/route53/domain/ResourceRecordSetIterable.java b/apis/route53/src/main/java/org/jclouds/route53/domain/ResourceRecordSetIterable.java index 87670ce..a94e45e 100644 --- a/apis/route53/src/main/java/org/jclouds/route53/domain/ResourceRecordSetIterable.java +++ b/apis/route53/src/main/java/org/jclouds/route53/domain/ResourceRecordSetIterable.java @@ -17,7 +17,7 @@ package org.jclouds.route53.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.Iterator; http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/s3/src/main/java/org/jclouds/s3/domain/DeleteResult.java ---------------------------------------------------------------------- diff --git a/apis/s3/src/main/java/org/jclouds/s3/domain/DeleteResult.java b/apis/s3/src/main/java/org/jclouds/s3/domain/DeleteResult.java index cfc6503..896168b 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/domain/DeleteResult.java +++ b/apis/s3/src/main/java/org/jclouds/s3/domain/DeleteResult.java @@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; import java.util.Set; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ForwardingSet; import com.google.common.collect.ImmutableMap; @@ -69,7 +70,7 @@ public class DeleteResult extends ForwardingSet<String> { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("code", code).add("message", message).toString(); } } @@ -181,7 +182,7 @@ public class DeleteResult extends ForwardingSet<String> { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("deleted", deleted).add("errors", errors).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sqs/src/main/java/org/jclouds/sqs/SQS.java ---------------------------------------------------------------------- diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/SQS.java b/apis/sqs/src/main/java/org/jclouds/sqs/SQS.java index a51db4c..1689bfe 100644 --- a/apis/sqs/src/main/java/org/jclouds/sqs/SQS.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/SQS.java @@ -26,7 +26,7 @@ import org.jclouds.sqs.features.MessageApi; import org.jclouds.sqs.options.ReceiveMessageOptions; import com.google.common.annotations.Beta; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Supplier; import com.google.common.collect.FluentIterable; @@ -68,7 +68,7 @@ public class SQS { this.api = checkNotNull(api, "message api"); checkArgument(max > 0, "max messages per request must be a positive number"); this.max = max; - this.options = Objects.firstNonNull(options, NO_OPTIONS); + this.options = MoreObjects.firstNonNull(options, NO_OPTIONS); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sqs/src/main/java/org/jclouds/sqs/domain/BatchError.java ---------------------------------------------------------------------- diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/domain/BatchError.java b/apis/sqs/src/main/java/org/jclouds/sqs/domain/BatchError.java index 7e2c09c..c3bef1f 100644 --- a/apis/sqs/src/main/java/org/jclouds/sqs/domain/BatchError.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/domain/BatchError.java @@ -18,6 +18,7 @@ package org.jclouds.sqs.domain; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -144,7 +145,7 @@ public class BatchError { */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("id", id).add("senderFault", senderFault) + return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("senderFault", senderFault) .add("message", message).add("code", code).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sqs/src/main/java/org/jclouds/sqs/domain/BatchResult.java ---------------------------------------------------------------------- diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/domain/BatchResult.java b/apis/sqs/src/main/java/org/jclouds/sqs/domain/BatchResult.java index 58aa80a..ca60327 100644 --- a/apis/sqs/src/main/java/org/jclouds/sqs/domain/BatchResult.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/domain/BatchResult.java @@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; import com.google.common.base.Function; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ForwardingMap; import com.google.common.collect.ImmutableMap; @@ -136,7 +137,7 @@ public class BatchResult<V> extends ForwardingMap<String, V> { */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("results", results).add("errors", errors).toString(); + return MoreObjects.toStringHelper(this).omitNullValues().add("results", results).add("errors", errors).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sqs/src/main/java/org/jclouds/sqs/domain/Message.java ---------------------------------------------------------------------- diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/domain/Message.java b/apis/sqs/src/main/java/org/jclouds/sqs/domain/Message.java index 5566e50..0c43f7d 100644 --- a/apis/sqs/src/main/java/org/jclouds/sqs/domain/Message.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/domain/Message.java @@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; import com.google.common.hash.HashCode; @@ -175,7 +176,7 @@ public class Message { */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("id", id).add("body", body).add("md5", md5) + return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("body", body).add("md5", md5) .add("receiptHandle", receiptHandle).add("attributes", attributes).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sqs/src/main/java/org/jclouds/sqs/domain/MessageIdAndMD5.java ---------------------------------------------------------------------- diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/domain/MessageIdAndMD5.java b/apis/sqs/src/main/java/org/jclouds/sqs/domain/MessageIdAndMD5.java index 934f13d..26e2f9c 100644 --- a/apis/sqs/src/main/java/org/jclouds/sqs/domain/MessageIdAndMD5.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/domain/MessageIdAndMD5.java @@ -18,6 +18,7 @@ package org.jclouds.sqs.domain; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.hash.HashCode; @@ -109,7 +110,7 @@ public class MessageIdAndMD5 { */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("id", id).add("md5", md5).toString(); + return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("md5", md5).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sqs/src/main/java/org/jclouds/sqs/domain/QueueAttributes.java ---------------------------------------------------------------------- diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/domain/QueueAttributes.java b/apis/sqs/src/main/java/org/jclouds/sqs/domain/QueueAttributes.java index d12a20b..82f7126 100644 --- a/apis/sqs/src/main/java/org/jclouds/sqs/domain/QueueAttributes.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/domain/QueueAttributes.java @@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Date; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; @@ -298,7 +299,7 @@ public class QueueAttributes { */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("queueArn", queueArn) + return MoreObjects.toStringHelper(this).omitNullValues().add("queueArn", queueArn) .add("approximateNumberOfMessages", approximateNumberOfMessages) .add("approximateNumberOfMessagesNotVisible", approximateNumberOfMessagesNotVisible) .add("approximateNumberOfMessagesDelayed", approximateNumberOfMessagesDelayed) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java ---------------------------------------------------------------------- diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java b/apis/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java index d8f70b3..d02b49f 100644 --- a/apis/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java @@ -21,6 +21,7 @@ import java.util.Map.Entry; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Multimap; @@ -138,7 +139,7 @@ public class CreateQueueOptions extends BaseHttpRequestOptions implements Clonea @Override public String toString() { ImmutableMap<String, String> attributes = this.attributes.build(); - return Objects.toStringHelper(this).omitNullValues().add("attributes", !attributes.isEmpty() ? attributes : null) + return MoreObjects.toStringHelper(this).omitNullValues().add("attributes", !attributes.isEmpty() ? attributes : null) .toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sqs/src/main/java/org/jclouds/sqs/options/ReceiveMessageOptions.java ---------------------------------------------------------------------- diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/options/ReceiveMessageOptions.java b/apis/sqs/src/main/java/org/jclouds/sqs/options/ReceiveMessageOptions.java index 279e1b5..a626d56 100644 --- a/apis/sqs/src/main/java/org/jclouds/sqs/options/ReceiveMessageOptions.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/options/ReceiveMessageOptions.java @@ -18,6 +18,7 @@ package org.jclouds.sqs.options; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; @@ -154,7 +155,7 @@ public class ReceiveMessageOptions extends BaseHttpRequestOptions implements Clo @Override public String toString() { ImmutableSet<String> attributes = this.attributes.build(); - return Objects.toStringHelper(this).omitNullValues().add("visibilityTimeout", visibilityTimeout) + return MoreObjects.toStringHelper(this).omitNullValues().add("visibilityTimeout", visibilityTimeout) .add("attributes", !attributes.isEmpty() ? attributes : null).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sqs/src/main/java/org/jclouds/sqs/options/SendMessageOptions.java ---------------------------------------------------------------------- diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/options/SendMessageOptions.java b/apis/sqs/src/main/java/org/jclouds/sqs/options/SendMessageOptions.java index eee4e7d..a491bcb 100644 --- a/apis/sqs/src/main/java/org/jclouds/sqs/options/SendMessageOptions.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/options/SendMessageOptions.java @@ -18,6 +18,7 @@ package org.jclouds.sqs.options; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.Multimap; @@ -99,6 +100,6 @@ public class SendMessageOptions extends BaseHttpRequestOptions implements Clonea */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("delaySeconds", delaySeconds).toString(); + return MoreObjects.toStringHelper(this).omitNullValues().add("delaySeconds", delaySeconds).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sts/src/main/java/org/jclouds/aws/domain/SessionCredentials.java ---------------------------------------------------------------------- diff --git a/apis/sts/src/main/java/org/jclouds/aws/domain/SessionCredentials.java b/apis/sts/src/main/java/org/jclouds/aws/domain/SessionCredentials.java index 2adcaea..0ca4ece 100644 --- a/apis/sts/src/main/java/org/jclouds/aws/domain/SessionCredentials.java +++ b/apis/sts/src/main/java/org/jclouds/aws/domain/SessionCredentials.java @@ -22,6 +22,7 @@ import java.util.Date; import org.jclouds.domain.Credentials; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; @@ -93,7 +94,7 @@ public final class SessionCredentials extends Credentials { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("accessKeyId", identity) + return MoreObjects.toStringHelper(this).omitNullValues().add("accessKeyId", identity) .add("sessionToken", sessionToken).add("expiration", expiration.orNull()).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sts/src/main/java/org/jclouds/sts/domain/User.java ---------------------------------------------------------------------- diff --git a/apis/sts/src/main/java/org/jclouds/sts/domain/User.java b/apis/sts/src/main/java/org/jclouds/sts/domain/User.java index f98cebe..2bcf5aa 100644 --- a/apis/sts/src/main/java/org/jclouds/sts/domain/User.java +++ b/apis/sts/src/main/java/org/jclouds/sts/domain/User.java @@ -18,6 +18,7 @@ package org.jclouds.sts.domain; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; public final class User { @@ -70,6 +71,6 @@ public final class User { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("arn", arn).toString(); + return MoreObjects.toStringHelper(this).add("id", id).add("arn", arn).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sts/src/main/java/org/jclouds/sts/domain/UserAndSessionCredentials.java ---------------------------------------------------------------------- diff --git a/apis/sts/src/main/java/org/jclouds/sts/domain/UserAndSessionCredentials.java b/apis/sts/src/main/java/org/jclouds/sts/domain/UserAndSessionCredentials.java index fa9839b..df72240 100644 --- a/apis/sts/src/main/java/org/jclouds/sts/domain/UserAndSessionCredentials.java +++ b/apis/sts/src/main/java/org/jclouds/sts/domain/UserAndSessionCredentials.java @@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import org.jclouds.aws.domain.SessionCredentials; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; public final class UserAndSessionCredentials { @@ -121,7 +122,7 @@ public final class UserAndSessionCredentials { @Override public String toString() { - return Objects.toStringHelper(this).add("user", user).add("credentials", credentials) + return MoreObjects.toStringHelper(this).add("user", user).add("credentials", credentials) .add("packedPolicySize", packedPolicySize).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sts/src/main/java/org/jclouds/sts/options/AssumeRoleOptions.java ---------------------------------------------------------------------- diff --git a/apis/sts/src/main/java/org/jclouds/sts/options/AssumeRoleOptions.java b/apis/sts/src/main/java/org/jclouds/sts/options/AssumeRoleOptions.java index feab718..77fda0c 100644 --- a/apis/sts/src/main/java/org/jclouds/sts/options/AssumeRoleOptions.java +++ b/apis/sts/src/main/java/org/jclouds/sts/options/AssumeRoleOptions.java @@ -18,6 +18,7 @@ package org.jclouds.sts.options; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.Multimap; @@ -130,7 +131,7 @@ public class AssumeRoleOptions extends BaseHttpRequestOptions implements Cloneab */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("externalId", externalId) + return MoreObjects.toStringHelper(this).omitNullValues().add("externalId", externalId) .add("durationSeconds", durationSeconds).add("policy", policy).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sts/src/main/java/org/jclouds/sts/options/FederatedUserOptions.java ---------------------------------------------------------------------- diff --git a/apis/sts/src/main/java/org/jclouds/sts/options/FederatedUserOptions.java b/apis/sts/src/main/java/org/jclouds/sts/options/FederatedUserOptions.java index d8c950d..b2b3a88 100644 --- a/apis/sts/src/main/java/org/jclouds/sts/options/FederatedUserOptions.java +++ b/apis/sts/src/main/java/org/jclouds/sts/options/FederatedUserOptions.java @@ -18,6 +18,7 @@ package org.jclouds.sts.options; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.Multimap; @@ -110,7 +111,7 @@ public class FederatedUserOptions extends BaseHttpRequestOptions implements Clon */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("durationSeconds", durationSeconds) + return MoreObjects.toStringHelper(this).omitNullValues().add("durationSeconds", durationSeconds) .add("policy", policy).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sts/src/main/java/org/jclouds/sts/options/SessionCredentialsOptions.java ---------------------------------------------------------------------- diff --git a/apis/sts/src/main/java/org/jclouds/sts/options/SessionCredentialsOptions.java b/apis/sts/src/main/java/org/jclouds/sts/options/SessionCredentialsOptions.java index 2f40684..6a75e6d 100644 --- a/apis/sts/src/main/java/org/jclouds/sts/options/SessionCredentialsOptions.java +++ b/apis/sts/src/main/java/org/jclouds/sts/options/SessionCredentialsOptions.java @@ -18,6 +18,7 @@ package org.jclouds.sts.options; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.Multimap; @@ -132,7 +133,7 @@ public class SessionCredentialsOptions extends BaseHttpRequestOptions implements */ @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("serialNumber", serialNumber) + return MoreObjects.toStringHelper(this).omitNullValues().add("serialNumber", serialNumber) .add("durationSeconds", durationSeconds).add("tokenCode", tokenCode).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobMetadataImpl.java ---------------------------------------------------------------------- diff --git a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobMetadataImpl.java b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobMetadataImpl.java index a339b06..5e7d2f9 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobMetadataImpl.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobMetadataImpl.java @@ -23,7 +23,7 @@ import java.util.Date; import java.util.Map; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import org.jclouds.blobstore.domain.BlobMetadata; import org.jclouds.blobstore.domain.StorageType; http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableBlobMetadataImpl.java ---------------------------------------------------------------------- diff --git a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableBlobMetadataImpl.java b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableBlobMetadataImpl.java index 0cae35a..5320be5 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableBlobMetadataImpl.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableBlobMetadataImpl.java @@ -19,7 +19,7 @@ package org.jclouds.blobstore.domain.internal; import java.net.URI; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import org.jclouds.blobstore.domain.BlobMetadata; import org.jclouds.blobstore.domain.MutableBlobMetadata; http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableStorageMetadataImpl.java ---------------------------------------------------------------------- diff --git a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableStorageMetadataImpl.java b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableStorageMetadataImpl.java index 677d470..d3676c1 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableStorageMetadataImpl.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableStorageMetadataImpl.java @@ -19,7 +19,7 @@ package org.jclouds.blobstore.domain.internal; import java.util.Date; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import org.jclouds.blobstore.domain.MutableStorageMetadata; import org.jclouds.blobstore.domain.StorageMetadata; http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/StorageMetadataImpl.java ---------------------------------------------------------------------- diff --git a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/StorageMetadataImpl.java b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/StorageMetadataImpl.java index 6ff32bd..69e650e 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/StorageMetadataImpl.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/StorageMetadataImpl.java @@ -23,7 +23,7 @@ import java.util.Date; import java.util.Map; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import org.jclouds.blobstore.domain.StorageMetadata; import org.jclouds.blobstore.domain.StorageType; http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 79829ec..d86673f 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; @@ -60,7 +61,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/a493e2ca/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/a493e2ca/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..8bab068 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.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.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/a493e2ca/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/a493e2ca/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/a493e2ca/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/a493e2ca/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 2a15f4b..9c5f9b9 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/a493e2ca/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/a493e2ca/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 472a214..07f7687 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; @@ -133,7 +133,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/a493e2ca/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 a6f0f4d..f79757d 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;
