From c5d920fa693b9c4df8cfb58e22388878a22ba04b Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Tue, 30 Dec 2014 13:45:34 +0100
Subject: [PATCH] DATACMNS-623 - Added converter for JSR-310 Instant instances.

Made the converter types public to be able to reuse them from other projects.

Related tickets: DATAJPA-650.
---
 .../data/convert/Jsr310Converters.java        | 35 +++++++++++++++----
 .../convert/Jsr310ConvertersUnitTests.java    | 21 +++++++++++
 2 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springframework/data/convert/Jsr310Converters.java b/src/main/java/org/springframework/data/convert/Jsr310Converters.java
index 2e11915ba..45694283f 100644
--- a/src/main/java/org/springframework/data/convert/Jsr310Converters.java
+++ b/src/main/java/org/springframework/data/convert/Jsr310Converters.java
@@ -19,6 +19,7 @@ import static java.time.Instant.*;
 import static java.time.LocalDateTime.*;
 import static java.time.ZoneId.*;
 
+import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -59,11 +60,13 @@ public abstract class Jsr310Converters {
 		converters.add(LocalDateToDateConverter.INSTANCE);
 		converters.add(DateToLocalTimeConverter.INSTANCE);
 		converters.add(LocalTimeToDateConverter.INSTANCE);
+		converters.add(DateToInstantConverter.INSTANCE);
+		converters.add(InstantToDateConverter.INSTANCE);
 
 		return converters;
 	}
 
-	static enum DateToLocalDateTimeConverter implements Converter<Date, LocalDateTime> {
+	public static enum DateToLocalDateTimeConverter implements Converter<Date, LocalDateTime> {
 
 		INSTANCE;
 
@@ -73,7 +76,7 @@ public abstract class Jsr310Converters {
 		}
 	}
 
-	static enum LocalDateTimeToDateConverter implements Converter<LocalDateTime, Date> {
+	public static enum LocalDateTimeToDateConverter implements Converter<LocalDateTime, Date> {
 
 		INSTANCE;
 
@@ -83,7 +86,7 @@ public abstract class Jsr310Converters {
 		}
 	}
 
-	static enum DateToLocalDateConverter implements Converter<Date, LocalDate> {
+	public static enum DateToLocalDateConverter implements Converter<Date, LocalDate> {
 
 		INSTANCE;
 
@@ -93,7 +96,7 @@ public abstract class Jsr310Converters {
 		}
 	}
 
-	static enum LocalDateToDateConverter implements Converter<LocalDate, Date> {
+	public static enum LocalDateToDateConverter implements Converter<LocalDate, Date> {
 
 		INSTANCE;
 
@@ -103,7 +106,7 @@ public abstract class Jsr310Converters {
 		}
 	}
 
-	static enum DateToLocalTimeConverter implements Converter<Date, LocalTime> {
+	public static enum DateToLocalTimeConverter implements Converter<Date, LocalTime> {
 
 		INSTANCE;
 
@@ -113,7 +116,7 @@ public abstract class Jsr310Converters {
 		}
 	}
 
-	static enum LocalTimeToDateConverter implements Converter<LocalTime, Date> {
+	public static enum LocalTimeToDateConverter implements Converter<LocalTime, Date> {
 
 		INSTANCE;
 
@@ -122,4 +125,24 @@ public abstract class Jsr310Converters {
 			return source == null ? null : Date.from(source.atDate(LocalDate.now()).atZone(systemDefault()).toInstant());
 		}
 	}
+
+	public static enum DateToInstantConverter implements Converter<Date, Instant> {
+
+		INSTANCE;
+
+		@Override
+		public Instant convert(Date source) {
+			return source == null ? null : source.toInstant();
+		}
+	}
+
+	public static enum InstantToDateConverter implements Converter<Instant, Date> {
+
+		INSTANCE;
+
+		@Override
+		public Date convert(Instant source) {
+			return source == null ? null : Date.from(source.atZone(systemDefault()).toInstant());
+		}
+	}
 }
diff --git a/src/test/java/org/springframework/data/convert/Jsr310ConvertersUnitTests.java b/src/test/java/org/springframework/data/convert/Jsr310ConvertersUnitTests.java
index 6d85a4269..e571ddadc 100644
--- a/src/test/java/org/springframework/data/convert/Jsr310ConvertersUnitTests.java
+++ b/src/test/java/org/springframework/data/convert/Jsr310ConvertersUnitTests.java
@@ -19,6 +19,7 @@ import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
 import java.text.SimpleDateFormat;
+import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -105,6 +106,26 @@ public class Jsr310ConvertersUnitTests {
 		assertThat(format(CONVERSION_SERVICE.convert(now, Date.class), "HH:mm:ss.SSS"), is(now.toString()));
 	}
 
+	/**
+	 * @see DATACMNS-623
+	 */
+	@Test
+	public void convertsDateToInstant() {
+
+		Date now = new Date();
+		assertThat(CONVERSION_SERVICE.convert(now, Instant.class), is(now.toInstant()));
+	}
+
+	/**
+	 * @see DATACMNS-623
+	 */
+	@Test
+	public void convertsInstantToDate() {
+
+		Date now = new Date();
+		assertThat(CONVERSION_SERVICE.convert(now.toInstant(), Date.class), is(now));
+	}
+
 	private static String format(Date date, String format) {
 		return new SimpleDateFormat(format).format(date);
 	}