Add Acl.of method to storage module

mziccard · mziccard · commit 973639a7b409 · 2016-01-22T10:34:30.000+01:00
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Acl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Acl.java
@@ -274,13 +274,7 @@ String toPb() {
     }
   }
 
-  /**
-   * Creates an ACL object.
-   *
-   * @param entity the entity for this ACL object
-   * @param role the role to associate to the {@code entity} object
-   */
-  public Acl(Entity entity, Role role) {
+  private Acl(Entity entity, Role role) {
     this.entity = entity;
     this.role = role;
   }
@@ -299,6 +293,16 @@ public Role role() {
     return role;
   }
 
+  /**
+   * Returns an Acl object.
+   *
+   * @param entity the entity for this ACL object
+   * @param role the role to associate to the {@code entity} object
+   */
+  public static Acl of(Entity entity, Role role) {
+    return new Acl(entity, role);
+  }
+
   @Override
   public int hashCode() {
     return Objects.hash(entity, role);
@@ -333,11 +337,11 @@ ObjectAccessControl toObjectPb() {
 
   static Acl fromPb(ObjectAccessControl objectAccessControl) {
     Role role = Role.valueOf(objectAccessControl.getRole());
-    return new Acl(Entity.fromPb(objectAccessControl.getEntity()), role);
+    return Acl.of(Entity.fromPb(objectAccessControl.getEntity()), role);
   }
 
   static Acl fromPb(BucketAccessControl bucketAccessControl) {
     Role role = Role.valueOf(bucketAccessControl.getRole());
-    return new Acl(Entity.fromPb(bucketAccessControl.getEntity()), role);
+    return Acl.of(Entity.fromPb(bucketAccessControl.getEntity()), role);
   }
 }
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/AclTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/AclTest.java
@@ -82,8 +82,8 @@ public void testRawEntity() {
 
 
   @Test
-  public void testAcl() {
-    Acl acl = new Acl(User.ofAllUsers(), Role.READER);
+  public void testOf() {
+    Acl acl = Acl.of(User.ofAllUsers(), Role.READER);
     assertEquals(User.ofAllUsers(), acl.entity());
     assertEquals(Role.READER, acl.role());
     ObjectAccessControl objectPb = acl.toObjectPb();
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobInfoTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobInfoTest.java
@@ -34,8 +34,8 @@
 public class BlobInfoTest {
 
   private static final List<Acl> ACL = ImmutableList.of(
-      new Acl(User.ofAllAuthenticatedUsers(), READER),
-      new Acl(new Project(VIEWERS, "p1"), WRITER));
+      Acl.of(User.ofAllAuthenticatedUsers(), READER),
+      Acl.of(new Project(VIEWERS, "p1"), WRITER));
   private static final Integer COMPONENT_COUNT = 2;
   private static final String CONTENT_TYPE = "text/html";
   private static final String CACHE_CONTROL = "cache";
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketInfoTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketInfoTest.java
@@ -41,8 +41,8 @@
 public class BucketInfoTest {
 
   private static final List<Acl> ACL = ImmutableList.of(
-      new Acl(User.ofAllAuthenticatedUsers(), Role.READER),
-      new Acl(new Project(VIEWERS, "p1"), Role.WRITER));
+      Acl.of(User.ofAllAuthenticatedUsers(), Role.READER),
+      Acl.of(new Project(VIEWERS, "p1"), Role.WRITER));
   private static final String ETAG = "0xFF00";
   private static final String ID = "B/N:1";
   private static final Long META_GENERATION = 10L;
@@ -51,7 +51,7 @@ public class BucketInfoTest {
   private static final Long CREATE_TIME = System.currentTimeMillis();
   private static final List<Cors> CORS = Collections.singletonList(Cors.builder().build());
   private static final List<Acl> DEFAULT_ACL =
-      Collections.singletonList(new Acl(User.ofAllAuthenticatedUsers(), Role.WRITER));
+      Collections.singletonList(Acl.of(User.ofAllAuthenticatedUsers(), Role.WRITER));
   private static final List<? extends DeleteRule> DELETE_RULES =
       Collections.singletonList(new AgeDeleteRule(5));
   private static final String INDEX_PAGE = "index.html";
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java
@@ -47,6 +47,7 @@ public class SerializationTest {
   private static final Acl.Project ACL_PROJECT_ = new Acl.Project(ProjectRole.VIEWERS, "pid");
   private static final Acl.User ACL_USER = new Acl.User("user");
   private static final Acl.RawEntity ACL_RAW = new Acl.RawEntity("raw");
+  private static final Acl ACL = Acl.of(ACL_DOMAIN, Acl.Role.OWNER);
   private static final BlobInfo BLOB_INFO = BlobInfo.builder("b", "n").build();
   private static final BucketInfo BUCKET_INFO = BucketInfo.of("b");
   private static final Cors.Origin ORIGIN = Cors.Origin.any();
@@ -94,11 +95,10 @@ public void testServiceOptions() throws Exception {
 
   @Test
   public void testModelAndRequests() throws Exception {
-    Serializable[] objects = {ACL_DOMAIN, ACL_GROUP, ACL_PROJECT_, ACL_USER, ACL_RAW, BLOB_INFO,
-        BUCKET_INFO,
-        ORIGIN, CORS, BATCH_REQUEST, BATCH_RESPONSE, PAGE_RESULT, BLOB_LIST_OPTIONS,
-        BLOB_SOURCE_OPTIONS, BLOB_TARGET_OPTIONS, BUCKET_LIST_OPTIONS, BUCKET_SOURCE_OPTIONS,
-        BUCKET_TARGET_OPTIONS};
+    Serializable[] objects = {ACL_DOMAIN, ACL_GROUP, ACL_PROJECT_, ACL_USER, ACL_RAW, ACL,
+        BLOB_INFO, BUCKET_INFO, ORIGIN, CORS, BATCH_REQUEST, BATCH_RESPONSE, PAGE_RESULT,
+        BLOB_LIST_OPTIONS, BLOB_SOURCE_OPTIONS, BLOB_TARGET_OPTIONS, BUCKET_LIST_OPTIONS,
+        BUCKET_SOURCE_OPTIONS, BUCKET_TARGET_OPTIONS};
     for (Serializable obj : objects) {
       Object copy = serializeAndDeserialize(obj);
       assertEquals(obj, obj);
