You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/10/24 20:25:15 UTC
[1/2] git commit: Revert "JCLOUDS-653: Address Guava 18 deprecations"
Repository: jclouds-labs-google
Updated Branches:
refs/heads/master 930dde3ce -> 2f828feef
Revert "JCLOUDS-653: Address Guava 18 deprecations"
This reverts commit e2e288ee86d537d249c7e58c782a66b0201f2134.
Many conflicts on account of lots of changes since the original commit.
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/4a483e59
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/4a483e59
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/4a483e59
Branch: refs/heads/master
Commit: 4a483e59b0552290161e0abb15bc6c7198096c39
Parents: 930dde3
Author: Adrian Cole <ad...@gmail.com>
Authored: Thu Oct 23 20:11:39 2014 -0700
Committer: Adrian Cole <ac...@twitter.com>
Committed: Fri Oct 24 10:54:47 2014 -0700
----------------------------------------------------------------------
.../googlecloudstorage/domain/Bucket.java | 4 ++--
.../domain/BucketAccessControls.java | 3 +--
.../domain/DefaultObjectAccessControls.java | 3 +--
.../googlecloudstorage/domain/GCSObject.java | 6 ++----
.../domain/ListBucketAccessControls.java | 6 +++---
.../domain/ListDefaultObjectAccessControls.java | 6 +++---
.../domain/ListObjectAccessControls.java | 4 ++--
.../googlecloudstorage/domain/ListPage.java | 5 ++---
.../domain/ObjectAccessControls.java | 3 +--
.../googlecloudstorage/domain/Resource.java | 4 ++--
.../domain/ResumableUpload.java | 6 +++---
.../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/DiskType.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 | 8 ++++----
.../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 ++---
51 files changed, 115 insertions(+), 146 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 bcc8bf2..d80a99e 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.MoreObjects;
+import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
/**
@@ -151,7 +151,7 @@ public class Bucket extends Resource {
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.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/4a483e59/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 1359fba..6d0d0ed 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,7 +25,6 @@ import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.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;
/**
@@ -96,7 +95,7 @@ public class BucketAccessControls extends Resource {
&& equal(this.id, that.id);
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.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/4a483e59/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 6405772..aeddc41 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,7 +25,6 @@ import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.ObjectRole
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;
/**
@@ -95,7 +94,7 @@ public class DefaultObjectAccessControls extends Resource {
return equal(this.kind, that.kind) && equal(this.entity, that.entity) && equal(this.role, that.role);
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.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/4a483e59/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/GCSObject.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/GCSObject.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/GCSObject.java
index 288a5c1..865cd90 100644
--- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/GCSObject.java
+++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/GCSObject.java
@@ -27,12 +27,11 @@ import java.util.Set;
import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.StorageClass;
import org.jclouds.googlecloudstorage.domain.internal.Owner;
-import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.hash.HashCode;
import com.google.common.io.BaseEncoding;
-import com.google.inject.Inject;
/**
* This class represent an object in a Google Cloud Storage Bucket.
@@ -62,7 +61,6 @@ public class GCSObject extends Resource {
private final String crc32c;
private final Integer componentCount;
- @Inject
private GCSObject(String id, URI selfLink, String etag, String name, String bucket, Long generation,
Long metageneration, String contentType, Date updated, Date timeDeleted, StorageClass storageClass,
Long size, String md5Hash, URI mediaLink, Map<String, String> metadata, String contentEncoding,
@@ -199,7 +197,7 @@ public class GCSObject extends Resource {
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string().omitNullValues().add("name", name).add("bucket", bucket).add("generation", generation)
.add("metageneration", metageneration).add("timeDeleted", timeDeleted).add("updated", updated)
.add("storageClass", storageClass).add("size", size).add("md5Hash", md5Hash).add("mediaLink", mediaLink)
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 9bde256..0a28d60 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.MoreObjects;
+import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
public class ListBucketAccessControls {
@@ -63,7 +63,7 @@ public class ListBucketAccessControls {
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return toStringHelper(this).omitNullValues().add("kind", kind).add("items", items);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 04645c3..2813e9c 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.MoreObjects;
+import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
public class ListDefaultObjectAccessControls {
@@ -63,7 +63,7 @@ public class ListDefaultObjectAccessControls {
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return toStringHelper(this).omitNullValues().add("kind", kind).add("items", items);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListObjectAccessControls.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListObjectAccessControls.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListObjectAccessControls.java
index a33d5bc..2e2944d 100644
--- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListObjectAccessControls.java
+++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListObjectAccessControls.java
@@ -17,16 +17,16 @@
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.util.Set;
import org.jclouds.googlecloudstorage.domain.Resource.Kind;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
public class ListObjectAccessControls {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 d296855..d01add6 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;
@@ -27,7 +27,6 @@ import java.util.Set;
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.ImmutableList;
@@ -89,7 +88,7 @@ public class ListPage<T> extends IterableWithMarker<T> {
return equal(this.kind, that.kind) && equal(this.items, that.items);
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.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/4a483e59/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ObjectAccessControls.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ObjectAccessControls.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ObjectAccessControls.java
index cdc8f67..3cf559f 100644
--- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ObjectAccessControls.java
+++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ObjectAccessControls.java
@@ -25,7 +25,6 @@ import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.ObjectRole
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;
/**
@@ -108,7 +107,7 @@ public class ObjectAccessControls extends Resource {
&& equal(this.entity, that.entity) && equal(this.id , that.id);
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string().omitNullValues().add("bucket", bucket).add("entity", entity).add("entityId", entityId)
.add("object", object).add("generation", generation).add("role", role).add("email", email)
.add("domain", domain).add("projectTeam", projectTeam);
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 196f831..89ef315 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.MoreObjects.ToStringHelper;
-import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.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/4a483e59/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ResumableUpload.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ResumableUpload.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ResumableUpload.java
index caeda2b..ebb80a1 100644
--- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ResumableUpload.java
+++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ResumableUpload.java
@@ -16,13 +16,13 @@
*/
package org.jclouds.googlecloudstorage.domain;
-import static com.google.common.base.MoreObjects.toStringHelper;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Represents results of resumable upload response.
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 a5fe1df..67431a3 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,9 +16,8 @@
*/
package org.jclouds.googlecloudstorage.domain.internal;
-import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -58,7 +57,7 @@ public class Action {
return true;
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return toStringHelper(this).add("type", type);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 782b4ac..0be95c6 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,12 +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 java.util.Set;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
@@ -77,7 +76,7 @@ public class BucketCors {
&& equal(this.responseHeader, that.responseHeader) && equal(this.maxAgeSeconds, that.maxAgeSeconds);
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.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/4a483e59/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 e0814f5..07a7461 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,11 +16,10 @@
*/
package org.jclouds.googlecloudstorage.domain.internal;
-import static com.google.common.base.MoreObjects.toStringHelper;
+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;
@@ -64,7 +63,7 @@ public class BucketLifeCycle {
return true;
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return toStringHelper(this).add("rule", rules);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 960b4d5..d298fe7 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,13 +16,12 @@
*/
package org.jclouds.googlecloudstorage.domain.internal;
-import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -96,7 +95,7 @@ public class Condition {
return true;
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.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/4a483e59/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 4273ed4..1bda912 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,11 +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 static com.google.common.base.Preconditions.checkNotNull;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -63,7 +62,7 @@ public class Logging {
return equal(this.logBucket, that.logBucket) && equal(this.logObjectPrefix, that.logObjectPrefix);
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return toStringHelper(this).add("logBucket", logBucket).add("logObjectPrefix", logObjectPrefix);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 52f2fbf..6f9cbdf 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,13 +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 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;
/**
@@ -61,7 +60,7 @@ public class Owner {
return equal(this.entity, that.entity);
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return toStringHelper(this).omitNullValues().add("entity", entity).add("entityId", entityId);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 1022b3e..f4bda2c 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,10 +16,9 @@
*/
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;
/**
@@ -78,7 +77,7 @@ public final class ProjectTeam {
return equal(this.projectNumber, that.projectNumber) && equal(this.team, that.team);
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return toStringHelper(this).add("projectNumber", projectNumber).add("team", team);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 36db832..45d298e 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,10 +16,9 @@
*/
package org.jclouds.googlecloudstorage.domain.internal;
-import static com.google.common.base.MoreObjects.toStringHelper;
+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;
/**
@@ -71,7 +70,7 @@ public class Rule {
return true;
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return toStringHelper(this).add("condition", condition).add("action", action);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 824e5c0..dd42113 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,9 +16,8 @@
*/
package org.jclouds.googlecloudstorage.domain.internal;
-import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -60,7 +59,7 @@ public final class Versioning {
return true;
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return toStringHelper(this).add("enabled", enabled);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 a824cec..7218c85 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,12 +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 org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -63,7 +62,7 @@ public class Website {
return equal(this.mainPageSuffix, that.mainPageSuffix);
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return toStringHelper(this).add("mainPageSuffix", mainPageSuffix).add("notFoundPage", notFoundPage);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 c090663..7abdb4f 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
@@ -75,7 +75,7 @@ import org.jclouds.http.HttpResponse;
import org.jclouds.logging.Logger;
import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.base.Supplier;
@@ -291,8 +291,8 @@ public class GoogleComputeEngineServiceAdapter implements ComputeServiceAdapter<
@Override
public Image getImage(String id) {
- return MoreObjects.firstNonNull(api.getImageApiForProject(userProject.get()).get(id),
- MoreObjects.firstNonNull(api.getImageApiForProject(DEBIAN_PROJECT).get(id),
+ return Objects.firstNonNull(api.getImageApiForProject(userProject.get()).get(id),
+ Objects.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/4a483e59/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 c279f19..b986e37 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.getUnchecked(nAr);
+ Network nw = networkCreator.apply(nAr);
return groupConverter.apply(nw);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 b65f152..14af9cd 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.getUnchecked(new NetworkAndAddressRange(networkName, DEFAULT_INTERNAL_NETWORK_RANGE, null));
+ return networkMap.apply(new NetworkAndAddressRange(networkName, DEFAULT_INTERNAL_NETWORK_RANGE, null));
}
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 a734f24..4bf6479 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.MoreObjects;
+import com.google.common.base.Objects;
/**
* A persistent disk resource
@@ -60,7 +60,7 @@ public abstract class AbstractDisk extends Resource {
* {@inheritDoc}
*/
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.omitNullValues()
.add("sizeGb", sizeGb)
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 b3d4386..85fda1f 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.MoreObjects;
+import com.google.common.base.Objects;
import com.google.common.base.Optional;
/**
@@ -101,7 +101,7 @@ public final class Address extends Resource {
* {@inheritDoc}
*/
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.omitNullValues()
.add("status", status)
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 3cb5500..26997e5 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,14 +16,13 @@
*/
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;
@@ -105,7 +104,7 @@ public class Deprecated {
&& equal(this.deleted, that.deleted);
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return toStringHelper(this)
.omitNullValues()
.add("state", state.orNull())
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 2e5ae42..d3896c1 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
@@ -27,7 +27,7 @@ import java.util.Date;
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;
/**
@@ -83,7 +83,7 @@ public final class Disk extends AbstractDisk {
* {@inheritDoc}
*/
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.omitNullValues()
.add("zone", zone);
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/DiskType.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/DiskType.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/DiskType.java
index 8919518..ac7224c 100644
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/DiskType.java
+++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/DiskType.java
@@ -23,7 +23,7 @@ import java.beans.ConstructorProperties;
import java.net.URI;
import java.util.Date;
-import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
import com.google.common.base.Optional;
/**
@@ -83,7 +83,7 @@ public final class DiskType extends Resource {
* {@inheritDoc}
*/
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.add("validDiskSize", validDiskSize.orNull())
.add("defaultDiskSizeGb", defaultDiskSizeGb)
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 a94fc78..545c206 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,7 +31,6 @@ 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;
@@ -115,7 +114,7 @@ public final class Firewall extends Resource {
* {@inheritDoc}
*/
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.add("network", network)
.add("sourceRanges", sourceRanges)
@@ -304,7 +303,7 @@ public final class Firewall extends Resource {
&& equal(this.ports, that.ports);
}
- public MoreObjects.ToStringHelper string() {
+ public Objects.ToStringHelper string() {
return toStringHelper(this)
.add("IpProtocol", ipProtocol).add("ports", ports);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 84c6975..44fc552 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,7 +26,6 @@ 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;
@@ -79,7 +78,7 @@ public final class Image extends Resource {
* {@inheritDoc}
*/
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.omitNullValues()
.add("sourceType", sourceType)
@@ -216,7 +215,7 @@ public final class Image extends Resource {
&& equal(this.sha1Checksum, that.sha1Checksum);
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return toStringHelper(this)
.omitNullValues()
.add("source", source)
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 eb7b92c..4b219f5 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,7 +30,6 @@ 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;
@@ -168,7 +167,7 @@ public class Instance extends Resource {
* {@inheritDoc}
*/
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.omitNullValues()
.add("items", tags)
@@ -388,7 +387,7 @@ public class Instance extends Resource {
&& equal(this.fingerprint, that.fingerprint);
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return toStringHelper(this)
.add("items", items)
.add("fingerprint", fingerprint);
@@ -491,7 +490,7 @@ public class Instance extends Resource {
return equal(this.index, that.index);
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return toStringHelper(this).add("index", index);
}
@@ -590,7 +589,7 @@ public class Instance extends Resource {
* {@inheritDoc}
*/
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return toStringHelper(this).add("boot", boot);
}
@@ -740,7 +739,7 @@ public class Instance extends Resource {
&& equal(this.network, that.network);
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return toStringHelper(this)
.add("name", name)
.add("network", network).add("networkIP", networkIP).add("accessConfigs",
@@ -891,7 +890,7 @@ public class Instance extends Resource {
&& equal(this.natIP, that.natIP);
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return toStringHelper(this)
.add("name", name).add("type", type).add("natIP", natIP);
}
@@ -1006,7 +1005,7 @@ public class Instance extends Resource {
return equal(this.selfLink, that.selfLink);
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return toStringHelper(this).add("selfLink", selfLink).add("contents", contents);
}
@@ -1111,7 +1110,7 @@ public class Instance extends Resource {
&& equal(this.scopes, that.scopes);
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return toStringHelper(this).add("email", email).add("scopes", scopes);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 6e17d75..7b118bc 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,7 +25,6 @@ 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;
@@ -418,8 +417,8 @@ public class InstanceTemplate {
return Objects.hashCode(description, image, disks, networkInterfaces, metadata, serviceAccounts);
}
- protected MoreObjects.ToStringHelper string() {
- MoreObjects.ToStringHelper toString = MoreObjects.toStringHelper("")
+ protected Objects.ToStringHelper string() {
+ Objects.ToStringHelper toString = Objects.toStringHelper("")
.omitNullValues();
toString.add("description", description);
if (disks.size() > 0)
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 86eeb35..59ec775 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;
@@ -26,7 +26,6 @@ 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.ImmutableList;
@@ -76,7 +75,7 @@ public class ListPage<T> extends IterableWithMarker<T> {
return equal(this.kind, that.kind) && equal(this.items, that.items);
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.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/4a483e59/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 eb59b7d..d847bcb 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,10 +16,11 @@
*/
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;
import java.net.URI;
import java.util.Date;
@@ -28,7 +29,6 @@ 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;
@@ -133,7 +133,7 @@ public final class MachineType extends Resource {
* {@inheritDoc}
*/
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.add("guestCpus", guestCpus)
.add("memoryMb", memoryMb)
@@ -302,7 +302,7 @@ public final class MachineType extends Resource {
return equal(this.diskGb, that.diskGb);
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return toStringHelper(this)
.add("diskGb", diskGb);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 e96aa40..da08214 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,15 +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 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;
@@ -78,7 +77,7 @@ public class Metadata {
&& equal(this.fingerprint, that.fingerprint);
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return toStringHelper(this)
.add("items", items)
.add("fingerprint", fingerprint);
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 c20eee2..a3c4bb0 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.MoreObjects;
+import com.google.common.base.Objects;
import com.google.common.base.Optional;
/**
@@ -72,7 +72,7 @@ public final class Network extends Resource {
* {@inheritDoc}
*/
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.omitNullValues()
.add("IPv4Range", IPv4Range)
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 5f7719c..f32c62d 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,7 +30,6 @@ 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;
@@ -205,7 +204,7 @@ public class Operation extends Resource {
* {@inheritDoc}
*/
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.omitNullValues()
.add("targetLink", targetLink)
@@ -488,7 +487,7 @@ public class Operation extends Resource {
&& equal(this.message, that.message);
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return toStringHelper(this)
.omitNullValues()
.add("code", code)
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 f2967da..2081e12 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.MoreObjects;
+import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
/**
@@ -75,7 +75,7 @@ public class Project extends Resource {
* {@inheritDoc}
*/
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.add("commonInstanceMetadata", commonInstanceMetadata)
.add("quotas", quotas)
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 f74b938..b1f4e04 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,9 +21,8 @@ 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.
@@ -86,7 +85,7 @@ public class Quota {
}
public ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.omitNullValues()
.add("metric", metric)
.add("usage", usage)
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 734a1dd..bd55e41 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.MoreObjects;
+import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
/**
@@ -86,7 +86,7 @@ public final class Region extends Resource {
* {@inheritDoc}
*/
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.add("status", status)
.add("zones", zones)
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 cec989c..e5c76cc 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.MoreObjects.ToStringHelper;
-import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.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/4a483e59/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 898dae0..2176670 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,7 +28,6 @@ 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;
@@ -142,7 +141,7 @@ public final class Route extends Resource {
* {@inheritDoc}
*/
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.add("network", network)
.add("tags", tags)
@@ -358,7 +357,7 @@ public final class Route extends Resource {
&& equal(this.data, that.data);
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return toStringHelper(this)
.add("code", code)
.add("message", message)
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 c46d1cd..71bebfe 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.MoreObjects;
+import com.google.common.base.Objects;
import com.google.common.base.Optional;
/**
@@ -71,7 +71,7 @@ public final class Snapshot extends AbstractDisk {
* {@inheritDoc}
*/
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.omitNullValues()
.add("sourceDisk", sourceDisk.orNull())
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 b2f6103..0f43daf 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,7 +29,6 @@ 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;
@@ -92,7 +91,7 @@ public final class Zone extends Resource {
* {@inheritDoc}
*/
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.add("status", status)
.add("maintenanceWindows", maintenanceWindows)
@@ -252,7 +251,7 @@ public final class Zone extends Resource {
&& equal(this.endTime, that.endTime);
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return toStringHelper(this)
.omitNullValues()
.add("name", name)
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 d05a9da..66fbd66 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/4a483e59/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 2143474..5c0b348 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.MoreObjects.ToStringHelper;
-import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.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/4a483e59/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 baacc11..c230e1d 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,11 +16,10 @@
*/
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 +121,7 @@ public class Header {
return string().toString();
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return toStringHelper(this).omitNullValues().add("signerAlgorithm", signerAlgorithm)
.add("type", type);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/4a483e59/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 ca2bd08..78cb402 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,14 +16,13 @@
*/
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;
/**
@@ -122,7 +121,7 @@ public class OAuthCredentials extends Credentials {
return string().toString();
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.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/4a483e59/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 ff44d69..a18a7eb 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,13 +16,12 @@
*/
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;
/**
@@ -142,7 +141,7 @@ public class Token {
return string().toString();
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.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/4a483e59/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 71f3420..7d1a6a4 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,11 +16,10 @@
*/
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;
/**
@@ -123,7 +122,7 @@ public class TokenRequest {
return string().toString();
}
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return toStringHelper(this).omitNullValues().add("header", header)
.add("claimSet", claimSet);
}
[2/2] git commit: JCLOUDS-653 remove test dep on guava 18 method.
Posted by ad...@apache.org.
JCLOUDS-653 remove test dep on guava 18 method.
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/2f828fee
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/2f828fee
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/2f828fee
Branch: refs/heads/master
Commit: 2f828feef1ee1ff704af7ff3d687e5165d07a134
Parents: 4a483e5
Author: Adrian Cole <ac...@twitter.com>
Authored: Fri Oct 24 11:17:03 2014 -0700
Committer: Adrian Cole <ac...@twitter.com>
Committed: Fri Oct 24 11:21:49 2014 -0700
----------------------------------------------------------------------
.../googlecloudstorage/features/ObjectApiLiveTest.java | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/2f828fee/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java
index 48c6b1f..5b213dc 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java
@@ -156,11 +156,7 @@ public class ObjectApiLiveTest extends BaseGoogleCloudStorageApiLiveTest {
assertEquals(gcsObject.getMd5HashCode(), hcMd5);
- // crc32c validation
- HashFunction hfCrc32c = Hashing.crc32c();
- hcCrc32c = hfCrc32c.newHasher().putBytes(testSource.read()).hash();
-
- assertEquals(gcsObject.getCrc32cHashcode(), hcCrc32c);
+ // TODO: crc32c validation without making a compile dep on guava 18+
}
@Test(groups = "live", dependsOnMethods = "testSimpleUpload")
@@ -383,8 +379,7 @@ public class ObjectApiLiveTest extends BaseGoogleCloudStorageApiLiveTest {
// This would trigger server side validation of md5
hcMd5 = byteSource.hash(Hashing.md5());
- // This would trigger server side validation of crc32c
- hcCrc32c = byteSource.hash(Hashing.crc32c());
+ // TODO: template.crc32c without making a compile dep on guava 18.
template.contentType("image/jpeg").addAcl(oacl).size(contentLength).name(MULTIPART_UPLOAD_OBJECT)
.contentLanguage("en").contentDisposition("attachment").md5Hash(hcMd5)