From d26dfbba708def67e956c32c3b4adb9b01c779e6 Mon Sep 17 00:00:00 2001
From: Peter-Josef Meisch <pj.meisch@sothawo.com>
Date: Fri, 29 May 2020 19:01:27 +0200
Subject: [PATCH] DATAES-847 - Polishing.

---
 .../elasticsearch/annotations/DateFormat.java | 59 ++++++++++++++++---
 .../ElasticsearchDateConverterTests.java      |  4 +-
 2 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/springframework/data/elasticsearch/annotations/DateFormat.java b/src/main/java/org/springframework/data/elasticsearch/annotations/DateFormat.java
index 75c90364..54a7775b 100644
--- a/src/main/java/org/springframework/data/elasticsearch/annotations/DateFormat.java
+++ b/src/main/java/org/springframework/data/elasticsearch/annotations/DateFormat.java
@@ -16,17 +16,58 @@
 package org.springframework.data.elasticsearch.annotations;
 
 /**
+ * Values based on reference doc - https://www.elastic.co/guide/reference/mapping/date-format/
+ * 
  * @author Jakub Vavrik
  * @author Tim te Beek
- *         Values based on reference doc - https://www.elastic.co/guide/reference/mapping/date-format/
+ * @author Peter-Josef Meisch
  */
 public enum DateFormat {
-	none, custom, basic_date, basic_date_time, basic_date_time_no_millis, basic_ordinal_date, basic_ordinal_date_time,
-	basic_ordinal_date_time_no_millis, basic_time, basic_time_no_millis, basic_t_time, basic_t_time_no_millis,
-	basic_week_date, basic_week_date_time, basic_week_date_time_no_millis, date, date_hour, date_hour_minute,
-	date_hour_minute_second, date_hour_minute_second_fraction, date_hour_minute_second_millis, date_optional_time,
-	date_time, date_time_no_millis, epoch_millis, epoch_second, hour, hour_minute, hour_minute_second,
-	hour_minute_second_fraction, hour_minute_second_millis, ordinal_date, ordinal_date_time,
-	ordinal_date_time_no_millis, time, time_no_millis, t_time, t_time_no_millis, week_date, week_date_time,
-	week_date_time_no_millis, weekyear, weekyear_week, weekyear_week_day, year, year_month, year_month_day
+	none, //
+	custom, //
+	basic_date, //
+	basic_date_time, //
+	basic_date_time_no_millis, //
+	basic_ordinal_date, //
+	basic_ordinal_date_time, //
+	basic_ordinal_date_time_no_millis, //
+	basic_time, //
+	basic_time_no_millis, //
+	basic_t_time, //
+	basic_t_time_no_millis, //
+	basic_week_date, //
+	basic_week_date_time, //
+	basic_week_date_time_no_millis, //
+	date, //
+	date_hour, //
+	date_hour_minute, //
+	date_hour_minute_second, //
+	date_hour_minute_second_fraction, //
+	date_hour_minute_second_millis, //
+	date_optional_time, //
+	date_time, //
+	date_time_no_millis, //
+	epoch_millis, //
+	epoch_second, //
+	hour, //
+	hour_minute, //
+	hour_minute_second, //
+	hour_minute_second_fraction, //
+	hour_minute_second_millis, //
+	ordinal_date, //
+	ordinal_date_time, //
+	ordinal_date_time_no_millis, //
+	time, //
+	time_no_millis, //
+	t_time, //
+	t_time_no_millis, //
+	week_date, //
+	week_date_time, //
+	week_date_time_no_millis, //
+	weekyear, //
+	weekyear_week, //
+	weekyear_week_day, //
+	year, //
+	year_month, //
+	year_month_day //
 }
diff --git a/src/test/java/org/springframework/data/elasticsearch/core/convert/ElasticsearchDateConverterTests.java b/src/test/java/org/springframework/data/elasticsearch/core/convert/ElasticsearchDateConverterTests.java
index c1f6b352..a99f9ec2 100644
--- a/src/test/java/org/springframework/data/elasticsearch/core/convert/ElasticsearchDateConverterTests.java
+++ b/src/test/java/org/springframework/data/elasticsearch/core/convert/ElasticsearchDateConverterTests.java
@@ -79,7 +79,7 @@ class ElasticsearchDateConverterTests {
 		assertThat(parsed).isEqualTo(legacyDate);
 	}
 
-	@Test
+	@Test // DATAES-847
 	void shouldParseEpochMillisString() {
 		Instant instant = Instant.ofEpochMilli(1234568901234L);
 		ElasticsearchDateConverter converter = ElasticsearchDateConverter.of(DateFormat.epoch_millis);
@@ -89,7 +89,7 @@ class ElasticsearchDateConverterTests {
 		assertThat(parsed.toInstant()).isEqualTo(instant);
 	}
 
-	@Test
+	@Test // DATAES-847
 	void shouldConvertInstantToString() {
 		Instant instant = Instant.ofEpochMilli(1234568901234L);
 		ElasticsearchDateConverter converter = ElasticsearchDateConverter.of(DateFormat.epoch_millis);