Repository: jclouds-labs-google Updated Branches: refs/heads/master d045567aa -> 521a0c05f
JCLOUDS-750 adjust for changes in @SerializedNames contract. 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/521a0c05 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/521a0c05 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/521a0c05 Branch: refs/heads/master Commit: 521a0c05f3e7ff5c91a28e73494d0b0091cb8aaf Parents: 192f9ae Author: Adrian Cole <[email protected]> Authored: Sat Nov 1 12:31:27 2014 -0700 Committer: Adrian Cole <[email protected]> Committed: Sun Nov 2 08:28:42 2014 -0800 ---------------------------------------------------------------------- .../googlecloudstorage/domain/BucketAccessControls.java | 10 ++++++---- .../org/jclouds/googlecloudstorage/domain/ListPage.java | 8 ++++---- 2 files changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/521a0c05/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 f6fc12f..732057a 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 @@ -33,6 +33,7 @@ public abstract class BucketAccessControls { READER, WRITER, OWNER } + // TODO: ensure this is actually needed on input. public abstract String kind(); public abstract String id(); @@ -51,10 +52,10 @@ public abstract class BucketAccessControls { @Nullable public abstract ProjectTeam projectTeam(); - @SerializedNames({ "id", "bucket", "entity", "entityId", "role", "email", "domain", "projectTeam" }) - public static BucketAccessControls create(String id, String bucket, String entity, String entityId, Role role, + @SerializedNames({ "kind", "id", "bucket", "entity", "entityId", "role", "email", "domain", "projectTeam" }) + static BucketAccessControls create(String kind, String id, String bucket, String entity, String entityId, Role role, String email, String domain, ProjectTeam projectTeam) { - return new AutoValue_BucketAccessControls("storage#bucketAccessControl", + return new AutoValue_BucketAccessControls(kind, id == null ? (bucket + "/" + entity) : id, bucket, entity, entityId, role, email, domain, projectTeam); } @@ -114,7 +115,8 @@ public abstract class BucketAccessControls { } public BucketAccessControls build() { - return BucketAccessControls.create(id, bucket, entity, entityId, role, email, domain, projectTeam); + return BucketAccessControls + .create("storage#bucketAccessControl", id, bucket, entity, entityId, role, email, domain, projectTeam); } } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/521a0c05/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 147e3c7..efa017c 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,10 +16,10 @@ */ package org.jclouds.googlecloudstorage.domain; +import java.beans.ConstructorProperties; import java.util.List; import org.jclouds.javax.annotation.Nullable; -import org.jclouds.json.SerializedNames; import com.google.common.collect.ForwardingList; import com.google.common.collect.ImmutableList; @@ -27,7 +27,7 @@ import com.google.common.collect.ImmutableList; /** * The collection returned from any <code>listFirstPage()</code> method. */ -public class ListPage<T> extends ForwardingList<T> { +public final class ListPage<T> extends ForwardingList<T> { private final List<T> items; private final String nextPageToken; @@ -37,8 +37,8 @@ public class ListPage<T> extends ForwardingList<T> { return new ListPage<T>(items, nextPageToken, prefixes); } - @SerializedNames({ "items", "nextPageToken", "prefixes" }) - protected ListPage(Iterable<T> items, String nextPageToken, List<String> prefixes) { + @ConstructorProperties({ "items", "nextPageToken", "prefixes" }) + ListPage(Iterable<T> items, String nextPageToken, List<String> prefixes) { this.items = items != null ? ImmutableList.copyOf(items) : ImmutableList.<T>of(); this.nextPageToken = nextPageToken; this.prefixes = prefixes != null ? prefixes : ImmutableList.<String>of();
