You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2014/08/26 08:02:34 UTC
git commit: JCLOUDS-458: Resource name changes
Repository: jclouds-labs-google
Updated Branches:
refs/heads/master 19b43e5e3 -> b5bbb6cbf
JCLOUDS-458: Resource name changes
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/b5bbb6cb
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/b5bbb6cb
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/b5bbb6cb
Branch: refs/heads/master
Commit: b5bbb6cbf70edfbb357a8330ba56fea8d1657309
Parents: 19b43e5
Author: hsbhathiya <hs...@gmail.com>
Authored: Tue Aug 26 10:18:00 2014 +0530
Committer: Andrew Gaul <ga...@apache.org>
Committed: Mon Aug 25 23:01:05 2014 -0700
----------------------------------------------------------------------
.../BucketAccessControlsApiExpectTest.java | 16 ++++++------
.../features/BucketApiExpectTest.java | 14 +++++-----
...efaultObjectAccessControlsApiExpectTest.java | 20 +++++++--------
.../ObjectAccessControlsApiExpectTest.java | 26 +++++++++----------
.../parse/BucketAclGetTest.java | 2 +-
.../parse/BucketAclInsertTest.java | 2 +-
.../parse/BucketAclListTest.java | 2 +-
.../parse/BucketAclUpdateTest.java | 2 +-
.../parse/DefaultObjectAclGetTest.java | 2 +-
.../parse/DefaultObjectAclInsertTest.java | 2 +-
.../parse/DefaultObjectAclListTest.java | 2 +-
.../parse/NoAclBucketListTest.java | 2 +-
.../parse/NoAclBucketTest.java | 2 +-
.../parse/ObjectAclGetTest.java | 2 +-
.../parse/ObjectAclInsertTest.java | 2 +-
.../parse/ObjectAclListTest.java | 2 +-
.../parse/ObjectAclUpdateTest.java | 2 +-
.../src/test/resources/bucket_acl_get.json | 9 +++++++
.../resources/bucket_acl_insert_response.json | 9 +++++++
.../src/test/resources/bucket_acl_list.json | 27 ++++++++++++++++++++
.../resources/bucket_acl_update_initial.json | 9 +++++++
.../resources/bucket_acl_update_response.json | 9 +++++++
.../bucket_insert_request_payload.json | 3 +++
.../resources/bucket_insert_requestpayload.json | 3 ---
.../bucket_update_request_payload.json | 12 +++++++++
.../resources/bucket_update_requestpayload.json | 12 ---------
.../src/test/resources/bucketacl_get.json | 9 -------
.../resources/bucketacl_insert_response.json | 9 -------
.../src/test/resources/bucketacl_list.json | 27 --------------------
.../resources/bucketacl_update_initial.json | 9 -------
.../resources/bucketacl_update_response.json | 9 -------
.../test/resources/default_object_acl_get.json | 10 ++++++++
...fault_object_acl_insert_request_payload.json | 4 +++
.../default_object_acl_insert_response.json | 6 +++++
.../test/resources/default_object_acl_list.json | 15 +++++++++++
.../default_object_acl_update_initial.json | 6 +++++
...fault_object_acl_update_request_payload.json | 5 ++++
.../test/resources/default_objectacl_get.json | 10 --------
...default_objectacl_insert_requestpayload.json | 4 ---
.../default_objectacl_insert_response.json | 6 -----
.../test/resources/default_objectacl_list.json | 15 -----------
.../default_objectacl_update_initial.json | 6 -----
...default_objectacl_update_requestpayload.json | 5 ----
.../resources/list_bucket_with_options.json | 21 +++++++++++++++
.../test/resources/list_bucket_withoptions.json | 21 ---------------
.../src/test/resources/noAcl_bucket.json | 15 -----------
.../src/test/resources/noAcl_bucket_list.json | 21 ---------------
.../src/test/resources/no_acl_bucket.json | 15 +++++++++++
.../src/test/resources/no_acl_bucket_list.json | 21 +++++++++++++++
.../src/test/resources/object_acl_get.json | 15 +++++++++++
.../object_acl_insert_request_payload.json | 4 +++
.../resources/object_acl_insert_response.json | 10 ++++++++
.../src/test/resources/object_acl_list.json | 17 ++++++++++++
.../resources/object_acl_request_payload.json | 4 +++
.../resources/object_acl_update_initial.json | 9 +++++++
.../resources/object_acl_update_response.json | 9 +++++++
.../src/test/resources/objectacl_get.json | 15 -----------
.../objectacl_insert_requestpayload.json | 4 ---
.../resources/objectacl_insert_response.json | 10 --------
.../src/test/resources/objectacl_list.json | 17 ------------
.../resources/objectacl_request_payload.json | 4 ---
.../resources/objectacl_update_initial.json | 9 -------
.../resources/objectacl_update_response.json | 9 -------
63 files changed, 300 insertions(+), 300 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketAccessControlsApiExpectTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketAccessControlsApiExpectTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketAccessControlsApiExpectTest.java
index 8dde326..432ad2d 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketAccessControlsApiExpectTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketAccessControlsApiExpectTest.java
@@ -46,17 +46,17 @@ public class BucketAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
.addHeader("Accept", "application/json").addHeader("Authorization", "Bearer " + TOKEN).build();
private final HttpResponse GET_BUCKETACL_RESPONSE = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/bucketacl_get.json")).build();
+ .payload(staticPayloadFromResource("/bucket_acl_get.json")).build();
private final HttpResponse CREATE_BUCKETACL_RESPONSE = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/bucketacl_insert_response.json")).build();
+ .payload(staticPayloadFromResource("/bucket_acl_insert_response.json")).build();
private final HttpRequest LIST_BUCKETACL_REQUEST = HttpRequest.builder().method("GET")
.endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/acl")
.addHeader("Accept", "application/json").addHeader("Authorization", "Bearer " + TOKEN).build();
private final HttpResponse LIST_BUCKETACL_RESPONSE = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/bucketacl_list.json")).build();
+ .payload(staticPayloadFromResource("/bucket_acl_list.json")).build();
// Test getBucketAccessControls
public void testGetBucketAclResponseIs2xx() throws Exception {
@@ -105,7 +105,7 @@ public class BucketAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
.endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/acl")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
- .payload(payloadFromResourceWithContentType("/bucketacl_insert_response.json",
+ .payload(payloadFromResourceWithContentType("/bucket_acl_insert_response.json",
MediaType.APPLICATION_JSON)).build();
BucketAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE,
@@ -157,11 +157,11 @@ public class BucketAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
.endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/acl/allUsers")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
- .payload(payloadFromResourceWithContentType("/bucketacl_update_response.json",
+ .payload(payloadFromResourceWithContentType("/bucket_acl_update_response.json",
MediaType.APPLICATION_JSON)).build();
HttpResponse updateResponse = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/bucketacl_update_initial.json")).build();
+ .payload(staticPayloadFromResource("/bucket_acl_update_initial.json")).build();
BucketAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE,
update, updateResponse).getBucketAccessControlsApi();
@@ -182,11 +182,11 @@ public class BucketAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
.endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/acl/allUsers")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
- .payload(payloadFromResourceWithContentType("/bucketacl_update_response.json",
+ .payload(payloadFromResourceWithContentType("/bucket_acl_update_response.json",
MediaType.APPLICATION_JSON)).build();
HttpResponse patchResponse = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/bucketacl_update_initial.json")).build();
+ .payload(staticPayloadFromResource("/bucket_acl_update_initial.json")).build();
BucketAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE,
patchRequest, patchResponse).getBucketAccessControlsApi();
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiExpectTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiExpectTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiExpectTest.java
index ad9f719..a047109 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiExpectTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiExpectTest.java
@@ -55,7 +55,7 @@ public class BucketApiExpectTest extends BaseGoogleCloudStorageApiExpectTest {
.addHeader("Accept", "application/json").addHeader("Authorization", "Bearer " + TOKEN).build();
private final HttpResponse BUCKET_RESPONSE = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/noAcl_bucket.json")).build();
+ .payload(staticPayloadFromResource("/no_acl_bucket.json")).build();
public static final HttpRequest LIST_BUCKET_REQUEST = HttpRequest.builder().method("GET")
.endpoint("https://www.googleapis.com/storage/v1/b").addQueryParam("project", EXPECTED_TEST_PROJECT_NUMBER)
@@ -67,7 +67,7 @@ public class BucketApiExpectTest extends BaseGoogleCloudStorageApiExpectTest {
.addHeader("Accept", "application/json").addHeader("Authorization", "Bearer " + TOKEN).build();
private final HttpResponse LIST_BUCKET_RESPONSE = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/noAcl_bucket_list.json")).build();
+ .payload(staticPayloadFromResource("/no_acl_bucket_list.json")).build();
// Test getBucket without options
public void testGetBucketWithNoOptionsResponseIs2xx() throws Exception {
@@ -139,7 +139,7 @@ public class BucketApiExpectTest extends BaseGoogleCloudStorageApiExpectTest {
.addHeader("Accept", "application/json")
.addQueryParam("project", EXPECTED_TEST_PROJECT_NUMBER)
.addHeader("Authorization", "Bearer " + TOKEN)
- .payload(payloadFromResourceWithContentType("/bucket_insert_requestpayload.json",
+ .payload(payloadFromResourceWithContentType("/bucket_insert_request_payload.json",
MediaType.APPLICATION_JSON)).build();
BucketApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE,
@@ -164,7 +164,7 @@ public class BucketApiExpectTest extends BaseGoogleCloudStorageApiExpectTest {
.endpoint("https://www.googleapis.com/storage/v1/b/" + EXPECTED_TEST_BUCKET)
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
- .payload(payloadFromResourceWithContentType("/bucket_update_requestpayload.json",
+ .payload(payloadFromResourceWithContentType("/bucket_update_request_payload.json",
MediaType.APPLICATION_JSON)).build();
HttpResponse updateResponse = HttpResponse.builder().statusCode(200)
@@ -192,7 +192,7 @@ public class BucketApiExpectTest extends BaseGoogleCloudStorageApiExpectTest {
.addHeader("Authorization", "Bearer " + TOKEN)
.addQueryParam("projection", Projection.NO_ACL.toString())
.addQueryParam("ifMetagenerationNotMatch", "100")
- .payload(payloadFromResourceWithContentType("/bucket_update_requestpayload.json",
+ .payload(payloadFromResourceWithContentType("/bucket_update_request_payload.json",
MediaType.APPLICATION_JSON)).build();
HttpResponse updateResponse = HttpResponse.builder().statusCode(200)
@@ -217,7 +217,7 @@ public class BucketApiExpectTest extends BaseGoogleCloudStorageApiExpectTest {
.endpoint("https://www.googleapis.com/storage/v1/b/" + EXPECTED_TEST_BUCKET)
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
- .payload(payloadFromResourceWithContentType("/bucket_update_requestpayload.json",
+ .payload(payloadFromResourceWithContentType("/bucket_update_request_payload.json",
MediaType.APPLICATION_JSON)).build();
HttpResponse patchResponse = HttpResponse.builder().statusCode(200)
@@ -245,7 +245,7 @@ public class BucketApiExpectTest extends BaseGoogleCloudStorageApiExpectTest {
.addHeader("Authorization", "Bearer " + TOKEN)
.addQueryParam("projection", Projection.NO_ACL.toString())
.addQueryParam("ifMetagenerationNotMatch", "100")
- .payload(payloadFromResourceWithContentType("/bucket_update_requestpayload.json",
+ .payload(payloadFromResourceWithContentType("/bucket_update_request_payload.json",
MediaType.APPLICATION_JSON)).build();
HttpResponse patchResponse = HttpResponse.builder().statusCode(200)
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiExpectTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiExpectTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiExpectTest.java
index bf946ff..3ba6b97 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiExpectTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiExpectTest.java
@@ -48,17 +48,17 @@ public class DefaultObjectAccessControlsApiExpectTest extends BaseGoogleCloudSto
.addHeader("Accept", "application/json").addHeader("Authorization", "Bearer " + TOKEN).build();
private final HttpResponse GET_DEFAULT_OBJECT_ACL_RESPONSE = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/default_objectacl_get.json")).build();
+ .payload(staticPayloadFromResource("/default_object_acl_get.json")).build();
private final HttpResponse CREATE_DEFAULT_OBJECT_ACL_RESPONSE = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/default_objectacl_insert_response.json")).build();
+ .payload(staticPayloadFromResource("/default_object_acl_insert_response.json")).build();
public final HttpRequest LIST_DEFAULT_OBJECT_ACL_REQUEST = HttpRequest.builder().method("GET")
.endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/defaultObjectAcl")
.addHeader("Accept", "application/json").addHeader("Authorization", "Bearer " + TOKEN).build();
private final HttpResponse LIST_DEFAULT_OBJECT_ACL_RESPONSE = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/default_objectacl_list.json")).build();
+ .payload(staticPayloadFromResource("/default_object_acl_list.json")).build();
// Test getDefaultObjectAccessControls
public void testGetDefaultObjectAclResponseIs2xx() throws Exception {
@@ -109,7 +109,7 @@ public class DefaultObjectAccessControlsApiExpectTest extends BaseGoogleCloudSto
.endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/defaultObjectAcl")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
- .payload(payloadFromResourceWithContentType("/default_objectacl_insert_requestpayload.json",
+ .payload(payloadFromResourceWithContentType("/default_object_acl_insert_request_payload.json",
MediaType.APPLICATION_JSON)).build();
DefaultObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE),
@@ -157,11 +157,11 @@ public class DefaultObjectAccessControlsApiExpectTest extends BaseGoogleCloudSto
.endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/defaultObjectAcl/allUsers")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
- .payload(payloadFromResourceWithContentType("/default_objectacl_update_requestpayload.json",
+ .payload(payloadFromResourceWithContentType("/default_object_acl_update_request_payload.json",
MediaType.APPLICATION_JSON)).build();
HttpResponse updateResponse = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/default_objectacl_update_initial.json")).build();
+ .payload(staticPayloadFromResource("/default_object_acl_update_initial.json")).build();
DefaultObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE),
TOKEN_RESPONSE, update, updateResponse).getDefaultObjectAccessControlsApi();
@@ -182,11 +182,11 @@ public class DefaultObjectAccessControlsApiExpectTest extends BaseGoogleCloudSto
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
.addQueryParam("role", ObjectRole.OWNER.toString())
- .payload(payloadFromResourceWithContentType("/default_objectacl_update_requestpayload.json",
+ .payload(payloadFromResourceWithContentType("/default_object_acl_update_request_payload.json",
MediaType.APPLICATION_JSON)).build();
HttpResponse updateResponse = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/default_objectacl_update_initial.json")).build();
+ .payload(staticPayloadFromResource("/default_object_acl_update_initial.json")).build();
DefaultObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE),
TOKEN_RESPONSE, update, updateResponse).getDefaultObjectAccessControlsApi();
@@ -206,11 +206,11 @@ public class DefaultObjectAccessControlsApiExpectTest extends BaseGoogleCloudSto
.endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/defaultObjectAcl/allUsers")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
- .payload(payloadFromResourceWithContentType("/default_objectacl_update_requestpayload.json",
+ .payload(payloadFromResourceWithContentType("/default_object_acl_update_request_payload.json",
MediaType.APPLICATION_JSON)).build();
HttpResponse updateResponse = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/default_objectacl_update_initial.json")).build();
+ .payload(staticPayloadFromResource("/default_object_acl_update_initial.json")).build();
DefaultObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE),
TOKEN_RESPONSE, update, updateResponse).getDefaultObjectAccessControlsApi();
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectAccessControlsApiExpectTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectAccessControlsApiExpectTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectAccessControlsApiExpectTest.java
index adc0dbe..971f290 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectAccessControlsApiExpectTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectAccessControlsApiExpectTest.java
@@ -58,10 +58,10 @@ public class ObjectAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
.addHeader("Authorization", "Bearer " + TOKEN).build();
public final HttpResponse GET_OBJECT_ACL_RESPONSE = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/objectacl_get.json")).build();
+ .payload(staticPayloadFromResource("/object_acl_get.json")).build();
public final HttpResponse CREATE_OBJECT_ACL_RESPONSE = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/objectacl_insert_response.json")).build();
+ .payload(staticPayloadFromResource("/object_acl_insert_response.json")).build();
public final HttpRequest LIST_OBJECT_ACL_REQUEST = HttpRequest.builder().method("GET")
.endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl")
@@ -73,7 +73,7 @@ public class ObjectAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
.addHeader("Authorization", "Bearer " + TOKEN).build();
public final HttpResponse LIST_OBJECT_ACL_RESPONSE = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/objectacl_list.json")).build();
+ .payload(staticPayloadFromResource("/object_acl_list.json")).build();
// Test getObjectAccessControls
public void testGetObjectaclWithNoOptionsResponseIs2xx() throws Exception {
@@ -145,7 +145,7 @@ public class ObjectAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
.endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
- .payload(payloadFromResourceWithContentType("/objectacl_insert_requestpayload.json",
+ .payload(payloadFromResourceWithContentType("/object_acl_insert_request_payload.json",
MediaType.APPLICATION_JSON)).build();
ObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE,
@@ -167,7 +167,7 @@ public class ObjectAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
.addQueryParam("generation", "100")
- .payload(payloadFromResourceWithContentType("/objectacl_insert_requestpayload.json",
+ .payload(payloadFromResourceWithContentType("/object_acl_insert_request_payload.json",
MediaType.APPLICATION_JSON)).build();
ObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE,
@@ -190,11 +190,11 @@ public class ObjectAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
.endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/allUsers")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
- .payload(payloadFromResourceWithContentType("/objectacl_request_payload.json",
+ .payload(payloadFromResourceWithContentType("/object_acl_request_payload.json",
MediaType.APPLICATION_JSON)).build();
HttpResponse updateResponse = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/objectacl_update_initial.json")).build();
+ .payload(staticPayloadFromResource("/object_acl_update_initial.json")).build();
ObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE,
update, updateResponse).getObjectAccessControlsApi();
@@ -214,11 +214,11 @@ public class ObjectAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
.addQueryParam("generation", "100")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
- .payload(payloadFromResourceWithContentType("/objectacl_request_payload.json",
+ .payload(payloadFromResourceWithContentType("/object_acl_request_payload.json",
MediaType.APPLICATION_JSON)).build();
HttpResponse updateResponse = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/objectacl_update_initial.json")).build();
+ .payload(staticPayloadFromResource("/object_acl_update_initial.json")).build();
ObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE,
update, updateResponse).getObjectAccessControlsApi();
@@ -239,11 +239,11 @@ public class ObjectAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
.endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/allUsers")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
- .payload(payloadFromResourceWithContentType("/objectacl_request_payload.json",
+ .payload(payloadFromResourceWithContentType("/object_acl_request_payload.json",
MediaType.APPLICATION_JSON)).build();
HttpResponse patchResponse = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/objectacl_update_initial.json")).build();
+ .payload(staticPayloadFromResource("/object_acl_update_initial.json")).build();
ObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE,
patchRequest, patchResponse).getObjectAccessControlsApi();
@@ -263,11 +263,11 @@ public class ObjectAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
.addQueryParam("generation", "100")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
- .payload(payloadFromResourceWithContentType("/objectacl_request_payload.json",
+ .payload(payloadFromResourceWithContentType("/object_acl_request_payload.json",
MediaType.APPLICATION_JSON)).build();
HttpResponse patchResponse = HttpResponse.builder().statusCode(200)
- .payload(staticPayloadFromResource("/objectacl_update_initial.json")).build();
+ .payload(staticPayloadFromResource("/object_acl_update_initial.json")).build();
ObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE,
patchRequest, patchResponse).getObjectAccessControlsApi();
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclGetTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclGetTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclGetTest.java
index de93dc9..827bb9c 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclGetTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclGetTest.java
@@ -29,7 +29,7 @@ public class BucketAclGetTest extends BaseGoogleCloudStorageParseTest<BucketAcce
@Override
public String resource() {
- return "/bucketacl_get.json";
+ return "/bucket_acl_get.json";
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/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 c80768d..cf8d2ac 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
@@ -29,7 +29,7 @@ public class BucketAclInsertTest extends BaseGoogleCloudStorageParseTest<BucketA
@Override
public String resource() {
- return "/bucketacl_insert_response.json";
+ return "/bucket_acl_insert_response.json";
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/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 8bdb0f4..37b4f0c 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
@@ -47,7 +47,7 @@ public class BucketAclListTest extends BaseGoogleCloudStorageParseTest<ListBucke
@Override
public String resource() {
- return "/bucketacl_list.json";
+ return "/bucket_acl_list.json";
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/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 6ac093e..1b69ae1 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
@@ -29,7 +29,7 @@ public class BucketAclUpdateTest extends BaseGoogleCloudStorageParseTest<BucketA
@Override
public String resource() {
- return "/bucketacl_update_response.json";
+ return "/bucket_acl_update_response.json";
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/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 dd5549d..eaa62bb 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
@@ -29,7 +29,7 @@ public class DefaultObjectAclGetTest extends BaseGoogleCloudStorageParseTest<Def
@Override
public String resource() {
- return "/default_objectacl_get.json";
+ return "/default_object_acl_get.json";
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/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 8f9ded1..86fd8c8 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
@@ -27,7 +27,7 @@ public class DefaultObjectAclInsertTest extends BaseGoogleCloudStorageParseTest<
@Override
public String resource() {
- return "/default_objectacl_insert_response.json";
+ return "/default_object_acl_insert_response.json";
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/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 06e53b6..b695c83 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
@@ -38,7 +38,7 @@ public class DefaultObjectAclListTest extends BaseGoogleCloudStorageParseTest<Li
@Override
public String resource() {
- return "/default_objectacl_list.json";
+ return "/default_object_acl_list.json";
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/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 78beb3f..c7fd39a 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
@@ -41,7 +41,7 @@ public class NoAclBucketListTest extends BaseGoogleCloudStorageParseTest<ListPag
@Override
public String resource() {
- return "/noAcl_bucket_list.json";
+ return "/no_acl_bucket_list.json";
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/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 b456b23..9c2158b 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
@@ -32,7 +32,7 @@ public class NoAclBucketTest extends BaseGoogleCloudStorageParseTest<Bucket> {
@Override
public String resource() {
- return "/noAcl_bucket.json";
+ return "/no_acl_bucket.json";
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/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 bafdf8e..8002473 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
@@ -31,7 +31,7 @@ public class ObjectAclGetTest extends BaseGoogleCloudStorageParseTest<ObjectAcce
@Override
public String resource() {
- return "/objectacl_get.json";
+ return "/object_acl_get.json";
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/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 229dcde..b9a8d77 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
@@ -29,7 +29,7 @@ public class ObjectAclInsertTest extends BaseGoogleCloudStorageParseTest<ObjectA
@Override
public String resource() {
- return "/objectacl_insert_response.json";
+ return "/object_acl_insert_response.json";
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/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 6cd98ae..abe6d47 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
@@ -43,7 +43,7 @@ public class ObjectAclListTest extends BaseGoogleCloudStorageParseTest<ListObjec
@Override
public String resource() {
- return "/objectacl_list.json";
+ return "/object_acl_list.json";
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/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 7953f87..13fa61e 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
@@ -29,7 +29,7 @@ public class ObjectAclUpdateTest extends BaseGoogleCloudStorageParseTest<ObjectA
@Override
public String resource() {
- return "/objectacl_update_response.json";
+ return "/object_acl_update_response.json";
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/bucket_acl_get.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/bucket_acl_get.json b/google-cloud-storage/src/test/resources/bucket_acl_get.json
new file mode 100644
index 0000000..1df3d84
--- /dev/null
+++ b/google-cloud-storage/src/test/resources/bucket_acl_get.json
@@ -0,0 +1,9 @@
+{
+ "kind": "storage#bucketAccessControl",
+ "id": "jcloudtestbucket/allUsers",
+ "selfLink": "https://content.googleapis.com/storage/v1/b/jcloudtestbucket/acl/allUsers",
+ "bucket": "jcloudtestbucket",
+ "entity": "allUsers",
+ "role": "READER",
+ "etag": "CAM="
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/bucket_acl_insert_response.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/bucket_acl_insert_response.json b/google-cloud-storage/src/test/resources/bucket_acl_insert_response.json
new file mode 100644
index 0000000..f03dae2
--- /dev/null
+++ b/google-cloud-storage/src/test/resources/bucket_acl_insert_response.json
@@ -0,0 +1,9 @@
+{
+ "kind": "storage#bucketAccessControl",
+ "id": "jcloudtestbucket/allAuthenticatedUsers",
+ "selfLink": "https://content.googleapis.com/storage/v1/b/jcloudtestbucket/acl/allAuthenticatedUsers",
+ "bucket": "jcloudtestbucket",
+ "entity": "allAuthenticatedUsers",
+ "role": "WRITER",
+ "etag": "CAQ="
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/bucket_acl_list.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/bucket_acl_list.json b/google-cloud-storage/src/test/resources/bucket_acl_list.json
new file mode 100644
index 0000000..e0ed5a4
--- /dev/null
+++ b/google-cloud-storage/src/test/resources/bucket_acl_list.json
@@ -0,0 +1,27 @@
+{
+ "kind": "storage#bucketAccessControls",
+ "items": [
+ {
+ "kind": "storage#bucketAccessControl",
+ "id": "jcloudtestbucket/allUsers",
+ "selfLink": "https://content.googleapis.com/storage/v1/b/jcloudtestbucket/acl/allUsers",
+ "bucket": "jcloudtestbucket",
+ "entity": "allUsers",
+ "role": "READER",
+ "etag": "CAc="
+ },
+ {
+ "kind": "storage#bucketAccessControl",
+ "id": "jcloudtestbucket/project-owners-1082289308625",
+ "selfLink": "https://content.googleapis.com/storage/v1/b/jcloudtestbucket/acl/project-owners-1082289308625",
+ "bucket": "jcloudtestbucket",
+ "entity": "project-owners-1082289308625",
+ "role": "OWNER",
+ "projectTeam": {
+ "projectNumber": "1082289308625",
+ "team": "owners"
+ },
+ "etag": "CAc="
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/bucket_acl_update_initial.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/bucket_acl_update_initial.json b/google-cloud-storage/src/test/resources/bucket_acl_update_initial.json
new file mode 100644
index 0000000..1df3d84
--- /dev/null
+++ b/google-cloud-storage/src/test/resources/bucket_acl_update_initial.json
@@ -0,0 +1,9 @@
+{
+ "kind": "storage#bucketAccessControl",
+ "id": "jcloudtestbucket/allUsers",
+ "selfLink": "https://content.googleapis.com/storage/v1/b/jcloudtestbucket/acl/allUsers",
+ "bucket": "jcloudtestbucket",
+ "entity": "allUsers",
+ "role": "READER",
+ "etag": "CAM="
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/bucket_acl_update_response.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/bucket_acl_update_response.json b/google-cloud-storage/src/test/resources/bucket_acl_update_response.json
new file mode 100644
index 0000000..f16f7a4
--- /dev/null
+++ b/google-cloud-storage/src/test/resources/bucket_acl_update_response.json
@@ -0,0 +1,9 @@
+{
+ "kind": "storage#bucketAccessControl",
+ "id": "jcloudtestbucket/allUsers",
+ "selfLink": "https://content.googleapis.com/storage/v1/b/jcloudtestbucket/acl/allUsers",
+ "bucket": "jcloudtestbucket",
+ "entity": "allUsers",
+ "role": "OWNER",
+ "etag": "CAg="
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/bucket_insert_request_payload.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/bucket_insert_request_payload.json b/google-cloud-storage/src/test/resources/bucket_insert_request_payload.json
new file mode 100644
index 0000000..0ebf517
--- /dev/null
+++ b/google-cloud-storage/src/test/resources/bucket_insert_request_payload.json
@@ -0,0 +1,3 @@
+{
+ "name": "bhashbucket"
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/bucket_insert_requestpayload.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/bucket_insert_requestpayload.json b/google-cloud-storage/src/test/resources/bucket_insert_requestpayload.json
deleted file mode 100644
index 0ebf517..0000000
--- a/google-cloud-storage/src/test/resources/bucket_insert_requestpayload.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "name": "bhashbucket"
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/bucket_update_request_payload.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/bucket_update_request_payload.json b/google-cloud-storage/src/test/resources/bucket_update_request_payload.json
new file mode 100644
index 0000000..07955dd
--- /dev/null
+++ b/google-cloud-storage/src/test/resources/bucket_update_request_payload.json
@@ -0,0 +1,12 @@
+{
+ "name":"bhashbucket",
+ "acl": [
+ {
+ "kind":"storage#bucketAccessControl",
+ "bucket":"bhashbucket",
+ "id":"bhashbucket/allAuthenticatedUsers",
+ "entity": "allAuthenticatedUsers",
+ "role": "OWNER"
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/bucket_update_requestpayload.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/bucket_update_requestpayload.json b/google-cloud-storage/src/test/resources/bucket_update_requestpayload.json
deleted file mode 100644
index 07955dd..0000000
--- a/google-cloud-storage/src/test/resources/bucket_update_requestpayload.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name":"bhashbucket",
- "acl": [
- {
- "kind":"storage#bucketAccessControl",
- "bucket":"bhashbucket",
- "id":"bhashbucket/allAuthenticatedUsers",
- "entity": "allAuthenticatedUsers",
- "role": "OWNER"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/bucketacl_get.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/bucketacl_get.json b/google-cloud-storage/src/test/resources/bucketacl_get.json
deleted file mode 100644
index 1df3d84..0000000
--- a/google-cloud-storage/src/test/resources/bucketacl_get.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "kind": "storage#bucketAccessControl",
- "id": "jcloudtestbucket/allUsers",
- "selfLink": "https://content.googleapis.com/storage/v1/b/jcloudtestbucket/acl/allUsers",
- "bucket": "jcloudtestbucket",
- "entity": "allUsers",
- "role": "READER",
- "etag": "CAM="
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/bucketacl_insert_response.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/bucketacl_insert_response.json b/google-cloud-storage/src/test/resources/bucketacl_insert_response.json
deleted file mode 100644
index f03dae2..0000000
--- a/google-cloud-storage/src/test/resources/bucketacl_insert_response.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "kind": "storage#bucketAccessControl",
- "id": "jcloudtestbucket/allAuthenticatedUsers",
- "selfLink": "https://content.googleapis.com/storage/v1/b/jcloudtestbucket/acl/allAuthenticatedUsers",
- "bucket": "jcloudtestbucket",
- "entity": "allAuthenticatedUsers",
- "role": "WRITER",
- "etag": "CAQ="
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/bucketacl_list.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/bucketacl_list.json b/google-cloud-storage/src/test/resources/bucketacl_list.json
deleted file mode 100644
index e0ed5a4..0000000
--- a/google-cloud-storage/src/test/resources/bucketacl_list.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "kind": "storage#bucketAccessControls",
- "items": [
- {
- "kind": "storage#bucketAccessControl",
- "id": "jcloudtestbucket/allUsers",
- "selfLink": "https://content.googleapis.com/storage/v1/b/jcloudtestbucket/acl/allUsers",
- "bucket": "jcloudtestbucket",
- "entity": "allUsers",
- "role": "READER",
- "etag": "CAc="
- },
- {
- "kind": "storage#bucketAccessControl",
- "id": "jcloudtestbucket/project-owners-1082289308625",
- "selfLink": "https://content.googleapis.com/storage/v1/b/jcloudtestbucket/acl/project-owners-1082289308625",
- "bucket": "jcloudtestbucket",
- "entity": "project-owners-1082289308625",
- "role": "OWNER",
- "projectTeam": {
- "projectNumber": "1082289308625",
- "team": "owners"
- },
- "etag": "CAc="
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/bucketacl_update_initial.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/bucketacl_update_initial.json b/google-cloud-storage/src/test/resources/bucketacl_update_initial.json
deleted file mode 100644
index 1df3d84..0000000
--- a/google-cloud-storage/src/test/resources/bucketacl_update_initial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "kind": "storage#bucketAccessControl",
- "id": "jcloudtestbucket/allUsers",
- "selfLink": "https://content.googleapis.com/storage/v1/b/jcloudtestbucket/acl/allUsers",
- "bucket": "jcloudtestbucket",
- "entity": "allUsers",
- "role": "READER",
- "etag": "CAM="
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/bucketacl_update_response.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/bucketacl_update_response.json b/google-cloud-storage/src/test/resources/bucketacl_update_response.json
deleted file mode 100644
index f16f7a4..0000000
--- a/google-cloud-storage/src/test/resources/bucketacl_update_response.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "kind": "storage#bucketAccessControl",
- "id": "jcloudtestbucket/allUsers",
- "selfLink": "https://content.googleapis.com/storage/v1/b/jcloudtestbucket/acl/allUsers",
- "bucket": "jcloudtestbucket",
- "entity": "allUsers",
- "role": "OWNER",
- "etag": "CAg="
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/default_object_acl_get.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/default_object_acl_get.json b/google-cloud-storage/src/test/resources/default_object_acl_get.json
new file mode 100644
index 0000000..8e42d23
--- /dev/null
+++ b/google-cloud-storage/src/test/resources/default_object_acl_get.json
@@ -0,0 +1,10 @@
+{
+ "kind": "storage#objectAccessControl",
+ "entity": "project-owners-1082289308625",
+ "role": "OWNER",
+ "projectTeam": {
+ "projectNumber": "1082289308625",
+ "team": "owners"
+ },
+ "etag": "CAk="
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/default_object_acl_insert_request_payload.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/default_object_acl_insert_request_payload.json b/google-cloud-storage/src/test/resources/default_object_acl_insert_request_payload.json
new file mode 100644
index 0000000..6bb3630
--- /dev/null
+++ b/google-cloud-storage/src/test/resources/default_object_acl_insert_request_payload.json
@@ -0,0 +1,4 @@
+{
+ "entity": "allUsers",
+ "role": "OWNER"
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/default_object_acl_insert_response.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/default_object_acl_insert_response.json b/google-cloud-storage/src/test/resources/default_object_acl_insert_response.json
new file mode 100644
index 0000000..9e0af50
--- /dev/null
+++ b/google-cloud-storage/src/test/resources/default_object_acl_insert_response.json
@@ -0,0 +1,6 @@
+{
+ "kind": "storage#objectAccessControl",
+ "entity": "allUsers",
+ "role": "OWNER",
+ "etag": "CAo="
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/default_object_acl_list.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/default_object_acl_list.json b/google-cloud-storage/src/test/resources/default_object_acl_list.json
new file mode 100644
index 0000000..d963de1
--- /dev/null
+++ b/google-cloud-storage/src/test/resources/default_object_acl_list.json
@@ -0,0 +1,15 @@
+{
+ "kind": "storage#objectAccessControls",
+ "items": [
+ {
+ "kind": "storage#objectAccessControl",
+ "entity": "project-owners-1082289308625",
+ "role": "OWNER",
+ "projectTeam": {
+ "projectNumber": "1082289308625",
+ "team": "owners"
+ },
+ "etag": "CAk="
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/default_object_acl_update_initial.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/default_object_acl_update_initial.json b/google-cloud-storage/src/test/resources/default_object_acl_update_initial.json
new file mode 100644
index 0000000..9e0af50
--- /dev/null
+++ b/google-cloud-storage/src/test/resources/default_object_acl_update_initial.json
@@ -0,0 +1,6 @@
+{
+ "kind": "storage#objectAccessControl",
+ "entity": "allUsers",
+ "role": "OWNER",
+ "etag": "CAo="
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/default_object_acl_update_request_payload.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/default_object_acl_update_request_payload.json b/google-cloud-storage/src/test/resources/default_object_acl_update_request_payload.json
new file mode 100644
index 0000000..d50e7a4
--- /dev/null
+++ b/google-cloud-storage/src/test/resources/default_object_acl_update_request_payload.json
@@ -0,0 +1,5 @@
+{
+ "kind": "storage#objectAccessControl",
+ "entity": "allUsers",
+ "role": "OWNER"
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/default_objectacl_get.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/default_objectacl_get.json b/google-cloud-storage/src/test/resources/default_objectacl_get.json
deleted file mode 100644
index 8e42d23..0000000
--- a/google-cloud-storage/src/test/resources/default_objectacl_get.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "kind": "storage#objectAccessControl",
- "entity": "project-owners-1082289308625",
- "role": "OWNER",
- "projectTeam": {
- "projectNumber": "1082289308625",
- "team": "owners"
- },
- "etag": "CAk="
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/default_objectacl_insert_requestpayload.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/default_objectacl_insert_requestpayload.json b/google-cloud-storage/src/test/resources/default_objectacl_insert_requestpayload.json
deleted file mode 100644
index 6bb3630..0000000
--- a/google-cloud-storage/src/test/resources/default_objectacl_insert_requestpayload.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "entity": "allUsers",
- "role": "OWNER"
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/default_objectacl_insert_response.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/default_objectacl_insert_response.json b/google-cloud-storage/src/test/resources/default_objectacl_insert_response.json
deleted file mode 100644
index 9e0af50..0000000
--- a/google-cloud-storage/src/test/resources/default_objectacl_insert_response.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "kind": "storage#objectAccessControl",
- "entity": "allUsers",
- "role": "OWNER",
- "etag": "CAo="
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/default_objectacl_list.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/default_objectacl_list.json b/google-cloud-storage/src/test/resources/default_objectacl_list.json
deleted file mode 100644
index d963de1..0000000
--- a/google-cloud-storage/src/test/resources/default_objectacl_list.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "kind": "storage#objectAccessControls",
- "items": [
- {
- "kind": "storage#objectAccessControl",
- "entity": "project-owners-1082289308625",
- "role": "OWNER",
- "projectTeam": {
- "projectNumber": "1082289308625",
- "team": "owners"
- },
- "etag": "CAk="
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/default_objectacl_update_initial.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/default_objectacl_update_initial.json b/google-cloud-storage/src/test/resources/default_objectacl_update_initial.json
deleted file mode 100644
index 9e0af50..0000000
--- a/google-cloud-storage/src/test/resources/default_objectacl_update_initial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "kind": "storage#objectAccessControl",
- "entity": "allUsers",
- "role": "OWNER",
- "etag": "CAo="
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/default_objectacl_update_requestpayload.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/default_objectacl_update_requestpayload.json b/google-cloud-storage/src/test/resources/default_objectacl_update_requestpayload.json
deleted file mode 100644
index d50e7a4..0000000
--- a/google-cloud-storage/src/test/resources/default_objectacl_update_requestpayload.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "kind": "storage#objectAccessControl",
- "entity": "allUsers",
- "role": "OWNER"
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/list_bucket_with_options.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/list_bucket_with_options.json b/google-cloud-storage/src/test/resources/list_bucket_with_options.json
new file mode 100644
index 0000000..bceb735
--- /dev/null
+++ b/google-cloud-storage/src/test/resources/list_bucket_with_options.json
@@ -0,0 +1,21 @@
+{
+ "kind": "storage#buckets",
+ "nextPageToken": "jcloudtestbucket500",
+ "items": [
+ {
+ "kind": "storage#bucket",
+ "id": "jcloudtestbucket500",
+ "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudtestbucket500",
+ "projectNumber": "1082289308625",
+ "name": "jcloudtestbucket500",
+ "timeCreated": "2014-06-17T14:17:50.155Z",
+ "metageneration": "1",
+ "owner": {
+ "entity": "project-owners-1082289308625"
+ },
+ "location": "US",
+ "storageClass": "STANDARD",
+ "etag": "CAE="
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/list_bucket_withoptions.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/list_bucket_withoptions.json b/google-cloud-storage/src/test/resources/list_bucket_withoptions.json
deleted file mode 100644
index bceb735..0000000
--- a/google-cloud-storage/src/test/resources/list_bucket_withoptions.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "kind": "storage#buckets",
- "nextPageToken": "jcloudtestbucket500",
- "items": [
- {
- "kind": "storage#bucket",
- "id": "jcloudtestbucket500",
- "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudtestbucket500",
- "projectNumber": "1082289308625",
- "name": "jcloudtestbucket500",
- "timeCreated": "2014-06-17T14:17:50.155Z",
- "metageneration": "1",
- "owner": {
- "entity": "project-owners-1082289308625"
- },
- "location": "US",
- "storageClass": "STANDARD",
- "etag": "CAE="
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/noAcl_bucket.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/noAcl_bucket.json b/google-cloud-storage/src/test/resources/noAcl_bucket.json
deleted file mode 100644
index fe46b76..0000000
--- a/google-cloud-storage/src/test/resources/noAcl_bucket.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "kind": "storage#bucket",
- "id": "bhashbucket",
- "selfLink": "https://content.googleapis.com/storage/v1/b/bhashbucket",
- "projectNumber": "1082289308625",
- "name": "bhashbucket",
- "timeCreated": "2014-06-02T19:19:41.112Z",
- "metageneration": "87",
- "owner": {
- "entity": "project-owners-1082289308625"
- },
- "location": "US",
- "storageClass": "STANDARD",
- "etag": "CFc="
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/noAcl_bucket_list.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/noAcl_bucket_list.json b/google-cloud-storage/src/test/resources/noAcl_bucket_list.json
deleted file mode 100644
index b936bee..0000000
--- a/google-cloud-storage/src/test/resources/noAcl_bucket_list.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "kind": "storage#buckets",
- "nextPageToken": "bhashbucket",
- "items": [
- {
- "kind": "storage#bucket",
- "id": "bhashbucket",
- "selfLink": "https://content.googleapis.com/storage/v1/b/bhashbucket",
- "projectNumber": "1082289308625",
- "name": "bhashbucket",
- "timeCreated": "2014-06-02T19:19:41.112Z",
- "metageneration": "99",
- "owner": {
- "entity": "project-owners-1082289308625"
- },
- "location": "US",
- "storageClass": "STANDARD",
- "etag": "CGM="
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/no_acl_bucket.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/no_acl_bucket.json b/google-cloud-storage/src/test/resources/no_acl_bucket.json
new file mode 100644
index 0000000..fe46b76
--- /dev/null
+++ b/google-cloud-storage/src/test/resources/no_acl_bucket.json
@@ -0,0 +1,15 @@
+{
+ "kind": "storage#bucket",
+ "id": "bhashbucket",
+ "selfLink": "https://content.googleapis.com/storage/v1/b/bhashbucket",
+ "projectNumber": "1082289308625",
+ "name": "bhashbucket",
+ "timeCreated": "2014-06-02T19:19:41.112Z",
+ "metageneration": "87",
+ "owner": {
+ "entity": "project-owners-1082289308625"
+ },
+ "location": "US",
+ "storageClass": "STANDARD",
+ "etag": "CFc="
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/no_acl_bucket_list.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/no_acl_bucket_list.json b/google-cloud-storage/src/test/resources/no_acl_bucket_list.json
new file mode 100644
index 0000000..b936bee
--- /dev/null
+++ b/google-cloud-storage/src/test/resources/no_acl_bucket_list.json
@@ -0,0 +1,21 @@
+{
+ "kind": "storage#buckets",
+ "nextPageToken": "bhashbucket",
+ "items": [
+ {
+ "kind": "storage#bucket",
+ "id": "bhashbucket",
+ "selfLink": "https://content.googleapis.com/storage/v1/b/bhashbucket",
+ "projectNumber": "1082289308625",
+ "name": "bhashbucket",
+ "timeCreated": "2014-06-02T19:19:41.112Z",
+ "metageneration": "99",
+ "owner": {
+ "entity": "project-owners-1082289308625"
+ },
+ "location": "US",
+ "storageClass": "STANDARD",
+ "etag": "CGM="
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/object_acl_get.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/object_acl_get.json b/google-cloud-storage/src/test/resources/object_acl_get.json
new file mode 100644
index 0000000..dd2417d
--- /dev/null
+++ b/google-cloud-storage/src/test/resources/object_acl_get.json
@@ -0,0 +1,15 @@
+{
+ "kind": "storage#objectAccessControl",
+ "id": "jcloudtestbucket/foo.txt/1394121608485000/project-owners-1082289308625",
+ "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/project-owners-1082289308625",
+ "bucket": "jcloudtestbucket",
+ "object": "foo.txt",
+ "generation": "1394121608485000",
+ "entity": "project-owners-1082289308625",
+ "role": "OWNER",
+ "projectTeam": {
+ "projectNumber": "1082289308625",
+ "team": "owners"
+ },
+ "etag": "CIix/dmj/rwCEAE="
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/object_acl_insert_request_payload.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/object_acl_insert_request_payload.json b/google-cloud-storage/src/test/resources/object_acl_insert_request_payload.json
new file mode 100644
index 0000000..393c571
--- /dev/null
+++ b/google-cloud-storage/src/test/resources/object_acl_insert_request_payload.json
@@ -0,0 +1,4 @@
+{
+ "entity": "user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d",
+ "role": "OWNER"
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/object_acl_insert_response.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/object_acl_insert_response.json b/google-cloud-storage/src/test/resources/object_acl_insert_response.json
new file mode 100644
index 0000000..1a477b8
--- /dev/null
+++ b/google-cloud-storage/src/test/resources/object_acl_insert_response.json
@@ -0,0 +1,10 @@
+{
+ "kind": "storage#objectAccessControl",
+ "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d",
+ "bucket": "jcloudtestbucket",
+ "object": "foo.txt",
+ "entity": "user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d",
+ "role": "OWNER",
+ "entityId": "00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d",
+ "etag": "CIix/dmj/rwCEAE="
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/object_acl_list.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/object_acl_list.json b/google-cloud-storage/src/test/resources/object_acl_list.json
new file mode 100644
index 0000000..9a7a677
--- /dev/null
+++ b/google-cloud-storage/src/test/resources/object_acl_list.json
@@ -0,0 +1,17 @@
+{
+ "kind": "storage#objectAccessControls",
+ "items": [
+ {
+ "kind": "storage#objectAccessControl",
+ "id": "jcloudtestbucket/foo.txt/1394121608485000/user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d",
+ "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d",
+ "bucket": "jcloudtestbucket",
+ "object": "foo.txt",
+ "generation": "1394121608485000",
+ "entity": "user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d",
+ "role": "OWNER",
+ "entityId": "00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d",
+ "etag": "CIix/dmj/rwCEAE="
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/object_acl_request_payload.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/object_acl_request_payload.json b/google-cloud-storage/src/test/resources/object_acl_request_payload.json
new file mode 100644
index 0000000..6bb3630
--- /dev/null
+++ b/google-cloud-storage/src/test/resources/object_acl_request_payload.json
@@ -0,0 +1,4 @@
+{
+ "entity": "allUsers",
+ "role": "OWNER"
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/object_acl_update_initial.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/object_acl_update_initial.json b/google-cloud-storage/src/test/resources/object_acl_update_initial.json
new file mode 100644
index 0000000..c3ee980
--- /dev/null
+++ b/google-cloud-storage/src/test/resources/object_acl_update_initial.json
@@ -0,0 +1,9 @@
+{
+ "kind": "storage#objectAccessControl",
+ "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/allUsers",
+ "bucket": "jcloudtestbucket",
+ "object": "foo.txt",
+ "entity": "allUsers",
+ "role": "OWNER",
+ "etag": "CIix/dmj/rwCEAQ="
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/object_acl_update_response.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/object_acl_update_response.json b/google-cloud-storage/src/test/resources/object_acl_update_response.json
new file mode 100644
index 0000000..c3ee980
--- /dev/null
+++ b/google-cloud-storage/src/test/resources/object_acl_update_response.json
@@ -0,0 +1,9 @@
+{
+ "kind": "storage#objectAccessControl",
+ "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/allUsers",
+ "bucket": "jcloudtestbucket",
+ "object": "foo.txt",
+ "entity": "allUsers",
+ "role": "OWNER",
+ "etag": "CIix/dmj/rwCEAQ="
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/objectacl_get.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/objectacl_get.json b/google-cloud-storage/src/test/resources/objectacl_get.json
deleted file mode 100644
index dd2417d..0000000
--- a/google-cloud-storage/src/test/resources/objectacl_get.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "kind": "storage#objectAccessControl",
- "id": "jcloudtestbucket/foo.txt/1394121608485000/project-owners-1082289308625",
- "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/project-owners-1082289308625",
- "bucket": "jcloudtestbucket",
- "object": "foo.txt",
- "generation": "1394121608485000",
- "entity": "project-owners-1082289308625",
- "role": "OWNER",
- "projectTeam": {
- "projectNumber": "1082289308625",
- "team": "owners"
- },
- "etag": "CIix/dmj/rwCEAE="
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/objectacl_insert_requestpayload.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/objectacl_insert_requestpayload.json b/google-cloud-storage/src/test/resources/objectacl_insert_requestpayload.json
deleted file mode 100644
index 393c571..0000000
--- a/google-cloud-storage/src/test/resources/objectacl_insert_requestpayload.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "entity": "user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d",
- "role": "OWNER"
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/objectacl_insert_response.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/objectacl_insert_response.json b/google-cloud-storage/src/test/resources/objectacl_insert_response.json
deleted file mode 100644
index 1a477b8..0000000
--- a/google-cloud-storage/src/test/resources/objectacl_insert_response.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "kind": "storage#objectAccessControl",
- "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d",
- "bucket": "jcloudtestbucket",
- "object": "foo.txt",
- "entity": "user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d",
- "role": "OWNER",
- "entityId": "00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d",
- "etag": "CIix/dmj/rwCEAE="
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/objectacl_list.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/objectacl_list.json b/google-cloud-storage/src/test/resources/objectacl_list.json
deleted file mode 100644
index 9a7a677..0000000
--- a/google-cloud-storage/src/test/resources/objectacl_list.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "kind": "storage#objectAccessControls",
- "items": [
- {
- "kind": "storage#objectAccessControl",
- "id": "jcloudtestbucket/foo.txt/1394121608485000/user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d",
- "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d",
- "bucket": "jcloudtestbucket",
- "object": "foo.txt",
- "generation": "1394121608485000",
- "entity": "user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d",
- "role": "OWNER",
- "entityId": "00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d",
- "etag": "CIix/dmj/rwCEAE="
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/objectacl_request_payload.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/objectacl_request_payload.json b/google-cloud-storage/src/test/resources/objectacl_request_payload.json
deleted file mode 100644
index 6bb3630..0000000
--- a/google-cloud-storage/src/test/resources/objectacl_request_payload.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "entity": "allUsers",
- "role": "OWNER"
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/objectacl_update_initial.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/objectacl_update_initial.json b/google-cloud-storage/src/test/resources/objectacl_update_initial.json
deleted file mode 100644
index c3ee980..0000000
--- a/google-cloud-storage/src/test/resources/objectacl_update_initial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "kind": "storage#objectAccessControl",
- "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/allUsers",
- "bucket": "jcloudtestbucket",
- "object": "foo.txt",
- "entity": "allUsers",
- "role": "OWNER",
- "etag": "CIix/dmj/rwCEAQ="
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/b5bbb6cb/google-cloud-storage/src/test/resources/objectacl_update_response.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/objectacl_update_response.json b/google-cloud-storage/src/test/resources/objectacl_update_response.json
deleted file mode 100644
index c3ee980..0000000
--- a/google-cloud-storage/src/test/resources/objectacl_update_response.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "kind": "storage#objectAccessControl",
- "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/allUsers",
- "bucket": "jcloudtestbucket",
- "object": "foo.txt",
- "entity": "allUsers",
- "role": "OWNER",
- "etag": "CIix/dmj/rwCEAQ="
-}