Remove use of SPI locale for JDK 23+ (#113182)

On JDK 23 we're just going with what CLDR specifies for week-date calculations - the built-in locales are available for ISO weekdate uses.

Author: thecoop

build-tools-internal/src/main/groovy/elasticsearch.ide.gradle

@@ -168,7 +168,7 @@ if (providers.systemProperty('idea.active').getOrNull() == 'true') {
             vmParameters = [
               '-ea',
               '-Djava.security.manager=allow',
-              '-Djava.locale.providers=SPI,CLDR',
+              '-Djava.locale.providers=CLDR',
               '-Des.nativelibs.path="' + testLibraryPath + '"',
               // TODO: only open these for mockito when it is modularized
               '--add-opens=java.base/java.security.cert=ALL-UNNAMED',

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchTestBasePlugin.java

@@ -93,7 +93,7 @@ public void execute(Task t) {
                     mkdirs(test.getWorkingDir().toPath().resolve("temp").toFile());
 
                     // TODO remove once jvm.options are added to test system properties
-                    test.systemProperty("java.locale.providers", "SPI,CLDR");
+                    test.systemProperty("java.locale.providers", "CLDR");
                 }
             });
             test.getJvmArgumentProviders().add(nonInputProperties);

distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/SystemJvmOptions.java

@@ -76,11 +76,11 @@ static List<String> systemJvmOptions(Settings nodeSettings, final Map<String, St
     @UpdateForV9    // only use CLDR in v9+
     private static String getLocaleProviders() {
         /*
-         * Specify SPI to load IsoCalendarDataProvider (see #48209), specifying the first day of week as Monday.
-         * When on pre-23, use COMPAT instead to maintain existing date formats as much as we can.
-         * When on JDK 23+, use the default CLDR locale database, as COMPAT was removed in JDK 23.
+         * When on pre-23, use COMPAT instead to maintain existing date formats as much as we can,
+         * and specify SPI to load IsoCalendarDataProvider (see #48209), specifying the first day of week as Monday.
+         * When on JDK 23+, use the default CLDR locale database for everything, as COMPAT was removed in JDK 23.
          */
-        return Runtime.version().feature() >= 23 ? "SPI,CLDR" : "SPI,COMPAT";
+        return Runtime.version().feature() >= 23 ? "CLDR" : "SPI,COMPAT";
     }
 
     /*

modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/DateFormatTests.java

@@ -75,17 +75,17 @@ public void testParseJavaDefaultYear() {
     public void testParseWeekBasedYearAndWeek() {
         String format = "YYYY-ww";
         ZoneId timezone = DateUtils.of("Europe/Amsterdam");
-        Function<String, ZonedDateTime> javaFunction = DateFormat.Java.getFunction(format, timezone, Locale.ROOT);
+        Function<String, ZonedDateTime> javaFunction = DateFormat.Java.getFunction(format, timezone, Locale.ENGLISH);
         ZonedDateTime dateTime = javaFunction.apply("2020-33");
-        assertThat(dateTime, equalTo(ZonedDateTime.of(2020, 8, 10, 0, 0, 0, 0, timezone)));
+        assertThat(dateTime, equalTo(ZonedDateTime.of(2020, 8, 9, 0, 0, 0, 0, timezone)));
     }
 
     public void testParseWeekBasedYear() {
         String format = "YYYY";
         ZoneId timezone = DateUtils.of("Europe/Amsterdam");
-        Function<String, ZonedDateTime> javaFunction = DateFormat.Java.getFunction(format, timezone, Locale.ROOT);
+        Function<String, ZonedDateTime> javaFunction = DateFormat.Java.getFunction(format, timezone, Locale.ENGLISH);
         ZonedDateTime dateTime = javaFunction.apply("2019");
-        assertThat(dateTime, equalTo(ZonedDateTime.of(2018, 12, 31, 0, 0, 0, 0, timezone)));
+        assertThat(dateTime, equalTo(ZonedDateTime.of(2018, 12, 30, 0, 0, 0, 0, timezone)));
     }
 
     public void testParseWeekBasedWithLocale() {

server/src/test/java/org/elasticsearch/common/time/DateFormattersTests.java

@@ -25,6 +25,7 @@
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 import java.time.temporal.ChronoField;
+import java.time.temporal.ChronoUnit;
 import java.time.temporal.TemporalAccessor;
 import java.util.List;
 import java.util.Locale;
@@ -85,38 +86,32 @@ private void assertDateMathEquals(String text, String expected, String pattern)
     }
 
     private void assertDateMathEquals(String text, String expected, String pattern, Locale locale) {
-        long gotMillisJava = dateMathToMillis(text, DateFormatter.forPattern(pattern), locale);
-        long expectedMillis = DateFormatters.from(DateFormatter.forPattern("strict_date_optional_time").withLocale(locale).parse(expected))
-            .toInstant()
-            .toEpochMilli();
+        Instant gotInstant = dateMathToInstant(text, DateFormatter.forPattern(pattern), locale).truncatedTo(ChronoUnit.MILLIS);
+        Instant expectedInstant = DateFormatters.from(
+            DateFormatter.forPattern("strict_date_optional_time").withLocale(locale).parse(expected)
+        ).toInstant().truncatedTo(ChronoUnit.MILLIS);
 
-        assertThat(gotMillisJava, equalTo(expectedMillis));
+        assertThat(gotInstant, equalTo(expectedInstant));
     }
 
     public void testWeekBasedDates() {
-        // as per WeekFields.ISO first week starts on Monday and has minimum 4 days
+        // the years and weeks this outputs depends on where the first day of the first week is for each year
         DateFormatter dateFormatter = DateFormatters.forPattern("YYYY-ww");
 
-        // first week of 2016 starts on Monday 2016-01-04 as previous week in 2016 has only 3 days
         assertThat(
-            DateFormatters.from(dateFormatter.parse("2016-01")),
-            equalTo(ZonedDateTime.of(2016, 01, 04, 0, 0, 0, 0, ZoneOffset.UTC))
+            DateFormatters.from(dateFormatter.parse("2016-02")),
+            equalTo(ZonedDateTime.of(2016, 01, 03, 0, 0, 0, 0, ZoneOffset.UTC))
         );
 
-        // first week of 2015 starts on Monday 2014-12-29 because 4days belong to 2019
         assertThat(
-            DateFormatters.from(dateFormatter.parse("2015-01")),
-            equalTo(ZonedDateTime.of(2014, 12, 29, 0, 0, 0, 0, ZoneOffset.UTC))
+            DateFormatters.from(dateFormatter.parse("2015-02")),
+            equalTo(ZonedDateTime.of(2015, 01, 04, 0, 0, 0, 0, ZoneOffset.UTC))
         );
 
-        // as per WeekFields.ISO first week starts on Monday and has minimum 4 days
         dateFormatter = DateFormatters.forPattern("YYYY");
 
-        // first week of 2016 starts on Monday 2016-01-04 as previous week in 2016 has only 3 days
-        assertThat(DateFormatters.from(dateFormatter.parse("2016")), equalTo(ZonedDateTime.of(2016, 01, 04, 0, 0, 0, 0, ZoneOffset.UTC)));
-
-        // first week of 2015 starts on Monday 2014-12-29 because 4days belong to 2019
-        assertThat(DateFormatters.from(dateFormatter.parse("2015")), equalTo(ZonedDateTime.of(2014, 12, 29, 0, 0, 0, 0, ZoneOffset.UTC)));
+        assertThat(DateFormatters.from(dateFormatter.parse("2016")), equalTo(ZonedDateTime.of(2015, 12, 27, 0, 0, 0, 0, ZoneOffset.UTC)));
+        assertThat(DateFormatters.from(dateFormatter.parse("2015")), equalTo(ZonedDateTime.of(2014, 12, 28, 0, 0, 0, 0, ZoneOffset.UTC)));
     }
 
     public void testEpochMillisParser() {
@@ -600,8 +595,8 @@ public void testYearWithoutMonthRoundUp() {
         assertDateMathEquals("1500", "1500-01-01T23:59:59.999", "uuuu");
         assertDateMathEquals("2022", "2022-01-01T23:59:59.999", "uuuu");
         assertDateMathEquals("2022", "2022-01-01T23:59:59.999", "yyyy");
-        // cannot reliably default week based years due to locale changing. See JavaDateFormatter javadocs
-        assertDateMathEquals("2022", "2022-01-03T23:59:59.999", "YYYY", Locale.ROOT);
+        // weird locales can change this to epoch-based
+        assertDateMathEquals("2022", "2021-12-26T23:59:59.999", "YYYY", Locale.ROOT);
     }
 
     private void assertRoundupFormatter(String format, String input, long expectedMilliSeconds) {
@@ -789,30 +784,28 @@ public void testExceptionWhenCompositeParsingFailsDateMath() {
         String text = "2014-06-06T12:01:02.123";
         ElasticsearchParseException e1 = expectThrows(
             ElasticsearchParseException.class,
-            () -> dateMathToMillis(text, DateFormatter.forPattern(pattern), randomLocale(random()))
+            () -> dateMathToInstant(text, DateFormatter.forPattern(pattern), randomLocale(random()))
         );
         assertThat(e1.getMessage(), containsString(pattern));
         assertThat(e1.getMessage(), containsString(text));
     }
 
-    private long dateMathToMillis(String text, DateFormatter dateFormatter, Locale locale) {
+    private Instant dateMathToInstant(String text, DateFormatter dateFormatter, Locale locale) {
         DateFormatter javaFormatter = dateFormatter.withLocale(locale);
         DateMathParser javaDateMath = javaFormatter.toDateMathParser();
-        return javaDateMath.parse(text, () -> 0, true, (ZoneId) null).toEpochMilli();
+        return javaDateMath.parse(text, () -> 0, true, null);
     }
 
     public void testDayOfWeek() {
-        // 7 (ok joda) vs 1 (java by default) but 7 with customized org.elasticsearch.common.time.IsoLocale.ISO8601
         ZonedDateTime now = LocalDateTime.of(2009, 11, 15, 1, 32, 8, 328402).atZone(ZoneOffset.UTC); // Sunday
         DateFormatter javaFormatter = DateFormatter.forPattern("8e").withZone(ZoneOffset.UTC);
-        assertThat(javaFormatter.format(now), equalTo("7"));
+        assertThat(javaFormatter.format(now), equalTo("1"));
     }
 
     public void testStartOfWeek() {
-        // 2019-21 (ok joda) vs 2019-22 (java by default) but 2019-21 with customized org.elasticsearch.common.time.IsoLocale.ISO8601
         ZonedDateTime now = LocalDateTime.of(2019, 5, 26, 1, 32, 8, 328402).atZone(ZoneOffset.UTC);
         DateFormatter javaFormatter = DateFormatter.forPattern("8YYYY-ww").withZone(ZoneOffset.UTC);
-        assertThat(javaFormatter.format(now), equalTo("2019-21"));
+        assertThat(javaFormatter.format(now), equalTo("2019-22"));
     }
 
     // these parsers should allow both ',' and '.' as a decimal point

server/src/test/java/org/elasticsearch/common/time/JavaDateMathParserTests.java

@@ -19,6 +19,7 @@
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.format.ResolverStyle;
+import java.time.temporal.ChronoUnit;
 import java.util.Locale;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.LongSupplier;
@@ -82,12 +83,12 @@ public void testOverridingLocaleOrZoneAndCompositeRoundUpParser() {
         // the pattern has to be composite and the match should not be on the first one
         DateFormatter formatter = DateFormatter.forPattern("date||epoch_millis").withLocale(randomLocale(random()));
         DateMathParser parser = formatter.toDateMathParser();
-        long gotMillis = parser.parse("297276785531", () -> 0, true, (ZoneId) null).toEpochMilli();
+        Instant gotMillis = parser.parse("297276785531", () -> 0, true, null).truncatedTo(ChronoUnit.MILLIS);
         assertDateEquals(gotMillis, "297276785531", "297276785531");
 
         formatter = DateFormatter.forPattern("date||epoch_millis").withZone(ZoneOffset.UTC);
         parser = formatter.toDateMathParser();
-        gotMillis = parser.parse("297276785531", () -> 0, true, (ZoneId) null).toEpochMilli();
+        gotMillis = parser.parse("297276785531", () -> 0, true, null).truncatedTo(ChronoUnit.MILLIS);
         assertDateEquals(gotMillis, "297276785531", "297276785531");
     }
 
@@ -99,7 +100,7 @@ public void testWeekBasedDate() {
         // defaulting missing day of week
         formatter = DateFormatter.forPattern("YYYY'W'ww[e]");// YYYY'W'wwe
         // second week of 2022 is starting on Monday 10th Jan
-        assertDateMathEquals(formatter.toDateMathParser(), "2022W02", "2022-01-10T23:59:59.999Z", 0, true, ZoneOffset.UTC);
+        assertDateMathEquals(formatter.toDateMathParser(), "2022W02", "2022-01-02T23:59:59.999Z", 0, true, ZoneOffset.UTC);
     }
 
     public void testDayOfYear() {
@@ -125,16 +126,16 @@ public void testAMPMWithTimeMissing() {
 
     public void testWeekDates() {
         DateFormatter formatter = DateFormatter.forPattern("YYYY-ww");
-        assertDateMathEquals(formatter.toDateMathParser(), "2016-01", "2016-01-04T23:59:59.999Z", 0, true, ZoneOffset.UTC);
+        assertDateMathEquals(formatter.toDateMathParser(), "2016-02", "2016-01-03T23:59:59.999Z", 0, true, ZoneOffset.UTC);
 
         formatter = DateFormatter.forPattern("YYYY");
-        assertDateMathEquals(formatter.toDateMathParser(), "2016", "2016-01-04T23:59:59.999Z", 0, true, ZoneOffset.UTC);
+        assertDateMathEquals(formatter.toDateMathParser(), "2016", "2015-12-27T23:59:59.999Z", 0, true, ZoneOffset.UTC);
 
         formatter = DateFormatter.forPattern("YYYY-ww");
-        assertDateMathEquals(formatter.toDateMathParser(), "2015-01", "2014-12-29T23:59:59.999Z", 0, true, ZoneOffset.UTC);
+        assertDateMathEquals(formatter.toDateMathParser(), "2015-02", "2015-01-04T23:59:59.999Z", 0, true, ZoneOffset.UTC);
 
         formatter = DateFormatter.forPattern("YYYY");
-        assertDateMathEquals(formatter.toDateMathParser(), "2015", "2014-12-29T23:59:59.999Z", 0, true, ZoneOffset.UTC);
+        assertDateMathEquals(formatter.toDateMathParser(), "2015", "2014-12-28T23:59:59.999Z", 0, true, ZoneOffset.UTC);
     }
 
     public void testBasicDates() {
@@ -343,7 +344,7 @@ public void testTimestamps() {
 
         // also check other time units
         DateMathParser parser = DateFormatter.forPattern("epoch_second||date_optional_time").toDateMathParser();
-        long datetime = parser.parse("1418248078", () -> 0).toEpochMilli();
+        Instant datetime = parser.parse("1418248078", () -> 0).truncatedTo(ChronoUnit.MILLIS);
         assertDateEquals(datetime, "1418248078", "2014-12-10T21:47:58.000");
 
         // for date_optional_time a timestamp with more than 9digits is epoch
@@ -401,14 +402,14 @@ private void assertDateMathEquals(
         boolean roundUp,
         ZoneId timeZone
     ) {
-        long gotMillis = parser.parse(toTest, () -> now, roundUp, timeZone).toEpochMilli();
+        Instant gotMillis = parser.parse(toTest, () -> now, roundUp, timeZone).truncatedTo(ChronoUnit.MILLIS);
         assertDateEquals(gotMillis, toTest, expected);
     }
 
-    private void assertDateEquals(long gotMillis, String original, String expected) {
-        long expectedMillis = parser.parse(expected, () -> 0).toEpochMilli();
-        if (gotMillis != expectedMillis) {
-            ZonedDateTime zonedDateTime = ZonedDateTime.ofInstant(Instant.ofEpochMilli(gotMillis), ZoneOffset.UTC);
+    private void assertDateEquals(Instant gotMillis, String original, String expected) {
+        Instant expectedMillis = parser.parse(expected, () -> 0).truncatedTo(ChronoUnit.MILLIS);
+        if (gotMillis.equals(expectedMillis) == false) {
+            ZonedDateTime zonedDateTime = ZonedDateTime.ofInstant(gotMillis, ZoneOffset.UTC);
             fail(Strings.format("""
                 Date math not equal
                 Original              : %s