Handle null role in Acl.fromPb, add test

mziccard · mziccard · commit 3f0d511746b9 · 2015-11-27T10:13:31.000+01:00
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Acl.java
@@ -16,6 +16,8 @@
 
 package com.google.gcloud.bigquery;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.google.api.services.bigquery.model.Dataset.Access;
 
 import java.io.Serializable;
@@ -370,15 +372,15 @@ Access toPb() {
    * Build an ACL for an {@code entity} and a {@code role}.
    */
   public Acl(Entity entity, Role role) {
-    this.entity = entity;
+    this.entity = checkNotNull(entity);
     this.role = role;
   }
 
   /**
    * Build an ACL for a view entity.
    */
   public Acl(View view) {
-    this.entity = view;
+    this.entity = checkNotNull(view);
     this.role = null;
   }
 
@@ -428,7 +430,7 @@ Access toPb() {
   }
 
   static Acl fromPb(Access access) {
-    Role role = Role.valueOf(access.getRole());
-    return new Acl(Entity.fromPb(access), role);
+    return new Acl(Entity.fromPb(access),
+        access.getRole() != null ? Role.valueOf(access.getRole()) : null);
   }
 }
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/AclTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/AclTest.java
@@ -87,5 +87,9 @@ public void testAcl() {
     assertEquals(Role.READER, acl.role());
     Dataset.Access pb = acl.toPb();
     assertEquals(acl, Acl.fromPb(pb));
+    View view = new View(TableId.of("project", "dataset", "view"));
+    acl = new Acl(view);
+    assertEquals(view, acl.entity());
+    assertEquals(null, acl.role());
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@`
`16`	`16`
`17`	`17`	`package com.google.gcloud.bigquery;`
`18`	`18`
	`19`	`+import static com.google.common.base.Preconditions.checkNotNull;`
	`20`	`+`
`19`	`21`	`import com.google.api.services.bigquery.model.Dataset.Access;`
`20`	`22`
`21`	`23`	`import java.io.Serializable;`
`@@ -370,15 +372,15 @@ Access toPb() {`
`370`	`372`	`* Build an ACL for an {@code entity} and a {@code role}.`
`371`	`373`	`*/`
`372`	`374`	`public Acl(Entity entity, Role role) {`
`373`		`- this.entity = entity;`
	`375`	`+ this.entity = checkNotNull(entity);`
`374`	`376`	`this.role = role;`
`375`	`377`	`}`
`376`	`378`
`377`	`379`	`/**`
`378`	`380`	`* Build an ACL for a view entity.`
`379`	`381`	`*/`
`380`	`382`	`public Acl(View view) {`
`381`		`- this.entity = view;`
	`383`	`+ this.entity = checkNotNull(view);`
`382`	`384`	`this.role = null;`
`383`	`385`	`}`
`384`	`386`
`@@ -428,7 +430,7 @@ Access toPb() {`
`428`	`430`	`}`
`429`	`431`
`430`	`432`	`static Acl fromPb(Access access) {`
`431`		`- Role role = Role.valueOf(access.getRole());`
`432`		`- return new Acl(Entity.fromPb(access), role);`
	`433`	`+ return new Acl(Entity.fromPb(access),`
	`434`	`+ access.getRole() != null ? Role.valueOf(access.getRole()) : null);`
`433`	`435`	`}`
`434`	`436`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,5 +87,9 @@ public void testAcl() {`
`87`	`87`	`assertEquals(Role.READER, acl.role());`
`88`	`88`	`Dataset.Access pb = acl.toPb();`
`89`	`89`	`assertEquals(acl, Acl.fromPb(pb));`
	`90`	`+ View view = new View(TableId.of("project", "dataset", "view"));`
	`91`	`+ acl = new Acl(view);`
	`92`	`+ assertEquals(view, acl.entity());`
	`93`	`+ assertEquals(null, acl.role());`
`90`	`94`	`}`
`91`	`95`	`}`