Fix Standard Date in QueryParameterValue classToType

Author: Praful Makani

google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryParameterValue.java

@@ -24,7 +24,10 @@
 import com.google.common.io.BaseEncoding;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import javax.annotation.Nullable;
 import org.threeten.bp.Instant;
@@ -67,6 +70,7 @@ public abstract class QueryParameterValue implements Serializable {
       DateTimeFormatter.ofPattern("HH:mm:ss.SSSSSS");
   private static final DateTimeFormatter datetimeFormatter =
       DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSS");
+  private static final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
 
   static final Function<
           QueryParameterValue, com.google.api.services.bigquery.model.QueryParameterValue>
@@ -256,6 +260,8 @@ private static <T> StandardSQLTypeName classToType(Class<T> type) {
       return StandardSQLTypeName.FLOAT64;
     } else if (BigDecimal.class.isAssignableFrom(type)) {
       return StandardSQLTypeName.NUMERIC;
+    } else if (Date.class.isAssignableFrom(type)) {
+      return StandardSQLTypeName.DATE;
     }
     throw new IllegalArgumentException("Unsupported object type for QueryParameter: " + type);
   }
@@ -310,6 +316,9 @@ private static <T> String valueToStringOrNull(T value, StandardSQLTypeName type)
           // verify that the String is in the right format
           checkFormat(value, dateFormatter);
           return (String) value;
+        } else if (value instanceof Date) {
+          checkFormat(value, dateFormat);
+          return dateFormat.format(value);
         }
         break;
       case TIME:
@@ -341,6 +350,14 @@ private static void checkFormat(Object value, DateTimeFormatter formatter) {
     }
   }
 
+  private static void checkFormat(Object value, DateFormat format) {
+    try {
+      format.format(value);
+    } catch (Exception e) {
+      throw new IllegalArgumentException(e.getMessage(), e);
+    }
+  }
+
   /** Returns a builder for a QueryParameterValue object with given value. */
   public abstract Builder toBuilder();
 

google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryParameterValueTest.java

@@ -20,11 +20,16 @@
 
 import com.google.api.services.bigquery.model.QueryParameterType;
 import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import org.junit.Test;
 
 public class QueryParameterValueTest {
 
+  private static final SimpleDateFormat SIMPLE_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd");
+
   @Test
   public void testBool() {
     QueryParameterValue value = QueryParameterValue.bool(true);
@@ -204,6 +209,16 @@ public void testDate() {
     assertThat(value.getArrayValues()).isNull();
   }
 
+  @Test
+  public void testStandardDate() throws ParseException {
+    Date date = SIMPLE_DATE_FORMAT.parse("2016-09-18");
+    QueryParameterValue value = QueryParameterValue.of(date, Date.class);
+    assertThat(value.getValue()).isEqualTo("2016-09-18");
+    assertThat(value.getType()).isEqualTo(StandardSQLTypeName.DATE);
+    assertThat(value.getArrayType()).isNull();
+    assertThat(value.getArrayValues()).isNull();
+  }
+
   @Test(expected = IllegalArgumentException.class)
   public void testInvalidDate() {
     // not supposed to have the time