-
Notifications
You must be signed in to change notification settings - Fork 24.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Core: Backport java time date formatters (#31997)
* Date: Add DateFormatters class that uses java.time (#31856) A newly added class called DateFormatters now contains java.time based builders for dates, which also intends to be fully backwards compatible, when the name based date formatters are picked. Also a new class named CompoundDateTimeFormatter for being able to parse multiple different formats has been added. A duelling test class has been added that ensures the same dates when parsing java or joda time formatted dates for the name based dates. Note, that java.time and joda time are not fully backwards compatible, which also means that old formats will currently not work with this setup. * Tests: Remove use of joda time in some tests (#31922) This also extends the dateformatters test to ensure that the printers are acting the same in java time and joda time. * Tests: Fix SearchFieldsIT.testDocValueFields This test produced different implementations of joda time classes, depending on if the data was serialized or not (DateTime vs MutableDateTime). This now uses a common base class to extract the milliseconds from the data. Closes #31992
- Loading branch information
Showing
20 changed files
with
1,767 additions
and
99 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
server/src/main/java/org/elasticsearch/common/time/CompoundDateTimeFormatter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you 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 org.elasticsearch.common.time; | ||
|
|
||
| import java.time.ZoneId; | ||
| import java.time.format.DateTimeFormatter; | ||
| import java.time.format.DateTimeParseException; | ||
| import java.time.temporal.TemporalAccessor; | ||
|
|
||
| /** | ||
| * wrapper class around java.time.DateTimeFormatter that supports multiple formats for easier parsing, | ||
| * and one specific format for printing | ||
| */ | ||
| public class CompoundDateTimeFormatter { | ||
|
|
||
| final DateTimeFormatter printer; | ||
| final DateTimeFormatter[] parsers; | ||
|
|
||
| CompoundDateTimeFormatter(DateTimeFormatter ... parsers) { | ||
| if (parsers.length == 0) { | ||
| throw new IllegalArgumentException("at least one date time formatter is required"); | ||
| } | ||
| this.printer = parsers[0]; | ||
| this.parsers = parsers; | ||
| } | ||
|
|
||
| public TemporalAccessor parse(String input) { | ||
| DateTimeParseException failure = null; | ||
| for (int i = 0; i < parsers.length; i++) { | ||
| try { | ||
| return parsers[i].parse(input); | ||
| } catch (DateTimeParseException e) { | ||
| if (failure == null) { | ||
| failure = e; | ||
| } else { | ||
| failure.addSuppressed(e); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // ensure that all parsers exceptions are returned instead of only the last one | ||
| throw failure; | ||
| } | ||
|
|
||
| public CompoundDateTimeFormatter withZone(ZoneId zoneId) { | ||
| final DateTimeFormatter[] parsersWithZone = new DateTimeFormatter[parsers.length]; | ||
| for (int i = 0; i < parsers.length; i++) { | ||
| parsersWithZone[i] = parsers[i].withZone(zoneId); | ||
| } | ||
|
|
||
| return new CompoundDateTimeFormatter(parsersWithZone); | ||
| } | ||
|
|
||
| public String format(TemporalAccessor accessor) { | ||
| return printer.format(accessor); | ||
| } | ||
| } |
Oops, something went wrong.