---

chingor13 · web-flow · commit 37c36d52a4df · 2019-01-15T11:23:49.000-08:00
yaml --- r: 17465 b: refs/heads/autosynth-tasks c: ea68410 h: refs/heads/master i: 17463: 3afcb7c
diff --git a/[refs] b/[refs]
@@ -142,7 +142,7 @@ refs/heads/autosynth-scheduler: d97f8743ba965c7d5e492c8dc1f51d023104e260
 refs/heads/autosynth-securitycenter: 8e95447ccb176c3648880ee0cb926cd1f4065156
 refs/heads/autosynth-spanner: 9bff86d057df31e04c76d72865e8e073ac5794fb
 refs/heads/autosynth-speech: 75d6c62a9d07d3a3642980502a25d07fbde0f232
-refs/heads/autosynth-tasks: 2aa9d803ed532d91a5f430368f1ec4fd21f3dd24
+refs/heads/autosynth-tasks: ea68410f175b64ab06ff8bd1371935d12e3ce3e9
 refs/heads/autosynth-texttospeech: 0e26ec9b0ed5bbedc038dea32bbb44bae0883668
 refs/heads/autosynth-trace: 80c58aa2fb54b0a9c6876f2c21aa8d19cf55962e
 refs/heads/autosynth-websecurityscanner: d4febbffb6c648b74faec62fe90e20adadc9a7d3
diff --git a/branches/autosynth-tasks/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Schema.java b/branches/autosynth-tasks/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-tasks/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/SchemaTest.java b/branches/autosynth-tasks/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());
+  }
 }
