Skip to content

Commit d26dfbb

Browse files
committed
DATAES-847 - Polishing.
1 parent fa31701 commit d26dfbb

File tree

2 files changed

+52
-11
lines changed

2 files changed

+52
-11
lines changed

src/main/java/org/springframework/data/elasticsearch/annotations/DateFormat.java

Lines changed: 50 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,58 @@
1616
package org.springframework.data.elasticsearch.annotations;
1717

1818
/**
19+
* Values based on reference doc - https://www.elastic.co/guide/reference/mapping/date-format/
20+
*
1921
* @author Jakub Vavrik
2022
* @author Tim te Beek
21-
* Values based on reference doc - https://www.elastic.co/guide/reference/mapping/date-format/
23+
* @author Peter-Josef Meisch
2224
*/
2325
public enum DateFormat {
24-
none, custom, basic_date, basic_date_time, basic_date_time_no_millis, basic_ordinal_date, basic_ordinal_date_time,
25-
basic_ordinal_date_time_no_millis, basic_time, basic_time_no_millis, basic_t_time, basic_t_time_no_millis,
26-
basic_week_date, basic_week_date_time, basic_week_date_time_no_millis, date, date_hour, date_hour_minute,
27-
date_hour_minute_second, date_hour_minute_second_fraction, date_hour_minute_second_millis, date_optional_time,
28-
date_time, date_time_no_millis, epoch_millis, epoch_second, hour, hour_minute, hour_minute_second,
29-
hour_minute_second_fraction, hour_minute_second_millis, ordinal_date, ordinal_date_time,
30-
ordinal_date_time_no_millis, time, time_no_millis, t_time, t_time_no_millis, week_date, week_date_time,
31-
week_date_time_no_millis, weekyear, weekyear_week, weekyear_week_day, year, year_month, year_month_day
26+
none, //
27+
custom, //
28+
basic_date, //
29+
basic_date_time, //
30+
basic_date_time_no_millis, //
31+
basic_ordinal_date, //
32+
basic_ordinal_date_time, //
33+
basic_ordinal_date_time_no_millis, //
34+
basic_time, //
35+
basic_time_no_millis, //
36+
basic_t_time, //
37+
basic_t_time_no_millis, //
38+
basic_week_date, //
39+
basic_week_date_time, //
40+
basic_week_date_time_no_millis, //
41+
date, //
42+
date_hour, //
43+
date_hour_minute, //
44+
date_hour_minute_second, //
45+
date_hour_minute_second_fraction, //
46+
date_hour_minute_second_millis, //
47+
date_optional_time, //
48+
date_time, //
49+
date_time_no_millis, //
50+
epoch_millis, //
51+
epoch_second, //
52+
hour, //
53+
hour_minute, //
54+
hour_minute_second, //
55+
hour_minute_second_fraction, //
56+
hour_minute_second_millis, //
57+
ordinal_date, //
58+
ordinal_date_time, //
59+
ordinal_date_time_no_millis, //
60+
time, //
61+
time_no_millis, //
62+
t_time, //
63+
t_time_no_millis, //
64+
week_date, //
65+
week_date_time, //
66+
week_date_time_no_millis, //
67+
weekyear, //
68+
weekyear_week, //
69+
weekyear_week_day, //
70+
year, //
71+
year_month, //
72+
year_month_day //
3273
}

src/test/java/org/springframework/data/elasticsearch/core/convert/ElasticsearchDateConverterTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ void shouldParseLegacyDateFromString() {
7979
assertThat(parsed).isEqualTo(legacyDate);
8080
}
8181

82-
@Test
82+
@Test // DATAES-847
8383
void shouldParseEpochMillisString() {
8484
Instant instant = Instant.ofEpochMilli(1234568901234L);
8585
ElasticsearchDateConverter converter = ElasticsearchDateConverter.of(DateFormat.epoch_millis);
@@ -89,7 +89,7 @@ void shouldParseEpochMillisString() {
8989
assertThat(parsed.toInstant()).isEqualTo(instant);
9090
}
9191

92-
@Test
92+
@Test // DATAES-847
9393
void shouldConvertInstantToString() {
9494
Instant instant = Instant.ofEpochMilli(1234568901234L);
9595
ElasticsearchDateConverter converter = ElasticsearchDateConverter.of(DateFormat.epoch_millis);

0 commit comments

Comments
 (0)