Upgrade to OpenSearch 3.x APIs and align with cluster manager terminology

.github/workflows/maven.yml

@@ -20,10 +20,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v2
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
     - name: Build with Maven
       run: mvn -B package --file pom.xml

pom.xml

@@ -5,7 +5,7 @@
 	<artifactId>fesen-httpclient</artifactId>
 	<packaging>jar</packaging>
 	<name>fesen-httpclient</name>
-	<version>2.19.1-SNAPSHOT</version>
+	<version>3.0.0-SNAPSHOT</version>
 	<description />
 	<url>https://github.com/codelibs/fesen-httpclient</url>
 	<inceptionYear>2012</inceptionYear>
@@ -36,10 +36,10 @@
 	</scm>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<opensearch.version>2.19.1</opensearch.version>
+		<opensearch.version>3.0.0</opensearch.version>
 		<log4j.version>2.21.0</log4j.version>
-		<junit.jupiter.version>5.10.0</junit.jupiter.version>
-		<testcontainers.version>1.19.1</testcontainers.version>
+		<junit.jupiter.version>5.12.2</junit.jupiter.version>
+		<testcontainers.version>1.21.0</testcontainers.version>
 	</properties>
 	<build>
 		<plugins>
@@ -192,7 +192,7 @@
 		<dependency>
 			<groupId>org.junit.platform</groupId>
 			<artifactId>junit-platform-launcher</artifactId>
-			<version>1.11.3</version>
+			<version>1.12.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

src/main/java/org/codelibs/fesen/client/HttpAbstractClient.java

@@ -284,6 +284,7 @@
 import org.opensearch.action.admin.indices.rollover.RolloverRequest;
 import org.opensearch.action.admin.indices.rollover.RolloverRequestBuilder;
 import org.opensearch.action.admin.indices.rollover.RolloverResponse;
+import org.opensearch.action.admin.indices.scale.searchonly.ScaleIndexRequestBuilder;
 import org.opensearch.action.admin.indices.segments.IndicesSegmentResponse;
 import org.opensearch.action.admin.indices.segments.IndicesSegmentsAction;
 import org.opensearch.action.admin.indices.segments.IndicesSegmentsRequest;
@@ -309,6 +310,12 @@
 import org.opensearch.action.admin.indices.stats.IndicesStatsRequest;
 import org.opensearch.action.admin.indices.stats.IndicesStatsRequestBuilder;
 import org.opensearch.action.admin.indices.stats.IndicesStatsResponse;
+import org.opensearch.action.admin.indices.streamingingestion.pause.PauseIngestionRequest;
+import org.opensearch.action.admin.indices.streamingingestion.pause.PauseIngestionResponse;
+import org.opensearch.action.admin.indices.streamingingestion.resume.ResumeIngestionRequest;
+import org.opensearch.action.admin.indices.streamingingestion.resume.ResumeIngestionResponse;
+import org.opensearch.action.admin.indices.streamingingestion.state.GetIngestionStateRequest;
+import org.opensearch.action.admin.indices.streamingingestion.state.GetIngestionStateResponse;
 import org.opensearch.action.admin.indices.template.delete.DeleteIndexTemplateAction;
 import org.opensearch.action.admin.indices.template.delete.DeleteIndexTemplateRequest;
 import org.opensearch.action.admin.indices.template.delete.DeleteIndexTemplateRequestBuilder;
@@ -405,7 +412,7 @@
 import org.opensearch.action.search.SearchScrollRequest;
 import org.opensearch.action.search.SearchScrollRequestBuilder;
 import org.opensearch.action.support.PlainActionFuture;
-import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 import org.opensearch.action.termvectors.MultiTermVectorsAction;
 import org.opensearch.action.termvectors.MultiTermVectorsRequest;
 import org.opensearch.action.termvectors.MultiTermVectorsRequestBuilder;
@@ -418,12 +425,6 @@
 import org.opensearch.action.update.UpdateRequest;
 import org.opensearch.action.update.UpdateRequestBuilder;
 import org.opensearch.action.update.UpdateResponse;
-import org.opensearch.client.AdminClient;
-import org.opensearch.client.Client;
-import org.opensearch.client.ClusterAdminClient;
-import org.opensearch.client.FilterClient;
-import org.opensearch.client.IndicesAdminClient;
-import org.opensearch.client.OpenSearchClient;
 import org.opensearch.cluster.metadata.IndexMetadata.APIBlock;
 import org.opensearch.common.Nullable;
 import org.opensearch.common.action.ActionFuture;
@@ -435,6 +436,12 @@
 import org.opensearch.core.tasks.TaskId;
 import org.opensearch.core.xcontent.MediaType;
 import org.opensearch.threadpool.ThreadPool;
+import org.opensearch.transport.client.AdminClient;
+import org.opensearch.transport.client.Client;
+import org.opensearch.transport.client.ClusterAdminClient;
+import org.opensearch.transport.client.FilterClient;
+import org.opensearch.transport.client.IndicesAdminClient;
+import org.opensearch.transport.client.OpenSearchClient;
 
 /**
  * Base client used to create concrete client implementations
@@ -2063,6 +2070,88 @@ public void segmentReplicationStats(final SegmentReplicationStatsRequest request
         public SegmentReplicationStatsRequestBuilder prepareSegmentReplicationStats(final String... indices) {
             return new SegmentReplicationStatsRequestBuilder(this, SegmentReplicationStatsAction.INSTANCE).setIndices(indices);
         }
+
+        @Override
+        public void createView(org.opensearch.action.admin.indices.view.CreateViewAction.Request request,
+                ActionListener<org.opensearch.action.admin.indices.view.GetViewAction.Response> listener) {
+            throw new UnsupportedOperationException("Not implemented yet");
+        }
+
+        @Override
+        public ActionFuture<org.opensearch.action.admin.indices.view.GetViewAction.Response> createView(
+                org.opensearch.action.admin.indices.view.CreateViewAction.Request request) {
+            throw new UnsupportedOperationException("Not implemented yet");
+        }
+
+        @Override
+        public void getView(org.opensearch.action.admin.indices.view.GetViewAction.Request request,
+                ActionListener<org.opensearch.action.admin.indices.view.GetViewAction.Response> listener) {
+            throw new UnsupportedOperationException("Not implemented yet");
+        }
+
+        @Override
+        public ActionFuture<org.opensearch.action.admin.indices.view.GetViewAction.Response> getView(
+                org.opensearch.action.admin.indices.view.GetViewAction.Request request) {
+            throw new UnsupportedOperationException("Not implemented yet");
+        }
+
+        @Override
+        public void deleteView(org.opensearch.action.admin.indices.view.DeleteViewAction.Request request,
+                ActionListener<AcknowledgedResponse> listener) {
+            throw new UnsupportedOperationException("Not implemented yet");
+        }
+
+        @Override
+        public ActionFuture<AcknowledgedResponse> deleteView(org.opensearch.action.admin.indices.view.DeleteViewAction.Request request) {
+            throw new UnsupportedOperationException("Not implemented yet");
+        }
+
+        @Override
+        public void updateView(org.opensearch.action.admin.indices.view.CreateViewAction.Request request,
+                ActionListener<org.opensearch.action.admin.indices.view.GetViewAction.Response> listener) {
+            throw new UnsupportedOperationException("Not implemented yet");
+        }
+
+        @Override
+        public ActionFuture<org.opensearch.action.admin.indices.view.GetViewAction.Response> updateView(
+                org.opensearch.action.admin.indices.view.CreateViewAction.Request request) {
+            throw new UnsupportedOperationException("Not implemented yet");
+        }
+
+        @Override
+        public ActionFuture<PauseIngestionResponse> pauseIngestion(PauseIngestionRequest request) {
+            throw new UnsupportedOperationException("Not implemented yet");
+        }
+
+        @Override
+        public void pauseIngestion(PauseIngestionRequest request, ActionListener<PauseIngestionResponse> listener) {
+            throw new UnsupportedOperationException("Not implemented yet");
+        }
+
+        @Override
+        public ActionFuture<ResumeIngestionResponse> resumeIngestion(ResumeIngestionRequest request) {
+            throw new UnsupportedOperationException("Not implemented yet");
+        }
+
+        @Override
+        public void resumeIngestion(ResumeIngestionRequest request, ActionListener<ResumeIngestionResponse> listener) {
+            throw new UnsupportedOperationException("Not implemented yet");
+        }
+
+        @Override
+        public ActionFuture<GetIngestionStateResponse> getIngestionState(GetIngestionStateRequest request) {
+            throw new UnsupportedOperationException("Not implemented yet");
+        }
+
+        @Override
+        public void getIngestionState(GetIngestionStateRequest request, ActionListener<GetIngestionStateResponse> listener) {
+            throw new UnsupportedOperationException("Not implemented yet");
+        }
+
+        @Override
+        public ScaleIndexRequestBuilder prepareScaleSearchOnly(String index, boolean searchOnly) {
+            throw new UnsupportedOperationException("Not implemented yet");
+        }
     }
 
     @Override

src/main/java/org/codelibs/fesen/client/HttpAdminClient.java

@@ -15,9 +15,9 @@
  */
 package org.codelibs.fesen.client;
 
-import org.opensearch.client.AdminClient;
-import org.opensearch.client.ClusterAdminClient;
-import org.opensearch.client.IndicesAdminClient;
+import org.opensearch.transport.client.AdminClient;
+import org.opensearch.transport.client.ClusterAdminClient;
+import org.opensearch.transport.client.IndicesAdminClient;
 
 public class HttpAdminClient implements AdminClient {
 

src/main/java/org/codelibs/fesen/client/HttpClient.java

@@ -273,11 +273,11 @@
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.search.SearchScrollAction;
 import org.opensearch.action.search.SearchScrollRequest;
-import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 import org.opensearch.action.update.UpdateAction;
 import org.opensearch.action.update.UpdateRequest;
 import org.opensearch.action.update.UpdateResponse;
-import org.opensearch.client.AdminClient;
+import org.opensearch.common.action.ActionFuture;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
 import org.opensearch.common.xcontent.json.JsonXContent;
@@ -371,6 +371,7 @@
 import org.opensearch.search.aggregations.pipeline.PercentilesBucketPipelineAggregationBuilder;
 import org.opensearch.search.aggregations.pipeline.StatsBucketPipelineAggregationBuilder;
 import org.opensearch.threadpool.ThreadPool;
+import org.opensearch.transport.client.AdminClient;
 
 public class HttpClient extends HttpAbstractClient {
 
@@ -1097,4 +1098,27 @@ protected WorkerThread(final ForkJoinPool pool) {
             setName("eshttp");
         }
     }
+
+    @Override
+    public void searchView(org.opensearch.action.admin.indices.view.SearchViewAction.Request request,
+            ActionListener<SearchResponse> listener) {
+        throw new UnsupportedOperationException("Not implemented yet");
+    }
+
+    @Override
+    public ActionFuture<SearchResponse> searchView(org.opensearch.action.admin.indices.view.SearchViewAction.Request request) {
+        throw new UnsupportedOperationException("Not implemented yet");
+    }
+
+    @Override
+    public void listViewNames(org.opensearch.action.admin.indices.view.ListViewNamesAction.Request request,
+            ActionListener<org.opensearch.action.admin.indices.view.ListViewNamesAction.Response> listener) {
+        throw new UnsupportedOperationException("Not implemented yet");
+    }
+
+    @Override
+    public ActionFuture<org.opensearch.action.admin.indices.view.ListViewNamesAction.Response> listViewNames(
+            org.opensearch.action.admin.indices.view.ListViewNamesAction.Request request) {
+        throw new UnsupportedOperationException("Not implemented yet");
+    }
 }

src/main/java/org/codelibs/fesen/client/HttpIndicesAdminClient.java

@@ -76,6 +76,7 @@
 import org.opensearch.action.admin.indices.rollover.RolloverRequest;
 import org.opensearch.action.admin.indices.rollover.RolloverRequestBuilder;
 import org.opensearch.action.admin.indices.rollover.RolloverResponse;
+import org.opensearch.action.admin.indices.scale.searchonly.ScaleIndexRequestBuilder;
 import org.opensearch.action.admin.indices.segments.IndicesSegmentResponse;
 import org.opensearch.action.admin.indices.segments.IndicesSegmentsRequest;
 import org.opensearch.action.admin.indices.segments.IndicesSegmentsRequestBuilder;
@@ -93,6 +94,12 @@
 import org.opensearch.action.admin.indices.stats.IndicesStatsRequest;
 import org.opensearch.action.admin.indices.stats.IndicesStatsRequestBuilder;
 import org.opensearch.action.admin.indices.stats.IndicesStatsResponse;
+import org.opensearch.action.admin.indices.streamingingestion.pause.PauseIngestionRequest;
+import org.opensearch.action.admin.indices.streamingingestion.pause.PauseIngestionResponse;
+import org.opensearch.action.admin.indices.streamingingestion.resume.ResumeIngestionRequest;
+import org.opensearch.action.admin.indices.streamingingestion.resume.ResumeIngestionResponse;
+import org.opensearch.action.admin.indices.streamingingestion.state.GetIngestionStateRequest;
+import org.opensearch.action.admin.indices.streamingingestion.state.GetIngestionStateResponse;
 import org.opensearch.action.admin.indices.template.delete.DeleteIndexTemplateRequest;
 import org.opensearch.action.admin.indices.template.delete.DeleteIndexTemplateRequestBuilder;
 import org.opensearch.action.admin.indices.template.get.GetIndexTemplatesRequest;
@@ -109,13 +116,13 @@
 import org.opensearch.action.admin.indices.validate.query.ValidateQueryRequest;
 import org.opensearch.action.admin.indices.validate.query.ValidateQueryRequestBuilder;
 import org.opensearch.action.admin.indices.validate.query.ValidateQueryResponse;
-import org.opensearch.action.support.master.AcknowledgedResponse;
-import org.opensearch.client.IndicesAdminClient;
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 import org.opensearch.cluster.metadata.IndexMetadata.APIBlock;
 import org.opensearch.common.action.ActionFuture;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.action.ActionResponse;
 import org.opensearch.threadpool.ThreadPool;
+import org.opensearch.transport.client.IndicesAdminClient;
 
 public class HttpIndicesAdminClient implements IndicesAdminClient {
 
@@ -676,4 +683,85 @@ public SegmentReplicationStatsRequestBuilder prepareSegmentReplicationStats(fina
         return indicesClient.prepareSegmentReplicationStats(indices);
     }
 
+    @Override
+    public void createView(org.opensearch.action.admin.indices.view.CreateViewAction.Request request,
+            ActionListener<org.opensearch.action.admin.indices.view.GetViewAction.Response> listener) {
+        throw new UnsupportedOperationException("Not implemented yet");
+    }
+
+    @Override
+    public ActionFuture<org.opensearch.action.admin.indices.view.GetViewAction.Response> createView(
+            org.opensearch.action.admin.indices.view.CreateViewAction.Request request) {
+        throw new UnsupportedOperationException("Not implemented yet");
+    }
+
+    @Override
+    public void getView(org.opensearch.action.admin.indices.view.GetViewAction.Request request,
+            ActionListener<org.opensearch.action.admin.indices.view.GetViewAction.Response> listener) {
+        throw new UnsupportedOperationException("Not implemented yet");
+    }
+
+    @Override
+    public ActionFuture<org.opensearch.action.admin.indices.view.GetViewAction.Response> getView(
+            org.opensearch.action.admin.indices.view.GetViewAction.Request request) {
+        throw new UnsupportedOperationException("Not implemented yet");
+    }
+
+    @Override
+    public void deleteView(org.opensearch.action.admin.indices.view.DeleteViewAction.Request request,
+            ActionListener<AcknowledgedResponse> listener) {
+        throw new UnsupportedOperationException("Not implemented yet");
+    }
+
+    @Override
+    public ActionFuture<AcknowledgedResponse> deleteView(org.opensearch.action.admin.indices.view.DeleteViewAction.Request request) {
+        throw new UnsupportedOperationException("Not implemented yet");
+    }
+
+    @Override
+    public void updateView(org.opensearch.action.admin.indices.view.CreateViewAction.Request request,
+            ActionListener<org.opensearch.action.admin.indices.view.GetViewAction.Response> listener) {
+        throw new UnsupportedOperationException("Not implemented yet");
+    }
+
+    @Override
+    public ActionFuture<org.opensearch.action.admin.indices.view.GetViewAction.Response> updateView(
+            org.opensearch.action.admin.indices.view.CreateViewAction.Request request) {
+        throw new UnsupportedOperationException("Not implemented yet");
+    }
+
+    @Override
+    public ActionFuture<PauseIngestionResponse> pauseIngestion(PauseIngestionRequest request) {
+        throw new UnsupportedOperationException("Not implemented yet");
+    }
+
+    @Override
+    public void pauseIngestion(PauseIngestionRequest request, ActionListener<PauseIngestionResponse> listener) {
+        throw new UnsupportedOperationException("Not implemented yet");
+    }
+
+    @Override
+    public ActionFuture<ResumeIngestionResponse> resumeIngestion(ResumeIngestionRequest request) {
+        throw new UnsupportedOperationException("Not implemented yet");
+    }
+
+    @Override
+    public void resumeIngestion(ResumeIngestionRequest request, ActionListener<ResumeIngestionResponse> listener) {
+        throw new UnsupportedOperationException("Not implemented yet");
+    }
+
+    @Override
+    public ActionFuture<GetIngestionStateResponse> getIngestionState(GetIngestionStateRequest request) {
+        throw new UnsupportedOperationException("Not implemented yet");
+    }
+
+    @Override
+    public void getIngestionState(GetIngestionStateRequest request, ActionListener<GetIngestionStateResponse> listener) {
+        throw new UnsupportedOperationException("Not implemented yet");
+    }
+
+    @Override
+    public ScaleIndexRequestBuilder prepareScaleSearchOnly(String index, boolean searchOnly) {
+        throw new UnsupportedOperationException("Not implemented yet");
+    }
 }

src/main/java/org/codelibs/fesen/client/action/HttpClusterRerouteAction.java

@@ -20,7 +20,7 @@
 import org.opensearch.action.admin.cluster.reroute.ClusterRerouteAction;
 import org.opensearch.action.admin.cluster.reroute.ClusterRerouteRequest;
 import org.opensearch.action.admin.cluster.reroute.ClusterRerouteResponse;
-import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.xcontent.XContentParser;
 

src/main/java/org/codelibs/fesen/client/action/HttpDeleteIndexAction.java

@@ -19,7 +19,7 @@
 import org.codelibs.fesen.client.HttpClient;
 import org.opensearch.action.admin.indices.delete.DeleteIndexAction;
 import org.opensearch.action.admin.indices.delete.DeleteIndexRequest;
-import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.xcontent.XContentParser;