fix: Set policy tags to empty instead of null

When BigQuery returns policy tag object without names, policy tags will have names field set to null (instead of the policy tags object itself set to null) to be consistent with the REST api.
googleapis · Jul 14, 2020 · 3312baf · 3312baf
1 parent a6d9491
commit 3312baf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/PolicyTags.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/PolicyTags.java
@@ -60,10 +60,11 @@ com.google.api.services.bigquery.model.TableFieldSchema.PolicyTags toPb() {
 
   static PolicyTags fromPb(
       com.google.api.services.bigquery.model.TableFieldSchema.PolicyTags tagPb) {
-    // Treat a PolicyTag message without a Names subfield as invalid.
+    Builder builder = newBuilder();
+    // Treat a PolicyTag message without a Names subfield as empty.
     if (tagPb.getNames() != null) {
-      return newBuilder().setNames(tagPb.getNames()).build();
+      builder = builder.setNames(tagPb.getNames());
     }
-    return null;
+    return builder.build();
   }
 }
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/PolicyTagsTest.java b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/PolicyTagsTest.java
@@ -51,7 +51,7 @@ public void testBuilder() {
   public void testWithoutNames() {
     com.google.api.services.bigquery.model.TableFieldSchema.PolicyTags PARTIALTAG =
         new com.google.api.services.bigquery.model.TableFieldSchema.PolicyTags();
-    assertNull(PolicyTags.fromPb(PARTIALTAG));
+    assertNull(PolicyTags.fromPb(PARTIALTAG).getNames());
   }
 
   @Test