-
Notifications
You must be signed in to change notification settings - Fork 24.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Date: Add DateFormatters class that uses java.time #31856
Merged
spinscale
merged 7 commits into
elastic:master
from
spinscale:1807-java-time-dateformatters
Jul 10, 2018
Merged
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
d28d8b8
Date: Add DateFormatters class that uses java.time
spinscale 715137d
Merge branch 'master' into 1807-java-time-dateformatters
spinscale 5007a93
review comment: rename DateFormatter to CompoundDateTimeFormatter
spinscale cd1e2df
review comment: make printer/parsers final
spinscale fc24da8
review comment: Remove DateFormatter.merge()
spinscale e37d99a
fix checkstyle
spinscale d37c2ca
review comment: only have a list of parsers, where the first one is t…
spinscale File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
80 changes: 80 additions & 0 deletions
80
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,80 @@ | ||
/* | ||
* 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 org.elasticsearch.common.util.ArrayUtils; | ||
|
||
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 parserAndPrinter, DateTimeFormatter ... parsers) { | ||
if (parserAndPrinter == null) { | ||
throw new IllegalArgumentException("printer is required for compound date formatter"); | ||
} | ||
this.printer = parserAndPrinter; | ||
if (parsers.length == 0) { | ||
this.parsers = new DateTimeFormatter[]{parserAndPrinter}; | ||
} else { | ||
this.parsers = ArrayUtils.concat(new DateTimeFormatter[]{parserAndPrinter}, parsers, DateTimeFormatter.class); | ||
} | ||
} | ||
|
||
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 printerWithZone = printer.withZone(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(printerWithZone, parsersWithZone); | ||
} | ||
|
||
public String format(TemporalAccessor accessor) { | ||
return printer.format(accessor); | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This name seems deceptive because if you pass any parsers, then this is not used as a parser, right? If it should also always be a parser, then I think it would be better to just have a
formatters
member, and useformatters[0]
for printing.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
indeed, way better. I'll push once CI passes... thx for reviewing!