feat: DATE and DOUBLE support more input formats

1. Long values are converted into Integer for DATE fields. 2. Date literals are converted into epoch days (Integer) for DATE fields. 3. Number values are converted into Double for DOUBLE fields.
googleapis · Nov 3, 2021 · 3d993e7 · 3d993e7
1 parent 2dd797a
commit 3d993e7
Showing 1 changed file with 25 additions and 10 deletions.
diff --git a/...igquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonToProtoMessage.java b/...igquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonToProtoMessage.java
@@ -25,6 +25,7 @@
 import com.google.protobuf.Message;
 import com.google.protobuf.UninitializedMessageException;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.logging.Logger;
 import org.json.JSONArray;
@@ -269,6 +270,15 @@ private static void fillField(
         }
         break;
       case INT32:
+        if (fieldSchema != null && fieldSchema.getType() == TableFieldSchema.Type.DATE) {
+          if (val instanceof String) {
+            protoMsg.setField(fieldDescriptor, (int) LocalDate.parse((String) val).toEpochDay());
+            return;
+          } else if (val instanceof Integer || val instanceof Long) {
+            protoMsg.setField(fieldDescriptor, ((Number) val).intValue());
+            return;
+          }
+        }
         if (val instanceof Integer) {
           protoMsg.setField(fieldDescriptor, (Integer) val);
           return;
@@ -281,11 +291,8 @@ private static void fillField(
         }
         break;
       case DOUBLE:
-        if (val instanceof Double) {
-          protoMsg.setField(fieldDescriptor, (Double) val);
-          return;
-        } else if (val instanceof Float) {
-          protoMsg.setField(fieldDescriptor, new Double((Float) val));
+        if (val instanceof Number) {
+          protoMsg.setField(fieldDescriptor, ((Number) val).doubleValue());
           return;
         }
         break;
@@ -435,7 +442,17 @@ private static void fillRepeatedField(
           }
           break;
         case INT32:
-          if (val instanceof Integer) {
+          if (fieldSchema != null && fieldSchema.getType() == TableFieldSchema.Type.DATE) {
+            if (val instanceof String) {
+              protoMsg.addRepeatedField(
+                  fieldDescriptor,
+                  (int) LocalDate.parse((String) val).toEpochDay());
+            } else if (val instanceof Integer || val instanceof Long) {
+              protoMsg.addRepeatedField(fieldDescriptor, ((Number) val).intValue());
+            } else {
+              fail = true;
+            }
+          } else if (val instanceof Integer) {
             protoMsg.addRepeatedField(fieldDescriptor, (Integer) val);
           } else {
             fail = true;
@@ -449,10 +466,8 @@ private static void fillRepeatedField(
           }
           break;
         case DOUBLE:
-          if (val instanceof Double) {
-            protoMsg.addRepeatedField(fieldDescriptor, (Double) val);
-          } else if (val instanceof Float) {
-            protoMsg.addRepeatedField(fieldDescriptor, new Double((float) val));
+          if (val instanceof Number) {
+            protoMsg.addRepeatedField(fieldDescriptor, ((Number) val).doubleValue());
           } else {
             fail = true;
           }