---

vam-google · vam-google · commit 59e0cad86c4c · 2017-01-27T14:22:09.000-08:00
yaml --- r: 7739 b: refs/heads/tswast-patch-1 c: 6d193de h: refs/heads/master i: 7737: 07ff47a 7735: 136f464
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: 7b6e5c65d2c3dd31fab465ced97b1e30ce5e6cab
+refs/heads/tswast-patch-1: 6d193de0bd228543ba287aae953bee907fca5785
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FormatOptions.java b/branches/tswast-patch-1/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FormatOptions.java
@@ -32,7 +32,6 @@ 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;
@@ -95,13 +94,6 @@ 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/branches/tswast-patch-1/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FormatOptionsTest.java b/branches/tswast-patch-1/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FormatOptionsTest.java
@@ -30,29 +30,23 @@ 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
