honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Core: Converge FormatDateTimeFormatter and DateFormatter apis (#36390) 

This commit makes FormatDateTimeFormatter and DateFormatter apis close
to each other, so that the former can be removed in favor of the latter.
This PR does not change the uses of FormatDateTimeFormatter yet, so that
that future change can be purely mechanical.
This commit is contained in:
Ryan Ernst 2018-12-07 17:23:41 -08:00 committed by GitHub
parent b15d1aebcf
commit a27f2efca5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
42 changed files with 242 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/rest-high-level/src/main/java/org/elasticsearch/client/watcher/WatchStatusDateParser.java
View File

@ -53,6 +53,6 @@ public final class WatchStatusDateParser {
} }
public static DateTime parseDate(String text) { public static DateTime parseDate(String text) {
return FORMATTER.parser().parseDateTime(text); return FORMATTER.parseJoda(text);
} }
} }

2
server/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java
View File

@ -174,7 +174,7 @@ public class MappingMetaData extends AbstractDiffable<MappingMetaData> {
if (out.getVersion().before(Version.V_6_0_0_alpha1)) { if (out.getVersion().before(Version.V_6_0_0_alpha1)) {
// timestamp // timestamp
out.writeBoolean(false); // enabled out.writeBoolean(false); // enabled
out.writeString(DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.format()); out.writeString(DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.pattern());
out.writeOptionalString("now"); // 5.x default out.writeOptionalString("now"); // 5.x default
out.writeOptionalBoolean(null); out.writeOptionalBoolean(null);
} }

55
server/src/main/java/org/elasticsearch/common/joda/FormatDateTimeFormatter.java
View File

@ -20,10 +20,12 @@
package org.elasticsearch.common.joda; package org.elasticsearch.common.joda;
import org.elasticsearch.common.time.DateMathParser; import org.elasticsearch.common.time.DateMathParser;
import org.elasticsearch.common.time.DateUtils;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.DateTimeFormatter;
import java.time.ZoneId;
import java.util.Locale; import java.util.Locale;
import java.util.Objects;
/** /**
* A simple wrapper around {@link DateTimeFormatter} that retains the * A simple wrapper around {@link DateTimeFormatter} that retains the
@ -31,27 +33,28 @@ import java.util.Objects;
*/ */
public class FormatDateTimeFormatter { public class FormatDateTimeFormatter {
private final String format; private final String pattern;
private final DateTimeFormatter parser; private final DateTimeFormatter parser;
private final DateTimeFormatter printer; private final DateTimeFormatter printer;
private final Locale locale; public FormatDateTimeFormatter(String pattern, DateTimeFormatter parser, DateTimeFormatter printer) {
this.pattern = pattern;
public FormatDateTimeFormatter(String format, DateTimeFormatter parser, Locale locale) { this.printer = printer.withDefaultYear(1970);
this(format, parser, parser, locale); this.parser = parser.withDefaultYear(1970);
} }
public FormatDateTimeFormatter(String format, DateTimeFormatter parser, DateTimeFormatter printer, Locale locale) { public String pattern() {
this.format = format; return pattern;
this.locale = Objects.requireNonNull(locale, "A locale is required as JODA otherwise uses the default locale");
this.printer = printer.withLocale(locale).withDefaultYear(1970);
this.parser = parser.withLocale(locale).withDefaultYear(1970);
} }
public String format() { public long parseMillis(String input) {
return format; return parser.parseMillis(input);
}
public DateTime parseJoda(String input) {
return parser.parseDateTime(input);
} }
public DateTimeFormatter parser() { public DateTimeFormatter parser() {
@ -62,8 +65,32 @@ public class FormatDateTimeFormatter {
return this.printer; return this.printer;
} }
public String formatJoda(DateTime dateTime) {
return printer.print(dateTime);
}
public String formatMillis(long millis) {
return printer.print(millis);
}
public FormatDateTimeFormatter withZone(ZoneId zoneId) {
DateTimeFormatter parser = this.parser.withZone(DateUtils.zoneIdToDateTimeZone(zoneId));
DateTimeFormatter printer = this.printer.withZone(DateUtils.zoneIdToDateTimeZone(zoneId));
return new FormatDateTimeFormatter(pattern, parser, printer);
}
public FormatDateTimeFormatter withLocale(Locale locale) {
DateTimeFormatter parser = this.parser.withLocale(locale);
DateTimeFormatter printer = this.printer.withLocale(locale);
return new FormatDateTimeFormatter(this.pattern, parser, printer);
}
public Locale locale() { public Locale locale() {
return locale; return parser.getLocale();
}
public ZoneId zone() {
return DateUtils.dateTimeZoneToZoneId(parser.getZone());
} }
public DateMathParser toDateMathParser() { public DateMathParser toDateMathParser() {

15
server/src/main/java/org/elasticsearch/common/joda/Joda.java
View File

@ -105,8 +105,8 @@ public class Joda {
// in this case, we have a separate parser and printer since the dataOptionalTimeParser can't print // in this case, we have a separate parser and printer since the dataOptionalTimeParser can't print
// this sucks we should use the root local by default and not be dependent on the node // this sucks we should use the root local by default and not be dependent on the node
return new FormatDateTimeFormatter(input, return new FormatDateTimeFormatter(input,
ISODateTimeFormat.dateOptionalTimeParser().withZone(DateTimeZone.UTC), ISODateTimeFormat.dateOptionalTimeParser().withLocale(locale).withZone(DateTimeZone.UTC),
ISODateTimeFormat.dateTime().withZone(DateTimeZone.UTC), locale); ISODateTimeFormat.dateTime().withLocale(locale).withZone(DateTimeZone.UTC));
} else if ("dateTime".equals(input) || "date_time".equals(input)) { } else if ("dateTime".equals(input) || "date_time".equals(input)) {
formatter = ISODateTimeFormat.dateTime(); formatter = ISODateTimeFormat.dateTime();
} else if ("dateTimeNoMillis".equals(input) || "date_time_no_millis".equals(input)) { } else if ("dateTimeNoMillis".equals(input) || "date_time_no_millis".equals(input)) {
@ -182,8 +182,8 @@ public class Joda {
// in this case, we have a separate parser and printer since the dataOptionalTimeParser can't print // in this case, we have a separate parser and printer since the dataOptionalTimeParser can't print
// this sucks we should use the root local by default and not be dependent on the node // this sucks we should use the root local by default and not be dependent on the node
return new FormatDateTimeFormatter(input, return new FormatDateTimeFormatter(input,
StrictISODateTimeFormat.dateOptionalTimeParser().withZone(DateTimeZone.UTC), StrictISODateTimeFormat.dateOptionalTimeParser().withLocale(locale).withZone(DateTimeZone.UTC),
StrictISODateTimeFormat.dateTime().withZone(DateTimeZone.UTC), locale); StrictISODateTimeFormat.dateTime().withLocale(locale).withZone(DateTimeZone.UTC));
} else if ("strictDateTime".equals(input) || "strict_date_time".equals(input)) { } else if ("strictDateTime".equals(input) || "strict_date_time".equals(input)) {
formatter = StrictISODateTimeFormat.dateTime(); formatter = StrictISODateTimeFormat.dateTime();
} else if ("strictDateTimeNoMillis".equals(input) || "strict_date_time_no_millis".equals(input)) { } else if ("strictDateTimeNoMillis".equals(input) || "strict_date_time_no_millis".equals(input)) {
@ -259,7 +259,8 @@ public class Joda {
} }
} }
return new FormatDateTimeFormatter(input, formatter.withZone(DateTimeZone.UTC), locale); formatter = formatter.withLocale(locale).withZone(DateTimeZone.UTC);
return new FormatDateTimeFormatter(input, formatter, formatter);
} }
public static FormatDateTimeFormatter getStrictStandardDateFormatter() { public static FormatDateTimeFormatter getStrictStandardDateFormatter() {
@ -292,8 +293,8 @@ public class Joda {
DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder().append(longFormatter.withZone(DateTimeZone.UTC).getPrinter(), DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder().append(longFormatter.withZone(DateTimeZone.UTC).getPrinter(),
new DateTimeParser[]{longFormatter.getParser(), shortFormatter.getParser(), new EpochTimeParser(true)}); new DateTimeParser[]{longFormatter.getParser(), shortFormatter.getParser(), new EpochTimeParser(true)});
return new FormatDateTimeFormatter("yyyy/MM/dd HH:mm:ss||yyyy/MM/dd||epoch_millis", DateTimeFormatter formatter = builder.toFormatter().withLocale(Locale.ROOT).withZone(DateTimeZone.UTC);
builder.toFormatter().withZone(DateTimeZone.UTC), Locale.ROOT); return new FormatDateTimeFormatter("yyyy/MM/dd HH:mm:ss||yyyy/MM/dd||epoch_millis", formatter, formatter);
} }

3
server/src/main/java/org/elasticsearch/common/joda/JodaDateMathParser.java
View File

@ -211,7 +211,8 @@ public class JodaDateMathParser implements DateMathParser {
} }
return date.getMillis(); return date.getMillis();
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
throw new ElasticsearchParseException("failed to parse date field [{}] with format [{}]", e, value, dateTimeFormatter.format()); throw new ElasticsearchParseException("failed to parse date field [{}] with format [{}]", e, value,
dateTimeFormatter.pattern());
} }
} }

45
server/src/main/java/org/elasticsearch/common/time/DateFormatter.java
View File

@ -20,8 +20,11 @@
package org.elasticsearch.common.time; package org.elasticsearch.common.time;
import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.ElasticsearchParseException;
import org.joda.time.DateTime;
import java.time.Instant;
import java.time.ZoneId; import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.format.DateTimeParseException; import java.time.format.DateTimeParseException;
import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAccessor;
import java.util.Arrays; import java.util.Arrays;
@ -39,6 +42,21 @@ public interface DateFormatter {
*/ */
TemporalAccessor parse(String input); TemporalAccessor parse(String input);
/**
* Parse the given input into millis-since-epoch.
*/
default long parseMillis(String input) {
return Instant.from(parse(input)).toEpochMilli();
}
/**
* Parse the given input into a Joda {@link DateTime}.
*/
default DateTime parseJoda(String input) {
ZonedDateTime dateTime = ZonedDateTime.from(parse(input));
return new DateTime(dateTime.toInstant().toEpochMilli(), DateUtils.zoneIdToDateTimeZone(dateTime.getZone()));
}
/** /**
* Create a copy of this formatter that is configured to parse dates in the specified time zone * Create a copy of this formatter that is configured to parse dates in the specified time zone
* *
@ -63,6 +81,21 @@ public interface DateFormatter {
*/ */
String format(TemporalAccessor accessor); String format(TemporalAccessor accessor);
/**
* Return the given millis-since-epoch formatted with this format.
*/
default String formatMillis(long millis) {
return format(Instant.ofEpochMilli(millis));
}
/**
* Return the given Joda {@link DateTime} formatted with this format.
*/
default String formatJoda(DateTime dateTime) {
return format(ZonedDateTime.ofInstant(Instant.ofEpochMilli(dateTime.getMillis()),
DateUtils.dateTimeZoneToZoneId(dateTime.getZone())));
}
/** /**
* A name based format for this formatter. Can be one of the registered formatters like <code>epoch_millis</code> or * A name based format for this formatter. Can be one of the registered formatters like <code>epoch_millis</code> or
* a configured format like <code>HH:mm:ss</code> * a configured format like <code>HH:mm:ss</code>
@ -76,14 +109,14 @@ public interface DateFormatter {
* *
* @return The locale of this formatter * @return The locale of this formatter
*/ */
Locale getLocale(); Locale locale();
/** /**
* Returns the configured time zone of the date formatter * Returns the configured time zone of the date formatter
* *
* @return The time zone of this formatter * @return The time zone of this formatter
*/ */
ZoneId getZone(); ZoneId zone();
/** /**
* Return a {@link DateMathParser} built from this formatter. * Return a {@link DateMathParser} built from this formatter.
@ -152,13 +185,13 @@ public interface DateFormatter {
} }
@Override @Override
public Locale getLocale() { public Locale locale() {
return formatters[0].getLocale(); return formatters[0].locale();
} }
@Override @Override
public ZoneId getZone() { public ZoneId zone() {
return formatters[0].getZone(); return formatters[0].zone();
} }
@Override @Override

3
server/src/main/java/org/elasticsearch/common/time/DateUtils.java
View File

@ -61,6 +61,9 @@ public class DateUtils {
if (timeZone == null) { if (timeZone == null) {
return null; return null;
} }
if (DateTimeZone.UTC.equals(timeZone)) {
return ZoneOffset.UTC;
}
String deprecatedId = DEPRECATED_SHORT_TIMEZONES.get(timeZone.getID()); String deprecatedId = DEPRECATED_SHORT_TIMEZONES.get(timeZone.getID());
if (deprecatedId != null) { if (deprecatedId != null) {

4
server/src/main/java/org/elasticsearch/common/time/EpochMillisDateFormatter.java
View File

@ -103,12 +103,12 @@ class EpochMillisDateFormatter implements DateFormatter {
} }
@Override @Override
public Locale getLocale() { public Locale locale() {
return Locale.ROOT; return Locale.ROOT;
} }
@Override @Override
public ZoneId getZone() { public ZoneId zone() {
return ZoneOffset.UTC; return ZoneOffset.UTC;
} }

4
server/src/main/java/org/elasticsearch/common/time/EpochSecondsDateFormatter.java
View File

@ -81,12 +81,12 @@ public class EpochSecondsDateFormatter implements DateFormatter {
} }
@Override @Override
public Locale getLocale() { public Locale locale() {
return Locale.ROOT; return Locale.ROOT;
} }
@Override @Override
public ZoneId getZone() { public ZoneId zone() {
return ZoneOffset.UTC; return ZoneOffset.UTC;
} }

10
server/src/main/java/org/elasticsearch/common/time/JavaDateFormatter.java
View File

@ -146,12 +146,12 @@ class JavaDateFormatter implements DateFormatter {
} }
@Override @Override
public Locale getLocale() { public Locale locale() {
return this.printer.getLocale(); return this.printer.getLocale();
} }
@Override @Override
public ZoneId getZone() { public ZoneId zone() {
return this.printer.getZone(); return this.printer.getZone();
} }
@ -162,7 +162,7 @@ class JavaDateFormatter implements DateFormatter {
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(getLocale(), printer.getZone(), format); return Objects.hash(locale(), printer.getZone(), format);
} }
@Override @Override
@ -173,12 +173,12 @@ class JavaDateFormatter implements DateFormatter {
JavaDateFormatter other = (JavaDateFormatter) obj; JavaDateFormatter other = (JavaDateFormatter) obj;
return Objects.equals(format, other.format) && return Objects.equals(format, other.format) &&
Objects.equals(getLocale(), other.getLocale()) && Objects.equals(locale(), other.locale()) &&
Objects.equals(this.printer.getZone(), other.printer.getZone()); Objects.equals(this.printer.getZone(), other.printer.getZone());
} }
@Override @Override
public String toString() { public String toString() {
return String.format(Locale.ROOT, "format[%s] locale[%s]", format, getLocale()); return String.format(Locale.ROOT, "format[%s] locale[%s]", format, locale());
} }
} }

17
server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java
View File

@ -124,8 +124,7 @@ public class DateFieldMapper extends FieldMapper {
super.setupFieldType(context); super.setupFieldType(context);
FormatDateTimeFormatter dateTimeFormatter = fieldType().dateTimeFormatter; FormatDateTimeFormatter dateTimeFormatter = fieldType().dateTimeFormatter;
if (!locale.equals(dateTimeFormatter.locale())) { if (!locale.equals(dateTimeFormatter.locale())) {
fieldType().setDateTimeFormatter( new FormatDateTimeFormatter(dateTimeFormatter.format(), fieldType().setDateTimeFormatter(dateTimeFormatter.withLocale(locale));
dateTimeFormatter.parser(), dateTimeFormatter.printer(), locale));
} }
} }
@ -199,13 +198,13 @@ public class DateFieldMapper extends FieldMapper {
public boolean equals(Object o) { public boolean equals(Object o) {
if (!super.equals(o)) return false; if (!super.equals(o)) return false;
DateFieldType that = (DateFieldType) o; DateFieldType that = (DateFieldType) o;
return Objects.equals(dateTimeFormatter.format(), that.dateTimeFormatter.format()) && return Objects.equals(dateTimeFormatter.pattern(), that.dateTimeFormatter.pattern()) &&
Objects.equals(dateTimeFormatter.locale(), that.dateTimeFormatter.locale()); Objects.equals(dateTimeFormatter.locale(), that.dateTimeFormatter.locale());
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(super.hashCode(), dateTimeFormatter.format(), dateTimeFormatter.locale()); return Objects.hash(super.hashCode(), dateTimeFormatter.pattern(), dateTimeFormatter.locale());
} }
@Override @Override
@ -217,7 +216,7 @@ public class DateFieldMapper extends FieldMapper {
public void checkCompatibility(MappedFieldType fieldType, List<String> conflicts) { public void checkCompatibility(MappedFieldType fieldType, List<String> conflicts) {
super.checkCompatibility(fieldType, conflicts); super.checkCompatibility(fieldType, conflicts);
DateFieldType other = (DateFieldType) fieldType; DateFieldType other = (DateFieldType) fieldType;
if (Objects.equals(dateTimeFormatter().format(), other.dateTimeFormatter().format()) == false) { if (Objects.equals(dateTimeFormatter().pattern(), other.dateTimeFormatter().pattern()) == false) {
conflicts.add("mapper [" + name() + "] has different [format] values"); conflicts.add("mapper [" + name() + "] has different [format] values");
} }
if (Objects.equals(dateTimeFormatter().locale(), other.dateTimeFormatter().locale()) == false) { if (Objects.equals(dateTimeFormatter().locale(), other.dateTimeFormatter().locale()) == false) {
@ -240,7 +239,7 @@ public class DateFieldMapper extends FieldMapper {
} }
long parse(String value) { long parse(String value) {
return dateTimeFormatter().parser().parseMillis(value); return dateTimeFormatter().parseMillis(value);
} }
@Override @Override
@ -375,7 +374,7 @@ public class DateFieldMapper extends FieldMapper {
if (val == null) { if (val == null) {
return null; return null;
} }
return dateTimeFormatter().printer().print(val); return dateTimeFormatter().formatMillis(val);
} }
@Override @Override
@ -489,8 +488,8 @@ public class DateFieldMapper extends FieldMapper {
} }
if (includeDefaults if (includeDefaults
|| fieldType().dateTimeFormatter().format().equals(DEFAULT_DATE_TIME_FORMATTER.format()) == false) { || fieldType().dateTimeFormatter().pattern().equals(DEFAULT_DATE_TIME_FORMATTER.pattern()) == false) {
builder.field("format", fieldType().dateTimeFormatter().format()); builder.field("format", fieldType().dateTimeFormatter().pattern());
} }
if (includeDefaults if (includeDefaults
|| fieldType().dateTimeFormatter().locale() != Locale.ROOT) { || fieldType().dateTimeFormatter().locale() != Locale.ROOT) {

2
server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java
View File

@ -717,7 +717,7 @@ final class DocumentParser {
// `epoch_millis` or `YYYY` // `epoch_millis` or `YYYY`
for (FormatDateTimeFormatter dateTimeFormatter : context.root().dynamicDateTimeFormatters()) { for (FormatDateTimeFormatter dateTimeFormatter : context.root().dynamicDateTimeFormatters()) {
try { try {
dateTimeFormatter.parser().parseMillis(text); dateTimeFormatter.parseMillis(text);
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
// failure to parse this, continue // failure to parse this, continue
continue; continue;

11
server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java
View File

@ -148,8 +148,7 @@ public class RangeFieldMapper extends FieldMapper {
FormatDateTimeFormatter dateTimeFormatter = fieldType().dateTimeFormatter; FormatDateTimeFormatter dateTimeFormatter = fieldType().dateTimeFormatter;
if (fieldType().rangeType == RangeType.DATE) { if (fieldType().rangeType == RangeType.DATE) {
if (!locale.equals(dateTimeFormatter.locale())) { if (!locale.equals(dateTimeFormatter.locale())) {
fieldType().setDateTimeFormatter(new FormatDateTimeFormatter(dateTimeFormatter.format(), fieldType().setDateTimeFormatter(dateTimeFormatter.withLocale(locale));
dateTimeFormatter.parser(), dateTimeFormatter.printer(), locale));
} }
} else if (dateTimeFormatter != null) { } else if (dateTimeFormatter != null) {
throw new IllegalArgumentException("field [" + name() + "] of type [" + fieldType().rangeType throw new IllegalArgumentException("field [" + name() + "] of type [" + fieldType().rangeType
@ -236,7 +235,7 @@ public class RangeFieldMapper extends FieldMapper {
RangeFieldType that = (RangeFieldType) o; RangeFieldType that = (RangeFieldType) o;
return Objects.equals(rangeType, that.rangeType) && return Objects.equals(rangeType, that.rangeType) &&
(rangeType == RangeType.DATE) ? (rangeType == RangeType.DATE) ?
Objects.equals(dateTimeFormatter.format(), that.dateTimeFormatter.format()) Objects.equals(dateTimeFormatter.pattern(), that.dateTimeFormatter.pattern())
&& Objects.equals(dateTimeFormatter.locale(), that.dateTimeFormatter.locale()) && Objects.equals(dateTimeFormatter.locale(), that.dateTimeFormatter.locale())
: dateTimeFormatter == null && that.dateTimeFormatter == null; : dateTimeFormatter == null && that.dateTimeFormatter == null;
} }
@ -244,7 +243,7 @@ public class RangeFieldMapper extends FieldMapper {
@Override @Override
public int hashCode() { public int hashCode() {
return (dateTimeFormatter == null) ? Objects.hash(super.hashCode(), rangeType) return (dateTimeFormatter == null) ? Objects.hash(super.hashCode(), rangeType)
: Objects.hash(super.hashCode(), rangeType, dateTimeFormatter.format(), dateTimeFormatter.locale()); : Objects.hash(super.hashCode(), rangeType, dateTimeFormatter.pattern(), dateTimeFormatter.locale());
} }
@Override @Override
@ -406,8 +405,8 @@ public class RangeFieldMapper extends FieldMapper {
if (fieldType().rangeType == RangeType.DATE if (fieldType().rangeType == RangeType.DATE
&& (includeDefaults || (fieldType().dateTimeFormatter() != null && (includeDefaults || (fieldType().dateTimeFormatter() != null
&& fieldType().dateTimeFormatter().format().equals(DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.format()) == false))) { && fieldType().dateTimeFormatter().pattern().equals(DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.pattern()) == false))) {
builder.field("format", fieldType().dateTimeFormatter().format()); builder.field("format", fieldType().dateTimeFormatter().pattern());
} }
if (fieldType().rangeType == RangeType.DATE if (fieldType().rangeType == RangeType.DATE
&& (includeDefaults || (fieldType().dateTimeFormatter() != null && (includeDefaults || (fieldType().dateTimeFormatter() != null

2
server/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java
View File

@ -303,7 +303,7 @@ public class RootObjectMapper extends ObjectMapper {
if (dynamicDateTimeFormatters.explicit() || includeDefaults) { if (dynamicDateTimeFormatters.explicit() || includeDefaults) {
builder.startArray("dynamic_date_formats"); builder.startArray("dynamic_date_formats");
for (FormatDateTimeFormatter dateTimeFormatter : dynamicDateTimeFormatters.value()) { for (FormatDateTimeFormatter dateTimeFormatter : dynamicDateTimeFormatters.value()) {
builder.value(dateTimeFormatter.format()); builder.value(dateTimeFormatter.pattern());
} }
builder.endArray(); builder.endArray();
} }

10
server/src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java
View File

@ -133,7 +133,7 @@ public class RangeQueryBuilder extends AbstractQueryBuilder<RangeQueryBuilder> i
out.writeOptionalTimeZone(timeZone); out.writeOptionalTimeZone(timeZone);
String formatString = null; String formatString = null;
if (this.format != null) { if (this.format != null) {
formatString = this.format.format(); formatString = this.format.pattern();
} }
out.writeOptionalString(formatString); out.writeOptionalString(formatString);
String relationString = null; String relationString = null;
@ -298,7 +298,7 @@ public class RangeQueryBuilder extends AbstractQueryBuilder<RangeQueryBuilder> i
* Gets the format field to parse the from/to fields * Gets the format field to parse the from/to fields
*/ */
public String format() { public String format() {
return this.format == null ? null : this.format.format(); return this.format == null ? null : this.format.pattern();
} }
DateMathParser getForceDateParser() { // pkg private for testing DateMathParser getForceDateParser() { // pkg private for testing
@ -338,7 +338,7 @@ public class RangeQueryBuilder extends AbstractQueryBuilder<RangeQueryBuilder> i
builder.field(TIME_ZONE_FIELD.getPreferredName(), timeZone.getID()); builder.field(TIME_ZONE_FIELD.getPreferredName(), timeZone.getID());
} }
if (format != null) { if (format != null) {
builder.field(FORMAT_FIELD.getPreferredName(), format.format()); builder.field(FORMAT_FIELD.getPreferredName(), format.pattern());
} }
if (relation != null) { if (relation != null) {
builder.field(RELATION_FIELD.getPreferredName(), relation.getRelationName()); builder.field(RELATION_FIELD.getPreferredName(), relation.getRelationName());
@ -533,14 +533,14 @@ public class RangeQueryBuilder extends AbstractQueryBuilder<RangeQueryBuilder> i
@Override @Override
protected int doHashCode() { protected int doHashCode() {
String timeZoneId = timeZone == null ? null : timeZone.getID(); String timeZoneId = timeZone == null ? null : timeZone.getID();
String formatString = format == null ? null : format.format(); String formatString = format == null ? null : format.pattern();
return Objects.hash(fieldName, from, to, timeZoneId, includeLower, includeUpper, formatString); return Objects.hash(fieldName, from, to, timeZoneId, includeLower, includeUpper, formatString);
} }
@Override @Override
protected boolean doEquals(RangeQueryBuilder other) { protected boolean doEquals(RangeQueryBuilder other) {
String timeZoneId = timeZone == null ? null : timeZone.getID(); String timeZoneId = timeZone == null ? null : timeZone.getID();
String formatString = format == null ? null : format.format(); String formatString = format == null ? null : format.pattern();
return Objects.equals(fieldName, other.fieldName) && return Objects.equals(fieldName, other.fieldName) &&
Objects.equals(from, other.from) && Objects.equals(from, other.from) &&
Objects.equals(to, other.to) && Objects.equals(to, other.to) &&

7
server/src/main/java/org/elasticsearch/search/DocValueFormat.java
View File

@ -39,6 +39,7 @@ import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols; import java.text.DecimalFormatSymbols;
import java.text.NumberFormat; import java.text.NumberFormat;
import java.text.ParseException; import java.text.ParseException;
import java.time.ZoneId;
import java.util.Arrays; import java.util.Arrays;
import java.util.Base64; import java.util.Base64;
import java.util.Locale; import java.util.Locale;
@ -174,11 +175,13 @@ public interface DocValueFormat extends NamedWriteable {
final FormatDateTimeFormatter formatter; final FormatDateTimeFormatter formatter;
// TODO: change this to ZoneId, but will require careful change to serialization // TODO: change this to ZoneId, but will require careful change to serialization
final DateTimeZone timeZone; final DateTimeZone timeZone;
private final ZoneId zoneId;
private final DateMathParser parser; private final DateMathParser parser;
public DateTime(FormatDateTimeFormatter formatter, DateTimeZone timeZone) { public DateTime(FormatDateTimeFormatter formatter, DateTimeZone timeZone) {
this.formatter = Objects.requireNonNull(formatter); this.formatter = Objects.requireNonNull(formatter);
this.timeZone = Objects.requireNonNull(timeZone); this.timeZone = Objects.requireNonNull(timeZone);
this.zoneId = DateUtils.dateTimeZoneToZoneId(timeZone);
this.parser = formatter.toDateMathParser(); this.parser = formatter.toDateMathParser();
} }
@ -193,13 +196,13 @@ public interface DocValueFormat extends NamedWriteable {
@Override @Override
public void writeTo(StreamOutput out) throws IOException { public void writeTo(StreamOutput out) throws IOException {
out.writeString(formatter.format()); out.writeString(formatter.pattern());
out.writeString(timeZone.getID()); out.writeString(timeZone.getID());
} }
@Override @Override
public String format(long value) { public String format(long value) {
return formatter.printer().withZone(timeZone).print(value); return formatter.withZone(zoneId).formatMillis(value);
} }
@Override @Override

6
server/src/test/java/org/elasticsearch/common/joda/JavaJodaTimeDuellingTests.java
View File

@ -479,7 +479,7 @@ public class JavaJodaTimeDuellingTests extends ESTestCase {
private void assertSamePrinterOutput(String format, ZonedDateTime javaDate, DateTime jodaDate) { private void assertSamePrinterOutput(String format, ZonedDateTime javaDate, DateTime jodaDate) {
assertThat(jodaDate.getMillis(), is(javaDate.toInstant().toEpochMilli())); assertThat(jodaDate.getMillis(), is(javaDate.toInstant().toEpochMilli()));
String javaTimeOut = DateFormatters.forPattern(format).format(javaDate); String javaTimeOut = DateFormatters.forPattern(format).format(javaDate);
String jodaTimeOut = Joda.forPattern(format).printer().print(jodaDate); String jodaTimeOut = Joda.forPattern(format).formatJoda(jodaDate);
String message = String.format(Locale.ROOT, "expected string representation to be equal for format [%s]: joda [%s], java [%s]", String message = String.format(Locale.ROOT, "expected string representation to be equal for format [%s]: joda [%s], java [%s]",
format, jodaTimeOut, javaTimeOut); format, jodaTimeOut, javaTimeOut);
assertThat(message, javaTimeOut, is(jodaTimeOut)); assertThat(message, javaTimeOut, is(jodaTimeOut));
@ -487,7 +487,7 @@ public class JavaJodaTimeDuellingTests extends ESTestCase {
private void assertSameDate(String input, String format) { private void assertSameDate(String input, String format) {
FormatDateTimeFormatter jodaFormatter = Joda.forPattern(format); FormatDateTimeFormatter jodaFormatter = Joda.forPattern(format);
DateTime jodaDateTime = jodaFormatter.parser().parseDateTime(input); DateTime jodaDateTime = jodaFormatter.parseJoda(input);
DateFormatter javaTimeFormatter = DateFormatters.forPattern(format); DateFormatter javaTimeFormatter = DateFormatters.forPattern(format);
TemporalAccessor javaTimeAccessor = javaTimeFormatter.parse(input); TemporalAccessor javaTimeAccessor = javaTimeFormatter.parse(input);
@ -506,7 +506,7 @@ public class JavaJodaTimeDuellingTests extends ESTestCase {
private void assertJodaParseException(String input, String format, String expectedMessage) { private void assertJodaParseException(String input, String format, String expectedMessage) {
FormatDateTimeFormatter jodaFormatter = Joda.forPattern(format); FormatDateTimeFormatter jodaFormatter = Joda.forPattern(format);
IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> jodaFormatter.parser().parseDateTime(input)); IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> jodaFormatter.parseJoda(input));
assertThat(e.getMessage(), containsString(expectedMessage)); assertThat(e.getMessage(), containsString(expectedMessage));
} }

6
server/src/test/java/org/elasticsearch/common/joda/JodaDateMathParserTests.java
View File

@ -50,7 +50,7 @@ public class JodaDateMathParserTests extends ESTestCase {
if (gotMillis != expectedMillis) { if (gotMillis != expectedMillis) {
fail("Date math not equal\n" + fail("Date math not equal\n" +
"Original : " + original + "\n" + "Original : " + original + "\n" +
"Parsed : " + formatter.printer().print(gotMillis) + "\n" + "Parsed : " + formatter.formatMillis(gotMillis) + "\n" +
"Expected : " + expected + "\n" + "Expected : " + expected + "\n" +
"Expected milliseconds : " + expectedMillis + "\n" + "Expected milliseconds : " + expectedMillis + "\n" +
"Actual milliseconds : " + gotMillis + "\n"); "Actual milliseconds : " + gotMillis + "\n");
@ -161,10 +161,10 @@ public class JodaDateMathParserTests extends ESTestCase {
FormatDateTimeFormatter formatter = Joda.forPattern("HH:mm:ss"); FormatDateTimeFormatter formatter = Joda.forPattern("HH:mm:ss");
JodaDateMathParser parser = new JodaDateMathParser(formatter); JodaDateMathParser parser = new JodaDateMathParser(formatter);
assertEquals( assertEquals(
this.formatter.parser().parseMillis("1970-01-01T04:52:20.000Z"), this.formatter.parseMillis("1970-01-01T04:52:20.000Z"),
parser.parse("04:52:20", () -> 0, false, (ZoneId) null)); parser.parse("04:52:20", () -> 0, false, (ZoneId) null));
assertEquals( assertEquals(
this.formatter.parser().parseMillis("1970-01-01T04:52:20.999Z"), this.formatter.parseMillis("1970-01-01T04:52:20.999Z"),
parser.parse("04:52:20", () -> 0, true, (ZoneId) null)); parser.parse("04:52:20", () -> 0, true, (ZoneId) null));
} }

19
server/src/test/java/org/elasticsearch/common/joda/JodaTests.java
View File

@ -22,7 +22,8 @@ package org.elasticsearch.common.joda;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.joda.time.DateTimeZone; import org.joda.time.DateTimeZone;
import org.joda.time.format.DateTimeFormatter;
import java.time.ZoneOffset;
public class JodaTests extends ESTestCase { public class JodaTests extends ESTestCase {
@ -30,20 +31,16 @@ public class JodaTests extends ESTestCase {
public void testBasicTTimePattern() { public void testBasicTTimePattern() {
FormatDateTimeFormatter formatter1 = Joda.forPattern("basic_t_time"); FormatDateTimeFormatter formatter1 = Joda.forPattern("basic_t_time");
assertEquals(formatter1.format(), "basic_t_time"); assertEquals(formatter1.pattern(), "basic_t_time");
DateTimeFormatter parser1 = formatter1.parser(); assertEquals(formatter1.zone(), ZoneOffset.UTC);
assertEquals(parser1.getZone(), DateTimeZone.UTC);
FormatDateTimeFormatter formatter2 = Joda.forPattern("basicTTime"); FormatDateTimeFormatter formatter2 = Joda.forPattern("basicTTime");
assertEquals(formatter2.format(), "basicTTime"); assertEquals(formatter2.pattern(), "basicTTime");
DateTimeFormatter parser2 = formatter2.parser(); assertEquals(formatter2.zone(), ZoneOffset.UTC);
assertEquals(parser2.getZone(), DateTimeZone.UTC);
DateTime dt = new DateTime(2004, 6, 9, 10, 20, 30, 40, DateTimeZone.UTC); DateTime dt = new DateTime(2004, 6, 9, 10, 20, 30, 40, DateTimeZone.UTC);
assertEquals("T102030.040Z", parser1.print(dt)); assertEquals("T102030.040Z", formatter1.formatJoda(dt));
assertEquals("T102030.040Z", parser2.print(dt)); assertEquals("T102030.040Z", formatter1.formatJoda(dt));
expectThrows(IllegalArgumentException.class, () -> Joda.forPattern("basic_t_Time")); expectThrows(IllegalArgumentException.class, () -> Joda.forPattern("basic_t_Time"));
expectThrows(IllegalArgumentException.class, () -> Joda.forPattern("basic_T_Time")); expectThrows(IllegalArgumentException.class, () -> Joda.forPattern("basic_T_Time"));

8
server/src/test/java/org/elasticsearch/common/time/DateFormattersTests.java
View File

@ -128,9 +128,9 @@ public class DateFormattersTests extends ESTestCase {
} }
public void testLocales() { public void testLocales() {
assertThat(DateFormatters.forPattern("strict_date_optional_time").getLocale(), is(Locale.ROOT)); assertThat(DateFormatters.forPattern("strict_date_optional_time").locale(), is(Locale.ROOT));
Locale locale = randomLocale(random()); Locale locale = randomLocale(random());
assertThat(DateFormatters.forPattern("strict_date_optional_time").withLocale(locale).getLocale(), is(locale)); assertThat(DateFormatters.forPattern("strict_date_optional_time").withLocale(locale).locale(), is(locale));
if (locale.equals(Locale.ROOT)) { if (locale.equals(Locale.ROOT)) {
DateFormatter millisFormatter = DateFormatters.forPattern("epoch_millis"); DateFormatter millisFormatter = DateFormatters.forPattern("epoch_millis");
assertThat(millisFormatter.withLocale(locale), is(millisFormatter)); assertThat(millisFormatter.withLocale(locale), is(millisFormatter));
@ -147,9 +147,9 @@ public class DateFormattersTests extends ESTestCase {
public void testTimeZones() { public void testTimeZones() {
// zone is null by default due to different behaviours between java8 and above // zone is null by default due to different behaviours between java8 and above
assertThat(DateFormatters.forPattern("strict_date_optional_time").getZone(), is(nullValue())); assertThat(DateFormatters.forPattern("strict_date_optional_time").zone(), is(nullValue()));
ZoneId zoneId = randomZone(); ZoneId zoneId = randomZone();
assertThat(DateFormatters.forPattern("strict_date_optional_time").withZone(zoneId).getZone(), is(zoneId)); assertThat(DateFormatters.forPattern("strict_date_optional_time").withZone(zoneId).zone(), is(zoneId));
if (zoneId.equals(ZoneOffset.UTC)) { if (zoneId.equals(ZoneOffset.UTC)) {
DateFormatter millisFormatter = DateFormatters.forPattern("epoch_millis"); DateFormatter millisFormatter = DateFormatters.forPattern("epoch_millis");
assertThat(millisFormatter.withZone(zoneId), is(millisFormatter)); assertThat(millisFormatter.withZone(zoneId), is(millisFormatter));

91
server/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java
View File

@ -113,7 +113,7 @@ public class SimpleJodaTests extends ESTestCase {
assertThat(millis, equalTo(0L)); assertThat(millis, equalTo(0L));
FormatDateTimeFormatter formatter2 = Joda.forPattern("yyyy/MM/dd HH:mm:ss"); FormatDateTimeFormatter formatter2 = Joda.forPattern("yyyy/MM/dd HH:mm:ss");
millis = formatter2.parser().parseMillis("1970/01/01 00:00:00"); millis = formatter2.parseMillis("1970/01/01 00:00:00");
assertThat(millis, equalTo(0L)); assertThat(millis, equalTo(0L));
} }
@ -126,14 +126,14 @@ public class SimpleJodaTests extends ESTestCase {
public void testSlashInFormat() { public void testSlashInFormat() {
FormatDateTimeFormatter formatter = Joda.forPattern("MM/yyyy"); FormatDateTimeFormatter formatter = Joda.forPattern("MM/yyyy");
formatter.parser().parseMillis("01/2001"); formatter.parseMillis("01/2001");
formatter = Joda.forPattern("yyyy/MM/dd HH:mm:ss"); formatter = Joda.forPattern("yyyy/MM/dd HH:mm:ss");
long millis = formatter.parser().parseMillis("1970/01/01 00:00:00"); long millis = formatter.parseMillis("1970/01/01 00:00:00");
formatter.printer().print(millis); formatter.formatMillis(millis);
try { try {
millis = formatter.parser().parseMillis("1970/01/01"); millis = formatter.parseMillis("1970/01/01");
fail(); fail();
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
// it really can't parse this one // it really can't parse this one
@ -142,15 +142,15 @@ public class SimpleJodaTests extends ESTestCase {
public void testMultipleFormats() { public void testMultipleFormats() {
FormatDateTimeFormatter formatter = Joda.forPattern("yyyy/MM/dd HH:mm:ss||yyyy/MM/dd"); FormatDateTimeFormatter formatter = Joda.forPattern("yyyy/MM/dd HH:mm:ss||yyyy/MM/dd");
long millis = formatter.parser().parseMillis("1970/01/01 00:00:00"); long millis = formatter.parseMillis("1970/01/01 00:00:00");
assertThat("1970/01/01 00:00:00", is(formatter.printer().print(millis))); assertThat("1970/01/01 00:00:00", is(formatter.formatMillis(millis)));
} }
public void testMultipleDifferentFormats() { public void testMultipleDifferentFormats() {
FormatDateTimeFormatter formatter = Joda.forPattern("yyyy/MM/dd HH:mm:ss||yyyy/MM/dd"); FormatDateTimeFormatter formatter = Joda.forPattern("yyyy/MM/dd HH:mm:ss||yyyy/MM/dd");
String input = "1970/01/01 00:00:00"; String input = "1970/01/01 00:00:00";
long millis = formatter.parser().parseMillis(input); long millis = formatter.parseMillis(input);
assertThat(input, is(formatter.printer().print(millis))); assertThat(input, is(formatter.formatMillis(millis)));
Joda.forPattern("yyyy/MM/dd HH:mm:ss||yyyy/MM/dd||dateOptionalTime"); Joda.forPattern("yyyy/MM/dd HH:mm:ss||yyyy/MM/dd||dateOptionalTime");
Joda.forPattern("dateOptionalTime||yyyy/MM/dd HH:mm:ss||yyyy/MM/dd"); Joda.forPattern("dateOptionalTime||yyyy/MM/dd HH:mm:ss||yyyy/MM/dd");
@ -246,7 +246,7 @@ public class SimpleJodaTests extends ESTestCase {
// epoch: 1433144433655 => date: Mon Jun 1 09:40:33.655 CEST 2015 // epoch: 1433144433655 => date: Mon Jun 1 09:40:33.655 CEST 2015
FormatDateTimeFormatter formatter = Joda.forPattern(parseMilliSeconds ? "epoch_millis" : "epoch_second"); FormatDateTimeFormatter formatter = Joda.forPattern(parseMilliSeconds ? "epoch_millis" : "epoch_second");
DateTime dateTime = formatter.parser().parseDateTime(parseMilliSeconds ? "1433144433655" : "1433144433"); DateTime dateTime = formatter.parseJoda(parseMilliSeconds ? "1433144433655" : "1433144433");
assertThat(dateTime.getYear(), is(2015)); assertThat(dateTime.getYear(), is(2015));
assertThat(dateTime.getDayOfMonth(), is(1)); assertThat(dateTime.getDayOfMonth(), is(1));
@ -263,14 +263,14 @@ public class SimpleJodaTests extends ESTestCase {
// test floats get truncated // test floats get truncated
String epochFloatValue = String.format(Locale.US, "%d.%d", dateTime.getMillis() / (parseMilliSeconds ? 1L : 1000L), randomNonNegativeLong()); String epochFloatValue = String.format(Locale.US, "%d.%d", dateTime.getMillis() / (parseMilliSeconds ? 1L : 1000L), randomNonNegativeLong());
assertThat(formatter.parser().parseDateTime(epochFloatValue).getMillis(), is(dateTime.getMillis())); assertThat(formatter.parseJoda(epochFloatValue).getMillis(), is(dateTime.getMillis()));
} }
public void testThatNegativeEpochsCanBeParsed() { public void testThatNegativeEpochsCanBeParsed() {
// problem: negative epochs can be arbitrary in size... // problem: negative epochs can be arbitrary in size...
boolean parseMilliSeconds = randomBoolean(); boolean parseMilliSeconds = randomBoolean();
FormatDateTimeFormatter formatter = Joda.forPattern(parseMilliSeconds ? "epoch_millis" : "epoch_second"); FormatDateTimeFormatter formatter = Joda.forPattern(parseMilliSeconds ? "epoch_millis" : "epoch_second");
DateTime dateTime = formatter.parser().parseDateTime("-10000"); DateTime dateTime = formatter.parseJoda("-10000");
assertThat(dateTime.getYear(), is(1969)); assertThat(dateTime.getYear(), is(1969));
assertThat(dateTime.getMonthOfYear(), is(12)); assertThat(dateTime.getMonthOfYear(), is(12));
@ -287,31 +287,31 @@ public class SimpleJodaTests extends ESTestCase {
// test floats get truncated // test floats get truncated
String epochFloatValue = String.format(Locale.US, "%d.%d", dateTime.getMillis() / (parseMilliSeconds ? 1L : 1000L), randomNonNegativeLong()); String epochFloatValue = String.format(Locale.US, "%d.%d", dateTime.getMillis() / (parseMilliSeconds ? 1L : 1000L), randomNonNegativeLong());
assertThat(formatter.parser().parseDateTime(epochFloatValue).getMillis(), is(dateTime.getMillis())); assertThat(formatter.parseJoda(epochFloatValue).getMillis(), is(dateTime.getMillis()));
// every negative epoch must be parsed, no matter if exact the size or bigger // every negative epoch must be parsed, no matter if exact the size or bigger
if (parseMilliSeconds) { if (parseMilliSeconds) {
formatter.parser().parseDateTime("-100000000"); formatter.parseJoda("-100000000");
formatter.parser().parseDateTime("-999999999999"); formatter.parseJoda("-999999999999");
formatter.parser().parseDateTime("-1234567890123"); formatter.parseJoda("-1234567890123");
formatter.parser().parseDateTime("-1234567890123456789"); formatter.parseJoda("-1234567890123456789");
formatter.parser().parseDateTime("-1234567890123.9999"); formatter.parseJoda("-1234567890123.9999");
formatter.parser().parseDateTime("-1234567890123456789.9999"); formatter.parseJoda("-1234567890123456789.9999");
} else { } else {
formatter.parser().parseDateTime("-100000000"); formatter.parseJoda("-100000000");
formatter.parser().parseDateTime("-1234567890"); formatter.parseJoda("-1234567890");
formatter.parser().parseDateTime("-1234567890123456"); formatter.parseJoda("-1234567890123456");
formatter.parser().parseDateTime("-1234567890.9999"); formatter.parseJoda("-1234567890.9999");
formatter.parser().parseDateTime("-1234567890123456.9999"); formatter.parseJoda("-1234567890123456.9999");
} }
} }
public void testForInvalidDatesInEpochSecond() { public void testForInvalidDatesInEpochSecond() {
FormatDateTimeFormatter formatter = Joda.forPattern("epoch_second"); FormatDateTimeFormatter formatter = Joda.forPattern("epoch_second");
try { try {
formatter.parser().parseDateTime(randomFrom("invalid date", "12345678901234567", "12345678901234567890")); formatter.parseJoda(randomFrom("invalid date", "12345678901234567", "12345678901234567890"));
fail("Expected IllegalArgumentException"); fail("Expected IllegalArgumentException");
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
assertThat(e.getMessage(), containsString("Invalid format")); assertThat(e.getMessage(), containsString("Invalid format"));
@ -321,7 +321,7 @@ public class SimpleJodaTests extends ESTestCase {
public void testForInvalidDatesInEpochMillis() { public void testForInvalidDatesInEpochMillis() {
FormatDateTimeFormatter formatter = Joda.forPattern("epoch_millis"); FormatDateTimeFormatter formatter = Joda.forPattern("epoch_millis");
try { try {
formatter.parser().parseDateTime(randomFrom("invalid date", "12345678901234567890")); formatter.parseJoda(randomFrom("invalid date", "12345678901234567890"));
fail("Expected IllegalArgumentException"); fail("Expected IllegalArgumentException");
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
assertThat(e.getMessage(), containsString("Invalid format")); assertThat(e.getMessage(), containsString("Invalid format"));
@ -332,11 +332,12 @@ public class SimpleJodaTests extends ESTestCase {
DateTimeFormatter dateTimeFormatter = new DateTimeFormatterBuilder() DateTimeFormatter dateTimeFormatter = new DateTimeFormatterBuilder()
.append(new Joda.EpochTimeParser(false)) .append(new Joda.EpochTimeParser(false))
.toFormatter() .toFormatter()
.withZone(DateTimeZone.forOffsetHours(1)); .withZone(DateTimeZone.forOffsetHours(1))
.withLocale(Locale.ROOT);
FormatDateTimeFormatter formatter = FormatDateTimeFormatter formatter =
new FormatDateTimeFormatter("epoch_seconds", dateTimeFormatter, Locale.ROOT); new FormatDateTimeFormatter("epoch_seconds", dateTimeFormatter, dateTimeFormatter);
try { try {
formatter.parser().parseDateTime("1433144433655"); formatter.parseJoda("1433144433655");
fail("Expected IllegalArgumentException"); fail("Expected IllegalArgumentException");
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
assertThat(e.getMessage(), containsString("time_zone must be UTC")); assertThat(e.getMessage(), containsString("time_zone must be UTC"));
@ -347,11 +348,12 @@ public class SimpleJodaTests extends ESTestCase {
DateTimeFormatter dateTimeFormatter = new DateTimeFormatterBuilder() DateTimeFormatter dateTimeFormatter = new DateTimeFormatterBuilder()
.append(new Joda.EpochTimeParser(true)) .append(new Joda.EpochTimeParser(true))
.toFormatter() .toFormatter()
.withZone(DateTimeZone.forOffsetHours(1)); .withZone(DateTimeZone.forOffsetHours(1))
.withLocale(Locale.ROOT);
FormatDateTimeFormatter formatter = FormatDateTimeFormatter formatter =
new FormatDateTimeFormatter("epoch_millis", dateTimeFormatter, Locale.ROOT); new FormatDateTimeFormatter("epoch_millis", dateTimeFormatter, dateTimeFormatter);
try { try {
formatter.parser().parseDateTime("1433144433"); formatter.parseJoda("1433144433");
fail("Expected IllegalArgumentException"); fail("Expected IllegalArgumentException");
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
assertThat(e.getMessage(), containsString("time_zone must be UTC")); assertThat(e.getMessage(), containsString("time_zone must be UTC"));
@ -387,23 +389,23 @@ public class SimpleJodaTests extends ESTestCase {
public void testThatEpochParserIsIdempotent() { public void testThatEpochParserIsIdempotent() {
FormatDateTimeFormatter formatter = Joda.forPattern("epoch_millis"); FormatDateTimeFormatter formatter = Joda.forPattern("epoch_millis");
DateTime dateTime = formatter.parser().parseDateTime("1234567890123"); DateTime dateTime = formatter.parseJoda("1234567890123");
assertThat(dateTime.getMillis(), is(1234567890123L)); assertThat(dateTime.getMillis(), is(1234567890123L));
dateTime = formatter.printer().parseDateTime("1234567890456"); dateTime = formatter.parseJoda("1234567890456");
assertThat(dateTime.getMillis(), is(1234567890456L)); assertThat(dateTime.getMillis(), is(1234567890456L));
dateTime = formatter.parser().parseDateTime("1234567890789"); dateTime = formatter.parseJoda("1234567890789");
assertThat(dateTime.getMillis(), is(1234567890789L)); assertThat(dateTime.getMillis(), is(1234567890789L));
dateTime = formatter.parser().parseDateTime("1234567890123456789"); dateTime = formatter.parseJoda("1234567890123456789");
assertThat(dateTime.getMillis(), is(1234567890123456789L)); assertThat(dateTime.getMillis(), is(1234567890123456789L));
FormatDateTimeFormatter secondsFormatter = Joda.forPattern("epoch_second"); FormatDateTimeFormatter secondsFormatter = Joda.forPattern("epoch_second");
DateTime secondsDateTime = secondsFormatter.parser().parseDateTime("1234567890"); DateTime secondsDateTime = secondsFormatter.parseJoda("1234567890");
assertThat(secondsDateTime.getMillis(), is(1234567890000L)); assertThat(secondsDateTime.getMillis(), is(1234567890000L));
secondsDateTime = secondsFormatter.printer().parseDateTime("1234567890"); secondsDateTime = secondsFormatter.parseJoda("1234567890");
assertThat(secondsDateTime.getMillis(), is(1234567890000L)); assertThat(secondsDateTime.getMillis(), is(1234567890000L));
secondsDateTime = secondsFormatter.parser().parseDateTime("1234567890"); secondsDateTime = secondsFormatter.parseJoda("1234567890");
assertThat(secondsDateTime.getMillis(), is(1234567890000L)); assertThat(secondsDateTime.getMillis(), is(1234567890000L));
secondsDateTime = secondsFormatter.parser().parseDateTime("1234567890123456"); secondsDateTime = secondsFormatter.parseJoda("1234567890123456");
assertThat(secondsDateTime.getMillis(), is(1234567890123456000L)); assertThat(secondsDateTime.getMillis(), is(1234567890123456000L));
} }
@ -728,7 +730,7 @@ public class SimpleJodaTests extends ESTestCase {
boolean dateParsingSuccessful = false; boolean dateParsingSuccessful = false;
for (FormatDateTimeFormatter dateTimeFormatter : RootObjectMapper.Defaults.DYNAMIC_DATE_TIME_FORMATTERS) { for (FormatDateTimeFormatter dateTimeFormatter : RootObjectMapper.Defaults.DYNAMIC_DATE_TIME_FORMATTERS) {
try { try {
dateTimeFormatter.parser().parseMillis(date); dateTimeFormatter.parseMillis(date);
dateParsingSuccessful = true; dateParsingSuccessful = true;
break; break;
} catch (Exception e) {} } catch (Exception e) {}
@ -742,7 +744,7 @@ public class SimpleJodaTests extends ESTestCase {
for (String date : datesThatShouldNotWork) { for (String date : datesThatShouldNotWork) {
for (FormatDateTimeFormatter dateTimeFormatter : RootObjectMapper.Defaults.DYNAMIC_DATE_TIME_FORMATTERS) { for (FormatDateTimeFormatter dateTimeFormatter : RootObjectMapper.Defaults.DYNAMIC_DATE_TIME_FORMATTERS) {
try { try {
dateTimeFormatter.parser().parseMillis(date); dateTimeFormatter.parseMillis(date);
fail(String.format(Locale.ROOT, "Expected exception when parsing date %s in root mapper", date)); fail(String.format(Locale.ROOT, "Expected exception when parsing date %s in root mapper", date));
} catch (Exception e) {} } catch (Exception e) {}
} }
@ -755,14 +757,13 @@ public class SimpleJodaTests extends ESTestCase {
private void assertValidDateFormatParsing(String pattern, String dateToParse, String expectedDate) { private void assertValidDateFormatParsing(String pattern, String dateToParse, String expectedDate) {
FormatDateTimeFormatter formatter = Joda.forPattern(pattern); FormatDateTimeFormatter formatter = Joda.forPattern(pattern);
assertThat(formatter.printer().print(formatter.parser().parseMillis(dateToParse)), is(expectedDate)); assertThat(formatter.formatMillis(formatter.parseMillis(dateToParse)), is(expectedDate));
} }
private void assertDateFormatParsingThrowingException(String pattern, String invalidDate) { private void assertDateFormatParsingThrowingException(String pattern, String invalidDate) {
try { try {
FormatDateTimeFormatter formatter = Joda.forPattern(pattern); FormatDateTimeFormatter formatter = Joda.forPattern(pattern);
DateTimeFormatter parser = formatter.parser(); formatter.parseMillis(invalidDate);
parser.parseMillis(invalidDate);
fail(String.format(Locale.ROOT, "Expected parsing exception for pattern [%s] with date [%s], but did not happen", pattern, invalidDate)); fail(String.format(Locale.ROOT, "Expected parsing exception for pattern [%s] with date [%s], but did not happen", pattern, invalidDate));
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
} }

16
server/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java
View File

@ -110,8 +110,8 @@ public class DateFieldTypeTests extends FieldTypeTestCase {
public void testIsFieldWithinQuery() throws IOException { public void testIsFieldWithinQuery() throws IOException {
Directory dir = newDirectory(); Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(null)); IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(null));
long instant1 = DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parser().parseDateTime("2015-10-12").getMillis(); long instant1 = DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parseJoda("2015-10-12").getMillis();
long instant2 = DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parser().parseDateTime("2016-04-03").getMillis(); long instant2 = DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parseJoda("2016-04-03").getMillis();
Document doc = new Document(); Document doc = new Document();
LongPoint field = new LongPoint("my_date", instant1); LongPoint field = new LongPoint("my_date", instant1);
doc.add(field); doc.add(field);
@ -138,7 +138,7 @@ public class DateFieldTypeTests extends FieldTypeTestCase {
public void testValueFormat() { public void testValueFormat() {
MappedFieldType ft = createDefaultFieldType(); MappedFieldType ft = createDefaultFieldType();
long instant = DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parser().parseDateTime("2015-10-12T14:10:55").getMillis(); long instant = DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parseJoda("2015-10-12T14:10:55").getMillis();
assertEquals("2015-10-12T14:10:55.000Z", assertEquals("2015-10-12T14:10:55.000Z",
ft.docValueFormat(null, DateTimeZone.UTC).format(instant)); ft.docValueFormat(null, DateTimeZone.UTC).format(instant));
assertEquals("2015-10-12T15:10:55.000+01:00", assertEquals("2015-10-12T15:10:55.000+01:00",
@ -149,14 +149,14 @@ public class DateFieldTypeTests extends FieldTypeTestCase {
ft.docValueFormat(null, DateTimeZone.UTC).parseLong("2015-10-12T14:10:55", false, null)); ft.docValueFormat(null, DateTimeZone.UTC).parseLong("2015-10-12T14:10:55", false, null));
assertEquals(instant + 999, assertEquals(instant + 999,
ft.docValueFormat(null, DateTimeZone.UTC).parseLong("2015-10-12T14:10:55", true, null)); ft.docValueFormat(null, DateTimeZone.UTC).parseLong("2015-10-12T14:10:55", true, null));
assertEquals(DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parser().parseDateTime("2015-10-13").getMillis() - 1, assertEquals(DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parseJoda("2015-10-13").getMillis() - 1,
ft.docValueFormat(null, DateTimeZone.UTC).parseLong("2015-10-12||/d", true, null)); ft.docValueFormat(null, DateTimeZone.UTC).parseLong("2015-10-12||/d", true, null));
} }
public void testValueForSearch() { public void testValueForSearch() {
MappedFieldType ft = createDefaultFieldType(); MappedFieldType ft = createDefaultFieldType();
String date = "2015-10-12T12:09:55.000Z"; String date = "2015-10-12T12:09:55.000Z";
long instant = DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parser().parseDateTime(date).getMillis(); long instant = DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parseJoda(date).getMillis();
assertEquals(date, ft.valueForDisplay(instant)); assertEquals(date, ft.valueForDisplay(instant));
} }
@ -170,7 +170,7 @@ public class DateFieldTypeTests extends FieldTypeTestCase {
MappedFieldType ft = createDefaultFieldType(); MappedFieldType ft = createDefaultFieldType();
ft.setName("field"); ft.setName("field");
String date = "2015-10-12T14:10:55"; String date = "2015-10-12T14:10:55";
long instant = DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parser().parseDateTime(date).getMillis(); long instant = DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parseJoda(date).getMillis();
ft.setIndexOptions(IndexOptions.DOCS); ft.setIndexOptions(IndexOptions.DOCS);
Query expected = new IndexOrDocValuesQuery( Query expected = new IndexOrDocValuesQuery(
LongPoint.newRangeQuery("field", instant, instant + 999), LongPoint.newRangeQuery("field", instant, instant + 999),
@ -193,8 +193,8 @@ public class DateFieldTypeTests extends FieldTypeTestCase {
ft.setName("field"); ft.setName("field");
String date1 = "2015-10-12T14:10:55"; String date1 = "2015-10-12T14:10:55";
String date2 = "2016-04-28T11:33:52"; String date2 = "2016-04-28T11:33:52";
long instant1 = DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parser().parseDateTime(date1).getMillis(); long instant1 = DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parseJoda(date1).getMillis();
long instant2 = DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parser().parseDateTime(date2).getMillis() + 999; long instant2 = DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parseJoda(date2).getMillis() + 999;
ft.setIndexOptions(IndexOptions.DOCS); ft.setIndexOptions(IndexOptions.DOCS);
Query expected = new IndexOrDocValuesQuery( Query expected = new IndexOrDocValuesQuery(
LongPoint.newRangeQuery("field", instant1, instant2), LongPoint.newRangeQuery("field", instant1, instant2),

6
server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java
View File

@ -709,11 +709,11 @@ public class DynamicMappingTests extends ESSingleNodeTestCase {
DateFieldMapper dateMapper2 = (DateFieldMapper) defaultMapper.mappers().getMapper("date2"); DateFieldMapper dateMapper2 = (DateFieldMapper) defaultMapper.mappers().getMapper("date2");
DateFieldMapper dateMapper3 = (DateFieldMapper) defaultMapper.mappers().getMapper("date3"); DateFieldMapper dateMapper3 = (DateFieldMapper) defaultMapper.mappers().getMapper("date3");
// inherited from dynamic date format // inherited from dynamic date format
assertEquals("yyyy-MM-dd", dateMapper1.fieldType().dateTimeFormatter().format()); assertEquals("yyyy-MM-dd", dateMapper1.fieldType().dateTimeFormatter().pattern());
// inherited from dynamic date format since the mapping in the template did not specify a format // inherited from dynamic date format since the mapping in the template did not specify a format
assertEquals("yyyy-MM-dd", dateMapper2.fieldType().dateTimeFormatter().format()); assertEquals("yyyy-MM-dd", dateMapper2.fieldType().dateTimeFormatter().pattern());
// not inherited from the dynamic date format since the template defined an explicit format // not inherited from the dynamic date format since the template defined an explicit format
assertEquals("yyyy-MM-dd||epoch_millis", dateMapper3.fieldType().dateTimeFormatter().format()); assertEquals("yyyy-MM-dd||epoch_millis", dateMapper3.fieldType().dateTimeFormatter().pattern());
} }
public void testDynamicTemplateOrder() throws IOException { public void testDynamicTemplateOrder() throws IOException {

4
server/src/test/java/org/elasticsearch/index/mapper/RangeFieldTypeTests.java
View File

@ -123,8 +123,8 @@ public class RangeFieldTypeTests extends FieldTypeTestCase {
// setting mapping format which is compatible with those dates // setting mapping format which is compatible with those dates
final FormatDateTimeFormatter formatter = Joda.forPattern("yyyy-dd-MM'T'HH:mm:ssZZ"); final FormatDateTimeFormatter formatter = Joda.forPattern("yyyy-dd-MM'T'HH:mm:ssZZ");
assertEquals(1465975790000L, formatter.parser().parseMillis(from)); assertEquals(1465975790000L, formatter.parseMillis(from));
assertEquals(1466062190000L, formatter.parser().parseMillis(to)); assertEquals(1466062190000L, formatter.parseMillis(to));
fieldType.setDateTimeFormatter(formatter); fieldType.setDateTimeFormatter(formatter);
final Query query = fieldType.rangeQuery(from, to, true, true, relation, null, null, context); final Query query = fieldType.rangeQuery(from, to, true, true, relation, null, null, context);

4
server/src/test/java/org/elasticsearch/script/JodaCompatibleZonedDateTimeTests.java
View File

@ -97,6 +97,10 @@ public class JodaCompatibleZonedDateTimeTests extends ESTestCase {
assertDeprecation(assertions, "Use of the joda time method [" + oldMethod + "] is deprecated. Use [" + newMethod + "] instead."); assertDeprecation(assertions, "Use of the joda time method [" + oldMethod + "] is deprecated. Use [" + newMethod + "] instead.");
} }
public void testToString() {
assertThat(javaTime.toString(), equalTo(jodaTime.toString()));
}
public void testDayOfMonth() { public void testDayOfMonth() {
assertThat(javaTime.getDayOfMonth(), equalTo(jodaTime.getDayOfMonth())); assertThat(javaTime.getDayOfMonth(), equalTo(jodaTime.getDayOfMonth()));
} }

2
server/src/test/java/org/elasticsearch/search/DocValueFormatTests.java
View File

@ -66,7 +66,7 @@ public class DocValueFormatTests extends ESTestCase {
in = new NamedWriteableAwareStreamInput(out.bytes().streamInput(), registry); in = new NamedWriteableAwareStreamInput(out.bytes().streamInput(), registry);
vf = in.readNamedWriteable(DocValueFormat.class); vf = in.readNamedWriteable(DocValueFormat.class);
assertEquals(DocValueFormat.DateTime.class, vf.getClass()); assertEquals(DocValueFormat.DateTime.class, vf.getClass());
assertEquals("epoch_second", ((DocValueFormat.DateTime) vf).formatter.format()); assertEquals("epoch_second", ((DocValueFormat.DateTime) vf).formatter.pattern());
assertEquals(DateTimeZone.forOffsetHours(1), ((DocValueFormat.DateTime) vf).timeZone); assertEquals(DateTimeZone.forOffsetHours(1), ((DocValueFormat.DateTime) vf).timeZone);
out = new BytesStreamOutput(); out = new BytesStreamOutput();

7
server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramIT.java
View File

@ -26,6 +26,7 @@ import org.elasticsearch.common.Strings;
import org.elasticsearch.common.joda.Joda; import org.elasticsearch.common.joda.Joda;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.time.DateMathParser; import org.elasticsearch.common.time.DateMathParser;
import org.elasticsearch.common.time.DateUtils;
import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.index.mapper.DateFieldMapper; import org.elasticsearch.index.mapper.DateFieldMapper;
import org.elasticsearch.index.query.MatchNoneQueryBuilder; import org.elasticsearch.index.query.MatchNoneQueryBuilder;
@ -50,6 +51,7 @@ import org.joda.time.format.DateTimeFormat;
import org.junit.After; import org.junit.After;
import java.io.IOException; import java.io.IOException;
import java.time.ZoneId;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
@ -87,7 +89,7 @@ public class DateHistogramIT extends ESIntegTestCase {
} }
private DateTime date(String date) { private DateTime date(String date) {
return DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parser().parseDateTime(date); return DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parseJoda(date);
} }
private static String format(DateTime date, String pattern) { private static String format(DateTime date, String pattern) {
@ -198,7 +200,8 @@ public class DateHistogramIT extends ESIntegTestCase {
} }
private static String getBucketKeyAsString(DateTime key, DateTimeZone tz) { private static String getBucketKeyAsString(DateTime key, DateTimeZone tz) {
return Joda.forPattern(DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.format()).printer().withZone(tz).print(key); ZoneId zoneId = DateUtils.dateTimeZoneToZoneId(tz);
return Joda.forPattern(DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.pattern()).withZone(zoneId).formatJoda(key);
} }
public void testSingleValuedField() throws Exception { public void testSingleValuedField() throws Exception {

2
server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetIT.java
View File

@ -52,7 +52,7 @@ public class DateHistogramOffsetIT extends ESIntegTestCase {
private static final String DATE_FORMAT = "yyyy-MM-dd:hh-mm-ss"; private static final String DATE_FORMAT = "yyyy-MM-dd:hh-mm-ss";
private DateTime date(String date) { private DateTime date(String date) {
return DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parser().parseDateTime(date); return DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parseJoda(date);
} }
@Before @Before

2
server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java
View File

@ -1835,6 +1835,6 @@ public class CompositeAggregatorTests extends AggregatorTestCase {
} }
private static long asLong(String dateTime) { private static long asLong(String dateTime) {
return DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parser().parseDateTime(dateTime).getMillis(); return DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parseJoda(dateTime).getMillis();
} }
} }

2
server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTests.java
View File

@ -455,6 +455,6 @@ public class DateHistogramAggregatorTests extends AggregatorTestCase {
} }
private static long asLong(String dateTime) { private static long asLong(String dateTime) {
return DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parser().parseDateTime(dateTime).getMillis(); return DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parseJoda(dateTime).getMillis();
} }
} }

2
server/src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketAggregatorTests.java
View File

@ -143,6 +143,6 @@ public class AvgBucketAggregatorTests extends AggregatorTestCase {
private static long asLong(String dateTime) { private static long asLong(String dateTime) {
return DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parser().parseDateTime(dateTime).getMillis(); return DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parseJoda(dateTime).getMillis();
} }
} }

2
server/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumAggregatorTests.java
View File

@ -307,6 +307,6 @@ public class CumulativeSumAggregatorTests extends AggregatorTestCase {
} }
private static long asLong(String dateTime) { private static long asLong(String dateTime) {
return DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parser().parseDateTime(dateTime).getMillis(); return DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parseJoda(dateTime).getMillis();
} }
} }

2
server/src/test/java/org/elasticsearch/search/aggregations/pipeline/DateDerivativeIT.java
View File

@ -65,7 +65,7 @@ public class DateDerivativeIT extends ESIntegTestCase {
} }
private DateTime date(String date) { private DateTime date(String date) {
return DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parser().parseDateTime(date); return DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parseJoda(date);
} }
private static String format(DateTime date, String pattern) { private static String format(DateTime date, String pattern) {

2
server/src/test/java/org/elasticsearch/search/aggregations/pipeline/MovFnUnitTests.java
View File

@ -160,6 +160,6 @@ public class MovFnUnitTests extends AggregatorTestCase {
} }
private static long asLong(String dateTime) { private static long asLong(String dateTime) {
return DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parser().parseDateTime(dateTime).getMillis(); return DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parseJoda(dateTime).getMillis();
} }
} }

4
x-pack/license-tools/src/test/java/org/elasticsearch/license/licensor/TestUtils.java
View File

@ -18,7 +18,6 @@ import org.elasticsearch.license.DateUtils;
import org.elasticsearch.license.License; import org.elasticsearch.license.License;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import org.hamcrest.MatcherAssert; import org.hamcrest.MatcherAssert;
import org.joda.time.format.DateTimeFormatter;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Path; import java.nio.file.Path;
@ -39,7 +38,6 @@ public class TestUtils {
private static final FormatDateTimeFormatter formatDateTimeFormatter = private static final FormatDateTimeFormatter formatDateTimeFormatter =
Joda.forPattern("yyyy-MM-dd"); Joda.forPattern("yyyy-MM-dd");
private static final DateMathParser dateMathParser = formatDateTimeFormatter.toDateMathParser(); private static final DateMathParser dateMathParser = formatDateTimeFormatter.toDateMathParser();
private static final DateTimeFormatter dateTimeFormatter = formatDateTimeFormatter.printer();
public static String dumpLicense(License license) throws Exception { public static String dumpLicense(License license) throws Exception {
XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON); XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
@ -52,7 +50,7 @@ public class TestUtils {
} }
public static String dateMathString(String time, final long now) { public static String dateMathString(String time, final long now) {
return dateTimeFormatter.print(dateMathParser.parse(time, () -> now)); return formatDateTimeFormatter.formatMillis(dateMathParser.parse(time, () -> now));
} }
public static long dateMath(String time, final long now) { public static long dateMath(String time, final long now) {

10
x-pack/plugin/core/src/main/java/org/elasticsearch/license/DateUtils.java
View File

@ -11,11 +11,11 @@ import org.joda.time.MutableDateTime;
import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.ISODateTimeFormat; import org.joda.time.format.ISODateTimeFormat;
import java.time.ZoneOffset;
public class DateUtils { public class DateUtils {
private static final FormatDateTimeFormatter formatDateOnlyFormatter = Joda.forPattern("yyyy-MM-dd"); private static final FormatDateTimeFormatter dateOnlyFormatter = Joda.forPattern("yyyy-MM-dd").withZone(ZoneOffset.UTC);
private static final DateTimeFormatter dateOnlyFormatter = formatDateOnlyFormatter.parser().withZoneUTC();
private static final DateTimeFormatter dateTimeFormatter = ISODateTimeFormat.dateTime().withZoneUTC(); private static final DateTimeFormatter dateTimeFormatter = ISODateTimeFormat.dateTime().withZoneUTC();
@ -25,7 +25,7 @@ public class DateUtils {
return dateTimeFormatter.parseDateTime(date).getMillis(); return dateTimeFormatter.parseDateTime(date).getMillis();
} catch (IllegalArgumentException ex) { } catch (IllegalArgumentException ex) {
// Fall back to the date only format // Fall back to the date only format
MutableDateTime dateTime = dateOnlyFormatter.parseMutableDateTime(date); MutableDateTime dateTime = new MutableDateTime(dateOnlyFormatter.parseMillis(date));
dateTime.millisOfDay().set(dateTime.millisOfDay().getMaximumValue()); dateTime.millisOfDay().set(dateTime.millisOfDay().getMaximumValue());
return dateTime.getMillis(); return dateTime.getMillis();
} }
@ -37,7 +37,7 @@ public class DateUtils {
return dateTimeFormatter.parseDateTime(date).getMillis(); return dateTimeFormatter.parseDateTime(date).getMillis();
} catch (IllegalArgumentException ex) { } catch (IllegalArgumentException ex) {
// Fall back to the date only format // Fall back to the date only format
return dateOnlyFormatter.parseDateTime(date).getMillis(); return dateOnlyFormatter.parseMillis(date);
} }
} }

2
x-pack/plugin/core/src/main/java/org/elasticsearch/license/LicenseService.java
View File

@ -140,7 +140,7 @@ public class LicenseService extends AbstractLifecycleComponent implements Cluste
String general = LoggerMessageFormat.format(null, "License [{}] on [{}].\n" + String general = LoggerMessageFormat.format(null, "License [{}] on [{}].\n" +
"# If you have a new license, please update it. Otherwise, please reach out to\n" + "# If you have a new license, please update it. Otherwise, please reach out to\n" +
"# your support contact.\n" + "# your support contact.\n" +
"# ", expiredMsg, DATE_FORMATTER.printer().print(expirationMillis)); "# ", expiredMsg, DATE_FORMATTER.formatMillis(expirationMillis));
if (expired) { if (expired) {
general = general.toUpperCase(Locale.ROOT); general = general.toUpperCase(Locale.ROOT);
} }

12
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/actions/ActionStatus.java
View File

@ -244,7 +244,7 @@ public class ActionStatus implements ToXContentObject {
@Override @Override
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
return builder.startObject() return builder.startObject()
.field(Field.TIMESTAMP.getPreferredName()).value(dateTimeFormatter.printer().print(timestamp)) .field(Field.TIMESTAMP.getPreferredName()).value(dateTimeFormatter.formatJoda(timestamp))
.field(Field.ACK_STATUS_STATE.getPreferredName(), state.name().toLowerCase(Locale.ROOT)) .field(Field.ACK_STATUS_STATE.getPreferredName(), state.name().toLowerCase(Locale.ROOT))
.endObject(); .endObject();
} }
@ -259,7 +259,7 @@ public class ActionStatus implements ToXContentObject {
if (token == XContentParser.Token.FIELD_NAME) { if (token == XContentParser.Token.FIELD_NAME) {
currentFieldName = parser.currentName(); currentFieldName = parser.currentName();
} else if (Field.TIMESTAMP.match(currentFieldName, parser.getDeprecationHandler())) { } else if (Field.TIMESTAMP.match(currentFieldName, parser.getDeprecationHandler())) {
timestamp = dateTimeFormatter.parser().parseDateTime(parser.text()); timestamp = dateTimeFormatter.parseJoda(parser.text());
} else if (Field.ACK_STATUS_STATE.match(currentFieldName, parser.getDeprecationHandler())) { } else if (Field.ACK_STATUS_STATE.match(currentFieldName, parser.getDeprecationHandler())) {
state = State.valueOf(parser.text().toUpperCase(Locale.ROOT)); state = State.valueOf(parser.text().toUpperCase(Locale.ROOT));
} else { } else {
@ -342,7 +342,7 @@ public class ActionStatus implements ToXContentObject {
@Override @Override
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
builder.startObject(); builder.startObject();
builder.field(Field.TIMESTAMP.getPreferredName()).value(dateTimeFormatter.printer().print(timestamp)); builder.field(Field.TIMESTAMP.getPreferredName()).value(dateTimeFormatter.formatJoda(timestamp));
builder.field(Field.EXECUTION_SUCCESSFUL.getPreferredName(), successful); builder.field(Field.EXECUTION_SUCCESSFUL.getPreferredName(), successful);
if (reason != null) { if (reason != null) {
builder.field(Field.REASON.getPreferredName(), reason); builder.field(Field.REASON.getPreferredName(), reason);
@ -361,7 +361,7 @@ public class ActionStatus implements ToXContentObject {
if (token == XContentParser.Token.FIELD_NAME) { if (token == XContentParser.Token.FIELD_NAME) {
currentFieldName = parser.currentName(); currentFieldName = parser.currentName();
} else if (Field.TIMESTAMP.match(currentFieldName, parser.getDeprecationHandler())) { } else if (Field.TIMESTAMP.match(currentFieldName, parser.getDeprecationHandler())) {
timestamp = dateTimeFormatter.parser().parseDateTime(parser.text()); timestamp = dateTimeFormatter.parseJoda(parser.text());
} else if (Field.EXECUTION_SUCCESSFUL.match(currentFieldName, parser.getDeprecationHandler())) { } else if (Field.EXECUTION_SUCCESSFUL.match(currentFieldName, parser.getDeprecationHandler())) {
successful = parser.booleanValue(); successful = parser.booleanValue();
} else if (Field.REASON.match(currentFieldName, parser.getDeprecationHandler())) { } else if (Field.REASON.match(currentFieldName, parser.getDeprecationHandler())) {
@ -442,7 +442,7 @@ public class ActionStatus implements ToXContentObject {
@Override @Override
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
return builder.startObject() return builder.startObject()
.field(Field.TIMESTAMP.getPreferredName()).value(dateTimeFormatter.printer().print(timestamp)) .field(Field.TIMESTAMP.getPreferredName()).value(dateTimeFormatter.formatJoda(timestamp))
.field(Field.REASON.getPreferredName(), reason) .field(Field.REASON.getPreferredName(), reason)
.endObject(); .endObject();
} }
@ -457,7 +457,7 @@ public class ActionStatus implements ToXContentObject {
if (token == XContentParser.Token.FIELD_NAME) { if (token == XContentParser.Token.FIELD_NAME) {
currentFieldName = parser.currentName(); currentFieldName = parser.currentName();
} else if (Field.TIMESTAMP.match(currentFieldName, parser.getDeprecationHandler())) { } else if (Field.TIMESTAMP.match(currentFieldName, parser.getDeprecationHandler())) {
timestamp = dateTimeFormatter.parser().parseDateTime(parser.text()); timestamp = dateTimeFormatter.parseJoda(parser.text());
} else if (Field.REASON.match(currentFieldName, parser.getDeprecationHandler())) { } else if (Field.REASON.match(currentFieldName, parser.getDeprecationHandler())) {
reason = parser.text(); reason = parser.text();
} else { } else {

4
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/support/WatcherDateTimeUtils.java
View File

@ -49,12 +49,12 @@ public class WatcherDateTimeUtils {
} }
public static DateTime parseDate(String format, DateTimeZone timeZone) { public static DateTime parseDate(String format, DateTimeZone timeZone) {
DateTime dateTime = dateTimeFormatter.parser().parseDateTime(format); DateTime dateTime = dateTimeFormatter.parseJoda(format);
return timeZone != null ? dateTime.toDateTime(timeZone) : dateTime; return timeZone != null ? dateTime.toDateTime(timeZone) : dateTime;
} }
public static String formatDate(DateTime date) { public static String formatDate(DateTime date) {
return dateTimeFormatter.printer().print(date); return dateTimeFormatter.formatJoda(date);
} }
public static DateTime parseDateMath(String fieldName, XContentParser parser, DateTimeZone timeZone, Clock clock) throws IOException { public static DateTime parseDateMath(String fieldName, XContentParser parser, DateTimeZone timeZone, Clock clock) throws IOException {

4
x-pack/plugin/core/src/test/java/org/elasticsearch/license/TestUtils.java
View File

@ -23,7 +23,6 @@ import org.elasticsearch.license.licensor.LicenseSigner;
import org.elasticsearch.protocol.xpack.license.LicensesStatus; import org.elasticsearch.protocol.xpack.license.LicensesStatus;
import org.elasticsearch.protocol.xpack.license.PutLicenseResponse; import org.elasticsearch.protocol.xpack.license.PutLicenseResponse;
import org.hamcrest.MatcherAssert; import org.hamcrest.MatcherAssert;
import org.joda.time.format.DateTimeFormatter;
import org.junit.Assert; import org.junit.Assert;
import java.io.IOException; import java.io.IOException;
@ -51,10 +50,9 @@ public class TestUtils {
private static final FormatDateTimeFormatter formatDateTimeFormatter = Joda.forPattern("yyyy-MM-dd"); private static final FormatDateTimeFormatter formatDateTimeFormatter = Joda.forPattern("yyyy-MM-dd");
private static final DateMathParser dateMathParser = formatDateTimeFormatter.toDateMathParser(); private static final DateMathParser dateMathParser = formatDateTimeFormatter.toDateMathParser();
private static final DateTimeFormatter dateTimeFormatter = formatDateTimeFormatter.printer();
public static String dateMathString(String time, final long now) { public static String dateMathString(String time, final long now) {
return dateTimeFormatter.print(dateMathParser.parse(time, () -> now)); return formatDateTimeFormatter.formatMillis(dateMathParser.parse(time, () -> now));
} }
public static long dateMath(String time, final long now) { public static long dateMath(String time, final long now) {

4
x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedJob.java
View File

@ -108,8 +108,8 @@ class DatafeedJob {
} }
String msg = Messages.getMessage(Messages.JOB_AUDIT_DATAFEED_STARTED_FROM_TO, String msg = Messages.getMessage(Messages.JOB_AUDIT_DATAFEED_STARTED_FROM_TO,
DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.printer().print(lookbackStartTimeMs), DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.formatMillis(lookbackStartTimeMs),
endTime == null ? "real-time" : DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.printer().print(lookbackEnd), endTime == null ? "real-time" : DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.formatMillis(lookbackEnd),
TimeValue.timeValueMillis(frequencyMs).getStringRep()); TimeValue.timeValueMillis(frequencyMs).getStringRep());
auditor.info(jobId, msg); auditor.info(jobId, msg);
LOGGER.info("[{}] {}", jobId, msg); LOGGER.info("[{}] {}", jobId, msg);

2
x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/rollup/job/RollupIndexerIndexingTests.java
View File

@ -449,7 +449,7 @@ public class RollupIndexerIndexingTests extends AggregatorTestCase {
} }
private static long asLong(String dateTime) { private static long asLong(String dateTime) {
return DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parser().parseDateTime(dateTime).getMillis(); return DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parseJoda(dateTime).getMillis();
} }
/** /**