Repository: jclouds-labs Updated Branches: refs/heads/master 80abf0854 -> 515f9b5f1
JCLOUDS-1225: Address Guava 18 Objects changes Fixed with: find -name \*.java | xargs sed -i 's/Objects.[Tt]oStringHelper/More&/g' find -name \*.java | xargs sed -i 's/Objects.firstNonNull/More&/g' find -name \*.java | xargs sed -i 's/^\(import com.google.common.base.\)\(Objects.*\)/\1More\2\n\1\2/g' find -name \*.java | xargs java -jar google-java-format-1.3-all-deps.jar -i --fix-imports-only --skip-sorting-imports Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/515f9b5f Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/515f9b5f Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/515f9b5f Branch: refs/heads/master Commit: 515f9b5f12a2552e6d4910bfa684dd1f50dabbbd Parents: 80abf08 Author: Andrew Gaul <[email protected]> Authored: Thu Aug 24 18:26:39 2017 -0700 Committer: Andrew Gaul <[email protected]> Committed: Thu Aug 24 18:28:07 2017 -0700 ---------------------------------------------------------------------- .../azurecompute/arm/compute/AzureComputeServiceAdapter.java | 4 ++-- .../azurecompute/arm/compute/options/AzureTemplateOptions.java | 5 +++-- .../azurecompute/compute/AzureComputeServiceAdapter.java | 2 +- .../compute/options/AzureComputeTemplateOptions.java | 4 ++-- ...tOrCreateStorageServiceAndVirtualNetworkThenCreateNodes.java | 2 +- .../main/java/org/jclouds/snia/cdmi/v1/domain/CDMIObject.java | 5 +++-- .../main/java/org/jclouds/snia/cdmi/v1/domain/Container.java | 2 +- .../main/java/org/jclouds/snia/cdmi/v1/domain/DataObject.java | 2 +- .../cloudsigma2/compute/options/CloudSigma2TemplateOptions.java | 2 +- .../v6_5/compute/options/JoyentCloudTemplateOptions.java | 2 +- .../java/org/jclouds/joyent/cloudapi/v6_5/domain/Dataset.java | 3 ++- .../main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Key.java | 3 ++- .../java/org/jclouds/joyent/cloudapi/v6_5/domain/Machine.java | 3 ++- .../java/org/jclouds/joyent/cloudapi/v6_5/domain/Package.java | 3 ++- .../v6_5/domain/datacenterscoped/DatacenterAndName.java | 5 +++-- .../joyent/cloudapi/v6_5/options/CreateMachineOptions.java | 5 +++-- .../profitbricks/rest/domain/zonescoped/DataCenterAndId.java | 5 +++-- .../profitbricks/rest/domain/zonescoped/ServerInDataCenter.java | 4 ++-- 18 files changed, 35 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/515f9b5f/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java ---------------------------------------------------------------------- diff --git a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java index 0a37d5d..213d438 100644 --- a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java +++ b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java @@ -96,7 +96,7 @@ import org.jclouds.location.Region; import org.jclouds.logging.Logger; import com.google.common.base.Function; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Predicate; import com.google.common.base.Splitter; import com.google.common.base.Supplier; @@ -375,7 +375,7 @@ public class AzureComputeServiceAdapter implements ComputeServiceAdapter<Virtual private OSProfile createOsProfile(String computerName, Template template) { String defaultLoginUser = template.getImage().getDefaultCredentials().getUser(); - String adminUsername = Objects.firstNonNull(template.getOptions().getLoginUser(), defaultLoginUser); + String adminUsername = MoreObjects.firstNonNull(template.getOptions().getLoginUser(), defaultLoginUser); // Password already generated in CreateResourcesThenCreateNodes (if not set by user) String adminPassword = template.getOptions().getLoginPassword(); OSProfile.Builder builder = OSProfile.builder().adminUsername(adminUsername).adminPassword(adminPassword) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/515f9b5f/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/options/AzureTemplateOptions.java ---------------------------------------------------------------------- diff --git a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/options/AzureTemplateOptions.java b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/options/AzureTemplateOptions.java index 6ba85d1..92f592e 100644 --- a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/options/AzureTemplateOptions.java +++ b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/options/AzureTemplateOptions.java @@ -26,6 +26,7 @@ import org.jclouds.azurecompute.arm.domain.OSProfile.WindowsConfiguration; import org.jclouds.azurecompute.arm.domain.Secrets; import org.jclouds.compute.options.TemplateOptions; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; @@ -179,8 +180,8 @@ public class AzureTemplateOptions extends TemplateOptions implements Cloneable { } @Override - public Objects.ToStringHelper string() { - Objects.ToStringHelper toString = super.string(); + public MoreObjects.ToStringHelper string() { + MoreObjects.ToStringHelper toString = super.string(); if (availabilitySet != null) toString.add("availabilitySet", availabilitySet); if (availabilitySetName != null) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/515f9b5f/azurecompute/src/main/java/org/jclouds/azurecompute/compute/AzureComputeServiceAdapter.java ---------------------------------------------------------------------- diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/compute/AzureComputeServiceAdapter.java b/azurecompute/src/main/java/org/jclouds/azurecompute/compute/AzureComputeServiceAdapter.java index 7241cc7..44f5f24 100644 --- a/azurecompute/src/main/java/org/jclouds/azurecompute/compute/AzureComputeServiceAdapter.java +++ b/azurecompute/src/main/java/org/jclouds/azurecompute/compute/AzureComputeServiceAdapter.java @@ -16,7 +16,7 @@ */ package org.jclouds.azurecompute.compute; -import static com.google.common.base.Objects.firstNonNull; +import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Predicates.notNull; import static java.lang.String.format; import static java.util.concurrent.TimeUnit.SECONDS; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/515f9b5f/azurecompute/src/main/java/org/jclouds/azurecompute/compute/options/AzureComputeTemplateOptions.java ---------------------------------------------------------------------- diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/compute/options/AzureComputeTemplateOptions.java b/azurecompute/src/main/java/org/jclouds/azurecompute/compute/options/AzureComputeTemplateOptions.java index 6fb95e5..db2c35d 100644 --- a/azurecompute/src/main/java/org/jclouds/azurecompute/compute/options/AzureComputeTemplateOptions.java +++ b/azurecompute/src/main/java/org/jclouds/azurecompute/compute/options/AzureComputeTemplateOptions.java @@ -25,7 +25,7 @@ import org.jclouds.domain.LoginCredentials; import org.jclouds.javax.annotation.Nullable; import org.jclouds.scriptbuilder.domain.Statement; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; /** @@ -115,7 +115,7 @@ public class AzureComputeTemplateOptions extends TemplateOptions implements Clon @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("virtualNetworkName", virtualNetworkName) .add("subnetNames", subnetNames) .add("storageAccountName", storageAccountName) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/515f9b5f/azurecompute/src/main/java/org/jclouds/azurecompute/compute/strategy/GetOrCreateStorageServiceAndVirtualNetworkThenCreateNodes.java ---------------------------------------------------------------------- diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/compute/strategy/GetOrCreateStorageServiceAndVirtualNetworkThenCreateNodes.java b/azurecompute/src/main/java/org/jclouds/azurecompute/compute/strategy/GetOrCreateStorageServiceAndVirtualNetworkThenCreateNodes.java index 184bfb0..348b72d 100644 --- a/azurecompute/src/main/java/org/jclouds/azurecompute/compute/strategy/GetOrCreateStorageServiceAndVirtualNetworkThenCreateNodes.java +++ b/azurecompute/src/main/java/org/jclouds/azurecompute/compute/strategy/GetOrCreateStorageServiceAndVirtualNetworkThenCreateNodes.java @@ -16,7 +16,7 @@ */ package org.jclouds.azurecompute.compute.strategy; -import static com.google.common.base.Objects.firstNonNull; +import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Predicates.and; import static com.google.common.base.Predicates.notNull; import static com.google.common.collect.Iterables.tryFind; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/515f9b5f/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/CDMIObject.java ---------------------------------------------------------------------- diff --git a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/CDMIObject.java b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/CDMIObject.java index dffd298..b5f2f16 100644 --- a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/CDMIObject.java +++ b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/CDMIObject.java @@ -25,8 +25,9 @@ import java.util.Map; import org.jclouds.domain.JsonBall; 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.Lists; import com.google.common.collect.Maps; @@ -278,7 +279,7 @@ public class CDMIObject { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("objectID", objectID).add("objectName", objectName) + return MoreObjects.toStringHelper("").add("objectID", objectID).add("objectName", objectName) .add("objectType", objectType).add("parentURI", parentURI).add("metadata", metadata); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/515f9b5f/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/Container.java ---------------------------------------------------------------------- diff --git a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/Container.java b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/Container.java index d8ccaf0..4bce943 100644 --- a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/Container.java +++ b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/Container.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; public class Container extends CDMIObject { http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/515f9b5f/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/DataObject.java ---------------------------------------------------------------------- diff --git a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/DataObject.java b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/DataObject.java index 4314705..43f2b51 100644 --- a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/DataObject.java +++ b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/DataObject.java @@ -25,7 +25,7 @@ import java.nio.charset.Charset; import com.google.common.base.Charsets; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.io.ByteSource; import com.google.common.io.Files; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/515f9b5f/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/compute/options/CloudSigma2TemplateOptions.java ---------------------------------------------------------------------- diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/compute/options/CloudSigma2TemplateOptions.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/compute/options/CloudSigma2TemplateOptions.java index db43a7d..286d0b6 100644 --- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/compute/options/CloudSigma2TemplateOptions.java +++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/compute/options/CloudSigma2TemplateOptions.java @@ -16,7 +16,7 @@ */ package org.jclouds.cloudsigma2.compute.options; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import org.jclouds.cloudsigma2.domain.DeviceEmulationType; import org.jclouds.cloudsigma2.domain.Model; import org.jclouds.compute.options.TemplateOptions; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/515f9b5f/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/options/JoyentCloudTemplateOptions.java ---------------------------------------------------------------------- diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/options/JoyentCloudTemplateOptions.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/options/JoyentCloudTemplateOptions.java index b1e401b..da65c0c 100644 --- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/options/JoyentCloudTemplateOptions.java +++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/options/JoyentCloudTemplateOptions.java @@ -25,7 +25,7 @@ import org.jclouds.domain.LoginCredentials; import org.jclouds.scriptbuilder.domain.Statement; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Optional; /** http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/515f9b5f/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Dataset.java ---------------------------------------------------------------------- diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Dataset.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Dataset.java index 0655f52..d476904 100644 --- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Dataset.java +++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Dataset.java @@ -30,6 +30,7 @@ import org.jclouds.joyent.cloudapi.v6_5.domain.Machine.Type; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; import com.google.common.base.Functions; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ComparisonChain; import com.google.common.collect.ImmutableMap; @@ -313,7 +314,7 @@ public class Dataset implements Comparable<Dataset> { @Override public String toString() { - return Objects.toStringHelper("").omitNullValues() + return MoreObjects.toStringHelper("").omitNullValues() .add("id", id) .add("urn", urn) .add("name", name) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/515f9b5f/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Key.java ---------------------------------------------------------------------- diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Key.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Key.java index e2ec1ff..84a3f2a 100644 --- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Key.java +++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Key.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.collect.ComparisonChain; @@ -131,7 +132,7 @@ public class Key implements Comparable<Key> { @Override public String toString() { - return Objects.toStringHelper("").omitNullValues() + return MoreObjects.toStringHelper("").omitNullValues() .add("name", name) .add("key", key) .add("created", created).toString(); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/515f9b5f/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Machine.java ---------------------------------------------------------------------- diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Machine.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Machine.java index 7867fda..f33935e 100644 --- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Machine.java +++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Machine.java @@ -31,6 +31,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.CaseFormat; import com.google.common.base.Function; import com.google.common.base.Functions; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ComparisonChain; import com.google.common.collect.ImmutableMap; @@ -386,7 +387,7 @@ public class Machine implements Comparable<Machine> { @Override public String toString() { - return Objects.toStringHelper("").omitNullValues() + return MoreObjects.toStringHelper("").omitNullValues() .add("id", id) .add("name", name) .add("type", type) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/515f9b5f/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Package.java ---------------------------------------------------------------------- diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Package.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Package.java index 17953b8..a9c20a1 100644 --- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Package.java +++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Package.java @@ -22,6 +22,7 @@ import java.beans.ConstructorProperties; import javax.inject.Named; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ComparisonChain; @@ -173,7 +174,7 @@ public class Package implements Comparable<Package> { @Override public String toString() { - return Objects.toStringHelper("").omitNullValues() + return MoreObjects.toStringHelper("").omitNullValues() .add("name", name) .add("memorySizeMb", memorySizeMb) .add("diskSizeGb", diskSizeGb) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/515f9b5f/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/datacenterscoped/DatacenterAndName.java ---------------------------------------------------------------------- diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/datacenterscoped/DatacenterAndName.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/datacenterscoped/DatacenterAndName.java index cb10222..11e067d 100644 --- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/datacenterscoped/DatacenterAndName.java +++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/datacenterscoped/DatacenterAndName.java @@ -21,9 +21,10 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.base.Function; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Splitter; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.Iterables; /** @@ -104,6 +105,6 @@ public class DatacenterAndName { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("datacenterId", datacenterId).add("name", name); + return MoreObjects.toStringHelper("").add("datacenterId", datacenterId).add("name", name); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/515f9b5f/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/options/CreateMachineOptions.java ---------------------------------------------------------------------- diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/options/CreateMachineOptions.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/options/CreateMachineOptions.java index 34730fa..e610b85 100644 --- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/options/CreateMachineOptions.java +++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/options/CreateMachineOptions.java @@ -25,8 +25,9 @@ import org.jclouds.http.options.BaseHttpRequestOptions; import org.jclouds.util.Maps2; 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.ImmutableMap; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; @@ -56,7 +57,7 @@ public class CreateMachineOptions extends BaseHttpRequestOptions { @Override public String toString() { - ToStringHelper toString = Objects.toStringHelper("").omitNullValues(); + ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues(); toString.add("name", name).add("package", name); if (metadata.size() > 0) toString.add("metadata", metadata); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/515f9b5f/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/domain/zonescoped/DataCenterAndId.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/domain/zonescoped/DataCenterAndId.java b/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/domain/zonescoped/DataCenterAndId.java index c4b1460..f82ecf9 100644 --- a/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/domain/zonescoped/DataCenterAndId.java +++ b/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/domain/zonescoped/DataCenterAndId.java @@ -16,6 +16,7 @@ */ package org.apache.jclouds.profitbricks.rest.domain.zonescoped; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Splitter; import com.google.common.collect.Iterables; @@ -78,8 +79,8 @@ public class DataCenterAndId { return Objects.equal(dataCenterId, other.dataCenterId) && Objects.equal(id, other.id); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper(this).add("dataCenterId", dataCenterId).add("id", id); + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper(this).add("dataCenterId", dataCenterId).add("id", id); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/515f9b5f/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/domain/zonescoped/ServerInDataCenter.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/domain/zonescoped/ServerInDataCenter.java b/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/domain/zonescoped/ServerInDataCenter.java index 7dd862a..68b684c 100644 --- a/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/domain/zonescoped/ServerInDataCenter.java +++ b/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/domain/zonescoped/ServerInDataCenter.java @@ -16,7 +16,7 @@ */ package org.apache.jclouds.profitbricks.rest.domain.zonescoped; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import static com.google.common.base.Preconditions.checkNotNull; import org.apache.jclouds.profitbricks.rest.domain.Server; @@ -34,7 +34,7 @@ public class ServerInDataCenter extends DataCenterAndId { } @Override - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return super.string().add("server", server); }
