Skip to content

BigQuery: Fix NPE for null table schema fields #4338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chingor13 merged 2 commits into from
Jan 15, 2019
Merged

BigQuery: Fix NPE for null table schema fields #4338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d292af0
Add failing test for empty table schema
chingor13 Jan 14, 2019
73663a5
Fix NPE if table schema returns null for fields
chingor13 Jan 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion ...e-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Schema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down Expand Up @@ -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));
}
}
8 changes: 8 additions & 0 deletions ...oud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/SchemaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
}
}