Fix mode's nullability by internally storing a string

mziccard · mziccard · commit 338ede110628 · 2015-12-04T15:33:57.000+01:00
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalDataConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalDataConfiguration.java
@@ -283,7 +283,7 @@ com.google.api.services.bigquery.model.ExternalDataConfiguration toPb() {
     if (sourceUris != null) {
       externalConfigurationPb.setSourceUris(sourceUris);
     }
-    if (formatOptions instanceof CsvOptions) {
+    if (formatOptions != null && FormatOptions.CSV.equals(formatOptions.type())) {
       externalConfigurationPb.setCsvOptions(((CsvOptions) formatOptions).toPb());
     }
     return externalConfigurationPb;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Field.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Field.java
@@ -182,19 +182,19 @@ public boolean equals(Object obj) {
    * than one value.
    */
   public enum Mode {
-    NULLABLE, REQUIRED, REPEATED, NOT_SET
+    NULLABLE, REQUIRED, REPEATED
   }
 
   private final String name;
   private final Type type;
-  private final Mode mode;
+  private final String mode;
   private final String description;
 
   public static final class Builder {
 
     private String name;
     private Type type;
-    private Mode mode;
+    private String mode;
     private String description;
 
     private Builder() {}
@@ -231,7 +231,7 @@ public Builder type(Type type) {
      * Sets the mode of the field. When not specified {@link Mode#NULLABLE} is used.
      */
     public Builder mode(Mode mode) {
-      this.mode = firstNonNull(mode, Mode.NOT_SET);
+      this.mode = mode != null ? mode.name() : Data.<String>nullOf(String.class);
       return this;
     }
 
@@ -279,7 +279,7 @@ public Type type() {
    * Returns the field mode. By default {@link Mode#NULLABLE} is used.
    */
   public Mode mode() {
-    return mode == Mode.NOT_SET ? null : mode;
+    return mode != null ? Mode.valueOf(mode) : null;
   }
 
   /**
@@ -329,7 +329,7 @@ TableFieldSchema toPb() {
     fieldSchemaPb.setName(name);
     fieldSchemaPb.setType(type.value().name());
     if (mode != null) {
-      fieldSchemaPb.setMode(mode == Mode.NOT_SET ? Data.<String>nullOf(String.class) : mode.name());
+      fieldSchemaPb.setMode(mode);
     }
     if (description != null) {
       fieldSchemaPb.setDescription(description);

Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ com.google.api.services.bigquery.model.ExternalDataConfiguration toPb() {`
`283`	`283`	`if (sourceUris != null) {`
`284`	`284`	`externalConfigurationPb.setSourceUris(sourceUris);`
`285`	`285`	`}`
`286`		`- if (formatOptions instanceof CsvOptions) {`
	`286`	`+ if (formatOptions != null && FormatOptions.CSV.equals(formatOptions.type())) {`
`287`	`287`	`externalConfigurationPb.setCsvOptions(((CsvOptions) formatOptions).toPb());`
`288`	`288`	`}`
`289`	`289`	`return externalConfigurationPb;`