Repository: jclouds-labs-google Updated Branches: refs/heads/master c713627c9 -> e2e288ee8
JCLOUDS-653: Address Guava 18 deprecations Mostly renaming Objects.toStringHelper to MoreObjects.toStringHelper. Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/commit/e2e288ee Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/e2e288ee Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/e2e288ee Branch: refs/heads/master Commit: e2e288ee86d537d249c7e58c782a66b0201f2134 Parents: c713627 Author: Andrew Gaul <[email protected]> Authored: Fri Aug 8 11:49:42 2014 -0700 Committer: Andrew Gaul <[email protected]> Committed: Fri Aug 8 11:55:25 2014 -0700 ---------------------------------------------------------------------- .../googlecloudstorage/domain/Bucket.java | 4 ++-- .../domain/BucketAccessControls.java | 3 ++- .../domain/DefaultObjectAccessControls.java | 3 ++- .../domain/ListBucketAccessControls.java | 6 +++--- .../domain/ListDefaultObjectAccessControls.java | 6 +++--- .../googlecloudstorage/domain/ListPage.java | 5 +++-- .../googlecloudstorage/domain/Resource.java | 4 ++-- .../domain/internal/Action.java | 5 +++-- .../domain/internal/BucketCors.java | 5 +++-- .../domain/internal/BucketLifeCycle.java | 5 +++-- .../domain/internal/Condition.java | 5 +++-- .../domain/internal/Logging.java | 5 +++-- .../domain/internal/Owner.java | 5 +++-- .../domain/internal/ProjectTeam.java | 5 +++-- .../googlecloudstorage/domain/internal/Rule.java | 5 +++-- .../domain/internal/Versioning.java | 5 +++-- .../domain/internal/Website.java | 5 +++-- .../GoogleComputeEngineServiceAdapter.java | 6 +++--- ...oogleComputeEngineSecurityGroupExtension.java | 2 +- ...odesWithGroupEncodedIntoNameThenAddToSet.java | 2 +- .../googlecomputeengine/domain/AbstractDisk.java | 4 ++-- .../googlecomputeengine/domain/Address.java | 4 ++-- .../googlecomputeengine/domain/Deprecated.java | 5 +++-- .../jclouds/googlecomputeengine/domain/Disk.java | 4 ++-- .../googlecomputeengine/domain/Firewall.java | 7 ++++--- .../googlecomputeengine/domain/Image.java | 7 ++++--- .../googlecomputeengine/domain/Instance.java | 19 ++++++++++--------- .../domain/InstanceTemplate.java | 5 +++-- .../googlecomputeengine/domain/ListPage.java | 5 +++-- .../googlecomputeengine/domain/MachineType.java | 7 ++++--- .../googlecomputeengine/domain/Metadata.java | 5 +++-- .../googlecomputeengine/domain/Network.java | 4 ++-- .../googlecomputeengine/domain/Operation.java | 7 ++++--- .../googlecomputeengine/domain/Project.java | 4 ++-- .../googlecomputeengine/domain/Quota.java | 5 +++-- .../googlecomputeengine/domain/Region.java | 4 ++-- .../googlecomputeengine/domain/Resource.java | 4 ++-- .../googlecomputeengine/domain/Route.java | 7 ++++--- .../googlecomputeengine/domain/Snapshot.java | 4 ++-- .../jclouds/googlecomputeengine/domain/Zone.java | 7 ++++--- .../domain/internal/NetworkAndAddressRange.java | 4 ++-- .../org/jclouds/oauth/v2/domain/ClaimSet.java | 4 ++-- .../java/org/jclouds/oauth/v2/domain/Header.java | 5 +++-- .../oauth/v2/domain/OAuthCredentials.java | 5 +++-- .../java/org/jclouds/oauth/v2/domain/Token.java | 5 +++-- .../jclouds/oauth/v2/domain/TokenRequest.java | 5 +++-- 46 files changed, 133 insertions(+), 104 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/Bucket.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/Bucket.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/Bucket.java index 2f47f7f..69a9489 100644 --- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/Bucket.java +++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/Bucket.java @@ -35,7 +35,7 @@ import org.jclouds.googlecloudstorage.domain.internal.Website; import org.jclouds.javax.annotation.Nullable; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSet; /** @@ -151,7 +151,7 @@ public class Bucket extends Resource { } - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return super.string().omitNullValues().add("name", name).add("timeCreated", timeCreated) .add("projectNumber", projectNumber).add("metageneration", metageneration).add("acl", acl) .add("defaultObjectAcl", defaultObjectAcl).add("owner", owner).add("location", location) http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/BucketAccessControls.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/BucketAccessControls.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/BucketAccessControls.java index d599e4b..76876cf 100644 --- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/BucketAccessControls.java +++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/BucketAccessControls.java @@ -25,6 +25,7 @@ import org.jclouds.googlecloudstorage.domain.DomainResourceRefferences.Role; import org.jclouds.googlecloudstorage.domain.internal.ProjectTeam; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -94,7 +95,7 @@ public class BucketAccessControls extends Resource { return equal(this.kind, that.kind) && equal(this.bucket, that.bucket) && equal(this.entity, that.entity); } - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return super.string().omitNullValues().add("bucket", bucket).add("entity", entity).add("entityId", entityId) .add("role", role).add("email", email).add("domain", domain); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/DefaultObjectAccessControls.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/DefaultObjectAccessControls.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/DefaultObjectAccessControls.java index 7509735..65bf19f 100644 --- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/DefaultObjectAccessControls.java +++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/DefaultObjectAccessControls.java @@ -25,6 +25,7 @@ import org.jclouds.googlecloudstorage.domain.DomainResourceRefferences.ObjectRol import org.jclouds.googlecloudstorage.domain.internal.ProjectTeam; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -94,7 +95,7 @@ public class DefaultObjectAccessControls extends Resource { return equal(this.kind, that.kind) && equal(this.entity, that.entity) && equal(this.role, that.role); } - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return super.string().omitNullValues().add("bucket", bucket).add("entity", entity).add("entityId", entityId) .add("role", role).add("email", email).add("domain", domain); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListBucketAccessControls.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListBucketAccessControls.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListBucketAccessControls.java index 0a28d60..9bde256 100644 --- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListBucketAccessControls.java +++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListBucketAccessControls.java @@ -22,15 +22,15 @@ package org.jclouds.googlecloudstorage.domain; * @see <a href= "https://developers.google.com/storage/docs/json_api/v1/bucketAccessControls/list"/> */ +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; import org.jclouds.googlecloudstorage.domain.Resource.Kind; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSet; public class ListBucketAccessControls { @@ -63,7 +63,7 @@ public class ListBucketAccessControls { } - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this).omitNullValues().add("kind", kind).add("items", items); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListDefaultObjectAccessControls.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListDefaultObjectAccessControls.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListDefaultObjectAccessControls.java index 2813e9c..04645c3 100644 --- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListDefaultObjectAccessControls.java +++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListDefaultObjectAccessControls.java @@ -22,15 +22,15 @@ package org.jclouds.googlecloudstorage.domain; * @see <a href= "https://developers.google.com/storage/docs/json_api/v1/defaultObjectAccessControls/list"/> */ +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; import org.jclouds.googlecloudstorage.domain.Resource.Kind; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSet; public class ListDefaultObjectAccessControls { @@ -63,7 +63,7 @@ public class ListDefaultObjectAccessControls { } - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this).omitNullValues().add("kind", kind).add("items", items); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListPage.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListPage.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListPage.java index c8e9a7f..c10a13e 100644 --- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListPage.java +++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListPage.java @@ -16,8 +16,8 @@ */ package org.jclouds.googlecloudstorage.domain; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; @@ -26,6 +26,7 @@ import java.util.Iterator; import org.jclouds.collect.IterableWithMarker; import org.jclouds.googlecloudstorage.domain.Resource.Kind; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; @@ -76,7 +77,7 @@ public class ListPage<T> extends IterableWithMarker<T> { return equal(this.kind, that.kind) && equal(this.items, that.items); } - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this).omitNullValues().add("kind", kind).add("nextPageToken", nextPageToken) .add("items", items); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/Resource.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/Resource.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/Resource.java index 7e623b4..c8d559b 100644 --- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/Resource.java +++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/Resource.java @@ -16,9 +16,9 @@ */ package org.jclouds.googlecloudstorage.domain; -import static com.google.common.base.Objects.ToStringHelper; +import static com.google.common.base.MoreObjects.ToStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Action.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Action.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Action.java index 67431a3..a5fe1df 100644 --- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Action.java +++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Action.java @@ -16,8 +16,9 @@ */ package org.jclouds.googlecloudstorage.domain.internal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -57,7 +58,7 @@ public class Action { return true; } - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this).add("type", type); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/BucketCors.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/BucketCors.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/BucketCors.java index 0be95c6..782b4ac 100644 --- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/BucketCors.java +++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/BucketCors.java @@ -16,11 +16,12 @@ */ package org.jclouds.googlecloudstorage.domain.internal; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import java.util.Set; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; @@ -76,7 +77,7 @@ public class BucketCors { && equal(this.responseHeader, that.responseHeader) && equal(this.maxAgeSeconds, that.maxAgeSeconds); } - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this).omitNullValues().add("origin", origin).add("method", method).add("responseHeader", responseHeader) .add("maxAgeSeconds", maxAgeSeconds); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/BucketLifeCycle.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/BucketLifeCycle.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/BucketLifeCycle.java index 07a7461..e0814f5 100644 --- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/BucketLifeCycle.java +++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/BucketLifeCycle.java @@ -16,10 +16,11 @@ */ package org.jclouds.googlecloudstorage.domain.internal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import java.util.Set; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; @@ -63,7 +64,7 @@ public class BucketLifeCycle { return true; } - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this).add("rule", rules); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Condition.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Condition.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Condition.java index d298fe7..960b4d5 100644 --- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Condition.java +++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Condition.java @@ -16,12 +16,13 @@ */ package org.jclouds.googlecloudstorage.domain.internal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import java.util.Date; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -95,7 +96,7 @@ public class Condition { return true; } - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this).add("age", age).add("createdBefore", createdBefore).add("isLive", isLive) .add("numNewerVersions", numNewerVersions); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Logging.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Logging.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Logging.java index 1bda912..4273ed4 100644 --- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Logging.java +++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Logging.java @@ -16,10 +16,11 @@ */ package org.jclouds.googlecloudstorage.domain.internal; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -62,7 +63,7 @@ public class Logging { return equal(this.logBucket, that.logBucket) && equal(this.logObjectPrefix, that.logObjectPrefix); } - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this).add("logBucket", logBucket).add("logObjectPrefix", logObjectPrefix); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Owner.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Owner.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Owner.java index 6f9cbdf..52f2fbf 100644 --- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Owner.java +++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Owner.java @@ -16,12 +16,13 @@ */ package org.jclouds.googlecloudstorage.domain.internal; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -60,7 +61,7 @@ public class Owner { return equal(this.entity, that.entity); } - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this).omitNullValues().add("entity", entity).add("entityId", entityId); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/ProjectTeam.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/ProjectTeam.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/ProjectTeam.java index 155f9e0..e53ea4e 100644 --- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/ProjectTeam.java +++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/ProjectTeam.java @@ -16,9 +16,10 @@ */ package org.jclouds.googlecloudstorage.domain.internal; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -77,7 +78,7 @@ public final class ProjectTeam { return equal(this.projectId, that.projectId) && equal(this.team, that.team); } - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this).add("projectId", projectId).add("team", team); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Rule.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Rule.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Rule.java index 45d298e..36db832 100644 --- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Rule.java +++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Rule.java @@ -16,9 +16,10 @@ */ package org.jclouds.googlecloudstorage.domain.internal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -70,7 +71,7 @@ public class Rule { return true; } - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this).add("condition", condition).add("action", action); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Versioning.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Versioning.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Versioning.java index dd42113..824e5c0 100644 --- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Versioning.java +++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Versioning.java @@ -16,8 +16,9 @@ */ package org.jclouds.googlecloudstorage.domain.internal; -import static com.google.common.base.Objects.toStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -59,7 +60,7 @@ public final class Versioning { return true; } - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this).add("enabled", enabled); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Website.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Website.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Website.java index 7218c85..a824cec 100644 --- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Website.java +++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Website.java @@ -16,11 +16,12 @@ */ package org.jclouds.googlecloudstorage.domain.internal; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -62,7 +63,7 @@ public class Website { return equal(this.mainPageSuffix, that.mainPageSuffix); } - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this).add("mainPageSuffix", mainPageSuffix).add("notFoundPage", notFoundPage); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceAdapter.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceAdapter.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceAdapter.java index 3a26d34..373152b 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceAdapter.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceAdapter.java @@ -73,7 +73,7 @@ import org.jclouds.http.HttpResponse; 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.Optional; import com.google.common.base.Predicate; import com.google.common.base.Supplier; @@ -288,8 +288,8 @@ public class GoogleComputeEngineServiceAdapter implements ComputeServiceAdapter< @Override public Image getImage(String id) { - return Objects.firstNonNull(api.getImageApiForProject(userProject.get()).get(id), - Objects.firstNonNull(api.getImageApiForProject(DEBIAN_PROJECT).get(id), + return MoreObjects.firstNonNull(api.getImageApiForProject(userProject.get()).get(id), + MoreObjects.firstNonNull(api.getImageApiForProject(DEBIAN_PROJECT).get(id), api.getImageApiForProject(CENTOS_PROJECT).get(id))); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/extensions/GoogleComputeEngineSecurityGroupExtension.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/extensions/GoogleComputeEngineSecurityGroupExtension.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/extensions/GoogleComputeEngineSecurityGroupExtension.java index f1113e0..fb35bed 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/extensions/GoogleComputeEngineSecurityGroupExtension.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/extensions/GoogleComputeEngineSecurityGroupExtension.java @@ -157,7 +157,7 @@ public class GoogleComputeEngineSecurityGroupExtension implements SecurityGroupE NetworkAndAddressRange nAr = new NetworkAndAddressRange(name, DEFAULT_INTERNAL_NETWORK_RANGE, null); - Network nw = networkCreator.apply(nAr); + Network nw = networkCreator.getUnchecked(nAr); return groupConverter.apply(nw); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java index 14af9cd..b65f152 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java @@ -134,7 +134,7 @@ public class CreateNodesWithGroupEncodedIntoNameThenAddToSet extends String networkName = templateOptions.getNetworkName().or(sharedResourceName); - return networkMap.apply(new NetworkAndAddressRange(networkName, DEFAULT_INTERNAL_NETWORK_RANGE, null)); + return networkMap.getUnchecked(new NetworkAndAddressRange(networkName, DEFAULT_INTERNAL_NETWORK_RANGE, null)); } /** http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/AbstractDisk.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/AbstractDisk.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/AbstractDisk.java index 2cc8d8e..4a3758d 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/AbstractDisk.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/AbstractDisk.java @@ -22,7 +22,7 @@ import java.net.URI; import java.util.Date; import com.google.common.annotations.Beta; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; /** * A persistent disk resource @@ -59,7 +59,7 @@ public abstract class AbstractDisk extends Resource { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return super.string() .omitNullValues() .add("sizeGb", sizeGb) http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Address.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Address.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Address.java index 207cf75..bc4558a 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Address.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Address.java @@ -25,7 +25,7 @@ import java.net.URI; import java.util.Date; import com.google.common.annotations.Beta; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Optional; /** @@ -100,7 +100,7 @@ public final class Address extends Resource { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return super.string() .omitNullValues() .add("status", status) http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Deprecated.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Deprecated.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Deprecated.java index 5a48acf..bba6aa1 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Deprecated.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Deprecated.java @@ -16,13 +16,14 @@ */ package org.jclouds.googlecomputeengine.domain; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Optional.fromNullable; import java.beans.ConstructorProperties; import java.net.URI; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; @@ -107,7 +108,7 @@ public class Deprecated { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this) .omitNullValues() .add("state", state.orNull()) http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Disk.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Disk.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Disk.java index 91d1502..6b18a08 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Disk.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Disk.java @@ -24,7 +24,7 @@ import java.net.URI; import java.util.Date; import com.google.common.annotations.Beta; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; /** * A persistent disk resource @@ -69,7 +69,7 @@ public final class Disk extends AbstractDisk { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return super.string() .omitNullValues() .add("zone", zone); http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Firewall.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Firewall.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Firewall.java index aee2cd4..e0d1e3d 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Firewall.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Firewall.java @@ -16,8 +16,8 @@ */ package org.jclouds.googlecomputeengine.domain; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.Range.closed; @@ -31,6 +31,7 @@ import java.util.Set; import org.jclouds.net.domain.IpProtocol; import com.google.common.annotations.Beta; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; import com.google.common.collect.RangeSet; @@ -113,7 +114,7 @@ public final class Firewall extends Resource { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return super.string() .add("network", network) .add("sourceRanges", sourceRanges) @@ -305,7 +306,7 @@ public final class Firewall extends Resource { /** * {@inheritDoc} */ - public Objects.ToStringHelper string() { + public MoreObjects.ToStringHelper string() { return toStringHelper(this) .add("IpProtocol", ipProtocol).add("ports", ports); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Image.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Image.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Image.java index 9ee7ea9..b97d49d 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Image.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Image.java @@ -16,8 +16,8 @@ */ package org.jclouds.googlecomputeengine.domain; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Optional.fromNullable; import static com.google.common.base.Preconditions.checkNotNull; @@ -26,6 +26,7 @@ import java.net.URI; import java.util.Date; import com.google.common.annotations.Beta; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; @@ -77,7 +78,7 @@ public final class Image extends Resource { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return super.string() .omitNullValues() .add("sourceType", sourceType) @@ -217,7 +218,7 @@ public final class Image extends Resource { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this) .omitNullValues() .add("source", source) http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Instance.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Instance.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Instance.java index e67366e..79d8fbd 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Instance.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Instance.java @@ -16,8 +16,8 @@ */ package org.jclouds.googlecomputeengine.domain; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Optional.fromNullable; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.Iterables.getLast; @@ -30,6 +30,7 @@ import java.util.Set; 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.Optional; import com.google.common.base.Splitter; @@ -166,7 +167,7 @@ public class Instance extends Resource { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return super.string() .omitNullValues() .add("items", tags) @@ -389,7 +390,7 @@ public class Instance extends Resource { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this) .add("items", items) .add("fingerprint", fingerprint); @@ -495,7 +496,7 @@ public class Instance extends Resource { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this).add("index", index); } @@ -593,7 +594,7 @@ public class Instance extends Resource { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this).add("boot", boot); } @@ -746,7 +747,7 @@ public class Instance extends Resource { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this) .add("name", name) .add("network", network).add("networkIP", networkIP).add("accessConfigs", @@ -900,7 +901,7 @@ public class Instance extends Resource { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this) .add("name", name).add("type", type).add("natIP", natIP); } @@ -1018,7 +1019,7 @@ public class Instance extends Resource { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this).add("selfLink", selfLink).add("contents", contents); } @@ -1126,7 +1127,7 @@ public class Instance extends Resource { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this).add("email", email).add("scopes", scopes); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/InstanceTemplate.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/InstanceTemplate.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/InstanceTemplate.java index e86bed2..aa28b80 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/InstanceTemplate.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/InstanceTemplate.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; @@ -420,8 +421,8 @@ public class InstanceTemplate { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { - Objects.ToStringHelper toString = Objects.toStringHelper("") + protected MoreObjects.ToStringHelper string() { + MoreObjects.ToStringHelper toString = MoreObjects.toStringHelper("") .omitNullValues(); toString.add("description", description); if (disks.size() > 0) http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/ListPage.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/ListPage.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/ListPage.java index 63107e7..a46cf3c 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/ListPage.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/ListPage.java @@ -16,8 +16,8 @@ */ package org.jclouds.googlecomputeengine.domain; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import static org.jclouds.googlecomputeengine.domain.Resource.Kind; @@ -27,6 +27,7 @@ import java.util.Iterator; import org.jclouds.collect.IterableWithMarker; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; @@ -98,7 +99,7 @@ public class ListPage<T> extends IterableWithMarker<T> { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this) .omitNullValues() .add("kind", kind) http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/MachineType.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/MachineType.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/MachineType.java index 1c59ac7..819e9d4 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/MachineType.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/MachineType.java @@ -16,8 +16,8 @@ */ package org.jclouds.googlecomputeengine.domain; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Optional.fromNullable; import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; @@ -28,6 +28,7 @@ import java.util.List; 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.Optional; import com.google.common.collect.ImmutableList; @@ -141,7 +142,7 @@ public final class MachineType extends Resource { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return super.string() .add("guestCpus", guestCpus) .add("memoryMb", memoryMb) @@ -315,7 +316,7 @@ public final class MachineType extends Resource { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this) .add("diskGb", diskGb); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Metadata.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Metadata.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Metadata.java index 53a8cfb..7402c12 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Metadata.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Metadata.java @@ -16,14 +16,15 @@ */ package org.jclouds.googlecomputeengine.domain; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import java.beans.ConstructorProperties; import java.util.Map; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; @@ -80,7 +81,7 @@ public class Metadata { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this) .add("items", items) .add("fingerprint", fingerprint); http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Network.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Network.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Network.java index 0919c89..8b00bdc 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Network.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Network.java @@ -25,7 +25,7 @@ import java.net.URI; import java.util.Date; import com.google.common.annotations.Beta; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Optional; /** @@ -71,7 +71,7 @@ public final class Network extends Resource { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return super.string() .omitNullValues() .add("IPv4Range", IPv4Range) http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Operation.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Operation.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Operation.java index deab873..d0e5ef9 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Operation.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Operation.java @@ -16,8 +16,8 @@ */ package org.jclouds.googlecomputeengine.domain; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Optional.fromNullable; import static com.google.common.base.Preconditions.checkNotNull; @@ -30,6 +30,7 @@ import org.jclouds.http.HttpResponse; 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.Optional; import com.google.common.collect.ImmutableList; @@ -203,7 +204,7 @@ public class Operation extends Resource { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return super.string() .omitNullValues() .add("targetLink", targetLink) @@ -489,7 +490,7 @@ public class Operation extends Resource { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this) .omitNullValues() .add("code", code) http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Project.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Project.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Project.java index ac3867b..e6f8bc0 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Project.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Project.java @@ -25,7 +25,7 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; import com.google.common.annotations.Beta; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSet; /** @@ -74,7 +74,7 @@ public class Project extends Resource { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return super.string() .add("commonInstanceMetadata", commonInstanceMetadata) .add("quotas", quotas) http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Quota.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Quota.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Quota.java index 3c17130..e160a3c 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Quota.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Quota.java @@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import com.google.common.annotations.Beta; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; /** * Quotas assigned to a given project or region. @@ -88,7 +89,7 @@ public class Quota { * {@inheritDoc} */ public ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .omitNullValues() .add("metric", metric) .add("usage", usage) http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Region.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Region.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Region.java index aa459bf..b7dba2c 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Region.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Region.java @@ -26,7 +26,7 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; import com.google.common.annotations.Beta; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSet; /** @@ -85,7 +85,7 @@ public final class Region extends Resource { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return super.string() .add("status", status) .add("zones", zones) http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Resource.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Resource.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Resource.java index 4d0a1c8..4aa4ea7 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Resource.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Resource.java @@ -16,9 +16,9 @@ */ package org.jclouds.googlecomputeengine.domain; -import static com.google.common.base.Objects.ToStringHelper; +import static com.google.common.base.MoreObjects.ToStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Optional.fromNullable; import static com.google.common.base.Preconditions.checkNotNull; http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Route.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Route.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Route.java index df5bb1d..d7a2c8b 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Route.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Route.java @@ -16,8 +16,8 @@ */ package org.jclouds.googlecomputeengine.domain; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Optional.fromNullable; import static com.google.common.base.Preconditions.checkNotNull; @@ -28,6 +28,7 @@ import java.util.Map; import java.util.Set; import com.google.common.annotations.Beta; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; @@ -140,7 +141,7 @@ public final class Route extends Resource { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return super.string() .add("network", network) .add("tags", tags) @@ -359,7 +360,7 @@ public final class Route extends Resource { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this) .add("code", code) .add("message", message) http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Snapshot.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Snapshot.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Snapshot.java index 69af275..c007c4a 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Snapshot.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Snapshot.java @@ -24,7 +24,7 @@ import java.net.URI; import java.util.Date; import com.google.common.annotations.Beta; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Optional; /** @@ -70,7 +70,7 @@ public final class Snapshot extends AbstractDisk { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return super.string() .omitNullValues() .add("sourceDisk", sourceDisk.orNull()) http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Zone.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Zone.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Zone.java index 232386c..de1758c 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Zone.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Zone.java @@ -16,8 +16,8 @@ */ package org.jclouds.googlecomputeengine.domain; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Optional.fromNullable; import static com.google.common.base.Preconditions.checkNotNull; @@ -29,6 +29,7 @@ import java.util.Set; 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.Optional; import com.google.common.collect.ImmutableSet; @@ -90,7 +91,7 @@ public final class Zone extends Resource { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return super.string() .add("status", status) .add("maintenanceWindows", maintenanceWindows) @@ -253,7 +254,7 @@ public final class Zone extends Resource { /** * {@inheritDoc} */ - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this) .omitNullValues() .add("name", name) http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/internal/NetworkAndAddressRange.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/internal/NetworkAndAddressRange.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/internal/NetworkAndAddressRange.java index 66fbd66..d05a9da 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/internal/NetworkAndAddressRange.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/internal/NetworkAndAddressRange.java @@ -16,8 +16,8 @@ */ package org.jclouds.googlecomputeengine.domain.internal; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Optional.fromNullable; import static com.google.common.base.Preconditions.checkNotNull; @@ -25,8 +25,8 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.base.Optional; /** http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/oauth/src/main/java/org/jclouds/oauth/v2/domain/ClaimSet.java ---------------------------------------------------------------------- diff --git a/oauth/src/main/java/org/jclouds/oauth/v2/domain/ClaimSet.java b/oauth/src/main/java/org/jclouds/oauth/v2/domain/ClaimSet.java index 5c0b348..2143474 100644 --- a/oauth/src/main/java/org/jclouds/oauth/v2/domain/ClaimSet.java +++ b/oauth/src/main/java/org/jclouds/oauth/v2/domain/ClaimSet.java @@ -26,9 +26,9 @@ import com.google.common.collect.Sets; import java.util.Map; import java.util.Set; -import static com.google.common.base.Objects.ToStringHelper; +import static com.google.common.base.MoreObjects.ToStringHelper; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/oauth/src/main/java/org/jclouds/oauth/v2/domain/Header.java ---------------------------------------------------------------------- diff --git a/oauth/src/main/java/org/jclouds/oauth/v2/domain/Header.java b/oauth/src/main/java/org/jclouds/oauth/v2/domain/Header.java index c230e1d..baacc11 100644 --- a/oauth/src/main/java/org/jclouds/oauth/v2/domain/Header.java +++ b/oauth/src/main/java/org/jclouds/oauth/v2/domain/Header.java @@ -16,10 +16,11 @@ */ package org.jclouds.oauth.v2.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; /** @@ -121,7 +122,7 @@ public class Header { return string().toString(); } - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this).omitNullValues().add("signerAlgorithm", signerAlgorithm) .add("type", type); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/oauth/src/main/java/org/jclouds/oauth/v2/domain/OAuthCredentials.java ---------------------------------------------------------------------- diff --git a/oauth/src/main/java/org/jclouds/oauth/v2/domain/OAuthCredentials.java b/oauth/src/main/java/org/jclouds/oauth/v2/domain/OAuthCredentials.java index 78cb402..ca2bd08 100644 --- a/oauth/src/main/java/org/jclouds/oauth/v2/domain/OAuthCredentials.java +++ b/oauth/src/main/java/org/jclouds/oauth/v2/domain/OAuthCredentials.java @@ -16,13 +16,14 @@ */ package org.jclouds.oauth.v2.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import org.jclouds.domain.Credentials; import java.security.PrivateKey; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; /** @@ -121,7 +122,7 @@ public class OAuthCredentials extends Credentials { return string().toString(); } - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this).omitNullValues().add("identity", identity) .add("credential", credential != null ? credential.hashCode() : null).add("privateKey", privateKey.hashCode()); http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/oauth/src/main/java/org/jclouds/oauth/v2/domain/Token.java ---------------------------------------------------------------------- diff --git a/oauth/src/main/java/org/jclouds/oauth/v2/domain/Token.java b/oauth/src/main/java/org/jclouds/oauth/v2/domain/Token.java index a18a7eb..ff44d69 100644 --- a/oauth/src/main/java/org/jclouds/oauth/v2/domain/Token.java +++ b/oauth/src/main/java/org/jclouds/oauth/v2/domain/Token.java @@ -16,12 +16,13 @@ */ package org.jclouds.oauth.v2.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.beans.ConstructorProperties; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; /** @@ -141,7 +142,7 @@ public class Token { return string().toString(); } - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this).omitNullValues().add("accessToken", accessToken) .add("tokenType", tokenType).add("expiresIn", expiresIn); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/e2e288ee/oauth/src/main/java/org/jclouds/oauth/v2/domain/TokenRequest.java ---------------------------------------------------------------------- diff --git a/oauth/src/main/java/org/jclouds/oauth/v2/domain/TokenRequest.java b/oauth/src/main/java/org/jclouds/oauth/v2/domain/TokenRequest.java index 7d1a6a4..71f3420 100644 --- a/oauth/src/main/java/org/jclouds/oauth/v2/domain/TokenRequest.java +++ b/oauth/src/main/java/org/jclouds/oauth/v2/domain/TokenRequest.java @@ -16,10 +16,11 @@ */ package org.jclouds.oauth.v2.domain; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; +import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; /** @@ -122,7 +123,7 @@ public class TokenRequest { return string().toString(); } - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return toStringHelper(this).omitNullValues().add("header", header) .add("claimSet", claimSet); }
