[Remove] Remaining Joda and Joda Dependency

CHANGELOG.md

@@ -136,6 +136,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Removed
 - Remove deprecated classes for Rounding ([#10956](https:/opensearch-project/OpenSearch/issues/10956))
+- [Remove] Remaining Joda and Joda Dependency ([#10949](https:/opensearch-project/OpenSearch/pull/10949))
 
 ### Fixed
 - Fix failure in dissect ingest processor parsing empty brackets ([#9225](https:/opensearch-project/OpenSearch/pull/9255))

benchmarks/src/main/java/org/opensearch/benchmark/time/DateFormatterBenchmark.java

@@ -31,7 +31,6 @@
 
 package org.opensearch.benchmark.time;
 
-import org.opensearch.common.joda.Joda;
 import org.opensearch.common.time.DateFormatter;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
@@ -56,15 +55,9 @@
 public class DateFormatterBenchmark {
 
  private final DateFormatter javaFormatter = DateFormatter.forPattern("8year_month_day||ordinal_date||epoch_millis");
- private final DateFormatter jodaFormatter = Joda.forPattern("year_month_day||ordinal_date||epoch_millis");
 
  @Benchmark
  public TemporalAccessor parseJavaDate() {
  return javaFormatter.parse("1234567890");
  }
-
- @Benchmark
- public TemporalAccessor parseJodaDate() {
- return jodaFormatter.parse("1234567890");
- }
 }

buildSrc/src/main/resources/forbidden/opensearch-server-signatures.txt

@@ -72,15 +72,6 @@ java.util.concurrent.Future#cancel(boolean)
 org.opensearch.common.io.PathUtils#get(java.lang.String, java.lang.String[])
 org.opensearch.common.io.PathUtils#get(java.net.URI)
 
-@defaultMessage Constructing a DateTime without a time zone is dangerous
-org.joda.time.DateTime#<init>()
-org.joda.time.DateTime#<init>(long)
-org.joda.time.DateTime#<init>(int, int, int, int, int)
-org.joda.time.DateTime#<init>(int, int, int, int, int, int)
-org.joda.time.DateTime#<init>(int, int, int, int, int, int, int)
-org.joda.time.DateTime#now()
-org.joda.time.DateTimeZone#getDefault()
-
 @defaultMessage Local times may be ambiguous or nonexistent in a specific time zones. Use ZoneRules#getValidOffsets() instead.
 java.time.LocalDateTime#atZone(java.time.ZoneId)
 java.time.ZonedDateTime#of(int, int, int, int, int, int, int, java.time.ZoneId)

buildSrc/version.properties

@@ -27,7 +27,6 @@ jakarta_annotation = 1.3.5
 jna = 5.13.0
 
 netty = 4.1.100.Final
-joda = 2.12.2
 
 # project reactor
 reactor_netty = 1.1.12

client/rest-high-level/src/test/java/org/opensearch/client/CrudIT.java

@@ -74,15 +74,17 @@
 import org.opensearch.script.Script;
 import org.opensearch.script.ScriptType;
 import org.opensearch.search.fetch.subphase.FetchSourceContext;
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-import org.joda.time.format.DateTimeFormat;
 
 import java.io.IOException;
+import java.time.LocalTime;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
@@ -1022,7 +1024,8 @@ private void validateBulkResponses(int nbItems, boolean[] errors, BulkResponse b
  public void testUrlEncode() throws IOException {
  String indexPattern = "<logstash-{now/M}>";
  String expectedIndex = "logstash-"
- + DateTimeFormat.forPattern("YYYY.MM.dd").print(new DateTime(DateTimeZone.UTC).monthOfYear().roundFloorCopy());
+ + DateTimeFormatter.ofPattern("uuuu.MM.dd", Locale.ROOT)
+ .format(ZonedDateTime.now(ZoneOffset.UTC).withDayOfMonth(1).with(LocalTime.MIN));
  {
  IndexRequest indexRequest = new IndexRequest(indexPattern).id("id#1");
  indexRequest.source("field", "value");

modules/lang-expression/src/main/java/org/opensearch/script/expression/DateObject.java

@@ -33,9 +33,12 @@
 package org.opensearch.script.expression;
 
 import org.apache.lucene.search.DoubleValuesSource;
+import org.opensearch.common.time.DateFormatters;
 import org.opensearch.index.fielddata.IndexFieldData;
 import org.opensearch.search.MultiValueMode;
-import org.joda.time.ReadableDateTime;
+
+import java.time.ZonedDateTime;
+import java.time.temporal.ChronoField;
 
 /**
  * Expressions API for date objects (.date)
@@ -87,41 +90,51 @@
  static DoubleValuesSource getVariable(IndexFieldData<?> fieldData, String fieldName, String variable) {
  switch (variable) {
  case CENTURY_OF_ERA_VARIABLE:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, ReadableDateTime::getCenturyOfEra);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, zdt -> zdt.get(ChronoField.YEAR_OF_ERA) / 100);
  case DAY_OF_MONTH_VARIABLE:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, ReadableDateTime::getDayOfMonth);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, ZonedDateTime::getDayOfMonth);
  case DAY_OF_WEEK_VARIABLE:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, ReadableDateTime::getDayOfWeek);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, zdt -> zdt.getDayOfWeek().getValue());
  case DAY_OF_YEAR_VARIABLE:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, ReadableDateTime::getDayOfYear);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, ZonedDateTime::getDayOfYear);
  case ERA_VARIABLE:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, ReadableDateTime::getEra);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, zdt -> zdt.get(ChronoField.ERA));
  case HOUR_OF_DAY_VARIABLE:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, ReadableDateTime::getHourOfDay);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, ZonedDateTime::getHour);
  case MILLIS_OF_DAY_VARIABLE:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, ReadableDateTime::getMillisOfDay);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, zdt -> zdt.get(ChronoField.MILLI_OF_DAY));
  case MILLIS_OF_SECOND_VARIABLE:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, ReadableDateTime::getMillisOfSecond);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, zdt -> zdt.get(ChronoField.MILLI_OF_SECOND));
  case MINUTE_OF_DAY_VARIABLE:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, ReadableDateTime::getMinuteOfDay);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, zdt -> zdt.get(ChronoField.MINUTE_OF_DAY));
  case MINUTE_OF_HOUR_VARIABLE:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, ReadableDateTime::getMinuteOfHour);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, ZonedDateTime::getMinute);
  case MONTH_OF_YEAR_VARIABLE:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, ReadableDateTime::getMonthOfYear);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, ZonedDateTime::getMonthValue);
  case SECOND_OF_DAY_VARIABLE:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, ReadableDateTime::getSecondOfDay);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, zdt -> zdt.get(ChronoField.SECOND_OF_DAY));
  case SECOND_OF_MINUTE_VARIABLE:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, ReadableDateTime::getSecondOfMinute);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, ZonedDateTime::getSecond);
  case WEEK_OF_WEEK_YEAR_VARIABLE:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, ReadableDateTime::getWeekOfWeekyear);
+ return new DateObjectValueSource(
+ fieldData,
+ MultiValueMode.MIN,
+ variable,
+ zdt -> zdt.get(DateFormatters.WEEK_FIELDS_ROOT.weekOfWeekBasedYear())
+ );
  case WEEK_YEAR_VARIABLE:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, ReadableDateTime::getWeekyear);
+ return new DateObjectValueSource(
+ fieldData,
+ MultiValueMode.MIN,
+ variable,
+ zdt -> zdt.get(DateFormatters.WEEK_FIELDS_ROOT.weekBasedYear())
+ );
  case YEAR_VARIABLE:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, ReadableDateTime::getYear);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, ZonedDateTime::getYear);
  case YEAR_OF_CENTURY_VARIABLE:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, ReadableDateTime::getYearOfCentury);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, zdt -> zdt.get(ChronoField.YEAR_OF_ERA) % 100);
  case YEAR_OF_ERA_VARIABLE:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, ReadableDateTime::getYearOfEra);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, variable, zdt -> zdt.get(ChronoField.YEAR_OF_ERA));
  default:
  throw new IllegalArgumentException(
  "Member variable [" + variable + "] does not exist for date object on field [" + fieldName + "]."
@@ -132,41 +145,51 @@
  static DoubleValuesSource getMethod(IndexFieldData<?> fieldData, String fieldName, String method) {
  switch (method) {
  case GETCENTURY_OF_ERA_METHOD:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, ReadableDateTime::getCenturyOfEra);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, zdt -> zdt.get(ChronoField.YEAR_OF_ERA) / 100);
  case GETDAY_OF_MONTH_METHOD:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, ReadableDateTime::getDayOfMonth);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, ZonedDateTime::getDayOfMonth);
  case GETDAY_OF_WEEK_METHOD:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, ReadableDateTime::getDayOfWeek);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, zdt -> zdt.getDayOfWeek().getValue());
  case GETDAY_OF_YEAR_METHOD:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, ReadableDateTime::getDayOfYear);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, ZonedDateTime::getDayOfYear);
  case GETERA_METHOD:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, ReadableDateTime::getEra);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, zdt -> zdt.get(ChronoField.ERA));
  case GETHOUR_OF_DAY_METHOD:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, ReadableDateTime::getHourOfDay);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, ZonedDateTime::getHour);
  case GETMILLIS_OF_DAY_METHOD:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, ReadableDateTime::getMillisOfDay);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, zdt -> zdt.get(ChronoField.MILLI_OF_DAY));
  case GETMILLIS_OF_SECOND_METHOD:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, ReadableDateTime::getMillisOfSecond);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, zdt -> zdt.get(ChronoField.MILLI_OF_SECOND));
  case GETMINUTE_OF_DAY_METHOD:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, ReadableDateTime::getMinuteOfDay);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, zdt -> zdt.get(ChronoField.MINUTE_OF_DAY));
  case GETMINUTE_OF_HOUR_METHOD:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, ReadableDateTime::getMinuteOfHour);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, ZonedDateTime::getMinute);
  case GETMONTH_OF_YEAR_METHOD:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, ReadableDateTime::getMonthOfYear);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, ZonedDateTime::getMonthValue);
  case GETSECOND_OF_DAY_METHOD:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, ReadableDateTime::getSecondOfDay);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, zdt -> zdt.get(ChronoField.SECOND_OF_DAY));
  case GETSECOND_OF_MINUTE_METHOD:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, ReadableDateTime::getSecondOfMinute);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, ZonedDateTime::getSecond);
  case GETWEEK_OF_WEEK_YEAR_METHOD:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, ReadableDateTime::getWeekOfWeekyear);
+ return new DateObjectValueSource(
+ fieldData,
+ MultiValueMode.MIN,
+ method,
+ zdt -> zdt.get(DateFormatters.WEEK_FIELDS_ROOT.weekOfWeekBasedYear())
+ );
  case GETWEEK_YEAR_METHOD:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, ReadableDateTime::getWeekyear);
+ return new DateObjectValueSource(
+ fieldData,
+ MultiValueMode.MIN,
+ method,
+ zdt -> zdt.get(DateFormatters.WEEK_FIELDS_ROOT.weekBasedYear())
+ );
  case GETYEAR_METHOD:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, ReadableDateTime::getYear);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, ZonedDateTime::getYear);
  case GETYEAR_OF_CENTURY_METHOD:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, ReadableDateTime::getYearOfCentury);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, zdt -> zdt.get(ChronoField.YEAR_OF_ERA) % 100);
  case GETYEAR_OF_ERA_METHOD:
- return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, ReadableDateTime::getYearOfEra);
+ return new DateObjectValueSource(fieldData, MultiValueMode.MIN, method, zdt -> zdt.get(ChronoField.YEAR_OF_ERA));
  default:
  throw new IllegalArgumentException(
  "Member method [" + method + "] does not exist for date object on field [" + fieldName + "]."

modules/lang-expression/src/main/java/org/opensearch/script/expression/DateObjectValueSource.java

@@ -38,25 +38,25 @@
 import org.opensearch.index.fielddata.LeafNumericFieldData;
 import org.opensearch.index.fielddata.NumericDoubleValues;
 import org.opensearch.search.MultiValueMode;
-import org.joda.time.DateTimeZone;
-import org.joda.time.MutableDateTime;
-import org.joda.time.ReadableDateTime;
 
 import java.io.IOException;
+import java.time.Instant;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
 import java.util.Objects;
 import java.util.function.ToIntFunction;
 
-/** Extracts a portion of a date field with joda time */
+/** Extracts a portion of a date field with java time */
 class DateObjectValueSource extends FieldDataValueSource {
 
  final String methodName;
- final ToIntFunction<ReadableDateTime> function;
+ final ToIntFunction<ZonedDateTime> function;
 
  DateObjectValueSource(
  IndexFieldData<?> indexFieldData,
  MultiValueMode multiValueMode,
  String methodName,
- ToIntFunction<ReadableDateTime> function
+ ToIntFunction<ZonedDateTime> function
  ) {
  super(indexFieldData, multiValueMode);
 
@@ -69,13 +69,11 @@
  @Override
  public DoubleValues getValues(LeafReaderContext leaf, DoubleValues scores) {
  LeafNumericFieldData leafData = (LeafNumericFieldData) fieldData.load(leaf);
- MutableDateTime joda = new MutableDateTime(0, DateTimeZone.UTC);
  NumericDoubleValues docValues = multiValueMode.select(leafData.getDoubleValues());
  return new DoubleValues() {
  @Override
  public double doubleValue() throws IOException {
- joda.setMillis((long) docValues.doubleValue());
- return function.applyAsInt(joda);
+ return function.applyAsInt(ZonedDateTime.ofInstant(Instant.ofEpochMilli((long) docValues.doubleValue()), ZoneOffset.UTC));
  }
 
  @Override

plugins/repository-s3/build.gradle

@@ -79,7 +79,6 @@ dependencies {
  api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
  api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
  api "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
- api "joda-time:joda-time:${versions.joda}"
  api "org.slf4j:slf4j-api:${versions.slf4j}"
 
  // network stack
@@ -129,6 +128,7 @@ test {
  // this is tested explicitly in separate test tasks
  exclude '**/RepositoryCredentialsTests.class'
  exclude '**/S3RepositoryThirdPartyTests.class'
+ systemProperty 'aws.region', 'us-east-2'
 }
 
 boolean useFixture = false

qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/30_camel_case_dateformat.yml

@@ -0,0 +1,19 @@
+---
+"Verify that we can still use index with camel case date field":
+ - do:
+ bulk:
+ refresh: true
+ body:
+ - '{"index": {"_index": "camel_case_date_format"}}'
+ - '{"date_field": "2023-02-01T00:00+01:00"}'
+
+ - do:
+ search:
+ rest_total_hits_as_int: true
+ index: camel_case_date_format
+ body:
+ query:
+ range:
+ date_field:
+ gte: "2023-01-01T00:00+01:00"
+ lte: "2023-03-01T00:00+01:00"