Skip to content

Commit 36edd2d

Browse files
committed
Import AcknowledgedResponse from new package
Signed-off-by: Daniel Widdis <widdis@gmail.com>
1 parent 7ce81f4 commit 36edd2d

14 files changed

+13
-18
lines changed

src/main/java/org/opensearch/flowframework/indices/FlowFrameworkIndicesHandler.java

-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ public void initFlowFrameworkIndexIfAbsent(FlowFrameworkIndex index, ActionListe
192192
try (ThreadContext.StoredContext threadContext = client.threadPool().getThreadContext().stashContext()) {
193193
ActionListener<Boolean> internalListener = ActionListener.runBefore(listener, threadContext::restore);
194194
if (!clusterService.state().metadata().hasIndex(indexName)) {
195-
@SuppressWarnings("deprecation")
196195
ActionListener<CreateIndexResponse> actionListener = ActionListener.wrap(r -> {
197196
if (r.isAcknowledged()) {
198197
logger.info("create index: {}", indexName);

src/main/java/org/opensearch/flowframework/workflow/AbstractCreatePipelineStep.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import org.opensearch.action.ingest.PutPipelineRequest;
1616
import org.opensearch.action.search.PutSearchPipelineRequest;
1717
import org.opensearch.action.support.PlainActionFuture;
18-
import org.opensearch.action.support.master.AcknowledgedResponse;
18+
import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
1919
import org.opensearch.client.Client;
2020
import org.opensearch.client.ClusterAdminClient;
2121
import org.opensearch.common.xcontent.XContentType;

src/main/java/org/opensearch/flowframework/workflow/AbstractUpdatePipelineStep.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.apache.logging.log4j.message.ParameterizedMessageFactory;
1414
import org.opensearch.ExceptionsHelper;
1515
import org.opensearch.action.support.PlainActionFuture;
16-
import org.opensearch.action.support.master.AcknowledgedResponse;
16+
import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
1717
import org.opensearch.client.Client;
1818
import org.opensearch.client.ClusterAdminClient;
1919
import org.opensearch.core.action.ActionListener;

src/main/java/org/opensearch/flowframework/workflow/UpdateIngestPipelineStep.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.apache.logging.log4j.LogManager;
1212
import org.apache.logging.log4j.Logger;
1313
import org.opensearch.action.ingest.PutPipelineRequest;
14-
import org.opensearch.action.support.master.AcknowledgedResponse;
14+
import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
1515
import org.opensearch.client.Client;
1616
import org.opensearch.client.ClusterAdminClient;
1717
import org.opensearch.common.xcontent.XContentType;

src/main/java/org/opensearch/flowframework/workflow/UpdateSearchPipelineStep.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.apache.logging.log4j.LogManager;
1212
import org.apache.logging.log4j.Logger;
1313
import org.opensearch.action.search.PutSearchPipelineRequest;
14-
import org.opensearch.action.support.master.AcknowledgedResponse;
14+
import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
1515
import org.opensearch.client.Client;
1616
import org.opensearch.client.ClusterAdminClient;
1717
import org.opensearch.common.xcontent.XContentType;

src/test/java/org/opensearch/flowframework/indices/FlowFrameworkIndicesHandlerTests.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import org.opensearch.action.get.GetRequest;
1818
import org.opensearch.action.get.GetResponse;
1919
import org.opensearch.action.index.IndexResponse;
20-
import org.opensearch.action.support.master.AcknowledgedResponse;
20+
import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
2121
import org.opensearch.action.update.UpdateRequest;
2222
import org.opensearch.action.update.UpdateResponse;
2323
import org.opensearch.client.AdminClient;
@@ -80,7 +80,6 @@
8080
import static org.mockito.Mockito.verify;
8181
import static org.mockito.Mockito.when;
8282

83-
@SuppressWarnings("deprecation")
8483
public class FlowFrameworkIndicesHandlerTests extends OpenSearchTestCase {
8584
@Mock
8685
private Client client;

src/test/java/org/opensearch/flowframework/workflow/CreateIngestPipelineStepTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
import org.opensearch.action.ingest.PutPipelineRequest;
1212
import org.opensearch.action.support.PlainActionFuture;
13-
import org.opensearch.action.support.master.AcknowledgedResponse;
13+
import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
1414
import org.opensearch.client.AdminClient;
1515
import org.opensearch.client.Client;
1616
import org.opensearch.client.ClusterAdminClient;

src/test/java/org/opensearch/flowframework/workflow/CreateSearchPipelineStepTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
import org.opensearch.action.search.PutSearchPipelineRequest;
1212
import org.opensearch.action.support.PlainActionFuture;
13-
import org.opensearch.action.support.master.AcknowledgedResponse;
13+
import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
1414
import org.opensearch.client.AdminClient;
1515
import org.opensearch.client.Client;
1616
import org.opensearch.client.ClusterAdminClient;

src/test/java/org/opensearch/flowframework/workflow/DeleteIndexStepTests.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.opensearch.action.admin.indices.delete.DeleteIndexRequest;
1212
import org.opensearch.action.delete.DeleteResponse;
1313
import org.opensearch.action.support.PlainActionFuture;
14-
import org.opensearch.action.support.master.AcknowledgedResponse;
14+
import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
1515
import org.opensearch.client.AdminClient;
1616
import org.opensearch.client.Client;
1717
import org.opensearch.client.IndicesAdminClient;
@@ -61,7 +61,6 @@ public void testDeleteIndex() throws IOException, ExecutionException, Interrupte
6161
DeleteIndexStep deleteIndexStep = new DeleteIndexStep(client);
6262

6363
doAnswer(invocation -> {
64-
@SuppressWarnings("deprecation")
6564
ActionListener<AcknowledgedResponse> actionListener = invocation.getArgument(1);
6665
actionListener.onResponse(new AcknowledgedResponse(true));
6766
return null;

src/test/java/org/opensearch/flowframework/workflow/DeleteIngestPipelineStepTests.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.opensearch.action.delete.DeleteResponse;
1212
import org.opensearch.action.ingest.DeletePipelineRequest;
1313
import org.opensearch.action.support.PlainActionFuture;
14-
import org.opensearch.action.support.master.AcknowledgedResponse;
14+
import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
1515
import org.opensearch.client.AdminClient;
1616
import org.opensearch.client.Client;
1717
import org.opensearch.client.ClusterAdminClient;
@@ -61,7 +61,6 @@ public void testDeletePipeline() throws IOException, ExecutionException, Interru
6161
DeleteIngestPipelineStep deleteIngestPipelineStep = new DeleteIngestPipelineStep(client);
6262

6363
doAnswer(invocation -> {
64-
@SuppressWarnings("deprecation")
6564
ActionListener<AcknowledgedResponse> actionListener = invocation.getArgument(1);
6665
actionListener.onResponse(new AcknowledgedResponse(true));
6766
return null;

src/test/java/org/opensearch/flowframework/workflow/DeleteSearchPipelineStepTests.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.opensearch.action.delete.DeleteResponse;
1212
import org.opensearch.action.search.DeleteSearchPipelineRequest;
1313
import org.opensearch.action.support.PlainActionFuture;
14-
import org.opensearch.action.support.master.AcknowledgedResponse;
14+
import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
1515
import org.opensearch.client.AdminClient;
1616
import org.opensearch.client.Client;
1717
import org.opensearch.client.ClusterAdminClient;
@@ -61,7 +61,6 @@ public void testDeleteSearchPipeline() throws IOException, ExecutionException, I
6161
DeleteSearchPipelineStep deleteSearchPipelineStep = new DeleteSearchPipelineStep(client);
6262

6363
doAnswer(invocation -> {
64-
@SuppressWarnings("deprecation")
6564
ActionListener<AcknowledgedResponse> actionListener = invocation.getArgument(1);
6665
actionListener.onResponse(new AcknowledgedResponse(true));
6766
return null;

src/test/java/org/opensearch/flowframework/workflow/UpdateIndexStepTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.opensearch.action.admin.indices.settings.get.GetSettingsResponse;
1313
import org.opensearch.action.admin.indices.settings.put.UpdateSettingsRequest;
1414
import org.opensearch.action.support.PlainActionFuture;
15-
import org.opensearch.action.support.master.AcknowledgedResponse;
15+
import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
1616
import org.opensearch.client.AdminClient;
1717
import org.opensearch.client.Client;
1818
import org.opensearch.client.IndicesAdminClient;

src/test/java/org/opensearch/flowframework/workflow/UpdateIngestPipelineStepTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
import org.opensearch.action.ingest.PutPipelineRequest;
1212
import org.opensearch.action.support.PlainActionFuture;
13-
import org.opensearch.action.support.master.AcknowledgedResponse;
13+
import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
1414
import org.opensearch.client.AdminClient;
1515
import org.opensearch.client.Client;
1616
import org.opensearch.client.ClusterAdminClient;

src/test/java/org/opensearch/flowframework/workflow/UpdateSearchPipelineStepTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
import org.opensearch.action.search.PutSearchPipelineRequest;
1212
import org.opensearch.action.support.PlainActionFuture;
13-
import org.opensearch.action.support.master.AcknowledgedResponse;
13+
import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
1414
import org.opensearch.client.AdminClient;
1515
import org.opensearch.client.Client;
1616
import org.opensearch.client.ClusterAdminClient;

0 commit comments

Comments
 (0)