Skip to content
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
merged 7 commits into from
Jul 10, 2018
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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) {
Copy link
Member

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 use formatters[0] for printing.

Copy link
Contributor Author

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!

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);
}
}
Loading