---

chingor13 · web-flow · commit b1ecbcf9a32c · 2019-01-15T11:23:49.000-08:00
yaml --- r: 15619 b: refs/heads/autosynth-datastore c: ea68410 h: refs/heads/master i: 15617: 790f93e 15615: 20d461f
diff --git a/[refs] b/[refs]
@@ -129,7 +129,7 @@ refs/heads/autosynth-bigquerystorage: 14ab055598b943ae3f33f484e9fb1653355d08e7
 refs/heads/autosynth-bigtable: 2fbcb15847e0e89e79d6dc07420e28d7dfcea894
 refs/heads/autosynth-bigtable-admin: 6379a2bc712f2736c83de0e009b4d26da4fa82ca
 refs/heads/autosynth-containeranalysis: 039ca5b8db725c76c16a965ff26b2774322b8ef8
-refs/heads/autosynth-datastore: 2aa9d803ed532d91a5f430368f1ec4fd21f3dd24
+refs/heads/autosynth-datastore: ea68410f175b64ab06ff8bd1371935d12e3ce3e9
 refs/heads/autosynth-dialogflow: ebdd13c445b9674ff9ad4601f78d7ecd6f9c3660
 refs/heads/autosynth-errorreporting: 3d0566d6bebcc187f148bbed463b5a8e75b1edf6
 refs/heads/autosynth-firestore: 92b27fbc8855c9902168695abb0a8f1f433b750b
diff --git a/branches/autosynth-datastore/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Schema.java b/branches/autosynth-datastore/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-datastore/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/SchemaTest.java b/branches/autosynth-datastore/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());
+  }
 }
