Refactor TableInfo and related classes

- TableSchema renamed to Schema
- FieldSchema renamed to Field
- Add class Type to Field to represent the field's type (and wrap record subfields)
- Add factory method and setter from varargs for Schema
- Better javadoc for CsvOptions and Field
- Update tests according to changes

Author: mziccard

gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CsvOptions.java

@@ -19,6 +19,7 @@
 import com.google.common.base.MoreObjects;
 
 import java.io.Serializable;
+import java.nio.charset.Charset;
 import java.util.Objects;
 
 /**
@@ -78,6 +79,16 @@ public Builder encoding(String encoding) {
       return this;
     }
 
+    /**
+     * Sets the character encoding of the data. The supported values are UTF-8 or ISO-8859-1. The
+     * default value is UTF-8. BigQuery decodes the data after the raw, binary data has been split
+     * using the values set in {@link #quote(String)} and {@link #fieldDelimiter(String)}.
+     */
+    public Builder encoding(Charset encoding) {
+      this.encoding = encoding.name();
+      return this;
+    }
+
     /**
      * Sets the separator for fields in a CSV file. BigQuery converts the string to ISO-8859-1
      * encoding, and then uses the first byte of the encoded string to split the data in its raw,
@@ -113,7 +124,7 @@ public Builder skipLeadingRows(Integer skipLeadingRows) {
     }
 
     /**
-     * Creates an {@code ExternalDataConfiguration} object.
+     * Creates a {@code CsvOptions} object.
      */
     public CsvOptions build() {
       return new CsvOptions(this);
@@ -132,8 +143,9 @@ private CsvOptions(Builder builder) {
   /**
    * Returns whether BigQuery should accept rows that are missing trailing optional columns. If
    * {@code true}, BigQuery treats missing trailing columns as null values. If {@code false},
-   * records with missing trailing columns are treated as bad records, and if there are too many
-   * bad records, an invalid error is returned in the job result.
+   * records with missing trailing columns are treated as bad records, and if the number of bad
+   * records exceeds {@link ExternalDataConfiguration#maxBadRecords()}, an invalid error is returned
+   * in the job result.
    */
   public Boolean allowJaggedRows() {
     return allowJaggedRows;
@@ -148,8 +160,8 @@ public Boolean allowQuotedNewLines() {
   }
 
   /**
-   * Returns the character encoding of the data. The supported values are UTF-8 or ISO-8859-1. The
-   * default value is UTF-8. BigQuery decodes the data after the raw, binary data has been split
+   * Returns the character encoding of the data. The supported values are UTF-8 or ISO-8859-1. If
+   * not set, UTF-8 is used. BigQuery decodes the data after the raw, binary data has been split
    * using the values set in {@link #quote()} and {@link #fieldDelimiter()}.
    */
   public String encoding() {

gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalDataConfiguration.java

@@ -62,7 +62,7 @@ public com.google.api.services.bigquery.model.ExternalDataConfiguration apply(
   private static final long serialVersionUID = -8004288831035566549L;
 
   private final List<String> sourceUris;
-  private final TableSchema schema;
+  private final Schema schema;
   private final String sourceFormat;
   private final Integer maxBadRecords;
   private final Boolean ignoreUnknownValues;
@@ -72,7 +72,7 @@ public com.google.api.services.bigquery.model.ExternalDataConfiguration apply(
   public static final class Builder {
 
     private List<String> sourceUris;
-    private TableSchema schema;
+    private Schema schema;
     private String sourceFormat;
     private Integer maxBadRecords;
     private Boolean ignoreUnknownValues;
@@ -97,13 +97,15 @@ public Builder sourceUris(List<String> sourceUris) {
     /**
      * Sets the schema for the external data.
      */
-    public Builder schema(TableSchema schema) {
+    public Builder schema(Schema schema) {
       this.schema = checkNotNull(schema);
       return this;
     }
 
     /**
-     * Sets the source format of the external data.
+     * Sets the source format of the external data. Supported values are {@code CSV} for CSV files,
+     * and {@code NEWLINE_DELIMITED_JSON} for newline-delimited JSON. If not set, files are assumed
+     * to be in CSV format.
      *
      * <a href="https://cloud.google.com/bigquery/docs/reference/v2/tables#externalDataConfiguration.sourceFormat">
      *     Source Format</a>
@@ -212,7 +214,7 @@ public Integer maxBadRecords() {
   /**
    * Returns the schema for the external data.
    */
-  public TableSchema schema() {
+  public Schema schema() {
     return schema;
   }
 
@@ -327,7 +329,7 @@ com.google.api.services.bigquery.model.ExternalDataConfiguration toPb() {
    * @see <a href="https://cloud.google.com/bigquery/docs/reference/v2/tables#externalDataConfiguration.sourceFormat">
    *     Source Format</a>
    */
-  public static Builder builder(List<String> sourceUris, TableSchema schema, String format) {
+  public static Builder builder(List<String> sourceUris, Schema schema, String format) {
     return new Builder().sourceUris(sourceUris).schema(schema).sourceFormat(format);
   }
 
@@ -345,7 +347,7 @@ public static Builder builder(List<String> sourceUris, TableSchema schema, Strin
    * @see <a href="https://cloud.google.com/bigquery/docs/reference/v2/tables#externalDataConfiguration.sourceFormat">
    *     Source Format</a>
    */
-  public static Builder builder(String sourceUri, TableSchema schema, String format) {
+  public static Builder builder(String sourceUri, Schema schema, String format) {
     return new Builder()
         .sourceUris(ImmutableList.of(sourceUri))
         .schema(schema)
@@ -368,7 +370,7 @@ public static Builder builder(String sourceUri, TableSchema schema, String forma
    *     Source Format</a>
    */
   public static ExternalDataConfiguration of(
-      List<String> sourceUris, TableSchema schema, String format) {
+      List<String> sourceUris, Schema schema, String format) {
     return builder(sourceUris, schema, format).build();
   }
 
@@ -386,7 +388,7 @@ public static ExternalDataConfiguration of(
    * @see <a href="https://cloud.google.com/bigquery/docs/reference/v2/tables#externalDataConfiguration.sourceFormat">
    *     Source Format</a>
    */
-  public static ExternalDataConfiguration of(String sourceUri, TableSchema schema, String format) {
+  public static ExternalDataConfiguration of(String sourceUri, Schema schema, String format) {
     return builder(sourceUri, schema, format).build();
   }
 
@@ -397,7 +399,7 @@ static ExternalDataConfiguration fromPb(
       builder.sourceUris(externalDataConfiguration.getSourceUris());
     }
     if (externalDataConfiguration.getSchema() != null) {
-      builder.schema(TableSchema.fromPb(externalDataConfiguration.getSchema()));
+      builder.schema(Schema.fromPb(externalDataConfiguration.getSchema()));
     }
     if (externalDataConfiguration.getSourceFormat() != null) {
       builder.sourceFormat(externalDataConfiguration.getSourceFormat());