Repository: jclouds-labs-google Updated Branches: refs/heads/master cca44c2e6 -> b8670b16e
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b8670b16/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclInsertTest.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclInsertTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclInsertTest.java index 0e7c509..b38ce42 100644 --- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclInsertTest.java +++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclInsertTest.java @@ -16,13 +16,11 @@ */ package org.jclouds.googlecloudstorage.parse; -import java.net.URI; - import javax.ws.rs.Consumes; import javax.ws.rs.core.MediaType; import org.jclouds.googlecloudstorage.domain.BucketAccessControls; -import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.Role; +import org.jclouds.googlecloudstorage.domain.BucketAccessControls.Role; import org.jclouds.googlecloudstorage.internal.BaseGoogleCloudStorageParseTest; public class BucketAclInsertTest extends BaseGoogleCloudStorageParseTest<BucketAccessControls> { @@ -38,9 +36,7 @@ public class BucketAclInsertTest extends BaseGoogleCloudStorageParseTest<BucketA return BucketAccessControls .builder() .id("jcloudtestbucket/allAuthenticatedUsers") - .selfLink( - URI.create("https://content.googleapis.com/storage/v1/b/jcloudtestbucket/acl/allAuthenticatedUsers";)) - .bucket("jcloudtestbucket").entity("allAuthenticatedUsers").role(Role.WRITER).etag("CAQ=").build(); + .bucket("jcloudtestbucket").entity("allAuthenticatedUsers").role(Role.WRITER).build(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b8670b16/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclListTest.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclListTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclListTest.java index 6428825..077eb46 100644 --- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclListTest.java +++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclListTest.java @@ -16,34 +16,30 @@ */ package org.jclouds.googlecloudstorage.parse; -import java.net.URI; +import java.util.List; import javax.ws.rs.Consumes; import javax.ws.rs.core.MediaType; import org.jclouds.googlecloudstorage.domain.BucketAccessControls; -import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.Role; -import org.jclouds.googlecloudstorage.domain.ListBucketAccessControls; -import org.jclouds.googlecloudstorage.domain.Resource.Kind; -import org.jclouds.googlecloudstorage.domain.internal.ProjectTeam; -import org.jclouds.googlecloudstorage.domain.internal.ProjectTeam.Team; +import org.jclouds.googlecloudstorage.domain.BucketAccessControls.Role; +import org.jclouds.googlecloudstorage.domain.ProjectTeam; +import org.jclouds.googlecloudstorage.domain.ProjectTeam.Team; import org.jclouds.googlecloudstorage.internal.BaseGoogleCloudStorageParseTest; +import org.jclouds.rest.annotations.SelectJson; -import com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableList; -public class BucketAclListTest extends BaseGoogleCloudStorageParseTest<ListBucketAccessControls> { +public class BucketAclListTest extends BaseGoogleCloudStorageParseTest<List<BucketAccessControls>> { private BucketAccessControls item_1 = BucketAccessControls.builder().id("jcloudtestbucket/allUsers") - .selfLink(URI.create("https://content.googleapis.com/storage/v1/b/jcloudtestbucket/acl/allUsers";)) - .bucket("jcloudtestbucket").entity("allUsers").role(Role.READER).etag("CAc=").build(); + .bucket("jcloudtestbucket").entity("allUsers").role(Role.READER).build(); private BucketAccessControls item_2 = BucketAccessControls .builder() .id("jcloudtestbucket/project-owners-1082289308625") - .selfLink( - URI.create("https://content.googleapis.com/storage/v1/b/jcloudtestbucket/acl/project-owners-1082289308625";)) - .projectTeam(ProjectTeam.builder().projectNumber("1082289308625").team(Team.OWNERS).build()) - .bucket("jcloudtestbucket").entity("project-owners-1082289308625").role(Role.OWNER).etag("CAc=").build(); + .projectTeam(ProjectTeam.create("1082289308625", Team.OWNERS)) + .bucket("jcloudtestbucket").entity("project-owners-1082289308625").role(Role.OWNER).build(); @Override public String resource() { @@ -52,8 +48,8 @@ public class BucketAclListTest extends BaseGoogleCloudStorageParseTest<ListBucke @Override @Consumes(MediaType.APPLICATION_JSON) - public ListBucketAccessControls expected() { - return ListBucketAccessControls.builder().kind(Kind.BUCKET_ACCESS_CONTROLS) - .items(ImmutableSet.of(item_1, item_2)).build(); + @SelectJson("items") + public List<BucketAccessControls> expected() { + return ImmutableList.of(item_1, item_2); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b8670b16/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclUpdateTest.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclUpdateTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclUpdateTest.java index d111801..bfba5e1 100644 --- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclUpdateTest.java +++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclUpdateTest.java @@ -16,13 +16,11 @@ */ package org.jclouds.googlecloudstorage.parse; -import java.net.URI; - import javax.ws.rs.Consumes; import javax.ws.rs.core.MediaType; import org.jclouds.googlecloudstorage.domain.BucketAccessControls; -import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.Role; +import org.jclouds.googlecloudstorage.domain.BucketAccessControls.Role; import org.jclouds.googlecloudstorage.internal.BaseGoogleCloudStorageParseTest; public class BucketAclUpdateTest extends BaseGoogleCloudStorageParseTest<BucketAccessControls> { @@ -36,7 +34,6 @@ public class BucketAclUpdateTest extends BaseGoogleCloudStorageParseTest<BucketA @Consumes(MediaType.APPLICATION_JSON) public BucketAccessControls expected() { return BucketAccessControls.builder().id("jcloudtestbucket/allUsers") - .selfLink(URI.create("https://content.googleapis.com/storage/v1/b/jcloudtestbucket/acl/allUsers";)) - .bucket("jcloudtestbucket").entity("allUsers").role(Role.OWNER).etag("CAg=").build(); + .bucket("jcloudtestbucket").entity("allUsers").role(Role.OWNER).build(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b8670b16/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketUpdateTest.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketUpdateTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketUpdateTest.java index 49c09fd..da57c19 100644 --- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketUpdateTest.java +++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketUpdateTest.java @@ -16,8 +16,6 @@ */ package org.jclouds.googlecloudstorage.parse; -import java.net.URI; - import javax.ws.rs.Consumes; import javax.ws.rs.core.MediaType; @@ -25,7 +23,7 @@ import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.googlecloudstorage.domain.Bucket; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.Location; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.StorageClass; -import org.jclouds.googlecloudstorage.domain.internal.Owner; +import org.jclouds.googlecloudstorage.domain.Owner; import org.jclouds.googlecloudstorage.internal.BaseGoogleCloudStorageParseTest; public class BucketUpdateTest extends BaseGoogleCloudStorageParseTest<Bucket> { @@ -38,12 +36,22 @@ public class BucketUpdateTest extends BaseGoogleCloudStorageParseTest<Bucket> { @Override @Consumes(MediaType.APPLICATION_JSON) public Bucket expected() { - return Bucket.builder().id("bhashbucket") - .selfLink(URI.create("https://www.googleapis.com/storage/v1/b/bhashbucket";)).name("bhashbucket") - .projectNumber(Long.valueOf("1082289308625")) - .timeCreated(new SimpleDateFormatDateService().iso8601DateParse("2014-06-02T19:19:41.112z")) - .metageneration(Long.valueOf(204)).location(Location.US).storageClass(StorageClass.STANDARD) - .etag("CMwB").owner(Owner.builder().entity("project-owners-1082289308625").build()).build(); - + return Bucket.create( + "bhashbucket", // id + "bhashbucket", // name + 1082289308625l, // projectNumber + new SimpleDateFormatDateService().iso8601DateParse("2014-06-02T19:19:41.112z"), // timeCreated + 204l, // metageneration + null, // acl + null, // defaultObjectAcl + Owner.create("project-owners-1082289308625", null), // owner + Location.US, // location + null, // website + null, // logging + null, // versioning + null, // cors + null, // lifeCycle + StorageClass.STANDARD // storageClass + ); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b8670b16/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclGetTest.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclGetTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclGetTest.java index 150374d..0183d71 100644 --- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclGetTest.java +++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclGetTest.java @@ -20,12 +20,12 @@ import javax.ws.rs.Consumes; import javax.ws.rs.core.MediaType; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.ObjectRole; -import org.jclouds.googlecloudstorage.domain.DefaultObjectAccessControls; -import org.jclouds.googlecloudstorage.domain.internal.ProjectTeam; -import org.jclouds.googlecloudstorage.domain.internal.ProjectTeam.Team; +import org.jclouds.googlecloudstorage.domain.ObjectAccessControls; +import org.jclouds.googlecloudstorage.domain.ProjectTeam; +import org.jclouds.googlecloudstorage.domain.ProjectTeam.Team; import org.jclouds.googlecloudstorage.internal.BaseGoogleCloudStorageParseTest; -public class DefaultObjectAclGetTest extends BaseGoogleCloudStorageParseTest<DefaultObjectAccessControls> { +public class DefaultObjectAclGetTest extends BaseGoogleCloudStorageParseTest<ObjectAccessControls> { @Override public String resource() { @@ -34,9 +34,9 @@ public class DefaultObjectAclGetTest extends BaseGoogleCloudStorageParseTest<Def @Override @Consumes(MediaType.APPLICATION_JSON) - public DefaultObjectAccessControls expected() { - return DefaultObjectAccessControls.builder().entity("project-owners-1082289308625").role(ObjectRole.OWNER) - .etag("CAk=").projectTeam(ProjectTeam.builder().projectNumber("1082289308625").team(Team.OWNERS).build()) + public ObjectAccessControls expected() { + return ObjectAccessControls.builder().entity("project-owners-1082289308625").role(ObjectRole.OWNER) + .projectTeam(ProjectTeam.create("1082289308625", Team.OWNERS)) .build(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b8670b16/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclInsertTest.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclInsertTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclInsertTest.java index e14ab16..c449c42 100644 --- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclInsertTest.java +++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclInsertTest.java @@ -19,11 +19,11 @@ package org.jclouds.googlecloudstorage.parse; import javax.ws.rs.Consumes; import javax.ws.rs.core.MediaType; -import org.jclouds.googlecloudstorage.domain.DefaultObjectAccessControls; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.ObjectRole; +import org.jclouds.googlecloudstorage.domain.ObjectAccessControls; import org.jclouds.googlecloudstorage.internal.BaseGoogleCloudStorageParseTest; -public class DefaultObjectAclInsertTest extends BaseGoogleCloudStorageParseTest<DefaultObjectAccessControls> { +public class DefaultObjectAclInsertTest extends BaseGoogleCloudStorageParseTest<ObjectAccessControls> { @Override public String resource() { @@ -32,8 +32,7 @@ public class DefaultObjectAclInsertTest extends BaseGoogleCloudStorageParseTest< @Override @Consumes(MediaType.APPLICATION_JSON) - public DefaultObjectAccessControls expected() { - return DefaultObjectAccessControls.builder().entity("allUsers").role(ObjectRole.OWNER).etag("CAo=").build(); - + public ObjectAccessControls expected() { + return ObjectAccessControls.builder().entity("allUsers").role(ObjectRole.OWNER).build(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b8670b16/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclListTest.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclListTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclListTest.java index ee7115c..afc66ae 100644 --- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclListTest.java +++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/DefaultObjectAclListTest.java @@ -16,22 +16,24 @@ */ package org.jclouds.googlecloudstorage.parse; +import java.util.Arrays; +import java.util.List; + import javax.ws.rs.Consumes; import javax.ws.rs.core.MediaType; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.ObjectRole; -import org.jclouds.googlecloudstorage.domain.DefaultObjectAccessControls; -import org.jclouds.googlecloudstorage.domain.ListDefaultObjectAccessControls; -import org.jclouds.googlecloudstorage.domain.Resource.Kind; -import org.jclouds.googlecloudstorage.domain.internal.ProjectTeam; -import org.jclouds.googlecloudstorage.domain.internal.ProjectTeam.Team; +import org.jclouds.googlecloudstorage.domain.ObjectAccessControls; +import org.jclouds.googlecloudstorage.domain.ProjectTeam; +import org.jclouds.googlecloudstorage.domain.ProjectTeam.Team; import org.jclouds.googlecloudstorage.internal.BaseGoogleCloudStorageParseTest; +import org.jclouds.rest.annotations.SelectJson; -public class DefaultObjectAclListTest extends BaseGoogleCloudStorageParseTest<ListDefaultObjectAccessControls> { +public class DefaultObjectAclListTest extends BaseGoogleCloudStorageParseTest<List<ObjectAccessControls>> { - private DefaultObjectAccessControls item_1 = DefaultObjectAccessControls.builder() + private ObjectAccessControls item_1 = ObjectAccessControls.builder() .entity("project-owners-1082289308625").role(ObjectRole.OWNER) - .projectTeam(ProjectTeam.builder().projectNumber("1082289308625").team(Team.OWNERS).build()).etag("CAk=") + .projectTeam(ProjectTeam.create("1082289308625", Team.OWNERS)) .build(); @Override @@ -41,7 +43,8 @@ public class DefaultObjectAclListTest extends BaseGoogleCloudStorageParseTest<Li @Override @Consumes(MediaType.APPLICATION_JSON) - public ListDefaultObjectAccessControls expected() { - return ListDefaultObjectAccessControls.builder().kind(Kind.OBJECT_ACCESS_CONTROLS).addItems(item_1).build(); + @SelectJson("items") + public List<ObjectAccessControls> expected() { + return Arrays.asList(item_1); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b8670b16/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/FullBucketGetTest.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/FullBucketGetTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/FullBucketGetTest.java index e6ffa05..14d473b 100644 --- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/FullBucketGetTest.java +++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/FullBucketGetTest.java @@ -16,23 +16,23 @@ */ package org.jclouds.googlecloudstorage.parse; -import java.net.URI; +import java.util.Arrays; import javax.ws.rs.Consumes; import javax.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; +import org.jclouds.googlecloudstorage.domain.Bucket; +import org.jclouds.googlecloudstorage.domain.Bucket.Cors; import org.jclouds.googlecloudstorage.domain.BucketAccessControls; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.Location; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.ObjectRole; -import org.jclouds.googlecloudstorage.domain.Bucket; -import org.jclouds.googlecloudstorage.domain.DefaultObjectAccessControls; -import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.Role; +import org.jclouds.googlecloudstorage.domain.BucketAccessControls.Role; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.StorageClass; -import org.jclouds.googlecloudstorage.domain.internal.BucketCors; -import org.jclouds.googlecloudstorage.domain.internal.Owner; -import org.jclouds.googlecloudstorage.domain.internal.ProjectTeam; -import org.jclouds.googlecloudstorage.domain.internal.ProjectTeam.Team; +import org.jclouds.googlecloudstorage.domain.ObjectAccessControls; +import org.jclouds.googlecloudstorage.domain.Owner; +import org.jclouds.googlecloudstorage.domain.ProjectTeam; +import org.jclouds.googlecloudstorage.domain.ProjectTeam.Team; import org.jclouds.googlecloudstorage.internal.BaseGoogleCloudStorageParseTest; public class FullBucketGetTest extends BaseGoogleCloudStorageParseTest<Bucket> { @@ -40,17 +40,16 @@ public class FullBucketGetTest extends BaseGoogleCloudStorageParseTest<Bucket> { private final BucketAccessControls acl1 = BucketAccessControls .builder() .id("jcloudtestbucket3500/project-owners-1082289308625") - .selfLink( - URI.create("https://www.googleapis.com/storage/v1/b/jcloudtestbucket3500/acl/project-owners-1082289308625";)) .bucket("jcloudtestbucket3500").entity("project-owners-1082289308625").role(Role.OWNER) - .projectTeam(ProjectTeam.builder().projectNumber("1082289308625").team(Team.OWNERS).build()).etag("CAo=") + .projectTeam(ProjectTeam.create("1082289308625", Team.OWNERS)) .build(); - private final DefaultObjectAccessControls defObjectAcl = DefaultObjectAccessControls.builder() - .entity("project-owners-1082289308625").role(ObjectRole.OWNER).etag("CAo=").build(); + private final ObjectAccessControls defObjectAcl = ObjectAccessControls.builder() + .entity("project-owners-1082289308625").role(ObjectRole.OWNER).build(); - private final BucketCors bucketCors = BucketCors.builder().addOrigin("http://example.appspot.com";).addMethod("GET") - .addMethod("HEAD").addResponseHeader("x-meta-goog-custom").maxAgeSeconds(10).build(); + private final Cors bucketCors = Cors + .create(Arrays.asList("http://example.appspot.com";), Arrays.asList("GET", "HEAD"), + Arrays.asList("x-meta-goog-custom"), 10); @Override public String resource() { @@ -60,13 +59,22 @@ public class FullBucketGetTest extends BaseGoogleCloudStorageParseTest<Bucket> { @Override @Consumes(MediaType.APPLICATION_JSON) public Bucket expected() { - return Bucket.builder().id("jcloudtestbucket3500") - .selfLink(URI.create("https://www.googleapis.com/storage/v1/b/jcloudtestbucket3500";)) - .name("jcloudtestbucket3500").projectNumber(Long.valueOf("1082289308625")) - .timeCreated(new SimpleDateFormatDateService().iso8601DateParse("2014-06-19T14:03:22.345Z")) - .metageneration(Long.valueOf(10)).owner(Owner.builder().entity("project-owners-1082289308625").build()) - .location(Location.US).storageClass(StorageClass.STANDARD).etag("CAo=").addAcl(acl1) - .addDefaultObjectAcl(defObjectAcl).addCORS(bucketCors).build(); + return Bucket.create( + "jcloudtestbucket3500", // id + "jcloudtestbucket3500", // name + 1082289308625l, // projectNumber + new SimpleDateFormatDateService().iso8601DateParse("2014-06-19T14:03:22.345Z"), // timeCreated + 10l, // metageneration + Arrays.asList(acl1), // acl + Arrays.asList(defObjectAcl), // defaultObjectAcl + Owner.create("project-owners-1082289308625", null), // owner + Location.US, // location + null, // website + null, // logging + null, // versioning + Arrays.asList(bucketCors), // cors + null, // lifeCycle + StorageClass.STANDARD // storageClass + ); } - } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b8670b16/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/NoAclBucketListTest.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/NoAclBucketListTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/NoAclBucketListTest.java index 220fd5b..af160fd 100644 --- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/NoAclBucketListTest.java +++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/NoAclBucketListTest.java @@ -16,7 +16,7 @@ */ package org.jclouds.googlecloudstorage.parse; -import java.net.URI; +import java.util.Arrays; import javax.ws.rs.Consumes; import javax.ws.rs.core.MediaType; @@ -26,28 +26,35 @@ import org.jclouds.googlecloudstorage.domain.Bucket; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.Location; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.StorageClass; import org.jclouds.googlecloudstorage.domain.ListPage; -import org.jclouds.googlecloudstorage.domain.Resource.Kind; -import org.jclouds.googlecloudstorage.domain.internal.Owner; +import org.jclouds.googlecloudstorage.domain.Owner; import org.jclouds.googlecloudstorage.internal.BaseGoogleCloudStorageParseTest; public class NoAclBucketListTest extends BaseGoogleCloudStorageParseTest<ListPage<Bucket>> { - private Bucket item1 = Bucket.builder().id("bhashbucket") - .selfLink(URI.create("https://content.googleapis.com/storage/v1/b/bhashbucket";)).name("bhashbucket") - .projectNumber(Long.valueOf("1082289308625")) - .timeCreated(new SimpleDateFormatDateService().iso8601DateParse("2014-06-02T19:19:41.112z")) - .metageneration(Long.valueOf(99)).owner(Owner.builder().entity("project-owners-1082289308625").build()) - .location(Location.US).storageClass(StorageClass.STANDARD).etag("CGM=").build(); + private Bucket item1 = Bucket.create("bhashbucket", // id + "bhashbucket", // name + 1082289308625l, // projectNumber + new SimpleDateFormatDateService().iso8601DateParse("2014-06-02T19:19:41.112z"), // timeCreated + 99l, // metageneration + null, // acl + null, // defaultObjectAcl + Owner.create("project-owners-1082289308625", null), // owner + Location.US, // location + null, // website + null, // logging + null, // versioning + null, // cors + null, // lifeCycle + StorageClass.STANDARD // storageClass + ); @Override public String resource() { return "/no_acl_bucket_list.json"; } - @Override - @Consumes(MediaType.APPLICATION_JSON) + @Override @Consumes(MediaType.APPLICATION_JSON) public ListPage<Bucket> expected() { - return ListPage.<Bucket> builder().kind(Kind.BUCKETS).nextPageToken("bhashbucket").addItem(item1).build(); + return ListPage.create(Arrays.asList(item1), "bhashbucket", null); } - } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b8670b16/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/NoAclBucketTest.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/NoAclBucketTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/NoAclBucketTest.java index 184af67..a2f4091 100644 --- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/NoAclBucketTest.java +++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/NoAclBucketTest.java @@ -16,8 +16,6 @@ */ package org.jclouds.googlecloudstorage.parse; -import java.net.URI; - import javax.ws.rs.Consumes; import javax.ws.rs.core.MediaType; @@ -25,7 +23,7 @@ import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.googlecloudstorage.domain.Bucket; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.Location; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.StorageClass; -import org.jclouds.googlecloudstorage.domain.internal.Owner; +import org.jclouds.googlecloudstorage.domain.Owner; import org.jclouds.googlecloudstorage.internal.BaseGoogleCloudStorageParseTest; public class NoAclBucketTest extends BaseGoogleCloudStorageParseTest<Bucket> { @@ -38,12 +36,22 @@ public class NoAclBucketTest extends BaseGoogleCloudStorageParseTest<Bucket> { @Override @Consumes(MediaType.APPLICATION_JSON) public Bucket expected() { - return Bucket.builder().id("bhashbucket") - .selfLink(URI.create("https://content.googleapis.com/storage/v1/b/bhashbucket";)).name("bhashbucket") - .projectNumber(Long.valueOf("1082289308625")) - .timeCreated(new SimpleDateFormatDateService().iso8601DateParse("2014-06-02T19:19:41.112z")) - .metageneration(Long.valueOf(87)).owner(Owner.builder().entity("project-owners-1082289308625").build()) - .location(Location.US).storageClass(StorageClass.STANDARD).etag("CFc=").build(); + return Bucket.create( + "bhashbucket", // id + "bhashbucket", // name + 1082289308625l, // projectNumber + new SimpleDateFormatDateService().iso8601DateParse("2014-06-02T19:19:41.112z"), // timeCreated + 87l, // metageneration + null, // acl + null, // defaultObjectAcl + Owner.create("project-owners-1082289308625", null), // owner + Location.US, // location + null, // website + null, // logging + null, // versioning + null, // cors + null, // lifeCycle + StorageClass.STANDARD // storageClass + ); } - } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b8670b16/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclGetTest.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclGetTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclGetTest.java index ff34b35..d50c284 100644 --- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclGetTest.java +++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclGetTest.java @@ -16,15 +16,13 @@ */ package org.jclouds.googlecloudstorage.parse; -import java.net.URI; - import javax.ws.rs.Consumes; import javax.ws.rs.core.MediaType; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.ObjectRole; import org.jclouds.googlecloudstorage.domain.ObjectAccessControls; -import org.jclouds.googlecloudstorage.domain.internal.ProjectTeam; -import org.jclouds.googlecloudstorage.domain.internal.ProjectTeam.Team; +import org.jclouds.googlecloudstorage.domain.ProjectTeam; +import org.jclouds.googlecloudstorage.domain.ProjectTeam.Team; import org.jclouds.googlecloudstorage.internal.BaseGoogleCloudStorageParseTest; public class ObjectAclGetTest extends BaseGoogleCloudStorageParseTest<ObjectAccessControls> { @@ -44,10 +42,7 @@ public class ObjectAclGetTest extends BaseGoogleCloudStorageParseTest<ObjectAcce .generation(1394121608485000L) .entity("project-owners-1082289308625") .role(ObjectRole.OWNER) - .etag("CIix/dmj/rwCEAE=") - .projectTeam(ProjectTeam.builder().projectNumber("1082289308625").team(Team.OWNERS).build()) - .selfLink( - URI.create("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/project-owners-1082289308625";)) + .projectTeam(ProjectTeam.create("1082289308625", Team.OWNERS)) .id("jcloudtestbucket/foo.txt/1394121608485000/project-owners-1082289308625").build(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b8670b16/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclInsertTest.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclInsertTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclInsertTest.java index 9fc938c..595687b 100644 --- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclInsertTest.java +++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclInsertTest.java @@ -16,8 +16,6 @@ */ package org.jclouds.googlecloudstorage.parse; -import java.net.URI; - import javax.ws.rs.Consumes; import javax.ws.rs.core.MediaType; @@ -37,13 +35,10 @@ public class ObjectAclInsertTest extends BaseGoogleCloudStorageParseTest<ObjectA public ObjectAccessControls expected() { return ObjectAccessControls .builder() - .selfLink( - URI.create("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d";)) .bucket("jcloudtestbucket").object("foo.txt") .entity("user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d") .entityId("00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d").role(ObjectRole.OWNER) - .etag("CIix/dmj/rwCEAE=").build(); - + .build(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b8670b16/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclListTest.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclListTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclListTest.java index 5e95b5b..7e7c4ed 100644 --- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclListTest.java +++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclListTest.java @@ -16,28 +16,26 @@ */ package org.jclouds.googlecloudstorage.parse; -import java.net.URI; +import java.util.Arrays; +import java.util.List; import javax.ws.rs.Consumes; import javax.ws.rs.core.MediaType; import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.ObjectRole; -import org.jclouds.googlecloudstorage.domain.ListObjectAccessControls; import org.jclouds.googlecloudstorage.domain.ObjectAccessControls; -import org.jclouds.googlecloudstorage.domain.Resource.Kind; import org.jclouds.googlecloudstorage.internal.BaseGoogleCloudStorageParseTest; +import org.jclouds.rest.annotations.SelectJson; -public class ObjectAclListTest extends BaseGoogleCloudStorageParseTest<ListObjectAccessControls> { +public class ObjectAclListTest extends BaseGoogleCloudStorageParseTest<List<ObjectAccessControls>> { private ObjectAccessControls item1 = ObjectAccessControls .builder() .id("jcloudtestbucket/foo.txt/1394121608485000/user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d") - .selfLink( - URI.create("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d";)) .bucket("jcloudtestbucket").object("foo.txt").generation(Long.valueOf("1394121608485000")) .entity("user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d") .entityId("00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d").role(ObjectRole.OWNER) - .etag("CIix/dmj/rwCEAE=").build(); + .build(); @Override public String resource() { @@ -46,8 +44,8 @@ public class ObjectAclListTest extends BaseGoogleCloudStorageParseTest<ListObjec @Override @Consumes(MediaType.APPLICATION_JSON) - public ListObjectAccessControls expected() { - return ListObjectAccessControls.builder().kind(Kind.OBJECT_ACCESS_CONTROLS).addItems(item1).build(); + @SelectJson("items") + public List<ObjectAccessControls> expected() { + return Arrays.asList(item1); } - } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b8670b16/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclUpdateTest.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclUpdateTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclUpdateTest.java index e48b2ee..5b5cd60 100644 --- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclUpdateTest.java +++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclUpdateTest.java @@ -16,8 +16,6 @@ */ package org.jclouds.googlecloudstorage.parse; -import java.net.URI; - import javax.ws.rs.Consumes; import javax.ws.rs.core.MediaType; @@ -36,9 +34,7 @@ public class ObjectAclUpdateTest extends BaseGoogleCloudStorageParseTest<ObjectA @Consumes(MediaType.APPLICATION_JSON) public ObjectAccessControls expected() { return ObjectAccessControls.builder() - .selfLink(URI.create("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/allUsers";)) - .bucket("jcloudtestbucket").object("foo.txt").entity("allUsers").role(ObjectRole.OWNER) - .etag("CIix/dmj/rwCEAQ=").build(); + .bucket("jcloudtestbucket").object("foo.txt").entity("allUsers").role(ObjectRole.OWNER).build(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b8670b16/oauth/pom.xml ---------------------------------------------------------------------- diff --git a/oauth/pom.xml b/oauth/pom.xml index 7c22dcb..a13d15b 100644 --- a/oauth/pom.xml +++ b/oauth/pom.xml @@ -51,7 +51,6 @@ <dependency> <groupId>com.google.auto.value</groupId> <artifactId>auto-value</artifactId> - <version>1.0-rc2</version> <scope>provided</scope> </dependency> <dependency>
