You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2017/08/25 01:11:36 UTC
[3/9] jclouds git commit: JCLOUDS-1225: Address Guava 18 Objects
changes
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/domain/CIMOperatingSystem.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/CIMOperatingSystem.java b/compute/src/main/java/org/jclouds/compute/domain/CIMOperatingSystem.java
index b743a71..fefa100 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/CIMOperatingSystem.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/CIMOperatingSystem.java
@@ -21,7 +21,7 @@ import org.jclouds.javax.annotation.Nullable;
import org.jclouds.ovf.Envelope;
import com.google.common.annotations.Beta;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Operating system based on DMTF CIM model.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/domain/ExecResponse.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/ExecResponse.java b/compute/src/main/java/org/jclouds/compute/domain/ExecResponse.java
index b74729b..6cd47bc 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/ExecResponse.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/ExecResponse.java
@@ -18,6 +18,7 @@ package org.jclouds.compute.domain;
import org.jclouds.compute.config.CustomizationResponse;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public class ExecResponse implements CustomizationResponse {
@@ -64,7 +65,7 @@ public class ExecResponse implements CustomizationResponse {
@Override
public String toString() {
- return Objects.toStringHelper("").add("output", output).add("error", error).add("exitStatus", exitStatus)
+ return MoreObjects.toStringHelper("").add("output", output).add("error", error).add("exitStatus", exitStatus)
.toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/domain/OperatingSystem.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/OperatingSystem.java b/compute/src/main/java/org/jclouds/compute/domain/OperatingSystem.java
index 64fab3d..a03161f 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/OperatingSystem.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/OperatingSystem.java
@@ -22,8 +22,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.annotations.Beta;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Running Operating system
@@ -117,7 +118,7 @@ public class OperatingSystem {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").omitNullValues().add("family", family).add("name", name).add("arch", arch)
+ return MoreObjects.toStringHelper("").omitNullValues().add("family", family).add("name", name).add("arch", arch)
.add("version", version).add("description", description).add("is64Bit", is64Bit);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/domain/Processor.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/Processor.java b/compute/src/main/java/org/jclouds/compute/domain/Processor.java
index 932e635..67a57f2 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/Processor.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/Processor.java
@@ -18,8 +18,9 @@ package org.jclouds.compute.domain;
import static com.google.common.base.Objects.equal;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ComparisonChain;
/**
@@ -80,7 +81,7 @@ public class Processor implements Comparable<Processor> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").omitNullValues().add("cores", cores).add("speed", speed);
+ return MoreObjects.toStringHelper("").omitNullValues().add("cores", cores).add("speed", speed);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/domain/SecurityGroup.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/SecurityGroup.java b/compute/src/main/java/org/jclouds/compute/domain/SecurityGroup.java
index 5f3a7ef..7170f27 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/SecurityGroup.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/SecurityGroup.java
@@ -27,7 +27,7 @@ import org.jclouds.domain.Location;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.net.domain.IpPermission;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilderSpec.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilderSpec.java b/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilderSpec.java
index d00cb3b..f1f8488 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilderSpec.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilderSpec.java
@@ -17,7 +17,7 @@
package org.jclouds.compute.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/domain/internal/ComputeMetadataImpl.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/ComputeMetadataImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/ComputeMetadataImpl.java
index 21fa298..a9adbad 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/ComputeMetadataImpl.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/ComputeMetadataImpl.java
@@ -31,8 +31,9 @@ import org.jclouds.domain.Location;
import org.jclouds.domain.ResourceMetadata;
import org.jclouds.domain.internal.ResourceMetadataImpl;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
public class ComputeMetadataImpl extends ResourceMetadataImpl<ComputeType> implements ComputeMetadata {
@@ -106,7 +107,7 @@ public class ComputeMetadataImpl extends ResourceMetadataImpl<ComputeType> imple
}
protected ToStringHelper computeToStringPrefix() {
- return Objects.toStringHelper("").omitNullValues().add("id", getId()).add("providerId", getProviderId())
+ return MoreObjects.toStringHelper("").omitNullValues().add("id", getId()).add("providerId", getProviderId())
.add("uri", getUri()).add("name", getName()).add("uri", getUri()).add("location", getLocation());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java
index 2753cf7..490f035 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java
@@ -34,7 +34,7 @@ import org.jclouds.domain.Location;
import org.jclouds.domain.ResourceMetadata;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Predicate;
import com.google.common.collect.ComparisonChain;
import com.google.common.collect.ImmutableList;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java
index d6ee20d..453b4cb 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java
@@ -30,7 +30,7 @@ import org.jclouds.domain.Location;
import org.jclouds.domain.LoginCredentials;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
public class ImageImpl extends ComputeMetadataImpl implements Image {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java
index 09919a7..cf4eae8 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java
@@ -31,7 +31,7 @@ import org.jclouds.domain.Location;
import org.jclouds.domain.LoginCredentials;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
public class NodeMetadataImpl extends ComputeMetadataImpl implements NodeMetadata {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java
index f860674..293d81b 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java
@@ -18,8 +18,8 @@ package org.jclouds.compute.domain.internal;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
@@ -1094,7 +1094,7 @@ public class TemplateBuilderImpl implements TemplateBuilder {
* @since 1.5
*/
protected ToStringHelper string() {
- ToStringHelper toString = Objects.toStringHelper("").omitNullValues();
+ ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues();
if (biggest)
toString.add("biggest", biggest);
if (fastest)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateImpl.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateImpl.java
index 4c71e9a..6e1fc0d 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateImpl.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateImpl.java
@@ -25,8 +25,9 @@ import org.jclouds.compute.domain.Template;
import org.jclouds.compute.options.TemplateOptions;
import org.jclouds.domain.Location;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
public class TemplateImpl implements Template {
@@ -96,7 +97,7 @@ public class TemplateImpl implements Template {
}
protected ToStringHelper string() {
- ToStringHelper helper = Objects.toStringHelper("").omitNullValues().add("image", image).add("hardware", hardware)
+ ToStringHelper helper = MoreObjects.toStringHelper("").omitNullValues().add("image", image).add("hardware", hardware)
.add("location", location);
if (!options.equals(defaultOptions()))
helper.add("options", options);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/domain/internal/VolumeImpl.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/VolumeImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/VolumeImpl.java
index f8c5d5f..11a7203 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/VolumeImpl.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/VolumeImpl.java
@@ -22,8 +22,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import org.jclouds.compute.domain.Volume;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
public class VolumeImpl implements Volume {
@@ -60,7 +61,7 @@ public class VolumeImpl implements Volume {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").omitNullValues().add("id", id).add("type", getType()).add("size", size)
+ return MoreObjects.toStringHelper("").omitNullValues().add("id", id).add("type", getType()).add("size", size)
.add("device", device).add("bootDevice", bootDevice).add("durable", durable);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/events/StatementOnNode.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/events/StatementOnNode.java b/compute/src/main/java/org/jclouds/compute/events/StatementOnNode.java
index cf89b79..7496006 100644
--- a/compute/src/main/java/org/jclouds/compute/events/StatementOnNode.java
+++ b/compute/src/main/java/org/jclouds/compute/events/StatementOnNode.java
@@ -22,8 +22,9 @@ import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.scriptbuilder.domain.Statement;
import com.google.common.annotations.Beta;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
@@ -67,7 +68,7 @@ public class StatementOnNode {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).add("statement", statement).add("node", node.getId());
+ return MoreObjects.toStringHelper(this).add("statement", statement).add("node", node.getId());
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeCompletion.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeCompletion.java b/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeCompletion.java
index 0d92915..9a8cf19 100644
--- a/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeCompletion.java
+++ b/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeCompletion.java
@@ -23,7 +23,7 @@ import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.scriptbuilder.domain.Statement;
import com.google.common.annotations.Beta;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* A statement that completed execution on a node.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeFailure.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeFailure.java b/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeFailure.java
index e4d0685..93bfab8 100644
--- a/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeFailure.java
+++ b/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeFailure.java
@@ -22,7 +22,7 @@ import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.scriptbuilder.domain.Statement;
import com.google.common.annotations.Beta;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* A statement that failed execution on a node.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/options/RunScriptOptions.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/options/RunScriptOptions.java b/compute/src/main/java/org/jclouds/compute/options/RunScriptOptions.java
index 7c90c22..8f35904 100644
--- a/compute/src/main/java/org/jclouds/compute/options/RunScriptOptions.java
+++ b/compute/src/main/java/org/jclouds/compute/options/RunScriptOptions.java
@@ -23,9 +23,10 @@ import static com.google.common.base.Preconditions.checkNotNull;
import org.jclouds.domain.LoginCredentials;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Enables additional options for running a script.
@@ -482,7 +483,7 @@ public class RunScriptOptions {
}
protected ToStringHelper string() {
- ToStringHelper toString = Objects.toStringHelper("").omitNullValues();
+ ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues();
toString.add("loginUser", loginUser);
if (loginPassword != null && loginPassword.isPresent())
toString.add("loginPasswordPresent", true);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/options/TemplateOptions.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/options/TemplateOptions.java b/compute/src/main/java/org/jclouds/compute/options/TemplateOptions.java
index 115710c..e7c6be7 100644
--- a/compute/src/main/java/org/jclouds/compute/options/TemplateOptions.java
+++ b/compute/src/main/java/org/jclouds/compute/options/TemplateOptions.java
@@ -29,7 +29,7 @@ import org.jclouds.scriptbuilder.domain.Statement;
import org.jclouds.scriptbuilder.domain.Statements;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
import com.google.common.primitives.Ints;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/strategy/InitializeRunScriptOnNodeOrPlaceInBadMap.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/strategy/InitializeRunScriptOnNodeOrPlaceInBadMap.java b/compute/src/main/java/org/jclouds/compute/strategy/InitializeRunScriptOnNodeOrPlaceInBadMap.java
index 4bd7e98..a601bf5 100644
--- a/compute/src/main/java/org/jclouds/compute/strategy/InitializeRunScriptOnNodeOrPlaceInBadMap.java
+++ b/compute/src/main/java/org/jclouds/compute/strategy/InitializeRunScriptOnNodeOrPlaceInBadMap.java
@@ -28,7 +28,7 @@ import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.options.RunScriptOptions;
import org.jclouds.scriptbuilder.domain.Statement;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.inject.assistedinject.Assisted;
public class InitializeRunScriptOnNodeOrPlaceInBadMap implements Callable<RunScriptOnNode> {
@@ -67,6 +67,6 @@ public class InitializeRunScriptOnNodeOrPlaceInBadMap implements Callable<RunScr
@Override
public String toString() {
- return Objects.toStringHelper(this).add("node", node).add("options", options).toString();
+ return MoreObjects.toStringHelper(this).add("node", node).add("options", options).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/strategy/RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/strategy/RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java b/compute/src/main/java/org/jclouds/compute/strategy/RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java
index 91c01f5..a9bbb0f 100644
--- a/compute/src/main/java/org/jclouds/compute/strategy/RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java
+++ b/compute/src/main/java/org/jclouds/compute/strategy/RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java
@@ -32,7 +32,7 @@ import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.reference.ComputeServiceConstants;
import org.jclouds.logging.Logger;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.inject.assistedinject.AssistedInject;
public class RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap implements Callable<ExecResponse> {
@@ -75,7 +75,7 @@ public class RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap implements C
@Override
public String toString() {
- return Objects.toStringHelper(this).add("runScriptOnNode", runScriptOnNode).add("goodNodes", goodNodes).add(
+ return MoreObjects.toStringHelper(this).add("runScriptOnNode", runScriptOnNode).add("goodNodes", goodNodes).add(
"badNodes", badNodes).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/strategy/impl/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/strategy/impl/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java b/compute/src/main/java/org/jclouds/compute/strategy/impl/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java
index 6ac36c7..f93cee0 100644
--- a/compute/src/main/java/org/jclouds/compute/strategy/impl/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java
+++ b/compute/src/main/java/org/jclouds/compute/strategy/impl/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.compute.strategy.impl;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.Iterables.any;
import static com.google.common.collect.Maps.newLinkedHashMap;
@@ -33,7 +33,7 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import org.jclouds.Constants;
import org.jclouds.compute.config.CustomizationResponse;
import org.jclouds.compute.domain.ComputeMetadata;
@@ -76,8 +76,8 @@ public class CreateNodesWithGroupEncodedIntoNameThenAddToSet implements CreateNo
public AtomicReference<NodeMetadata> call() throws Exception {
NodeMetadata node = null;
logger.debug(">> adding node location(%s) name(%s) image(%s) hardware(%s)", template.getLocation().getId(),
- name, Objects.firstNonNull(template.getImage().getProviderId(), template.getImage().getId()),
- Objects.firstNonNull(template.getHardware().getProviderId(), template.getHardware().getId()));
+ name, MoreObjects.firstNonNull(template.getImage().getProviderId(), template.getImage().getId()),
+ MoreObjects.firstNonNull(template.getHardware().getProviderId(), template.getHardware().getId()));
node = addNodeWithGroupStrategy.createNodeWithGroupEncodedIntoName(group, name, template);
logger.debug("<< %s node(%s)", formatStatus(node), node.getId());
return new AtomicReference<NodeMetadata>(node);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/strategy/impl/ReturnCredentialsBoundToImage.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/strategy/impl/ReturnCredentialsBoundToImage.java b/compute/src/main/java/org/jclouds/compute/strategy/impl/ReturnCredentialsBoundToImage.java
index f45426f..1b51a74 100644
--- a/compute/src/main/java/org/jclouds/compute/strategy/impl/ReturnCredentialsBoundToImage.java
+++ b/compute/src/main/java/org/jclouds/compute/strategy/impl/ReturnCredentialsBoundToImage.java
@@ -31,7 +31,7 @@ import org.jclouds.domain.Credentials;
import org.jclouds.domain.LoginCredentials;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
@Singleton
public class ReturnCredentialsBoundToImage implements PopulateDefaultLoginCredentialsForImageStrategy {
@@ -67,6 +67,6 @@ public class ReturnCredentialsBoundToImage implements PopulateDefaultLoginCreden
@Override
public String toString() {
- return Objects.toStringHelper(this).toString();
+ return MoreObjects.toStringHelper(this).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/net/domain/IpPermission.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/net/domain/IpPermission.java b/compute/src/main/java/org/jclouds/net/domain/IpPermission.java
index bfcb7b2..0108caf 100644
--- a/compute/src/main/java/org/jclouds/net/domain/IpPermission.java
+++ b/compute/src/main/java/org/jclouds/net/domain/IpPermission.java
@@ -31,8 +31,9 @@ import org.jclouds.net.util.IpPermissions;
import com.google.common.annotations.Beta;
import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
@@ -328,7 +329,7 @@ public class IpPermission implements Comparable<IpPermission> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("ipProtocol", ipProtocol).add("fromPort", fromPort)
+ return MoreObjects.toStringHelper("").add("ipProtocol", ipProtocol).add("fromPort", fromPort)
.add("toPort", toPort).add("tenantIdGroupNamePairs", tenantIdGroupNamePairs).add("groupIds", groupIds)
.add("cidrBlocks", cidrBlocks).add("exclusionCidrBlocks", exclusionCidrBlocks);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/ContextBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/ContextBuilder.java b/core/src/main/java/org/jclouds/ContextBuilder.java
index 404ef79..a547599 100644
--- a/core/src/main/java/org/jclouds/ContextBuilder.java
+++ b/core/src/main/java/org/jclouds/ContextBuilder.java
@@ -16,7 +16,7 @@
*/
package org.jclouds;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Predicates.containsPattern;
import static com.google.common.base.Predicates.instanceOf;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/apis/internal/BaseApiMetadata.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/apis/internal/BaseApiMetadata.java b/core/src/main/java/org/jclouds/apis/internal/BaseApiMetadata.java
index e074a6c..5b85dc7 100644
--- a/core/src/main/java/org/jclouds/apis/internal/BaseApiMetadata.java
+++ b/core/src/main/java/org/jclouds/apis/internal/BaseApiMetadata.java
@@ -45,8 +45,9 @@ import org.jclouds.JcloudsVersion;
import org.jclouds.View;
import org.jclouds.apis.ApiMetadata;
+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;
import com.google.common.reflect.TypeToken;
@@ -348,7 +349,7 @@ public abstract class BaseApiMetadata implements ApiMetadata {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("id", getId()).add("name", getName()).add("views", getViews()).add(
+ return MoreObjects.toStringHelper("").add("id", getId()).add("name", getName()).add("views", getViews()).add(
"endpointName", getEndpointName()).add("identityName", getIdentityName()).add("credentialName",
getCredentialName()).add("documentation", getDocumentation());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/collect/AdvanceUntilEmptyIterable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/collect/AdvanceUntilEmptyIterable.java b/core/src/main/java/org/jclouds/collect/AdvanceUntilEmptyIterable.java
index 78e380d..0ae224f 100644
--- a/core/src/main/java/org/jclouds/collect/AdvanceUntilEmptyIterable.java
+++ b/core/src/main/java/org/jclouds/collect/AdvanceUntilEmptyIterable.java
@@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Iterator;
import com.google.common.annotations.Beta;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Supplier;
import com.google.common.collect.AbstractIterator;
@@ -104,7 +105,7 @@ public class AdvanceUntilEmptyIterable<E> extends FluentIterable<FluentIterable<
*/
@Override
public String toString() {
- return Objects.toStringHelper("").omitNullValues().add("current", current).add("unread", unread).toString();
+ return MoreObjects.toStringHelper("").omitNullValues().add("current", current).add("unread", unread).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/collect/PagedIterables.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/collect/PagedIterables.java b/core/src/main/java/org/jclouds/collect/PagedIterables.java
index 90ad17f..69421fa 100644
--- a/core/src/main/java/org/jclouds/collect/PagedIterables.java
+++ b/core/src/main/java/org/jclouds/collect/PagedIterables.java
@@ -22,6 +22,7 @@ import java.util.Iterator;
import com.google.common.annotations.Beta;
import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.AbstractIterator;
import com.google.common.collect.ImmutableSet;
@@ -115,7 +116,7 @@ public class PagedIterables {
@Override
public String toString() {
- return Objects.toStringHelper("").add("current", current).add("unread", unread).toString();
+ return MoreObjects.toStringHelper("").add("current", current).add("unread", unread).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java b/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java
index f02c73f..775f799 100644
--- a/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java
+++ b/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java
@@ -26,8 +26,9 @@ import org.jclouds.domain.Location;
import org.jclouds.domain.LocationScope;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -57,7 +58,7 @@ public class LocationImpl implements Location {
@Override
public String toString() {
- ToStringHelper helper = Objects.toStringHelper("").omitNullValues().add("scope", scope).add("id", id)
+ ToStringHelper helper = MoreObjects.toStringHelper("").omitNullValues().add("scope", scope).add("id", id)
.add("description", description);
if (parent != null)
helper.add("parent", parent.getId());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/domain/internal/MutableResourceMetadataImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/domain/internal/MutableResourceMetadataImpl.java b/core/src/main/java/org/jclouds/domain/internal/MutableResourceMetadataImpl.java
index 973eb93..e6a6b56 100644
--- a/core/src/main/java/org/jclouds/domain/internal/MutableResourceMetadataImpl.java
+++ b/core/src/main/java/org/jclouds/domain/internal/MutableResourceMetadataImpl.java
@@ -23,8 +23,9 @@ import org.jclouds.domain.Location;
import org.jclouds.domain.MutableResourceMetadata;
import org.jclouds.domain.ResourceMetadata;
+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.Maps;
/**
@@ -164,7 +165,7 @@ public class MutableResourceMetadataImpl<T extends Enum<T>> implements MutableRe
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").omitNullValues()
+ return MoreObjects.toStringHelper("").omitNullValues()
.add("id", id)
.add("location", location)
.add("name", name)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java b/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java
index a46b3c4..1aaa4ec 100644
--- a/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java
+++ b/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java
@@ -28,8 +28,9 @@ import org.jclouds.domain.Location;
import org.jclouds.domain.ResourceMetadata;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.Maps;
/**
@@ -130,7 +131,7 @@ public abstract class ResourceMetadataImpl<T extends Enum<T>> implements Resourc
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").omitNullValues().add("type", getType()).add("providerId", providerId)
+ return MoreObjects.toStringHelper("").omitNullValues().add("type", getType()).add("providerId", providerId)
.add("name", name).add("location", location).add("uri", uri).add("userMetadata", userMetadata);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/http/HttpMessage.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/http/HttpMessage.java b/core/src/main/java/org/jclouds/http/HttpMessage.java
index 71656c3..07bc27c 100644
--- a/core/src/main/java/org/jclouds/http/HttpMessage.java
+++ b/core/src/main/java/org/jclouds/http/HttpMessage.java
@@ -29,8 +29,9 @@ import org.jclouds.io.Payloads;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.util.Multimaps2;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.Multimap;
import com.google.common.io.ByteSource;
@@ -218,7 +219,7 @@ public class HttpMessage extends PayloadEnclosingImpl {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").omitNullValues()
+ return MoreObjects.toStringHelper("").omitNullValues()
.add("headers", headers)
.add("payload", payload);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/http/HttpRequest.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/http/HttpRequest.java b/core/src/main/java/org/jclouds/http/HttpRequest.java
index bb84161..de07a05 100644
--- a/core/src/main/java/org/jclouds/http/HttpRequest.java
+++ b/core/src/main/java/org/jclouds/http/HttpRequest.java
@@ -31,8 +31,9 @@ import java.util.Set;
import org.jclouds.io.Payload;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.ImmutableSet;
@@ -285,7 +286,7 @@ public class HttpRequest extends HttpMessage {
@Override
protected ToStringHelper string() {
- return Objects.toStringHelper("").omitNullValues()
+ return MoreObjects.toStringHelper("").omitNullValues()
.add("method", method)
.add("endpoint", endpoint)
.add("headers", headers)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/http/HttpResponse.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/http/HttpResponse.java b/core/src/main/java/org/jclouds/http/HttpResponse.java
index 2f894a9..f2b6e07 100644
--- a/core/src/main/java/org/jclouds/http/HttpResponse.java
+++ b/core/src/main/java/org/jclouds/http/HttpResponse.java
@@ -19,8 +19,9 @@ package org.jclouds.http;
import org.jclouds.io.Payload;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.Multimap;
/**
@@ -114,7 +115,7 @@ public class HttpResponse extends HttpMessage {
@Override
protected ToStringHelper string() {
- return Objects.toStringHelper("").omitNullValues()
+ return MoreObjects.toStringHelper("").omitNullValues()
.add("statusCode", statusCode)
.add("message", message)
.add("headers", headers)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/http/options/BaseHttpRequestOptions.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/http/options/BaseHttpRequestOptions.java b/core/src/main/java/org/jclouds/http/options/BaseHttpRequestOptions.java
index 7316b94..7e5d918 100644
--- a/core/src/main/java/org/jclouds/http/options/BaseHttpRequestOptions.java
+++ b/core/src/main/java/org/jclouds/http/options/BaseHttpRequestOptions.java
@@ -18,7 +18,7 @@ package org.jclouds.http.options;
import java.util.Collection;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.Multimap;
@@ -133,7 +133,7 @@ public class BaseHttpRequestOptions implements HttpRequestOptions {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("formParameters", formParameters)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("formParameters", formParameters)
.add("headers", headers).add("pathSuffix", pathSuffix).add("payload", payload)
.add("queryParameters", queryParameters).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/internal/BaseView.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/internal/BaseView.java b/core/src/main/java/org/jclouds/internal/BaseView.java
index 287852c..73e699b 100644
--- a/core/src/main/java/org/jclouds/internal/BaseView.java
+++ b/core/src/main/java/org/jclouds/internal/BaseView.java
@@ -27,8 +27,9 @@ import org.jclouds.location.Provider;
import org.jclouds.rest.ApiContext;
import org.jclouds.util.TypeTokenUtils;
+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.ForwardingObject;
import com.google.common.reflect.TypeParameter;
import com.google.common.reflect.TypeToken;
@@ -98,7 +99,7 @@ public abstract class BaseView extends ForwardingObject implements View {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("backend", delegate()).add("backendType", getBackendType());
+ return MoreObjects.toStringHelper("").add("backend", delegate()).add("backendType", getBackendType());
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/internal/ContextImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/internal/ContextImpl.java b/core/src/main/java/org/jclouds/internal/ContextImpl.java
index 374710c..533d4df 100644
--- a/core/src/main/java/org/jclouds/internal/ContextImpl.java
+++ b/core/src/main/java/org/jclouds/internal/ContextImpl.java
@@ -17,7 +17,7 @@
package org.jclouds.internal;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.jclouds.lifecycle.Closer.State.AVAILABLE;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java b/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java
index 85293e2..ae07809 100644
--- a/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java
+++ b/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java
@@ -28,6 +28,7 @@ import java.util.Map;
import org.jclouds.json.internal.NamingStrategies.AnnotationConstructorNamingStrategy;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
@@ -250,7 +251,7 @@ public final class DeserializationConstructorAndReflectiveTypeAdapterFactory imp
@Override
public String toString() {
- return Objects.toStringHelper(this).add("parameterizedCtor", parameterizedCtor)
+ return MoreObjects.toStringHelper(this).add("parameterizedCtor", parameterizedCtor)
.add("parameterReaders", parameterReaders).add("serializer", serializer).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/json/internal/NullFilteringTypeAdapterFactories.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/json/internal/NullFilteringTypeAdapterFactories.java b/core/src/main/java/org/jclouds/json/internal/NullFilteringTypeAdapterFactories.java
index 7ad257e..85dd545 100644
--- a/core/src/main/java/org/jclouds/json/internal/NullFilteringTypeAdapterFactories.java
+++ b/core/src/main/java/org/jclouds/json/internal/NullFilteringTypeAdapterFactories.java
@@ -43,7 +43,7 @@ import java.util.Map.Entry;
import java.util.Set;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
/**
* Eliminates null values when deserializing Collections, Maps, and Multimaps
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/providers/internal/BaseProviderMetadata.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/providers/internal/BaseProviderMetadata.java b/core/src/main/java/org/jclouds/providers/internal/BaseProviderMetadata.java
index fea73ed..6fea9d5 100644
--- a/core/src/main/java/org/jclouds/providers/internal/BaseProviderMetadata.java
+++ b/core/src/main/java/org/jclouds/providers/internal/BaseProviderMetadata.java
@@ -29,9 +29,10 @@ import org.jclouds.apis.ApiMetadata;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.providers.ProviderMetadata;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -246,7 +247,7 @@ public abstract class BaseProviderMetadata implements ProviderMetadata {
}
public ToStringHelper string() {
- return Objects.toStringHelper("").add("id", getId()).add("name", getName()).add("api", getApiMetadata()).add(
+ return MoreObjects.toStringHelper("").add("id", getId()).add("name", getName()).add("api", getApiMetadata()).add(
"endpoint", getEndpoint()).add("console", getConsole()).add("homepage", getHomepage()).add(
"linkedServices", getLinkedServices()).add("iso3166Codes", getIso3166Codes());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/proxy/internal/GuiceProxyConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/proxy/internal/GuiceProxyConfig.java b/core/src/main/java/org/jclouds/proxy/internal/GuiceProxyConfig.java
index 609a850..bc20f7a 100644
--- a/core/src/main/java/org/jclouds/proxy/internal/GuiceProxyConfig.java
+++ b/core/src/main/java/org/jclouds/proxy/internal/GuiceProxyConfig.java
@@ -34,7 +34,7 @@ import javax.inject.Singleton;
import org.jclouds.domain.Credentials;
import org.jclouds.proxy.ProxyConfig;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Optional;
import com.google.common.base.Strings;
import com.google.common.net.HostAndPort;
@@ -123,7 +123,7 @@ public class GuiceProxyConfig implements ProxyConfig {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("systemProxies", systemProxies ? "true" : null)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("systemProxies", systemProxies ? "true" : null)
.add("jvmProxyEnabled", jvmProxyEnabled ? "true" : "false")
.add("proxyHostPort", getProxy().orNull()).add("user", user).add("type", host != null ? type : null).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/reflect/InvocationSuccess.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/reflect/InvocationSuccess.java b/core/src/main/java/org/jclouds/reflect/InvocationSuccess.java
index a1e1381..9fabc6e 100644
--- a/core/src/main/java/org/jclouds/reflect/InvocationSuccess.java
+++ b/core/src/main/java/org/jclouds/reflect/InvocationSuccess.java
@@ -22,8 +22,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.annotations.Beta;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Optional;
/**
@@ -75,6 +76,6 @@ public final class InvocationSuccess {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").omitNullValues().add("invocation", invocation).add("result", result.orNull());
+ return MoreObjects.toStringHelper("").omitNullValues().add("invocation", invocation).add("result", result.orNull());
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/reflect/Reflection2.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/reflect/Reflection2.java b/core/src/main/java/org/jclouds/reflect/Reflection2.java
index eb43ce0..7302884 100644
--- a/core/src/main/java/org/jclouds/reflect/Reflection2.java
+++ b/core/src/main/java/org/jclouds/reflect/Reflection2.java
@@ -33,6 +33,7 @@ import java.util.concurrent.ExecutionException;
import com.google.common.annotations.Beta;
import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
@@ -248,7 +249,7 @@ public class Reflection2 {
}
public String toString() {
- return Objects.toStringHelper("").add("type", type).add("parameterTypes", parameterTypes).toString();
+ return MoreObjects.toStringHelper("").add("type", type).add("parameterTypes", parameterTypes).toString();
}
}
@@ -297,7 +298,7 @@ public class Reflection2 {
}
public String toString() {
- return Objects.toStringHelper("").add("type", type).add("name", name).add("parameterTypes", parameterTypes)
+ return MoreObjects.toStringHelper("").add("type", type).add("name", name).add("parameterTypes", parameterTypes)
.toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/rest/internal/BaseHttpApiMetadata.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/rest/internal/BaseHttpApiMetadata.java b/core/src/main/java/org/jclouds/rest/internal/BaseHttpApiMetadata.java
index 3d52021..110e7d5 100644
--- a/core/src/main/java/org/jclouds/rest/internal/BaseHttpApiMetadata.java
+++ b/core/src/main/java/org/jclouds/rest/internal/BaseHttpApiMetadata.java
@@ -28,7 +28,7 @@ import org.jclouds.rest.ApiContext;
import org.jclouds.rest.HttpApiMetadata;
import com.google.common.annotations.Beta;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.reflect.TypeParameter;
import com.google.common.reflect.TypeToken;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java b/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java
index 8d94c3e..da2a8a9 100644
--- a/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java
+++ b/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java
@@ -52,7 +52,7 @@ import org.jclouds.rest.config.SetCaller;
import com.google.common.annotations.Beta;
import com.google.common.base.Function;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.base.Supplier;
@@ -282,7 +282,7 @@ public class DelegatesToInvocationFunction<S, F extends Function<Invocation, Obj
@Override
public String toString() {
- return Objects.toStringHelper("").omitNullValues().add("ownerType", ownerType.getRawType().getSimpleName())
+ return MoreObjects.toStringHelper("").omitNullValues().add("ownerType", ownerType.getRawType().getSimpleName())
.add("methodInvoker", methodInvoker).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/rest/internal/InvokeHttpMethod.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/rest/internal/InvokeHttpMethod.java b/core/src/main/java/org/jclouds/rest/internal/InvokeHttpMethod.java
index 9aa3330..064e500 100644
--- a/core/src/main/java/org/jclouds/rest/internal/InvokeHttpMethod.java
+++ b/core/src/main/java/org/jclouds/rest/internal/InvokeHttpMethod.java
@@ -17,7 +17,7 @@
package org.jclouds.rest.internal;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Throwables.propagate;
import static java.util.concurrent.TimeUnit.NANOSECONDS;
@@ -37,6 +37,7 @@ import org.jclouds.rest.config.InvocationConfig;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.util.concurrent.TimeLimiter;
@@ -214,6 +215,6 @@ public class InvokeHttpMethod implements Function<Invocation, Object> {
@Override
public String toString() {
- return Objects.toStringHelper("").omitNullValues().add("annotationParser", annotationProcessor).toString();
+ return MoreObjects.toStringHelper("").omitNullValues().add("annotationParser", annotationProcessor).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
index 0ee891a..8fdbb43 100644
--- a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
+++ b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
@@ -110,7 +110,7 @@ import org.jclouds.rest.binders.BindToJsonPayloadWrappedWith;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.base.Supplier;
@@ -889,6 +889,6 @@ public class RestAnnotationProcessor implements Function<Invocation, HttpRequest
public String toString() {
String callerString = caller != null ? String.format("%s.%s%s", caller.getInvokable().getOwnerType().getRawType().getSimpleName(),
caller.getInvokable().getName(), caller.getArgs()) : null;
- return Objects.toStringHelper("").omitNullValues().add("caller", callerString).toString();
+ return MoreObjects.toStringHelper("").omitNullValues().add("caller", callerString).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/rest/suppliers/MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/rest/suppliers/MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.java b/core/src/main/java/org/jclouds/rest/suppliers/MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.java
index a481e12..aecce10 100644
--- a/core/src/main/java/org/jclouds/rest/suppliers/MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.java
+++ b/core/src/main/java/org/jclouds/rest/suppliers/MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.java
@@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicReference;
import org.jclouds.rest.AuthorizationException;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Optional;
import com.google.common.base.Supplier;
import com.google.common.cache.CacheBuilder;
@@ -87,7 +87,7 @@ public class MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<T> ext
@Override
public String toString() {
- return Objects.toStringHelper(this).add("delegate", delegate).toString();
+ return MoreObjects.toStringHelper(this).add("delegate", delegate).toString();
}
}
@@ -157,7 +157,7 @@ public class MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<T> ext
@Override
public String toString() {
- return Objects.toStringHelper(this).add("delegate", delegate).add("duration", duration).add("unit", unit)
+ return MoreObjects.toStringHelper(this).add("delegate", delegate).add("duration", duration).add("unit", unit)
.toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/rest/suppliers/URIFromStringSupplier.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/rest/suppliers/URIFromStringSupplier.java b/core/src/main/java/org/jclouds/rest/suppliers/URIFromStringSupplier.java
index 8d54d9b..5736412 100644
--- a/core/src/main/java/org/jclouds/rest/suppliers/URIFromStringSupplier.java
+++ b/core/src/main/java/org/jclouds/rest/suppliers/URIFromStringSupplier.java
@@ -17,7 +17,7 @@
package org.jclouds.rest.suppliers;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.net.URI;
@@ -25,7 +25,7 @@ import java.net.URI;
import javax.inject.Inject;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Supplier;
public class URIFromStringSupplier implements Supplier<URI> {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/util/Suppliers2.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/util/Suppliers2.java b/core/src/main/java/org/jclouds/util/Suppliers2.java
index df0e4f2..783fd23 100644
--- a/core/src/main/java/org/jclouds/util/Suppliers2.java
+++ b/core/src/main/java/org/jclouds/util/Suppliers2.java
@@ -20,7 +20,7 @@ import java.util.Map;
import com.google.common.annotations.Beta;
import com.google.common.base.Function;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
import com.google.common.base.Throwables;
@@ -91,7 +91,7 @@ public class Suppliers2 {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("unlessNull", unlessNull).add("fallback", fallback).toString();
+ return MoreObjects.toStringHelper(this).add("unlessNull", unlessNull).add("fallback", fallback).toString();
}
};
}
@@ -117,7 +117,7 @@ public class Suppliers2 {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("unlessThrowable", unlessThrowable)
+ return MoreObjects.toStringHelper(this).add("unlessThrowable", unlessThrowable)
.add("throwable", throwable.getSimpleName()).add("fallback", fallback).toString();
}
};
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/SessionConnection.java
----------------------------------------------------------------------
diff --git a/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/SessionConnection.java b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/SessionConnection.java
index 2ff4e75..bf45922 100644
--- a/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/SessionConnection.java
+++ b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/SessionConnection.java
@@ -25,6 +25,7 @@ import org.jclouds.javax.annotation.Nullable;
import org.jclouds.proxy.ProxyConfig;
import org.jclouds.ssh.jsch.JschSshClient.Connection;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.net.HostAndPort;
@@ -253,7 +254,7 @@ public final class SessionConnection implements Connection<Session> {
@Override
public String toString() {
- return Objects.toStringHelper("").omitNullValues()
+ return MoreObjects.toStringHelper("").omitNullValues()
.add("hostAndPort", hostAndPort).add("loginUser", loginCredentials.getUser())
.add("session", session != null ? session.hashCode() : null)
.add("connectTimeout", connectTimeout)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java
----------------------------------------------------------------------
diff --git a/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java b/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java
index 5a4895d..01a5f42 100644
--- a/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java
+++ b/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java
@@ -36,6 +36,7 @@ import org.jclouds.logging.Logger;
import org.jclouds.sshj.SshjSshClient.Connection;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
@@ -235,7 +236,7 @@ public class SSHClientConnection implements Connection<SSHClient> {
@Override
public String toString() {
- return Objects.toStringHelper("").add("hostAndPort", hostAndPort).add("loginUser", loginCredentials.getUser())
+ return MoreObjects.toStringHelper("").add("hostAndPort", hostAndPort).add("loginUser", loginCredentials.getUser())
.add("ssh", ssh != null ? ssh.hashCode() : null).add("connectTimeout", connectTimeout).add(
"sessionTimeout", sessionTimeout).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java
----------------------------------------------------------------------
diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java
index d711ad7..6608146 100644
--- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java
+++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java
@@ -38,7 +38,7 @@ import org.jclouds.rest.annotations.SinceApiVersion;
import org.jclouds.scriptbuilder.domain.Statement;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java
----------------------------------------------------------------------
diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java
index f3ffc0b..ba75584 100644
--- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java
+++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java
@@ -17,7 +17,7 @@
package org.jclouds.aws.ec2.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;
@@ -33,7 +33,7 @@ import org.jclouds.javax.annotation.Nullable;
import org.jclouds.rest.annotations.SinceApiVersion;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java
----------------------------------------------------------------------
diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java
index 2972dd5..1b9a47a 100644
--- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java
+++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java
@@ -17,7 +17,7 @@
package org.jclouds.aws.ec2.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Arrays;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/options/DigitalOcean2TemplateOptions.java
----------------------------------------------------------------------
diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/options/DigitalOcean2TemplateOptions.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/options/DigitalOcean2TemplateOptions.java
index 2a86f85..f25bc0b 100644
--- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/options/DigitalOcean2TemplateOptions.java
+++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/options/DigitalOcean2TemplateOptions.java
@@ -24,7 +24,7 @@ import java.util.Map;
import java.util.Set;
import org.jclouds.compute.options.TemplateOptions;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreatePrimaryZone.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreatePrimaryZone.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreatePrimaryZone.java
index 04bdb1f..ff3a43b 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreatePrimaryZone.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreatePrimaryZone.java
@@ -17,7 +17,7 @@
package org.jclouds.dynect.v3.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import javax.inject.Named;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreateRecord.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreateRecord.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreateRecord.java
index bf9dd04..dbb30d7 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreateRecord.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreateRecord.java
@@ -17,7 +17,7 @@
package org.jclouds.dynect.v3.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoRegionGroup.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoRegionGroup.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoRegionGroup.java
index 0910036..c9d027b 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoRegionGroup.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoRegionGroup.java
@@ -17,7 +17,7 @@
package org.jclouds.dynect.v3.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoService.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoService.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoService.java
index 23aa4be..a24959a 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoService.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoService.java
@@ -17,7 +17,7 @@
package org.jclouds.dynect.v3.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Job.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Job.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Job.java
index e03444e..0217840 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Job.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Job.java
@@ -17,7 +17,7 @@
package org.jclouds.dynect.v3.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Node.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Node.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Node.java
index 24e122c..576d33a 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Node.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Node.java
@@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public class Node {
@@ -70,6 +71,6 @@ public class Node {
@Override
public String toString() {
- return Objects.toStringHelper("").add("zone", zone).add("fqdn", fqdn).toString();
+ return MoreObjects.toStringHelper("").add("zone", zone).add("fqdn", fqdn).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Record.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Record.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Record.java
index 084dc6a..ec6aeeb 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Record.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Record.java
@@ -24,7 +24,7 @@ import java.util.Map;
import javax.inject.Named;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
public class Record<D extends Map<String, Object>> extends RecordId {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordId.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordId.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordId.java
index e5b5476..b384b1b 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordId.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordId.java
@@ -17,13 +17,13 @@
package org.jclouds.dynect.v3.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
public class RecordId extends Node {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordSet.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordSet.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordSet.java
index aeed65e..8131317 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordSet.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordSet.java
@@ -17,7 +17,7 @@
package org.jclouds.dynect.v3.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SOARecord.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SOARecord.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SOARecord.java
index b64e139..08fa9ca 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SOARecord.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SOARecord.java
@@ -25,7 +25,7 @@ import javax.inject.Named;
import org.jclouds.dynect.v3.domain.Zone.SerialStyle;
import org.jclouds.dynect.v3.domain.rdata.SOAData;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Start of Authority per RFC 1035
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Session.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Session.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Session.java
index 3cc7ecc..fda4736 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Session.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Session.java
@@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public final class Session {
@@ -70,6 +71,6 @@ public final class Session {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("token", token).add("version", version).toString();
+ return MoreObjects.toStringHelper(this).add("token", token).add("version", version).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SessionCredentials.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SessionCredentials.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SessionCredentials.java
index 752bf5c..2347899 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SessionCredentials.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SessionCredentials.java
@@ -24,6 +24,7 @@ import javax.inject.Named;
import org.jclouds.domain.Credentials;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -144,6 +145,6 @@ public final class SessionCredentials extends Credentials {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("userName", identity).add("customerName", customerName).toString();
+ return MoreObjects.toStringHelper(this).add("userName", identity).add("customerName", customerName).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Zone.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Zone.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Zone.java
index a229fb8..287bb5c 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Zone.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Zone.java
@@ -17,7 +17,7 @@
package org.jclouds.dynect.v3.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/compute/options/GleSYSTemplateOptions.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/compute/options/GleSYSTemplateOptions.java b/providers/glesys/src/main/java/org/jclouds/glesys/compute/options/GleSYSTemplateOptions.java
index d85a455..912d716 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/compute/options/GleSYSTemplateOptions.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/compute/options/GleSYSTemplateOptions.java
@@ -23,7 +23,7 @@ import java.util.Map;
import org.jclouds.compute.options.TemplateOptions;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.net.InetAddresses;
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArguments.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArguments.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArguments.java
index 9e3d968..11bbc6d 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArguments.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArguments.java
@@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
import java.util.Set;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -122,7 +123,7 @@ public class AllowedArguments {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("costPerUnit", this.costPerUnit)
+ return MoreObjects.toStringHelper("").add("costPerUnit", this.costPerUnit)
.add("allowedUnits", this.allowedUnits);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArgumentsForCreateServer.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArgumentsForCreateServer.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArgumentsForCreateServer.java
index 5eb568f..9fb171e 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArgumentsForCreateServer.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArgumentsForCreateServer.java
@@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
import java.util.Set;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -205,7 +206,7 @@ public class AllowedArgumentsForCreateServer {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("diskSizesInGB", diskSizesInGB).add("memorySizesInMB", memorySizesInMB)
+ return MoreObjects.toStringHelper("").add("diskSizesInGB", diskSizesInGB).add("memorySizesInMB", memorySizesInMB)
.add("cpuCoreOptions", cpuCoreOptions).add("templateNames", templateNames)
.add("transfersInGB", transfersInGB).add("dataCenters", dataCenters);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/Archive.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Archive.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Archive.java
index 6141782..99c04db 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Archive.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Archive.java
@@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Information about an archive
@@ -158,7 +159,7 @@ public class Archive {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("username", username).add("totalSize", totalSize).add("freeSize", freeSize).add("locked", locked);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveAllowedArguments.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveAllowedArguments.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveAllowedArguments.java
index b93332b..ef39156 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveAllowedArguments.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveAllowedArguments.java
@@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
import java.util.List;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableList;
/**
@@ -103,7 +104,7 @@ public class ArchiveAllowedArguments {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("archiveSizes", archiveSizes);
}