Update main branch for 3.0.0.0-alpha1 / gradle 8.10.2 / JDK23 (#698)

* Update main branch for 3.0.0-alpha1

Signed-off-by: Andrew Ross <[email protected]>

* Bump gradle 8.10.2 / JDK23 / fix qualifier

Signed-off-by: Peter Zhu <[email protected]>

* Resolve imports updates

Signed-off-by: Peter Zhu <[email protected]>

* More imports update

Signed-off-by: Peter Zhu <[email protected]>

* Add missing space

Signed-off-by: Peter Zhu <[email protected]>

* Update upload artifacts

Signed-off-by: Peter Zhu <[email protected]>

* Update upload artifacts

Signed-off-by: Peter Zhu <[email protected]>

* Resolve bwc tests

Signed-off-by: Peter Zhu <[email protected]>

---------

Signed-off-by: Andrew Ross <[email protected]>
Signed-off-by: Peter Zhu <[email protected]>
Co-authored-by: Peter Zhu <[email protected]>

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
   linux-build:
     strategy:
       matrix:
-        java: [ 21 ]
+        java: [21, 23]
     needs: Get-CI-Image-Tag
     # Job name
     name: Linux - Build Asynchronous Search
@@ -65,7 +65,7 @@ jobs:
   linux-test-docker:
     strategy:
       matrix:
-        java: [ 21 ]
+        java: [21]
     needs: linux-build
     # Job name
     name: Test Asynchronous Search with opensearchstaging docker
@@ -138,13 +138,13 @@ jobs:
         uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: logs
+          name: linux-test-docker-logs-${{ matrix.java }}
           path: build/testclusters/integTest-*/logs/*
 
   windows-build:
     strategy:
       matrix:
-        java: [ 21 ]
+        java: [21, 23]
     # Job name
     name: Windows - Build Asynchronous Search
     # This job runs on Windows.
@@ -172,13 +172,13 @@ jobs:
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: asynchronous-search-plugin-windows
+          name: asynchronous-search-plugin-windows-${{ matrix.java }}
           path: asynchronous-search-artifacts
 
   mac-os-build:
     strategy:
       matrix:
-        java: [ 21 ]
+        java: [21, 23]
     # Job name
     name: MacOS - Build Asynchronous Search
     # This job runs on Mac OS.
@@ -206,5 +206,5 @@ jobs:
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: asynchronous-search-plugin-mac
+          name: asynchronous-search-plugin-mac-${{ matrix.java }}
           path: asynchronous-search-artifacts

.github/workflows/multi-node-test-workflow.yml

@@ -18,7 +18,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [ 21 ]
+        java: [21, 23]
     needs: Get-CI-Image-Tag
     # Job name
     name: Build Asynchronous Search
@@ -56,5 +56,5 @@ jobs:
         uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: logs
+          name: multi-test-linux-${{ matrix.java }}
           path: build/testclusters/integTest-*/logs/*

build.gradle

@@ -11,8 +11,8 @@ buildscript {
         distribution = 'oss-zip'
         opensearch_group = "org.opensearch"
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
-        opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT")
-        buildVersionQualifier = System.getProperty("build.version_qualifier", "")
+        opensearch_version = System.getProperty("opensearch.version", "3.0.0-alpha1-SNAPSHOT")
+        buildVersionQualifier = System.getProperty("build.version_qualifier", "alpha1")
         version_tokens = opensearch_version.tokenize('-')
         opensearch_build = version_tokens[0] + '.0'
         if (buildVersionQualifier) {
@@ -284,7 +284,7 @@ Boolean bwcBundleTest = (project.findProperty('customDistributionDownloadType')
 When testing between major versions note that ONLY the latest minor release of the previous version is api compatible.
 */
 
-String bwcVersion = "2.19.0.0"
+String bwcVersion = "2.20.0.0"
 String bwcVersionShort = bwcVersion.replaceAll(/\.0+$/, "")
 String nxtVersionShort = opensearch_version.replaceAll("-SNAPSHOT", "")
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-all.zip
-distributionSha256Sum=fdfca5dbc2834f0ece5020465737538e5ba679deeff5ab6c09621d67f8bb1a15
+distributionSha256Sum=2ab88d6de2c23e6adae7363ae6e29cbdd2a709e992929b48b6530fd0c7133bd6
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,9 +85,9 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -199,6 +201,7 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
@@ -246,4 +249,4 @@ eval "set -- $(
         tr '\n' ' '
     )" '"$@"'
 
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -89,4 +91,4 @@ exit /b %EXIT_CODE%
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 
-:omega
+:omega

src/main/java/org/opensearch/search/asynchronous/plugin/AsynchronousSearchPlugin.java

@@ -29,7 +29,7 @@
 import org.opensearch.search.asynchronous.transport.TransportSubmitAsynchronousSearchAction;
 import org.opensearch.action.ActionRequest;
 import org.opensearch.core.action.ActionResponse;
-import org.opensearch.client.Client;
+import org.opensearch.transport.client.Client;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.node.DiscoveryNodes;
 import org.opensearch.cluster.service.ClusterService;

src/main/java/org/opensearch/search/asynchronous/response/AsynchronousSearchResponse.java

@@ -18,7 +18,7 @@
 import org.opensearch.ExceptionsHelper;
 import org.opensearch.core.action.ActionResponse;
 import org.opensearch.action.search.SearchResponse;
-import org.opensearch.client.Requests;
+import org.opensearch.transport.client.Requests;
 import org.opensearch.common.Nullable;
 import org.opensearch.core.common.Strings;
 import org.opensearch.core.common.bytes.BytesReference;

src/main/java/org/opensearch/search/asynchronous/rest/RestAsynchronousSearchStatsAction.java

@@ -13,7 +13,7 @@
 import org.opensearch.search.asynchronous.request.AsynchronousSearchStatsRequest;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.opensearch.client.node.NodeClient;
+import org.opensearch.transport.client.node.NodeClient;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestActions;

src/main/java/org/opensearch/search/asynchronous/rest/RestDeleteAsynchronousSearchAction.java

@@ -11,7 +11,7 @@
 import org.opensearch.search.asynchronous.action.DeleteAsynchronousSearchAction;
 import org.opensearch.search.asynchronous.plugin.AsynchronousSearchPlugin;
 import org.opensearch.search.asynchronous.request.DeleteAsynchronousSearchRequest;
-import org.opensearch.client.node.NodeClient;
+import org.opensearch.transport.client.node.NodeClient;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestStatusToXContentListener;

src/main/java/org/opensearch/search/asynchronous/rest/RestGetAsynchronousSearchAction.java

@@ -10,7 +10,7 @@
 
 import org.opensearch.search.asynchronous.action.GetAsynchronousSearchAction;
 import org.opensearch.search.asynchronous.request.GetAsynchronousSearchRequest;
-import org.opensearch.client.node.NodeClient;
+import org.opensearch.transport.client.node.NodeClient;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestStatusToXContentListener;

src/main/java/org/opensearch/search/asynchronous/rest/RestSubmitAsynchronousSearchAction.java

@@ -11,7 +11,7 @@
 import org.opensearch.search.asynchronous.action.SubmitAsynchronousSearchAction;
 import org.opensearch.search.asynchronous.request.SubmitAsynchronousSearchRequest;
 import org.opensearch.action.search.SearchRequest;
-import org.opensearch.client.node.NodeClient;
+import org.opensearch.transport.client.node.NodeClient;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestCancellableNodeClient;

src/main/java/org/opensearch/search/asynchronous/service/AsynchronousSearchPersistenceService.java

@@ -29,7 +29,7 @@
 import org.opensearch.action.index.IndexRequestBuilder;
 import org.opensearch.action.index.IndexResponse;
 import org.opensearch.action.update.UpdateRequest;
-import org.opensearch.client.Client;
+import org.opensearch.transport.client.Client;
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.core.common.io.stream.NotSerializableExceptionWrapper;

src/main/java/org/opensearch/search/asynchronous/service/AsynchronousSearchService.java

@@ -21,7 +21,7 @@
 import org.opensearch.action.search.SearchAction;
 import org.opensearch.action.search.SearchTask;
 import org.opensearch.action.support.GroupedActionListener;
-import org.opensearch.client.Client;
+import org.opensearch.transport.client.Client;
 import org.opensearch.cluster.ClusterChangedEvent;
 import org.opensearch.cluster.ClusterStateListener;
 import org.opensearch.cluster.service.ClusterService;

src/main/java/org/opensearch/search/asynchronous/transport/TransportAsynchronousSearchRoutingAction.java

@@ -23,7 +23,7 @@
 import org.opensearch.core.action.ActionResponse;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
-import org.opensearch.client.Client;
+import org.opensearch.transport.client.Client;
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.service.ClusterService;

src/main/java/org/opensearch/search/asynchronous/transport/TransportDeleteAsynchronousSearchAction.java

@@ -19,7 +19,7 @@
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.action.support.ActionFilters;
-import org.opensearch.client.Client;
+import org.opensearch.transport.client.Client;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.threadpool.ThreadPool;

src/main/java/org/opensearch/search/asynchronous/transport/TransportGetAsynchronousSearchAction.java

@@ -23,7 +23,7 @@
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.action.support.ActionFilters;
-import org.opensearch.client.Client;
+import org.opensearch.transport.client.Client;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.threadpool.ThreadPool;

src/test/java/org/opensearch/search/asynchronous/commons/AsynchronousSearchIntegTestCase.java

@@ -25,7 +25,7 @@
 import org.opensearch.action.get.GetRequest;
 import org.opensearch.action.search.SearchPhaseExecutionException;
 import org.opensearch.action.search.SearchResponse;
-import org.opensearch.client.Client;
+import org.opensearch.transport.client.Client;
 import org.opensearch.index.reindex.ReindexModulePlugin;
 import org.opensearch.plugins.Plugin;
 import org.opensearch.plugins.PluginsService;

src/test/java/org/opensearch/search/asynchronous/commons/AsynchronousSearchSingleNodeTestCase.java

@@ -32,7 +32,7 @@
 import org.opensearch.action.get.GetRequest;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.search.ShardSearchFailure;
-import org.opensearch.client.Client;
+import org.opensearch.transport.client.Client;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.index.reindex.ReindexModulePlugin;

src/test/java/org/opensearch/search/asynchronous/integTests/AsynchronousSearchTaskCancellationIT.java

@@ -21,7 +21,7 @@
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.support.WriteRequest;
-import org.opensearch.client.Client;
+import org.opensearch.transport.client.Client;
 import org.opensearch.core.common.Strings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;

src/test/java/org/opensearch/search/asynchronous/listener/AsynchronousSearchCancellationIT.java

@@ -20,7 +20,7 @@
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.search.SearchTask;
 import org.opensearch.action.support.WriteRequest;
-import org.opensearch.client.Client;
+import org.opensearch.transport.client.Client;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.plugins.Plugin;
 import org.opensearch.script.Script;

src/test/java/org/opensearch/search/asynchronous/listener/AsynchronousSearchPartialResponseIT.java

@@ -17,7 +17,7 @@
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.search.SearchShard;
 import org.opensearch.action.search.SearchTask;
-import org.opensearch.client.Client;
+import org.opensearch.transport.client.Client;
 import org.opensearch.search.SearchService;
 import org.opensearch.search.aggregations.Aggregator;
 import org.opensearch.search.aggregations.BucketOrder;
@@ -84,7 +84,7 @@ protected void indexData() throws Exception {
         String shardRouting = routingKeyForShard("idx", randomIntBetween(0, shardCount - 1));
         SearchResponse resp = client().prepareSearch("idx").setRouting(shardRouting).setQuery(matchAllQuery()).get();
         assertSearchResponse(resp);
-        long totalHits = resp.getHits().getTotalHits().value;
+        long totalHits = resp.getHits().getTotalHits().value();
         assertThat(totalHits, is(20L));
     }
 

src/test/java/org/opensearch/search/asynchronous/listener/AsynchronousSearchProgressListenerIT.java

@@ -17,8 +17,8 @@
 import org.opensearch.action.search.SearchShard;
 import org.opensearch.action.search.SearchTask;
 import org.opensearch.action.search.SearchType;
-import org.opensearch.client.Client;
-import org.opensearch.client.node.NodeClient;
+import org.opensearch.transport.client.Client;
+import org.opensearch.transport.client.node.NodeClient;
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.search.SearchService;
 import org.opensearch.search.aggregations.AggregationBuilders;

src/test/java/org/opensearch/search/asynchronous/management/AsynchronousSearchManagementServiceIT.java

@@ -27,7 +27,7 @@
 import org.opensearch.action.bulk.BulkRequestBuilder;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.support.WriteRequest;
-import org.opensearch.client.Client;
+import org.opensearch.transport.client.Client;
 import org.opensearch.cluster.health.ClusterHealthStatus;
 import org.opensearch.core.common.Strings;
 import org.opensearch.common.settings.Settings;

src/test/java/org/opensearch/search/asynchronous/response/AsynchronousSearchResponseTests.java

@@ -15,7 +15,7 @@
 import org.apache.lucene.search.TotalHits;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.search.ShardSearchFailure;
-import org.opensearch.client.Requests;
+import org.opensearch.transport.client.Requests;
 import org.opensearch.common.Randomness;
 import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.core.common.io.stream.Writeable;

src/test/java/org/opensearch/search/asynchronous/restIT/AsynchronousSearchRestTestCase.java

@@ -211,8 +211,8 @@ protected void assertRnf(Exception e) {
 
     protected static void assertHitCount(SearchResponse countResponse, long expectedHitCount) {
         final TotalHits totalHits = countResponse.getHits().getTotalHits();
-        if (totalHits.relation != TotalHits.Relation.EQUAL_TO || totalHits.value != expectedHitCount) {
-            fail("Count is " + totalHits + " but " + expectedHitCount + " was expected. " + countResponse.toString());
+        if (totalHits.relation() != TotalHits.Relation.EQUAL_TO || totalHits.value() != expectedHitCount) {
+            fail("Count is " + totalHits + " but " + expectedHitCount + " was expected. " + countResponse);
         }
     }