Merge pull request #1576 from vam-google/master

vam-google · web-flow · commit da93da72f39b · 2017-01-27T20:03:50.000-08:00
BigQuery: Add support to FormatOptions for AVRO #1441 Added new constant in FormatOptions and a corresponding factory method. Updated test cases. Confirmed that AVRO does not require special treatment (like CSV does), so no additional changes are required.
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FormatOptions.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FormatOptions.java
@@ -32,6 +32,7 @@ public class FormatOptions implements Serializable {
   static final String CSV = "CSV";
   static final String JSON = "NEWLINE_DELIMITED_JSON";
   static final String DATASTORE_BACKUP = "DATASTORE_BACKUP";
+  static final String AVRO = "AVRO";
   private static final long serialVersionUID = -443376052020423691L;
 
   private final String type;
@@ -94,6 +95,13 @@ public static FormatOptions datastoreBackup() {
     return new FormatOptions(DATASTORE_BACKUP);
   }
 
+  /**
+   * Default options for AVRO format.
+   */
+  public static FormatOptions avro() {
+    return new FormatOptions(AVRO);
+  }
+
   /**
    * Default options for the provided format.
    */
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FormatOptionsTest.java b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FormatOptionsTest.java
@@ -30,23 +30,29 @@ public void testConstructor() {
     assertEquals(FormatOptions.JSON, options.getType());
     options = new FormatOptions(FormatOptions.DATASTORE_BACKUP);
     assertEquals(FormatOptions.DATASTORE_BACKUP, options.getType());
+    options = new FormatOptions(FormatOptions.AVRO);
+    assertEquals(FormatOptions.AVRO, options.getType());
   }
 
   @Test
+  @SuppressWarnings("deprecation")
   public void testConstructorDeprecated() {
     FormatOptions options = new FormatOptions(FormatOptions.CSV);
     assertEquals(FormatOptions.CSV, options.type());
     options = new FormatOptions(FormatOptions.JSON);
     assertEquals(FormatOptions.JSON, options.type());
     options = new FormatOptions(FormatOptions.DATASTORE_BACKUP);
     assertEquals(FormatOptions.DATASTORE_BACKUP, options.type());
+    options = new FormatOptions(FormatOptions.AVRO);
+    assertEquals(FormatOptions.AVRO, options.type());
   }
 
   @Test
   public void testFactoryMethods() {
     assertEquals(FormatOptions.CSV, FormatOptions.csv().getType());
     assertEquals(FormatOptions.JSON, FormatOptions.json().getType());
     assertEquals(FormatOptions.DATASTORE_BACKUP, FormatOptions.datastoreBackup().getType());
+    assertEquals(FormatOptions.AVRO, FormatOptions.avro().getType());
   }
 
   @Test
