---

chingor13 · web-flow · commit 3dd6375f5a51 · 2019-01-15T11:23:49.000-08:00
yaml --- r: 17981 b: refs/heads/autosynth-websecurityscanner c: ea68410 h: refs/heads/master i: 17979: 855ce83
diff --git a/[refs] b/[refs]
@@ -145,7 +145,7 @@ refs/heads/autosynth-speech: 75d6c62a9d07d3a3642980502a25d07fbde0f232
 refs/heads/autosynth-tasks: b0cdb991f3f75345151a3f68db1aab273dfc069b
 refs/heads/autosynth-texttospeech: 2dcc5dc22be0f456caa1b6a8a4bcdace2641239c
 refs/heads/autosynth-trace: db35fc1080cc51034e9c431c141cbceb53fb19c1
-refs/heads/autosynth-websecurityscanner: 2aa9d803ed532d91a5f430368f1ec4fd21f3dd24
+refs/heads/autosynth-websecurityscanner: ea68410f175b64ab06ff8bd1371935d12e3ce3e9
 refs/heads/bigquerystorage: 06db74d123d7f8a3ef48755c2fcabed09faf8e64
 refs/heads/elharo-patch-1: ce159ef828d3c545991ff78e7b6e0d912a9453e9
 refs/heads/mrschmidt-numericadd: 96509abadf6190b7886d57fdd9b090da55f5171c
diff --git a/branches/autosynth-websecurityscanner/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Schema.java b/branches/autosynth-websecurityscanner/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Schema.java
@@ -18,10 +18,13 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import com.google.api.services.bigquery.model.TableFieldSchema;
 import com.google.api.services.bigquery.model.TableSchema;
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
 import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
 import java.util.Objects;
 
 /** This class represents the schema for a Google BigQuery Table or data source. */
@@ -90,6 +93,10 @@ TableSchema toPb() {
   }
 
   static Schema fromPb(com.google.api.services.bigquery.model.TableSchema tableSchemaPb) {
-    return Schema.of(FieldList.fromPb(tableSchemaPb.getFields()));
+    List<TableFieldSchema> fields = tableSchemaPb.getFields();
+    if (fields == null) {
+      fields = Collections.emptyList();
+    }
+    return Schema.of(FieldList.fromPb(fields));
   }
 }
diff --git a/branches/autosynth-websecurityscanner/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/SchemaTest.java b/branches/autosynth-websecurityscanner/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/SchemaTest.java
@@ -18,6 +18,7 @@
 
 import static org.junit.Assert.assertEquals;
 
+import com.google.api.services.bigquery.model.TableSchema;
 import com.google.common.collect.ImmutableList;
 import java.util.List;
 import org.junit.Test;
@@ -57,4 +58,11 @@ private void compareTableSchema(Schema expected, Schema value) {
     assertEquals(expected, value);
     assertEquals(expected.getFields(), value.getFields());
   }
+
+  @Test
+  public void testEmptySchema() {
+    TableSchema tableSchema = new TableSchema();
+    Schema schema = Schema.fromPb(tableSchema);
+    assertEquals(0, schema.getFields().size());
+  }
 }
