[Release 3.0] Bump gradle 8.10.2 / JDK23 / 3.0.0.0-alpha1 on SQL plugin (#3319)

* Bump gradle 8.10.2 / JDK23 / 3.0.0.0-alpha1 on SQL plugin

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

* Update imports

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

* Update more imports and github actions with jdk23

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

* More imports

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

* Apply spotless

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

* Update byte-buddy to 1.14.19 to support JDK23

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

* Update bwc test

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

* Update doctest scores

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

---------

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

Author: peterzhuamazon

.github/workflows/integ-tests-with-security.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [21]
+        java: [21, 23]
     runs-on: ubuntu-latest
     container:
       # using the same image which is used by opensearch-build team to build the OpenSearch Distribution
@@ -62,7 +62,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ windows-latest, macos-13 ]
-        java: [21]
+        java: [21, 23]
 
     runs-on: ${{ matrix.os }}
 

.github/workflows/sql-pitest.yml

@@ -22,6 +22,7 @@ jobs:
       matrix:
         java:
           - 21
+          - 23
     runs-on: ubuntu-latest
     container:
       # using the same image which is used by opensearch-build team to build the OpenSearch Distribution

.github/workflows/sql-test-and-build-workflow.yml

@@ -29,7 +29,7 @@ jobs:
       # Run all jobs
       fail-fast: false
       matrix:
-        java: [21]
+        java: [21, 23]
     runs-on: ubuntu-latest
     container:
       # using the same image which is used by opensearch-build team to build the OpenSearch Distribution
@@ -101,7 +101,9 @@ jobs:
       matrix:
         entry:
           - { os: windows-latest, java: 21, os_build_args: -x doctest -PbuildPlatform=windows }
+          - { os: windows-latest, java: 23, os_build_args: -x doctest -PbuildPlatform=windows }
           - { os: macos-13, java: 21 }
+          - { os: macos-13, java: 23 }
     runs-on: ${{ matrix.entry.os }}
 
     steps:
@@ -161,7 +163,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [21]
+        java: [21, 23]
     container:
       image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }}
       options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }}

.github/workflows/sql-test-workflow.yml

@@ -22,6 +22,7 @@ jobs:
       matrix:
         java:
           - 21
+          - 23
     runs-on: ubuntu-latest
     container:
       # using the same image which is used by opensearch-build team to build the OpenSearch Distribution

async-query-core/build.gradle

@@ -9,7 +9,7 @@ plugins {
     id 'jacoco'
     id 'antlr'
     id 'com.diffplug.spotless' version '6.22.0'
-    id 'com.github.johnrengelman.shadow'
+    id 'com.gradleup.shadow'
 }
 
 repositories {
@@ -147,4 +147,4 @@ shadowJar {
 
     from sourceSets.main.output
     configurations = [project.configurations.runtimeClasspath]
-}
+}

async-query/src/main/java/org/opensearch/sql/spark/cluster/ClusterManagerEventListener.java

@@ -12,7 +12,6 @@
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.List;
-import org.opensearch.client.Client;
 import org.opensearch.cluster.LocalNodeClusterManagerListener;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.lifecycle.LifecycleListener;
@@ -25,6 +24,7 @@
 import org.opensearch.sql.spark.flint.operation.FlintIndexOpFactory;
 import org.opensearch.threadpool.Scheduler.Cancellable;
 import org.opensearch.threadpool.ThreadPool;
+import org.opensearch.transport.client.Client;
 
 public class ClusterManagerEventListener implements LocalNodeClusterManagerListener {
 

async-query/src/main/java/org/opensearch/sql/spark/cluster/IndexCleanup.java

@@ -8,13 +8,13 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.action.support.IndicesOptions;
-import org.opensearch.client.Client;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.util.concurrent.ThreadContext;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.index.reindex.DeleteByQueryAction;
 import org.opensearch.index.reindex.DeleteByQueryRequest;
+import org.opensearch.transport.client.Client;
 
 /** Clean up the old docs for indices. */
 public class IndexCleanup {

async-query/src/main/java/org/opensearch/sql/spark/execution/statestore/StateStore.java

@@ -30,7 +30,6 @@
 import org.opensearch.action.support.WriteRequest;
 import org.opensearch.action.update.UpdateRequest;
 import org.opensearch.action.update.UpdateResponse;
-import org.opensearch.client.Client;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.action.ActionFuture;
 import org.opensearch.common.util.concurrent.ThreadContext;
@@ -60,6 +59,7 @@
 import org.opensearch.sql.spark.execution.xcontent.XContentSerializerUtil;
 import org.opensearch.sql.spark.flint.FlintIndexState;
 import org.opensearch.sql.spark.flint.FlintIndexStateModel;
+import org.opensearch.transport.client.Client;
 
 /**
  * State Store maintain the state of Session and Statement. State State create/update/get doc on
@@ -260,7 +260,7 @@ public long count(String indexName, QueryBuilder query) {
       throw new RuntimeException(
           "Fetching job metadata information failed with status : " + searchResponse.status());
     } else {
-      return searchResponse.getHits().getTotalHits().value;
+      return searchResponse.getHits().getTotalHits().value();
     }
   }
 

async-query/src/main/java/org/opensearch/sql/spark/flint/FlintIndexMetadataServiceImpl.java

@@ -22,9 +22,9 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.action.admin.indices.mapping.get.GetMappingsResponse;
-import org.opensearch.client.Client;
 import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
 import org.opensearch.sql.spark.dispatcher.model.FlintIndexOptions;
+import org.opensearch.transport.client.Client;
 
 /** Implementation of {@link FlintIndexMetadataService} */
 @AllArgsConstructor

async-query/src/main/java/org/opensearch/sql/spark/flint/OpenSearchFlintIndexClient.java

@@ -9,8 +9,8 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.action.admin.indices.delete.DeleteIndexRequest;
-import org.opensearch.action.support.master.AcknowledgedResponse;
-import org.opensearch.client.Client;
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
+import org.opensearch.transport.client.Client;
 
 @RequiredArgsConstructor
 public class OpenSearchFlintIndexClient implements FlintIndexClient {