Import AcknowledgedResponse from new package

Signed-off-by: Daniel Widdis <widdis@gmail.com>
opensearch-project · Jan 30, 2025 · 36edd2d · 36edd2d
1 parent 7ce81f4
commit 36edd2d
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 18 deletions.
diff --git a/src/main/java/org/opensearch/flowframework/indices/FlowFrameworkIndicesHandler.java b/src/main/java/org/opensearch/flowframework/indices/FlowFrameworkIndicesHandler.java
@@ -192,7 +192,6 @@ public void initFlowFrameworkIndexIfAbsent(FlowFrameworkIndex index, ActionListe
         try (ThreadContext.StoredContext threadContext = client.threadPool().getThreadContext().stashContext()) {
             ActionListener<Boolean> internalListener = ActionListener.runBefore(listener, threadContext::restore);
             if (!clusterService.state().metadata().hasIndex(indexName)) {
-                @SuppressWarnings("deprecation")
                 ActionListener<CreateIndexResponse> actionListener = ActionListener.wrap(r -> {
                     if (r.isAcknowledged()) {
                         logger.info("create index: {}", indexName);

diff --git a/src/main/java/org/opensearch/flowframework/workflow/AbstractCreatePipelineStep.java b/src/main/java/org/opensearch/flowframework/workflow/AbstractCreatePipelineStep.java
@@ -15,7 +15,7 @@
 import org.opensearch.action.ingest.PutPipelineRequest;
 import org.opensearch.action.search.PutSearchPipelineRequest;
 import org.opensearch.action.support.PlainActionFuture;
-import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 import org.opensearch.client.Client;
 import org.opensearch.client.ClusterAdminClient;
 import org.opensearch.common.xcontent.XContentType;

diff --git a/src/main/java/org/opensearch/flowframework/workflow/AbstractUpdatePipelineStep.java b/src/main/java/org/opensearch/flowframework/workflow/AbstractUpdatePipelineStep.java
@@ -13,7 +13,7 @@
 import org.apache.logging.log4j.message.ParameterizedMessageFactory;
 import org.opensearch.ExceptionsHelper;
 import org.opensearch.action.support.PlainActionFuture;
-import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 import org.opensearch.client.Client;
 import org.opensearch.client.ClusterAdminClient;
 import org.opensearch.core.action.ActionListener;

diff --git a/src/main/java/org/opensearch/flowframework/workflow/UpdateIngestPipelineStep.java b/src/main/java/org/opensearch/flowframework/workflow/UpdateIngestPipelineStep.java
@@ -11,7 +11,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.action.ingest.PutPipelineRequest;
-import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 import org.opensearch.client.Client;
 import org.opensearch.client.ClusterAdminClient;
 import org.opensearch.common.xcontent.XContentType;

diff --git a/src/main/java/org/opensearch/flowframework/workflow/UpdateSearchPipelineStep.java b/src/main/java/org/opensearch/flowframework/workflow/UpdateSearchPipelineStep.java
@@ -11,7 +11,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.action.search.PutSearchPipelineRequest;
-import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 import org.opensearch.client.Client;
 import org.opensearch.client.ClusterAdminClient;
 import org.opensearch.common.xcontent.XContentType;

diff --git a/src/test/java/org/opensearch/flowframework/indices/FlowFrameworkIndicesHandlerTests.java b/src/test/java/org/opensearch/flowframework/indices/FlowFrameworkIndicesHandlerTests.java
@@ -17,7 +17,7 @@
 import org.opensearch.action.get.GetRequest;
 import org.opensearch.action.get.GetResponse;
 import org.opensearch.action.index.IndexResponse;
-import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 import org.opensearch.action.update.UpdateRequest;
 import org.opensearch.action.update.UpdateResponse;
 import org.opensearch.client.AdminClient;
@@ -80,7 +80,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@SuppressWarnings("deprecation")
 public class FlowFrameworkIndicesHandlerTests extends OpenSearchTestCase {
     @Mock
     private Client client;

diff --git a/src/test/java/org/opensearch/flowframework/workflow/CreateIngestPipelineStepTests.java b/src/test/java/org/opensearch/flowframework/workflow/CreateIngestPipelineStepTests.java
@@ -10,7 +10,7 @@
 
 import org.opensearch.action.ingest.PutPipelineRequest;
 import org.opensearch.action.support.PlainActionFuture;
-import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 import org.opensearch.client.AdminClient;
 import org.opensearch.client.Client;
 import org.opensearch.client.ClusterAdminClient;

diff --git a/src/test/java/org/opensearch/flowframework/workflow/CreateSearchPipelineStepTests.java b/src/test/java/org/opensearch/flowframework/workflow/CreateSearchPipelineStepTests.java
@@ -10,7 +10,7 @@
 
 import org.opensearch.action.search.PutSearchPipelineRequest;
 import org.opensearch.action.support.PlainActionFuture;
-import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 import org.opensearch.client.AdminClient;
 import org.opensearch.client.Client;
 import org.opensearch.client.ClusterAdminClient;

diff --git a/src/test/java/org/opensearch/flowframework/workflow/DeleteIndexStepTests.java b/src/test/java/org/opensearch/flowframework/workflow/DeleteIndexStepTests.java
@@ -11,7 +11,7 @@
 import org.opensearch.action.admin.indices.delete.DeleteIndexRequest;
 import org.opensearch.action.delete.DeleteResponse;
 import org.opensearch.action.support.PlainActionFuture;
-import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 import org.opensearch.client.AdminClient;
 import org.opensearch.client.Client;
 import org.opensearch.client.IndicesAdminClient;
@@ -61,7 +61,6 @@ public void testDeleteIndex() throws IOException, ExecutionException, Interrupte
         DeleteIndexStep deleteIndexStep = new DeleteIndexStep(client);
 
         doAnswer(invocation -> {
-            @SuppressWarnings("deprecation")
             ActionListener<AcknowledgedResponse> actionListener = invocation.getArgument(1);
             actionListener.onResponse(new AcknowledgedResponse(true));
             return null;

diff --git a/src/test/java/org/opensearch/flowframework/workflow/DeleteIngestPipelineStepTests.java b/src/test/java/org/opensearch/flowframework/workflow/DeleteIngestPipelineStepTests.java
@@ -11,7 +11,7 @@
 import org.opensearch.action.delete.DeleteResponse;
 import org.opensearch.action.ingest.DeletePipelineRequest;
 import org.opensearch.action.support.PlainActionFuture;
-import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 import org.opensearch.client.AdminClient;
 import org.opensearch.client.Client;
 import org.opensearch.client.ClusterAdminClient;
@@ -61,7 +61,6 @@ public void testDeletePipeline() throws IOException, ExecutionException, Interru
         DeleteIngestPipelineStep deleteIngestPipelineStep = new DeleteIngestPipelineStep(client);
 
         doAnswer(invocation -> {
-            @SuppressWarnings("deprecation")
             ActionListener<AcknowledgedResponse> actionListener = invocation.getArgument(1);
             actionListener.onResponse(new AcknowledgedResponse(true));
             return null;

diff --git a/src/test/java/org/opensearch/flowframework/workflow/DeleteSearchPipelineStepTests.java b/src/test/java/org/opensearch/flowframework/workflow/DeleteSearchPipelineStepTests.java
@@ -11,7 +11,7 @@
 import org.opensearch.action.delete.DeleteResponse;
 import org.opensearch.action.search.DeleteSearchPipelineRequest;
 import org.opensearch.action.support.PlainActionFuture;
-import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 import org.opensearch.client.AdminClient;
 import org.opensearch.client.Client;
 import org.opensearch.client.ClusterAdminClient;
@@ -61,7 +61,6 @@ public void testDeleteSearchPipeline() throws IOException, ExecutionException, I
         DeleteSearchPipelineStep deleteSearchPipelineStep = new DeleteSearchPipelineStep(client);
 
         doAnswer(invocation -> {
-            @SuppressWarnings("deprecation")
             ActionListener<AcknowledgedResponse> actionListener = invocation.getArgument(1);
             actionListener.onResponse(new AcknowledgedResponse(true));
             return null;

diff --git a/src/test/java/org/opensearch/flowframework/workflow/UpdateIndexStepTests.java b/src/test/java/org/opensearch/flowframework/workflow/UpdateIndexStepTests.java
@@ -12,7 +12,7 @@
 import org.opensearch.action.admin.indices.settings.get.GetSettingsResponse;
 import org.opensearch.action.admin.indices.settings.put.UpdateSettingsRequest;
 import org.opensearch.action.support.PlainActionFuture;
-import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 import org.opensearch.client.AdminClient;
 import org.opensearch.client.Client;
 import org.opensearch.client.IndicesAdminClient;

diff --git a/src/test/java/org/opensearch/flowframework/workflow/UpdateIngestPipelineStepTests.java b/src/test/java/org/opensearch/flowframework/workflow/UpdateIngestPipelineStepTests.java
@@ -10,7 +10,7 @@
 
 import org.opensearch.action.ingest.PutPipelineRequest;
 import org.opensearch.action.support.PlainActionFuture;
-import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 import org.opensearch.client.AdminClient;
 import org.opensearch.client.Client;
 import org.opensearch.client.ClusterAdminClient;

diff --git a/src/test/java/org/opensearch/flowframework/workflow/UpdateSearchPipelineStepTests.java b/src/test/java/org/opensearch/flowframework/workflow/UpdateSearchPipelineStepTests.java
@@ -10,7 +10,7 @@
 
 import org.opensearch.action.search.PutSearchPipelineRequest;
 import org.opensearch.action.support.PlainActionFuture;
-import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 import org.opensearch.client.AdminClient;
 import org.opensearch.client.Client;
 import org.opensearch.client.ClusterAdminClient;