Added Java Date to Sql Date converter to better support sql dates (#11224)

Change-Id: I83d8c96a6877ea33b270a1a4a2c6f360a8147518

2 files changed, 61 insertions, 0 deletions

diff --git a/server/src/com/vaadin/data/util/converter/DateToSqlDateConverter.java b/server/src/com/vaadin/data/util/converter/DateToSqlDateConverter.java
new file mode 100644
index 0000000000..97027cc05b
--- /dev/null
+++ b/server/src/com/vaadin/data/util/converter/DateToSqlDateConverter.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2000-2013 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+/**
+ * 
+ */
+package com.vaadin.data.util.converter;
+
+import java.util.Date;
+import java.util.Locale;
+
+/**
+ * Converter for handling conversion between {@link java.util.Date} and
+ * {@link java.sql.Date}. This is used when a PopupDateField or InlineDateField
+ * is connected to a java.sql.Date property, typically through a JPAContainer or
+ * SQLContainer. Note that information (time information) is lost when
+ * converting from {@link java.util.Date} to {@link java.sql.Date}.
+ * 
+ * @since 7.1
+ * @author Vaadin Ltd
+ */
+public class DateToSqlDateConverter implements Converter<Date, java.sql.Date> {
+
+    @Override
+    public java.sql.Date convertToModel(Date value, Locale locale)
+            throws ConversionException {
+        return new java.sql.Date(value.getTime());
+    }
+
+    @Override
+    public Date convertToPresentation(java.sql.Date value, Locale locale)
+            throws ConversionException {
+        return new Date(value.getTime());
+    }
+
+    @Override
+    public Class<java.sql.Date> getModelType() {
+        return java.sql.Date.class;
+    }
+
+    @Override
+    public Class<Date> getPresentationType() {
+        return Date.class;
+    }
+
+}
diff --git a/server/src/com/vaadin/data/util/converter/DefaultConverterFactory.java b/server/src/com/vaadin/data/util/converter/DefaultConverterFactory.java
index de183dd342..bbd3945a37 100644
--- a/server/src/com/vaadin/data/util/converter/DefaultConverterFactory.java
+++ b/server/src/com/vaadin/data/util/converter/DefaultConverterFactory.java
@@ -87,6 +87,8 @@ public class DefaultConverterFactory implements ConverterFactory {
     protected Converter<Date, ?> createDateConverter(Class<?> sourceType) {
         if (Long.class.isAssignableFrom(sourceType)) {
             return new DateToLongConverter();
+        } else if (java.sql.Date.class.isAssignableFrom(sourceType)) {
+            return new DateToSqlDateConverter();
         } else {
             return null;
         }