Skip to content

Commit 17a09ea

Browse files
authored
Add strict_date_optional_time_nanos field type.
Original Pull Request #2684 Closes #2676
1 parent b99ca18 commit 17a09ea

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public enum DateFormat {
4848
date_hour_minute_second_fraction("uuuu-MM-dd'T'HH:mm:ss.SSS"), //
4949
date_hour_minute_second_millis("uuuu-MM-dd'T'HH:mm:ss.SSS"), //
5050
date_optional_time("uuuu-MM-dd['T'HH:mm:ss.SSSXXX]"), //
51+
strict_date_optional_time_nanos("uuuu-MM-dd['T'HH:mm:ss.SSSSSSXXX]"), //
5152
date_time("uuuu-MM-dd'T'HH:mm:ss.SSSXXX"), //
5253
date_time_no_millis("uuuu-MM-dd'T'HH:mm:ssVV"), // here Elasticsearch uses the zone-id in its implementation
5354
epoch_millis("epoch_millis"), //

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,12 @@ void shouldConvertDateOptionalTime() {
274274
check(ElasticsearchDateConverter.of(DateFormat.date_optional_time), LocalDateTime.class);
275275
}
276276

277+
@Test // #2676
278+
@DisplayName("should convert strict_date_optional_time_nanos")
279+
void shouldConvertStrictDateOptionalTime() {
280+
check(ElasticsearchDateConverter.of(DateFormat.strict_date_optional_time_nanos), LocalDateTime.class);
281+
}
282+
277283
@Test // #1647
278284
@DisplayName("should convert date_time")
279285
void shouldConvertDateTime() {

0 commit comments

Comments
 (0)