Core: Migrating from joda to java.time. ML package

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

@@ -21,16 +21,16 @@
 
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.common.joda.FormatDateTimeFormatter;
+import org.elasticsearch.common.joda.Joda;
 import org.elasticsearch.common.xcontent.XContentParser;
-import org.elasticsearch.index.mapper.DateFieldMapper;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 
 import java.io.IOException;
 
 public final class WatchStatusDateParser {
 
-    private static final FormatDateTimeFormatter FORMATTER = DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER;
+    private static final FormatDateTimeFormatter FORMATTER = Joda.forPattern("strict_date_optional_time||epoch_millis");
 
     private WatchStatusDateParser() {
         // Prevent instantiation.

modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java

@@ -59,9 +59,9 @@
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
 import org.elasticsearch.search.DocValueFormat;
 import org.elasticsearch.search.MultiValueMode;
-import org.joda.time.DateTimeZone;
 
 import java.io.IOException;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
@@ -302,7 +302,7 @@ public Object valueForDisplay(Object value) {
         }
 
         @Override
-        public DocValueFormat docValueFormat(String format, DateTimeZone timeZone) {
+        public DocValueFormat docValueFormat(String format, ZoneId timeZone) {
             if (timeZone != null) {
                 throw new IllegalArgumentException("Field [" + name() + "] of type [" + typeName()
                     + "] does not support custom time zones");

plugins/analysis-icu/src/main/java/org/elasticsearch/index/mapper/ICUCollationKeywordFieldMapper.java

@@ -46,9 +46,9 @@
 import org.elasticsearch.index.fielddata.plain.DocValuesIndexFieldData;
 import org.elasticsearch.index.query.QueryShardContext;
 import org.elasticsearch.search.DocValueFormat;
-import org.joda.time.DateTimeZone;
 
 import java.io.IOException;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -229,7 +229,7 @@ public BytesRef parseBytesRef(String value) {
         };
 
         @Override
-        public DocValueFormat docValueFormat(final String format, final DateTimeZone timeZone) {
+        public DocValueFormat docValueFormat(final String format, final ZoneId timeZone) {
             return COLLATE_FORMAT;
         }
     }

server/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java

@@ -30,6 +30,7 @@
 import org.elasticsearch.common.time.DateFormatter;
 import org.elasticsearch.common.time.DateFormatters;
 import org.elasticsearch.common.time.DateMathParser;
+import org.elasticsearch.common.time.DateUtils;
 import org.elasticsearch.common.time.JavaDateMathParser;
 import org.elasticsearch.common.util.set.Sets;
 import org.elasticsearch.index.Index;
@@ -913,18 +914,19 @@ String resolveExpression(String expression, final Context context) {
                                     int formatPatternTimeZoneSeparatorIndex = patternAndTZid.indexOf(TIME_ZONE_BOUND);
                                     if (formatPatternTimeZoneSeparatorIndex != -1) {
                                         dateFormatterPattern = patternAndTZid.substring(0, formatPatternTimeZoneSeparatorIndex);
-                                        timeZone = ZoneId.of(patternAndTZid.substring(formatPatternTimeZoneSeparatorIndex + 1));
+                                        timeZone = DateUtils.of(patternAndTZid.substring(formatPatternTimeZoneSeparatorIndex + 1));
                                     } else {
                                         dateFormatterPattern = patternAndTZid;
                                         timeZone = ZoneOffset.UTC;
                                     }
                                     dateFormatter = DateFormatters.forPattern(dateFormatterPattern);
                                 }
+
                                 DateFormatter formatter = dateFormatter.withZone(timeZone);
                                 DateMathParser dateMathParser = new JavaDateMathParser(formatter);
-                                long millis = dateMathParser.parse(mathExpression, context::getStartTime, false, timeZone);
+                                Instant instant = dateMathParser.parse(mathExpression, context::getStartTime, false, timeZone);
 
-                                String time = formatter.format(Instant.ofEpochMilli(millis));
+                                String time = formatter.format(instant);
                                 beforePlaceHolderSb.append(time);
                                 inPlaceHolderSb = new StringBuilder();
                                 inPlaceHolder = false;

server/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java

@@ -174,7 +174,7 @@ public void writeTo(StreamOutput out) throws IOException {
         if (out.getVersion().before(Version.V_6_0_0_alpha1)) {
             // timestamp
             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.writeOptionalBoolean(null);
         }

server/src/main/java/org/elasticsearch/common/Rounding.java

@@ -19,6 +19,7 @@
 package org.elasticsearch.common;
 
 import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.Version;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
@@ -367,8 +368,13 @@ public long nextRoundingValue(long utcMillis) {
         @Override
         public void innerWriteTo(StreamOutput out) throws IOException {
             out.writeByte(unit.getId());
-            String tz = ZoneOffset.UTC.equals(timeZone) ? "UTC" : timeZone.getId(); // stay joda compatible
-            out.writeString(tz);
+            if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
+                out.writeString(timeZone.getId());
+            } else {
+                // stay joda compatible
+                String tz = ZoneOffset.UTC.equals(timeZone) ? "UTC" : timeZone.getId();
+                out.writeString(tz);
+            }
         }
 
         @Override
@@ -490,8 +496,13 @@ public long nextRoundingValue(long time) {
         @Override
         public void innerWriteTo(StreamOutput out) throws IOException {
             out.writeVLong(interval);
-            String tz = ZoneOffset.UTC.equals(timeZone) ? "UTC" : timeZone.getId(); // stay joda compatible
-            out.writeString(tz);
+            if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
+                out.writeString(timeZone.getId());
+            } else {
+                // stay joda compatible
+                String tz = ZoneOffset.UTC.equals(timeZone) ? "UTC" : timeZone.getId();
+                out.writeString(tz);
+            }
         }
 
         @Override

server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java

@@ -653,6 +653,23 @@ public DateTimeZone readOptionalTimeZone() throws IOException {
         return null;
     }
 
+    /**
+     * Read a {@linkplain DateTimeZone}.
+     */
+    public ZoneId readZoneId() throws IOException {
+        return ZoneId.of(readString());
+    }
+
+    /**
+     * Read an optional {@linkplain ZoneId}.
+     */
+    public ZoneId readOptionalZoneId() throws IOException {
+        if (readBoolean()) {
+            return ZoneId.of(readString());
+        }
+        return null;
+    }
+
     public int[] readIntArray() throws IOException {
         int length = readArraySize();
         int[] values = new int[length];

server/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java

@@ -55,6 +55,7 @@
 import java.nio.file.FileSystemLoopException;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.NotDirectoryException;
+import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.Collection;
 import java.util.Collections;
@@ -677,7 +678,6 @@ public final <K, V> void writeMap(final Map<K, V> map, final Writer<K> keyWriter
         writers.put(ZonedDateTime.class, (o, v) -> {
             o.writeByte((byte) 23);
             final ZonedDateTime zonedDateTime = (ZonedDateTime) v;
-            zonedDateTime.getZone().getId();
             o.writeString(zonedDateTime.getZone().getId());
             o.writeLong(zonedDateTime.toInstant().toEpochMilli());
         });
@@ -974,6 +974,13 @@ public void writeTimeZone(DateTimeZone timeZone) throws IOException {
         writeString(timeZone.getID());
     }
 
+    /**
+     * Write a {@linkplain ZoneId} to the stream.
+     */
+    public void writeZoneId(ZoneId timeZone) throws IOException {
+        writeString(timeZone.getId());
+    }
+
     /**
      * Write an optional {@linkplain DateTimeZone} to the stream.
      */
@@ -986,6 +993,18 @@ public void writeOptionalTimeZone(@Nullable DateTimeZone timeZone) throws IOExce
         }
     }
 
+    /**
+     * Write an optional {@linkplain ZoneId} to the stream.
+     */
+    public void writeOptionalZoneId(@Nullable ZoneId timeZone) throws IOException {
+        if (timeZone == null) {
+            writeBoolean(false);
+        } else {
+            writeBoolean(true);
+            writeZoneId(timeZone);
+        }
+    }
+
     /**
      * Writes a list of {@link Streamable} objects
      */

server/src/main/java/org/elasticsearch/common/joda/JodaDateMathParser.java

@@ -26,6 +26,7 @@
 import org.joda.time.MutableDateTime;
 import org.joda.time.format.DateTimeFormatter;
 
+import java.time.Instant;
 import java.time.ZoneId;
 import java.util.Objects;
 import java.util.function.LongSupplier;
@@ -41,7 +42,7 @@ public class JodaDateMathParser implements DateMathParser {
 
     private final FormatDateTimeFormatter dateTimeFormatter;
 
-    public JodaDateMathParser(FormatDateTimeFormatter dateTimeFormatter) {
+    JodaDateMathParser(FormatDateTimeFormatter dateTimeFormatter) {
         Objects.requireNonNull(dateTimeFormatter);
         this.dateTimeFormatter = dateTimeFormatter;
     }
@@ -50,7 +51,7 @@ public JodaDateMathParser(FormatDateTimeFormatter dateTimeFormatter) {
     // if it has been used. For instance, the request cache does not cache requests that make
     // use of `now`.
     @Override
-    public long parse(String text, LongSupplier now, boolean roundUp, ZoneId tz) {
+    public Instant parse(String text, LongSupplier now, boolean roundUp, ZoneId tz) {
         final DateTimeZone timeZone = tz == null ? null : DateUtils.zoneIdToDateTimeZone(tz);
         long time;
         String mathString;
@@ -64,13 +65,13 @@ public long parse(String text, LongSupplier now, boolean roundUp, ZoneId tz) {
         } else {
             int index = text.indexOf("||");
             if (index == -1) {
-                return parseDateTime(text, timeZone, roundUp);
+                return Instant.ofEpochMilli(parseDateTime(text, timeZone, roundUp));
             }
             time = parseDateTime(text.substring(0, index), timeZone, false);
             mathString = text.substring(index + 2);
         }
 
-        return parseMath(mathString, time, roundUp, timeZone);
+        return Instant.ofEpochMilli(parseMath(mathString, time, roundUp, timeZone));
     }
 
     private long parseMath(String mathString, long time, boolean roundUp, DateTimeZone timeZone) throws ElasticsearchParseException {

server/src/main/java/org/elasticsearch/common/time/DateFormatter.java

@@ -19,13 +19,18 @@
 
 package org.elasticsearch.common.time;
 
+import org.elasticsearch.ElasticsearchParseException;
+
+import java.time.Instant;
 import java.time.ZoneId;
 import java.time.format.DateTimeParseException;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalField;
 import java.util.Arrays;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
+import java.util.function.LongSupplier;
 import java.util.stream.Collectors;
 
 public interface DateFormatter {
@@ -94,6 +99,13 @@ public interface DateFormatter {
      */
     DateFormatter parseDefaulting(Map<TemporalField, Long> fields);
 
+    /**
+     * Create a DateMathParser from the existing formatter
+     *
+     * @return The DateMathParser object
+     */
+    DateMathParser toDateMathParser();
+
     /**
      * Merge several date formatters into a single one. Useful if you need to have several formatters with
      * different formats act as one, for example when you specify a
@@ -106,6 +118,34 @@ static DateFormatter merge(DateFormatter ... formatters) {
         return new MergedDateFormatter(formatters);
     }
 
+    class MergedDateMathParser implements DateMathParser {
+
+        private final DateMathParser[] parsers;
+
+        MergedDateMathParser(DateFormatter ... formatters) {
+            this.parsers = Arrays.stream(formatters)
+                .map(DateFormatter::toDateMathParser)
+                .collect(Collectors.toList()).toArray(new DateMathParser[0]);
+        }
+
+        @Override
+        public Instant parse(String text, LongSupplier now, boolean roundUp, ZoneId tz) {
+            ElasticsearchParseException failure = null;
+            for (DateMathParser parser : parsers) {
+                try {
+                    return parser.parse(text, now, roundUp, tz);
+                } catch (ElasticsearchParseException e) {
+                    if (failure == null) {
+                        failure = e;
+                    } else {
+                        failure.addSuppressed(e);
+                    }
+                }
+            }
+            throw failure;
+        }
+    }
+
     class MergedDateFormatter implements DateFormatter {
 
         private final String format;
@@ -118,11 +158,11 @@ class MergedDateFormatter implements DateFormatter {
 
         @Override
         public TemporalAccessor parse(String input) {
-            DateTimeParseException failure = null;
+            ElasticsearchParseException failure = null;
             for (DateFormatter formatter : formatters) {
                 try {
                     return formatter.parse(input);
-                } catch (DateTimeParseException e) {
+                } catch (ElasticsearchParseException e) {
                     if (failure == null) {
                         failure = e;
                     } else {
@@ -163,9 +203,31 @@ public ZoneId getZone() {
             return formatters[0].getZone();
         }
 
+        @Override
+        public DateMathParser toDateMathParser() {
+            return new MergedDateMathParser(formatters);
+        }
+
         @Override
         public DateFormatter parseDefaulting(Map<TemporalField, Long> fields) {
             return new MergedDateFormatter(Arrays.stream(formatters).map(f -> f.parseDefaulting(fields)).toArray(DateFormatter[]::new));
         }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(getLocale(), format);
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (obj.getClass().equals(this.getClass()) == false) {
+                return false;
+            }
+            MergedDateFormatter other = (MergedDateFormatter) obj;
+
+            return Objects.equals(pattern(), other.pattern()) &&
+                   Objects.equals(getLocale(), other.getLocale()) &&
+                   Objects.equals(getZone(), other.getZone());
+        }
     }
 }