http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/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..7b9e64a 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.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.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/95cfc0d9/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/95cfc0d9/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..1e1d601 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.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.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/95cfc0d9/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..71af6e2 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.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.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/95cfc0d9/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/95cfc0d9/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..9cddec2 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.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.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/95cfc0d9/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/95cfc0d9/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 0eda19e..7bd638d 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.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.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/95cfc0d9/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/95cfc0d9/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/95cfc0d9/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/95cfc0d9/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..5fb7809 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.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.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/95cfc0d9/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 007f6fe..c68fd1f 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/95cfc0d9/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..97e532f 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.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.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/95cfc0d9/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..2d68487 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.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.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/95cfc0d9/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..8a9f65f 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.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.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/95cfc0d9/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..fc2911d 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.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.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/95cfc0d9/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..475c6dd 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.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.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/95cfc0d9/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..f77f8e4 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.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.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/95cfc0d9/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 42eb6ca..041e9d2 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 @@ -28,8 +28,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.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Maps; @@ -159,7 +160,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/95cfc0d9/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..49b47a2 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 @@ -19,9 +19,9 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; - +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; /** * The nodes defined by the load balancer are responsible for servicing the requests received @@ -97,7 +97,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/95cfc0d9/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/95cfc0d9/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/95cfc0d9/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 b227b73..626e470 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/95cfc0d9/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/95cfc0d9/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/95cfc0d9/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/95cfc0d9/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/95cfc0d9/apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java ---------------------------------------------------------------------- diff --git a/apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java b/apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java index cf9c54d..279de59 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java +++ b/apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java @@ -19,7 +19,7 @@ package org.jclouds.s3; import static com.google.common.net.HttpHeaders.CONTENT_LENGTH; import static com.google.common.net.HttpHeaders.ETAG; import static com.google.common.net.HttpHeaders.EXPECT; -import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; +import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; import static org.jclouds.Constants.PROPERTY_MAX_RETRIES; import static org.jclouds.Constants.PROPERTY_SO_TIMEOUT; import static org.testng.Assert.assertEquals; @@ -45,7 +45,7 @@ import com.squareup.okhttp.mockwebserver.RecordedRequest; public class S3ClientMockTest { private static final Set<Module> modules = ImmutableSet.<Module> of( - new ExecutorServiceModule(sameThreadExecutor(), sameThreadExecutor())); + new ExecutorServiceModule(newDirectExecutorService(), newDirectExecutorService())); static S3Client getS3Client(URL server) { Properties overrides = new Properties(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/s3/src/test/java/org/jclouds/s3/blobstore/functions/BucketsToStorageMetadataTest.java ---------------------------------------------------------------------- diff --git a/apis/s3/src/test/java/org/jclouds/s3/blobstore/functions/BucketsToStorageMetadataTest.java b/apis/s3/src/test/java/org/jclouds/s3/blobstore/functions/BucketsToStorageMetadataTest.java index 3d638db..46fa6b5 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/blobstore/functions/BucketsToStorageMetadataTest.java +++ b/apis/s3/src/test/java/org/jclouds/s3/blobstore/functions/BucketsToStorageMetadataTest.java @@ -16,7 +16,7 @@ */ package org.jclouds.s3.blobstore.functions; -import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; +import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; import static org.testng.Assert.assertEquals; import org.jclouds.blobstore.domain.MutableStorageMetadata; @@ -49,7 +49,7 @@ public class BucketsToStorageMetadataTest { public void test() { BucketsToStorageMetadata fn = new BucketsToStorageMetadata( - sameThreadExecutor(), + newDirectExecutorService(), new BucketToResourceMetadata(Functions.forMap(ImmutableMap.<String, Location> of("mycontainer", region)))); MutableStorageMetadata expected = new MutableStorageMetadataImpl(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/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/95cfc0d9/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 1c8d35c..428918a 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/95cfc0d9/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/95cfc0d9/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/95cfc0d9/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/95cfc0d9/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/95cfc0d9/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 b6d62d1..1f76ced 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.size() > 0 ? attributes : null) + return MoreObjects.toStringHelper(this).omitNullValues().add("attributes", attributes.size() > 0 ? attributes : null) .toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/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 288c442..0001d2d 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.size() > 0 ? attributes : null).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/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/95cfc0d9/apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiLiveTest.java ---------------------------------------------------------------------- diff --git a/apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiLiveTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiLiveTest.java index dde6ed1..aad0473 100644 --- a/apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiLiveTest.java +++ b/apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiLiveTest.java @@ -16,7 +16,7 @@ */ package org.jclouds.sqs.features; -import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; +import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; import static org.jclouds.providers.AnonymousProviderMetadata.forClientMappedToAsyncClientOnEndpoint; import static org.jclouds.sqs.reference.SQSParameters.ACTION; import static org.testng.Assert.assertEquals; @@ -98,7 +98,7 @@ public class PermissionApiLiveTest extends BaseSQSApiLiveTest { return ContextBuilder.newBuilder( forClientMappedToAsyncClientOnEndpoint(AnonymousAttributesApi.class, AnonymousAttributesAsyncApi.class, queue.toASCIIString())) - .modules(ImmutableSet.<Module> of(new ExecutorServiceModule(sameThreadExecutor(), sameThreadExecutor()))) + .modules(ImmutableSet.<Module> of(new ExecutorServiceModule(newDirectExecutorService(), newDirectExecutorService()))) .buildApi(AnonymousAttributesApi.class); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/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/95cfc0d9/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/95cfc0d9/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 57aacaf..9ad382e 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/95cfc0d9/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/95cfc0d9/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/95cfc0d9/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/95cfc0d9/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/AccountMetadata.java ---------------------------------------------------------------------- diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/AccountMetadata.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/AccountMetadata.java index 8fec10a..6c42ae3 100644 --- a/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/AccountMetadata.java +++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/AccountMetadata.java @@ -18,8 +18,9 @@ package org.jclouds.openstack.swift.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; public class AccountMetadata { @@ -105,7 +106,7 @@ public class AccountMetadata { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("containerCount", containerCount).add("bytes", bytes); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/ContainerMetadata.java ---------------------------------------------------------------------- diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/ContainerMetadata.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/ContainerMetadata.java index 0b7a426..1173070 100644 --- a/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/ContainerMetadata.java +++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/ContainerMetadata.java @@ -23,8 +23,9 @@ import java.util.Map; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableMap; /** @@ -164,7 +165,7 @@ public class ContainerMetadata { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("name", name).add("count", count).add("bytes", bytes).add("readACL", readACL).add("metadata", metadata); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/internal/ObjectInfoImpl.java ---------------------------------------------------------------------- diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/internal/ObjectInfoImpl.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/internal/ObjectInfoImpl.java index acb6a1b..bc46f22 100644 --- a/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/internal/ObjectInfoImpl.java +++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/internal/ObjectInfoImpl.java @@ -28,8 +28,9 @@ import javax.inject.Named; import org.jclouds.javax.annotation.Nullable; import org.jclouds.openstack.swift.domain.ObjectInfo; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ComparisonChain; import com.google.common.collect.Ordering; @@ -230,7 +231,7 @@ public class ObjectInfoImpl implements ObjectInfo { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("name", name).add("container", container).add("uri", uri).add("hash", Arrays.toString(hash)) .add("bytes", bytes).add("contentType", contentType).add("lastModified", lastModified); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java ---------------------------------------------------------------------- diff --git a/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java b/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java index 99e09cf..cba3a29 100644 --- a/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java +++ b/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java @@ -16,7 +16,7 @@ */ package org.jclouds.openstack.swift.blobstore.strategy.internal; -import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; +import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; import static org.jclouds.Constants.PROPERTY_MAX_RETRIES; import static org.jclouds.Constants.PROPERTY_SO_TIMEOUT; import static org.testng.Assert.assertEquals; @@ -97,8 +97,8 @@ public class SequentialMultipartUploadStrategyMockTest { } } - private static final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(sameThreadExecutor(), - sameThreadExecutor())); + private static final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(newDirectExecutorService(), + newDirectExecutorService())); static SequentialMultipartUploadStrategy mockSequentialMultipartUploadStrategy(String uri, int partSize) { Properties overrides = new Properties(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/options/VCloudTemplateOptions.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/options/VCloudTemplateOptions.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/options/VCloudTemplateOptions.java index 03b12fe..20a3cc2 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/options/VCloudTemplateOptions.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/options/VCloudTemplateOptions.java @@ -28,7 +28,7 @@ import org.jclouds.vcloud.domain.network.FenceMode; import org.jclouds.vcloud.domain.network.IpAddressAllocationMode; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Contains options supported in the {@code ComputeService#runNode} operation on http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudHttpApiModule.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudHttpApiModule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudHttpApiModule.java index 5cc6d67..1f2f07c 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudHttpApiModule.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudHttpApiModule.java @@ -89,7 +89,7 @@ import org.jclouds.vcloud.predicates.TaskSuccess; import org.jclouds.vcloud.xml.ovf.VCloudResourceAllocationSettingDataHandler; 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.Supplier; import com.google.common.base.Suppliers; @@ -125,7 +125,7 @@ public class VCloudHttpApiModule extends HttpApiModule<VCloudApi> { @Override public String toString() { - return Objects.toStringHelper(login).add("method", "login").toString(); + return MoreObjects.toStringHelper(login).add("method", "login").toString(); } }, seconds, TimeUnit.SECONDS); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/ReferenceTypeImpl.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/ReferenceTypeImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/ReferenceTypeImpl.java index 4519eba..0efd054 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/ReferenceTypeImpl.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/ReferenceTypeImpl.java @@ -22,8 +22,9 @@ import java.net.URI; import org.jclouds.vcloud.domain.ReferenceType; +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; /** * Location of a Rest resource @@ -80,6 +81,6 @@ public class ReferenceTypeImpl implements ReferenceType { } protected ToStringHelper string() { - return Objects.toStringHelper("").omitNullValues().add("href", href).add("name", name).add("type", type); + return MoreObjects.toStringHelper("").omitNullValues().add("href", href).add("name", name).add("type", type); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/TaskImpl.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/TaskImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/TaskImpl.java index 70815a1..a4eca56 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/TaskImpl.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/TaskImpl.java @@ -28,7 +28,7 @@ import org.jclouds.vcloud.domain.Task; import org.jclouds.vcloud.domain.TaskStatus; import org.jclouds.vcloud.domain.VCloudError; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; public class TaskImpl extends ReferenceTypeImpl implements Task { @@ -82,7 +82,7 @@ public class TaskImpl extends ReferenceTypeImpl implements Task { @Override public String toString() { - return Objects.toStringHelper("").omitNullValues().add("href", getHref()).add("name", getName()) + return MoreObjects.toStringHelper("").omitNullValues().add("href", getHref()).add("name", getName()) .add("owner", owner).add("operation", operation).add("startTime", startTime).add("endTime", endTime) .add("expiryTime", expiryTime).add("error", error).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/DhcpService.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/DhcpService.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/DhcpService.java index 628a7d1..8dea319 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/DhcpService.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/DhcpService.java @@ -20,6 +20,7 @@ import static com.google.common.base.Objects.equal; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -99,7 +100,7 @@ public class DhcpService { @Override public String toString() { - return Objects.toStringHelper("").omitNullValues().add("enabled", enabled) + return MoreObjects.toStringHelper("").omitNullValues().add("enabled", enabled) .add("defaultLeaseTime", defaultLeaseTime).add("maxLeaseTime", maxLeaseTime).add("ipRange", ipRange) .toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/Features.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/Features.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/Features.java index 24eb38e..faca148 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/Features.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/Features.java @@ -20,6 +20,7 @@ import static com.google.common.base.Objects.equal; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -88,7 +89,7 @@ public class Features { @Override public String toString() { - return Objects.toStringHelper("").omitNullValues().add("dhcpService", dhcpService) + return MoreObjects.toStringHelper("").omitNullValues().add("dhcpService", dhcpService) .add("firewallService", firewallService).add("natService", natService).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/FirewallService.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/FirewallService.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/FirewallService.java index 63212b2..fb52cdc 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/FirewallService.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/FirewallService.java @@ -24,8 +24,9 @@ import java.util.List; import org.jclouds.javax.annotation.Nullable; import org.jclouds.vcloud.domain.network.firewall.FirewallRule; +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.Iterables; import com.google.common.collect.Lists; @@ -78,7 +79,7 @@ public class FirewallService { @Override public String toString() { - ToStringHelper helper = Objects.toStringHelper("").omitNullValues().add("enabled", enabled); + ToStringHelper helper = MoreObjects.toStringHelper("").omitNullValues().add("enabled", enabled); if (firewallRules.size() > 0) helper.add("firewallRules", firewallRules); return helper.toString(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpRange.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpRange.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpRange.java index 180d13d..931cc30 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpRange.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpRange.java @@ -19,6 +19,7 @@ package org.jclouds.vcloud.domain.network; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -68,7 +69,7 @@ public class IpRange { @Override public String toString() { - return Objects.toStringHelper("").omitNullValues().add("startAddress", startAddress) + return MoreObjects.toStringHelper("").omitNullValues().add("startAddress", startAddress) .add("endAddress", endAddress).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpScope.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpScope.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpScope.java index e5af063..65a9942 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpScope.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpScope.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.Iterables; import com.google.common.collect.Sets; @@ -158,7 +159,7 @@ public class IpScope { @Override public String toString() { - ToStringHelper helper = Objects.toStringHelper("").omitNullValues().add("inherited", inherited).add("gateway", gateway) + ToStringHelper helper = MoreObjects.toStringHelper("").omitNullValues().add("inherited", inherited).add("gateway", gateway) .add("netmask", netmask).add("dns1", dns1).add("dns2", dns2).add("dnsSuffix", dnsSuffix); if (ipRanges.size() > 0) helper.add("ipRanges", ipRanges); http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NatService.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NatService.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NatService.java index ea4c388..e9fe116 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NatService.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NatService.java @@ -26,8 +26,9 @@ import org.jclouds.vcloud.domain.network.nat.NatPolicy; import org.jclouds.vcloud.domain.network.nat.NatRule; import org.jclouds.vcloud.domain.network.nat.NatType; +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.Iterables; import com.google.common.collect.Lists; @@ -106,7 +107,7 @@ public class NatService { @Override public String toString() { - ToStringHelper helper = Objects.toStringHelper("").omitNullValues().add("enabled", enabled) + ToStringHelper helper = MoreObjects.toStringHelper("").omitNullValues().add("enabled", enabled) .add("type", type).add("policy", policy); if (natRules.size() > 0) helper.add("natRules", natRules); http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallProtocols.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallProtocols.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallProtocols.java index 8b09dc2..1482053 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallProtocols.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallProtocols.java @@ -18,6 +18,7 @@ package org.jclouds.vcloud.domain.network.firewall; import static com.google.common.base.Objects.equal; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -65,7 +66,7 @@ public class FirewallProtocols { @Override public String toString() { - return Objects.toStringHelper("").omitNullValues().add("tcp", tcp).add("udp", udp).toString(); + return MoreObjects.toStringHelper("").omitNullValues().add("tcp", tcp).add("udp", udp).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallRule.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallRule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallRule.java index dfb578b..835d41a 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallRule.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallRule.java @@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -116,7 +117,7 @@ public class FirewallRule { @Override public String toString() { - return Objects.toStringHelper("").omitNullValues().add("enabled", enabled).add("description", description) + return MoreObjects.toStringHelper("").omitNullValues().add("enabled", enabled).add("description", description) .add("policy", policy).add("protocols", protocols).add("port", port).add("destinationIp", destinationIp) .toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/internal/OrgNetworkImpl.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/internal/OrgNetworkImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/internal/OrgNetworkImpl.java index 76a394f..8f7a65d 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/internal/OrgNetworkImpl.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/internal/OrgNetworkImpl.java @@ -32,8 +32,9 @@ import org.jclouds.vcloud.domain.network.FenceMode; import org.jclouds.vcloud.domain.network.IpScope; import org.jclouds.vcloud.domain.network.OrgNetwork; +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.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -130,7 +131,7 @@ public class OrgNetworkImpl extends ReferenceTypeImpl implements OrgNetwork { @Override public String toString() { - return Objects.toStringHelper("").omitNullValues().add("ipScope", ipScope).add("parentNetwork", parentNetwork) + return MoreObjects.toStringHelper("").omitNullValues().add("ipScope", ipScope).add("parentNetwork", parentNetwork) .add("fenceMode", fenceMode).add("features", features).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/OneToOneVmRule.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/OneToOneVmRule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/OneToOneVmRule.java index c2b1b4b..7f9bdc8 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/OneToOneVmRule.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/OneToOneVmRule.java @@ -22,6 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import org.jclouds.javax.annotation.Nullable; import org.jclouds.vcloud.domain.network.nat.NatRule; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -66,7 +67,7 @@ public class OneToOneVmRule implements NatRule { @Override public String toString() { - return Objects.toStringHelper("").omitNullValues().add("mappingMode", mappingMode).add("externalIP", externalIP) + return MoreObjects.toStringHelper("").omitNullValues().add("mappingMode", mappingMode).add("externalIP", externalIP) .add("vAppScopedVmId", vAppScopedVmId).add("vmNicId", vmNicId).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/95cfc0d9/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/PortForwardingRule.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/PortForwardingRule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/PortForwardingRule.java index 3170a73..b888e58 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/PortForwardingRule.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/PortForwardingRule.java @@ -22,6 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import org.jclouds.vcloud.domain.network.nat.NatProtocol; import org.jclouds.vcloud.domain.network.nat.NatRule; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -102,7 +103,7 @@ public class PortForwardingRule implements NatRule { @Override public String toString() { - return Objects.toStringHelper("").omitNullValues().add("externalIP", externalIP) + return MoreObjects.toStringHelper("").omitNullValues().add("externalIP", externalIP) .add("externalPort", externalPort).add("internalIP", internalIP).add("internalPort", internalPort) .add("protocol", protocol).toString(); }
