From 09e32b41ecd7919a528b4291c94324ea0396f595 Mon Sep 17 00:00:00 2001 From: Daniel Widdis Date: Fri, 24 Jan 2025 22:38:27 -0800 Subject: [PATCH 1/6] Add alpha1 version qualifier to OpenSearch version Signed-off-by: Daniel Widdis --- CHANGELOG.md | 4 ++++ build.gradle | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13a7e2cc..19ab5f2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,10 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) ### Documentation - Add text to visualization agent template ([#936](https://github.com/opensearch-project/flow-framework/pull/936)) + ### Maintenance +- Fix breaking changes for 3.0.0 release ([#1026](https://github.com/opensearch-project/flow-framework/pull/1026)) + ### Refactoring ## [Unreleased 2.x](https://github.com/opensearch-project/flow-framework/compare/2.18...2.x) @@ -22,5 +25,6 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) ### Infrastructure ### Documentation - Update template for alert summary with new log pattern tools ([#1021](https://github.com/opensearch-project/flow-framework/pull/1021)) + ### Maintenance ### Refactoring diff --git a/build.gradle b/build.gradle index b79a26ae..2ae1c696 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,8 @@ import java.nio.file.Paths buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "3.0.0-alpha1-SNAPSHOT") + // TODO: when upstream plugin dependencies are on alpha1, add alpha1 as the qualifier here buildVersionQualifier = System.getProperty("build.version_qualifier", "") isSnapshot = "true" == System.getProperty("build.snapshot", "true") version_tokens = opensearch_version.tokenize('-') From 34037ca4d2328939a8431f5fad66fab36ec5f7a8 Mon Sep 17 00:00:00 2001 From: Daniel Widdis Date: Fri, 24 Jan 2025 22:39:22 -0800 Subject: [PATCH 2/6] Use getter for SearchResponse totalhits value Signed-off-by: Daniel Widdis --- .../transport/CreateWorkflowTransportAction.java | 2 +- .../flowframework/rest/FlowFrameworkRestApiIT.java | 4 ++-- .../rest/RestWorkflowStateTenantAwareIT.java | 10 +++++----- .../flowframework/rest/RestWorkflowTenantAwareIT.java | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/opensearch/flowframework/transport/CreateWorkflowTransportAction.java b/src/main/java/org/opensearch/flowframework/transport/CreateWorkflowTransportAction.java index 2cc08299..d398f7c7 100644 --- a/src/main/java/org/opensearch/flowframework/transport/CreateWorkflowTransportAction.java +++ b/src/main/java/org/opensearch/flowframework/transport/CreateWorkflowTransportAction.java @@ -546,7 +546,7 @@ void checkMaxWorkflows(TimeValue requestTimeOut, Integer maxWorkflow, String ten context.restore(); try { SearchResponse searchResponse = SearchResponse.fromXContent(r.parser()); - internalListener.onResponse(searchResponse.getHits().getTotalHits().value < maxWorkflow); + internalListener.onResponse(searchResponse.getHits().getTotalHits().value() < maxWorkflow); } catch (Exception e) { logger.error("Failed to parse workflow searchResponse", e); internalListener.onFailure(e); diff --git a/src/test/java/org/opensearch/flowframework/rest/FlowFrameworkRestApiIT.java b/src/test/java/org/opensearch/flowframework/rest/FlowFrameworkRestApiIT.java index f1b0775f..8beba892 100644 --- a/src/test/java/org/opensearch/flowframework/rest/FlowFrameworkRestApiIT.java +++ b/src/test/java/org/opensearch/flowframework/rest/FlowFrameworkRestApiIT.java @@ -69,7 +69,7 @@ public void testSearchWorkflows() throws Exception { // Hit Search Workflows API String termIdQuery = "{\"query\":{\"ids\":{\"values\":[\"" + workflowId + "\"]}}}"; SearchResponse searchResponse = searchWorkflows(client(), termIdQuery); - assertEquals(1, searchResponse.getHits().getTotalHits().value); + assertEquals(1, searchResponse.getHits().getTotalHits().value()); } public void testFailedUpdateWorkflow() throws Exception { @@ -285,7 +285,7 @@ public void testCreateAndProvisionAgentFrameworkWorkflow() throws Exception { // Hit Search State API with the workflow id created above String query = "{\"query\":{\"ids\":{\"values\":[\"" + workflowId + "\"]}}}"; SearchResponse searchResponse = searchWorkflowState(client(), query); - assertEquals(1, searchResponse.getHits().getTotalHits().value); + assertEquals(1, searchResponse.getHits().getTotalHits().value()); String searchHitSource = searchResponse.getHits().getAt(0).getSourceAsString(); WorkflowState searchHitWorkflowState = WorkflowState.parse(searchHitSource); diff --git a/src/test/java/org/opensearch/flowframework/rest/RestWorkflowStateTenantAwareIT.java b/src/test/java/org/opensearch/flowframework/rest/RestWorkflowStateTenantAwareIT.java index 37828667..8ef54805 100644 --- a/src/test/java/org/opensearch/flowframework/rest/RestWorkflowStateTenantAwareIT.java +++ b/src/test/java/org/opensearch/flowframework/rest/RestWorkflowStateTenantAwareIT.java @@ -353,10 +353,10 @@ public void testWorkflowStateCRUD() throws Exception { assertOK(restResponse); SearchResponse searchResponse = searchResponseFromResponse(restResponse); if (multiTenancyEnabled) { - assertEquals(1, searchResponse.getHits().getTotalHits().value); + assertEquals(1, searchResponse.getHits().getTotalHits().value()); assertEquals(tenantId, searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD)); } else { - assertEquals(2, searchResponse.getHits().getTotalHits().value); + assertEquals(2, searchResponse.getHits().getTotalHits().value()); assertNull(searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD)); assertNull(searchResponse.getHits().getHits()[1].getSourceAsMap().get(TENANT_ID_FIELD)); } @@ -368,10 +368,10 @@ public void testWorkflowStateCRUD() throws Exception { assertOK(restResponse); SearchResponse searchResponse = searchResponseFromResponse(restResponse); if (multiTenancyEnabled) { - assertEquals(1, searchResponse.getHits().getTotalHits().value); + assertEquals(1, searchResponse.getHits().getTotalHits().value()); assertEquals(otherTenantId, searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD)); } else { - assertEquals(2, searchResponse.getHits().getTotalHits().value); + assertEquals(2, searchResponse.getHits().getTotalHits().value()); assertNull(searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD)); assertNull(searchResponse.getHits().getHits()[1].getSourceAsMap().get(TENANT_ID_FIELD)); } @@ -391,7 +391,7 @@ public void testWorkflowStateCRUD() throws Exception { response = makeRequest(nullTenantMatchAllRequest, GET, WORKFLOW_PATH + "_search"); assertOK(response); SearchResponse searchResponse = searchResponseFromResponse(response); - assertEquals(2, searchResponse.getHits().getTotalHits().value); + assertEquals(2, searchResponse.getHits().getTotalHits().value()); assertNull(searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD)); assertNull(searchResponse.getHits().getHits()[1].getSourceAsMap().get(TENANT_ID_FIELD)); } diff --git a/src/test/java/org/opensearch/flowframework/rest/RestWorkflowTenantAwareIT.java b/src/test/java/org/opensearch/flowframework/rest/RestWorkflowTenantAwareIT.java index 0120f65f..7008c1c4 100644 --- a/src/test/java/org/opensearch/flowframework/rest/RestWorkflowTenantAwareIT.java +++ b/src/test/java/org/opensearch/flowframework/rest/RestWorkflowTenantAwareIT.java @@ -191,10 +191,10 @@ public void testWorkflowCRUD() throws Exception { assertOK(restResponse); SearchResponse searchResponse = searchResponseFromResponse(restResponse); if (multiTenancyEnabled) { - assertEquals(1, searchResponse.getHits().getTotalHits().value); + assertEquals(1, searchResponse.getHits().getTotalHits().value()); assertEquals(tenantId, searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD)); } else { - assertEquals(2, searchResponse.getHits().getTotalHits().value); + assertEquals(2, searchResponse.getHits().getTotalHits().value()); assertNull(searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD)); assertNull(searchResponse.getHits().getHits()[1].getSourceAsMap().get(TENANT_ID_FIELD)); } @@ -206,10 +206,10 @@ public void testWorkflowCRUD() throws Exception { assertOK(restResponse); SearchResponse searchResponse = searchResponseFromResponse(restResponse); if (multiTenancyEnabled) { - assertEquals(1, searchResponse.getHits().getTotalHits().value); + assertEquals(1, searchResponse.getHits().getTotalHits().value()); assertEquals(otherTenantId, searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD)); } else { - assertEquals(2, searchResponse.getHits().getTotalHits().value); + assertEquals(2, searchResponse.getHits().getTotalHits().value()); assertNull(searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD)); assertNull(searchResponse.getHits().getHits()[1].getSourceAsMap().get(TENANT_ID_FIELD)); } @@ -229,7 +229,7 @@ public void testWorkflowCRUD() throws Exception { response = makeRequest(nullTenantMatchAllRequest, GET, WORKFLOW_PATH + "_search"); assertOK(response); SearchResponse searchResponse = searchResponseFromResponse(response); - assertEquals(2, searchResponse.getHits().getTotalHits().value); + assertEquals(2, searchResponse.getHits().getTotalHits().value()); assertNull(searchResponse.getHits().getHits()[0].getSourceAsMap().get(TENANT_ID_FIELD)); assertNull(searchResponse.getHits().getHits()[1].getSourceAsMap().get(TENANT_ID_FIELD)); } From 67e95d40e7c2215915cb9aa338cf91f121151c85 Mon Sep 17 00:00:00 2001 From: Daniel Widdis Date: Fri, 24 Jan 2025 22:40:01 -0800 Subject: [PATCH 3/6] Import AcknowledgedResponse from new package Signed-off-by: Daniel Widdis --- .../flowframework/indices/FlowFrameworkIndicesHandler.java | 1 - .../flowframework/workflow/AbstractCreatePipelineStep.java | 2 +- .../flowframework/workflow/AbstractUpdatePipelineStep.java | 2 +- .../flowframework/workflow/UpdateIngestPipelineStep.java | 2 +- .../flowframework/workflow/UpdateSearchPipelineStep.java | 2 +- .../indices/FlowFrameworkIndicesHandlerTests.java | 3 +-- .../flowframework/workflow/CreateIngestPipelineStepTests.java | 2 +- .../flowframework/workflow/CreateSearchPipelineStepTests.java | 2 +- .../flowframework/workflow/DeleteIndexStepTests.java | 3 +-- .../flowframework/workflow/DeleteIngestPipelineStepTests.java | 3 +-- .../flowframework/workflow/DeleteSearchPipelineStepTests.java | 3 +-- .../flowframework/workflow/UpdateIndexStepTests.java | 2 +- .../flowframework/workflow/UpdateIngestPipelineStepTests.java | 2 +- .../flowframework/workflow/UpdateSearchPipelineStepTests.java | 2 +- 14 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/opensearch/flowframework/indices/FlowFrameworkIndicesHandler.java b/src/main/java/org/opensearch/flowframework/indices/FlowFrameworkIndicesHandler.java index 31c49bb1..cb46bf7c 100644 --- 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 internalListener = ActionListener.runBefore(listener, threadContext::restore); if (!clusterService.state().metadata().hasIndex(indexName)) { - @SuppressWarnings("deprecation") ActionListener 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 index d1916dc8..dba5466b 100644 --- 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 index e03e048a..2dd7448c 100644 --- 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 index f1107c1c..a2d3a690 100644 --- 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 index 0a6048ee..9b91e94a 100644 --- 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 index 16cabf64..e2976e8b 100644 --- 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 index 0904d904..629de6b2 100644 --- 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 index 0cd62952..49c7b225 100644 --- 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 index 65c16efa..08f1a6bb 100644 --- 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 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 index b0940226..034ccaab 100644 --- 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 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 index f369558e..9addea3d 100644 --- 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 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 index 45c7b4fa..ebb5870d 100644 --- 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 index daa72b3f..0bc97cfb 100644 --- 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 index 0a1f91b5..a190e0d9 100644 --- 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; From 29b011284816fd419af7573cfccafc6249c4761f Mon Sep 17 00:00:00 2001 From: Daniel Widdis Date: Fri, 7 Feb 2025 13:55:41 -0800 Subject: [PATCH 4/6] Update o.o.client imports to o.o.transport.client Signed-off-by: Daniel Widdis --- build.gradle | 16 +++++++++++----- .../flowframework/FlowFrameworkPlugin.java | 5 +++-- .../indices/FlowFrameworkIndicesHandler.java | 2 +- .../rest/AbstractSearchWorkflowAction.java | 2 +- .../rest/RestCreateWorkflowAction.java | 2 +- .../rest/RestDeleteWorkflowAction.java | 2 +- .../rest/RestDeprovisionWorkflowAction.java | 2 +- .../rest/RestGetWorkflowAction.java | 2 +- .../rest/RestGetWorkflowStateAction.java | 2 +- .../rest/RestGetWorkflowStepAction.java | 2 +- .../rest/RestProvisionWorkflowAction.java | 2 +- .../transport/CreateWorkflowTransportAction.java | 2 +- .../transport/DeleteWorkflowTransportAction.java | 2 +- .../DeprovisionWorkflowTransportAction.java | 2 +- .../GetWorkflowStateTransportAction.java | 2 +- .../transport/GetWorkflowTransportAction.java | 2 +- .../ProvisionWorkflowTransportAction.java | 2 +- .../ReprovisionWorkflowTransportAction.java | 2 +- .../transport/handler/SearchHandler.java | 2 +- .../flowframework/util/EncryptorUtils.java | 2 +- .../flowframework/util/ParseUtils.java | 2 +- .../util/WorkflowTimeoutUtility.java | 2 +- .../workflow/AbstractCreatePipelineStep.java | 4 ++-- .../workflow/AbstractUpdatePipelineStep.java | 4 ++-- .../flowframework/workflow/CreateIndexStep.java | 2 +- .../workflow/CreateIngestPipelineStep.java | 2 +- .../workflow/CreateSearchPipelineStep.java | 2 +- .../flowframework/workflow/DeleteIndexStep.java | 2 +- .../workflow/DeleteIngestPipelineStep.java | 2 +- .../workflow/DeleteSearchPipelineStep.java | 2 +- .../flowframework/workflow/ReindexStep.java | 2 +- .../flowframework/workflow/UpdateIndexStep.java | 2 +- .../workflow/UpdateIngestPipelineStep.java | 4 ++-- .../workflow/UpdateSearchPipelineStep.java | 4 ++-- .../workflow/WorkflowStepFactory.java | 2 +- .../flowframework/FlowFrameworkPluginTests.java | 6 +++--- .../FlowFrameworkTenantAwareRestTestCase.java | 2 +- .../FlowFrameworkIndicesHandlerTests.java | 6 +++--- .../model/WorkflowValidatorTests.java | 2 +- .../rest/RestCreateWorkflowActionTests.java | 2 +- .../rest/RestDeleteWorkflowActionTests.java | 2 +- .../rest/RestDeprovisionWorkflowActionTests.java | 2 +- .../rest/RestGetWorkflowActionTests.java | 2 +- .../rest/RestGetWorkflowStateActionTests.java | 2 +- .../rest/RestGetWorkflowStepActionTests.java | 4 ++-- .../rest/RestProvisionWorkflowActionTests.java | 2 +- .../rest/RestSearchWorkflowActionTests.java | 2 +- .../rest/RestSearchWorkflowStateActionTests.java | 2 +- .../CreateWorkflowTransportActionTests.java | 2 +- .../DeleteWorkflowTransportActionTests.java | 2 +- .../DeprovisionWorkflowTransportActionTests.java | 2 +- .../GetWorkflowStateTransportActionTests.java | 2 +- .../GetWorkflowTransportActionTests.java | 2 +- .../ProvisionWorkflowTransportActionTests.java | 2 +- .../ReprovisionWorkflowTransportActionTests.java | 2 +- .../SearchWorkflowStateTransportActionTests.java | 2 +- .../SearchWorkflowTransportActionTests.java | 2 +- .../transport/handler/SearchHandlerTests.java | 2 +- .../flowframework/util/EncryptorUtilsTests.java | 2 +- .../util/WorkflowTimeoutUtilityTests.java | 2 +- .../workflow/CreateIndexStepTests.java | 6 +++--- .../workflow/CreateIngestPipelineStepTests.java | 6 +++--- .../workflow/CreateSearchPipelineStepTests.java | 6 +++--- .../workflow/DeleteIndexStepTests.java | 6 +++--- .../workflow/DeleteIngestPipelineStepTests.java | 6 +++--- .../workflow/DeleteSearchPipelineStepTests.java | 6 +++--- .../flowframework/workflow/ReindexStepTests.java | 2 +- .../workflow/UpdateIndexStepTests.java | 6 +++--- .../workflow/UpdateIngestPipelineStepTests.java | 6 +++--- .../workflow/UpdateSearchPipelineStepTests.java | 6 +++--- .../workflow/WorkflowProcessSorterTests.java | 4 ++-- 71 files changed, 111 insertions(+), 104 deletions(-) diff --git a/build.gradle b/build.gradle index 2ae1c696..68237162 100644 --- a/build.gradle +++ b/build.gradle @@ -9,17 +9,20 @@ import java.nio.file.Paths buildscript { ext { opensearch_version = System.getProperty("opensearch.version", "3.0.0-alpha1-SNAPSHOT") - // TODO: when upstream plugin dependencies are on alpha1, add alpha1 as the qualifier here - buildVersionQualifier = System.getProperty("build.version_qualifier", "") + buildVersionQualifier = System.getProperty("build.version_qualifier", "alpha1") isSnapshot = "true" == System.getProperty("build.snapshot", "true") version_tokens = opensearch_version.tokenize('-') opensearch_build = version_tokens[0] + '.0' plugin_no_snapshot = opensearch_build if (buildVersionQualifier) { + // TODO: when upstream plugin dependencies are on alpha1, switch to opensearch_build and remove this + opensearch_build_noalpha = opensearch_build opensearch_build += "-${buildVersionQualifier}" plugin_no_snapshot += "-${buildVersionQualifier}" } if (isSnapshot) { + // TODO: when upstream plugin dependencies are on alpha1, switch to opensearch_build and remove this + opensearch_build_noalpha += "-SNAPSHOT" opensearch_build += "-SNAPSHOT" } opensearch_group = "org.opensearch" @@ -168,7 +171,8 @@ configurations { dependencies { implementation "org.opensearch:opensearch:${opensearch_version}" - api group: 'org.opensearch', name:'opensearch-ml-client', version: "${opensearch_build}" + // TODO remove _noalpha + api group: 'org.opensearch', name:'opensearch-ml-client', version: "${opensearch_build_noalpha}" api(group: 'org.opensearch.client', name: 'opensearch-rest-client', version: "${opensearch_version}") { exclude group: "org.apache.httpcomponents.client5", module: "httpclient5" } @@ -202,9 +206,11 @@ dependencies { // ZipArchive dependencies used for integration tests // Check the order in case of transitive dependencies zipArchive group: 'org.opensearch.plugin', name:'opensearch-job-scheduler', version: "${opensearch_build}" - zipArchive group: 'org.opensearch.plugin', name:'opensearch-ml-plugin', version: "${opensearch_build}" + // TODO remove _noalpha + zipArchive group: 'org.opensearch.plugin', name:'opensearch-ml-plugin', version: "${opensearch_build_noalpha}" zipArchive group: 'org.opensearch.plugin', name:'opensearch-knn', version: "${opensearch_build}" - zipArchive group: 'org.opensearch.plugin', name:'neural-search', version: "${opensearch_build}" + // TODO remove _noalpha + zipArchive group: 'org.opensearch.plugin', name:'neural-search', version: "${opensearch_build_noalpha}" secureIntegTestPluginArchive group: 'org.opensearch.plugin', name:'opensearch-security', version: "${opensearch_build}" configurations.all { diff --git a/src/main/java/org/opensearch/flowframework/FlowFrameworkPlugin.java b/src/main/java/org/opensearch/flowframework/FlowFrameworkPlugin.java index 440ddaea..774e8739 100644 --- a/src/main/java/org/opensearch/flowframework/FlowFrameworkPlugin.java +++ b/src/main/java/org/opensearch/flowframework/FlowFrameworkPlugin.java @@ -9,7 +9,6 @@ package org.opensearch.flowframework; import org.opensearch.action.ActionRequest; -import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.service.ClusterService; @@ -74,6 +73,7 @@ import org.opensearch.threadpool.ExecutorBuilder; import org.opensearch.threadpool.ScalingExecutorBuilder; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.Client; import org.opensearch.watcher.ResourceWatcherService; import java.util.Collection; @@ -136,7 +136,8 @@ public Collection createComponents( ) { Settings settings = environment.settings(); flowFrameworkSettings = new FlowFrameworkSettings(clusterService, settings); - MachineLearningNodeClient mlClient = new MachineLearningNodeClient(client); + // TODO: Commented out to compile. Uncomment out when ML Commons is on alpha1 + MachineLearningNodeClient mlClient = null; // new MachineLearningNodeClient(client); SdkClient sdkClient = SdkClientFactory.createSdkClient( client, xContentRegistry, diff --git a/src/main/java/org/opensearch/flowframework/indices/FlowFrameworkIndicesHandler.java b/src/main/java/org/opensearch/flowframework/indices/FlowFrameworkIndicesHandler.java index cb46bf7c..6ff43bfb 100644 --- a/src/main/java/org/opensearch/flowframework/indices/FlowFrameworkIndicesHandler.java +++ b/src/main/java/org/opensearch/flowframework/indices/FlowFrameworkIndicesHandler.java @@ -22,7 +22,6 @@ import org.opensearch.action.get.GetResponse; import org.opensearch.action.index.IndexResponse; import org.opensearch.action.update.UpdateResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.util.concurrent.ThreadContext; @@ -50,6 +49,7 @@ import org.opensearch.remote.metadata.client.SdkClient; import org.opensearch.remote.metadata.client.UpdateDataObjectRequest; import org.opensearch.remote.metadata.common.SdkClientUtils; +import org.opensearch.transport.client.Client; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/org/opensearch/flowframework/rest/AbstractSearchWorkflowAction.java b/src/main/java/org/opensearch/flowframework/rest/AbstractSearchWorkflowAction.java index e5ae2528..659a1a4b 100644 --- a/src/main/java/org/opensearch/flowframework/rest/AbstractSearchWorkflowAction.java +++ b/src/main/java/org/opensearch/flowframework/rest/AbstractSearchWorkflowAction.java @@ -11,7 +11,6 @@ import org.opensearch.action.ActionType; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.node.NodeClient; import org.opensearch.core.rest.RestStatus; import org.opensearch.core.xcontent.ToXContent; import org.opensearch.core.xcontent.ToXContentObject; @@ -25,6 +24,7 @@ import org.opensearch.rest.RestResponse; import org.opensearch.rest.action.RestResponseListener; import org.opensearch.search.builder.SearchSourceBuilder; +import org.opensearch.transport.client.node.NodeClient; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/org/opensearch/flowframework/rest/RestCreateWorkflowAction.java b/src/main/java/org/opensearch/flowframework/rest/RestCreateWorkflowAction.java index a3beab33..e91678d5 100644 --- a/src/main/java/org/opensearch/flowframework/rest/RestCreateWorkflowAction.java +++ b/src/main/java/org/opensearch/flowframework/rest/RestCreateWorkflowAction.java @@ -11,7 +11,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.ExceptionsHelper; -import org.opensearch.client.node.NodeClient; import org.opensearch.common.unit.TimeValue; import org.opensearch.core.action.ActionListener; import org.opensearch.core.rest.RestStatus; @@ -29,6 +28,7 @@ import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestRequest; +import org.opensearch.transport.client.node.NodeClient; import java.io.IOException; import java.util.Collections; diff --git a/src/main/java/org/opensearch/flowframework/rest/RestDeleteWorkflowAction.java b/src/main/java/org/opensearch/flowframework/rest/RestDeleteWorkflowAction.java index 65251d23..dda629e3 100644 --- a/src/main/java/org/opensearch/flowframework/rest/RestDeleteWorkflowAction.java +++ b/src/main/java/org/opensearch/flowframework/rest/RestDeleteWorkflowAction.java @@ -11,7 +11,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.ExceptionsHelper; -import org.opensearch.client.node.NodeClient; import org.opensearch.core.action.ActionListener; import org.opensearch.core.rest.RestStatus; import org.opensearch.core.xcontent.ToXContent; @@ -24,6 +23,7 @@ import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestRequest; +import org.opensearch.transport.client.node.NodeClient; import java.io.IOException; import java.util.List; diff --git a/src/main/java/org/opensearch/flowframework/rest/RestDeprovisionWorkflowAction.java b/src/main/java/org/opensearch/flowframework/rest/RestDeprovisionWorkflowAction.java index 783404ff..3b81955a 100644 --- a/src/main/java/org/opensearch/flowframework/rest/RestDeprovisionWorkflowAction.java +++ b/src/main/java/org/opensearch/flowframework/rest/RestDeprovisionWorkflowAction.java @@ -11,7 +11,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.ExceptionsHelper; -import org.opensearch.client.node.NodeClient; import org.opensearch.core.action.ActionListener; import org.opensearch.core.rest.RestStatus; import org.opensearch.core.xcontent.ToXContent; @@ -24,6 +23,7 @@ import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestRequest; +import org.opensearch.transport.client.node.NodeClient; import java.io.IOException; import java.util.Collections; diff --git a/src/main/java/org/opensearch/flowframework/rest/RestGetWorkflowAction.java b/src/main/java/org/opensearch/flowframework/rest/RestGetWorkflowAction.java index 3a05b4fb..372856cc 100644 --- a/src/main/java/org/opensearch/flowframework/rest/RestGetWorkflowAction.java +++ b/src/main/java/org/opensearch/flowframework/rest/RestGetWorkflowAction.java @@ -11,7 +11,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.ExceptionsHelper; -import org.opensearch.client.node.NodeClient; import org.opensearch.core.action.ActionListener; import org.opensearch.core.rest.RestStatus; import org.opensearch.core.xcontent.ToXContent; @@ -24,6 +23,7 @@ import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestRequest; +import org.opensearch.transport.client.node.NodeClient; import java.io.IOException; import java.util.List; diff --git a/src/main/java/org/opensearch/flowframework/rest/RestGetWorkflowStateAction.java b/src/main/java/org/opensearch/flowframework/rest/RestGetWorkflowStateAction.java index 286d4d1e..1fa9dafb 100644 --- a/src/main/java/org/opensearch/flowframework/rest/RestGetWorkflowStateAction.java +++ b/src/main/java/org/opensearch/flowframework/rest/RestGetWorkflowStateAction.java @@ -11,7 +11,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.ExceptionsHelper; -import org.opensearch.client.node.NodeClient; import org.opensearch.core.action.ActionListener; import org.opensearch.core.rest.RestStatus; import org.opensearch.core.xcontent.ToXContent; @@ -24,6 +23,7 @@ import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestRequest; +import org.opensearch.transport.client.node.NodeClient; import java.io.IOException; import java.util.List; diff --git a/src/main/java/org/opensearch/flowframework/rest/RestGetWorkflowStepAction.java b/src/main/java/org/opensearch/flowframework/rest/RestGetWorkflowStepAction.java index d970a080..5d4a8123 100644 --- a/src/main/java/org/opensearch/flowframework/rest/RestGetWorkflowStepAction.java +++ b/src/main/java/org/opensearch/flowframework/rest/RestGetWorkflowStepAction.java @@ -11,7 +11,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.ExceptionsHelper; -import org.opensearch.client.node.NodeClient; import org.opensearch.core.action.ActionListener; import org.opensearch.core.rest.RestStatus; import org.opensearch.core.xcontent.ToXContent; @@ -24,6 +23,7 @@ import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestRequest; +import org.opensearch.transport.client.node.NodeClient; import java.io.IOException; import java.util.Collections; diff --git a/src/main/java/org/opensearch/flowframework/rest/RestProvisionWorkflowAction.java b/src/main/java/org/opensearch/flowframework/rest/RestProvisionWorkflowAction.java index fa53aec2..bb853224 100644 --- a/src/main/java/org/opensearch/flowframework/rest/RestProvisionWorkflowAction.java +++ b/src/main/java/org/opensearch/flowframework/rest/RestProvisionWorkflowAction.java @@ -11,7 +11,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.ExceptionsHelper; -import org.opensearch.client.node.NodeClient; import org.opensearch.common.unit.TimeValue; import org.opensearch.core.action.ActionListener; import org.opensearch.core.rest.RestStatus; @@ -26,6 +25,7 @@ import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestRequest; +import org.opensearch.transport.client.node.NodeClient; import java.io.IOException; import java.util.List; diff --git a/src/main/java/org/opensearch/flowframework/transport/CreateWorkflowTransportAction.java b/src/main/java/org/opensearch/flowframework/transport/CreateWorkflowTransportAction.java index d398f7c7..b2530ac9 100644 --- a/src/main/java/org/opensearch/flowframework/transport/CreateWorkflowTransportAction.java +++ b/src/main/java/org/opensearch/flowframework/transport/CreateWorkflowTransportAction.java @@ -16,7 +16,6 @@ import org.opensearch.action.search.SearchResponse; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Settings; @@ -46,6 +45,7 @@ import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import java.io.IOException; import java.time.Instant; diff --git a/src/main/java/org/opensearch/flowframework/transport/DeleteWorkflowTransportAction.java b/src/main/java/org/opensearch/flowframework/transport/DeleteWorkflowTransportAction.java index 81c72406..59f3a4aa 100644 --- a/src/main/java/org/opensearch/flowframework/transport/DeleteWorkflowTransportAction.java +++ b/src/main/java/org/opensearch/flowframework/transport/DeleteWorkflowTransportAction.java @@ -15,7 +15,6 @@ import org.opensearch.action.delete.DeleteResponse; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Settings; @@ -33,6 +32,7 @@ import org.opensearch.remote.metadata.common.SdkClientUtils; import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import static org.opensearch.flowframework.common.CommonValue.CLEAR_STATUS; import static org.opensearch.flowframework.common.CommonValue.GLOBAL_CONTEXT_INDEX; diff --git a/src/main/java/org/opensearch/flowframework/transport/DeprovisionWorkflowTransportAction.java b/src/main/java/org/opensearch/flowframework/transport/DeprovisionWorkflowTransportAction.java index 5eacbc69..3a96230c 100644 --- a/src/main/java/org/opensearch/flowframework/transport/DeprovisionWorkflowTransportAction.java +++ b/src/main/java/org/opensearch/flowframework/transport/DeprovisionWorkflowTransportAction.java @@ -16,7 +16,6 @@ import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; import org.opensearch.action.support.PlainActionFuture; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Settings; @@ -41,6 +40,7 @@ import org.opensearch.tasks.Task; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import java.time.Instant; import java.util.ArrayList; diff --git a/src/main/java/org/opensearch/flowframework/transport/GetWorkflowStateTransportAction.java b/src/main/java/org/opensearch/flowframework/transport/GetWorkflowStateTransportAction.java index 59d7f729..36c843f1 100644 --- a/src/main/java/org/opensearch/flowframework/transport/GetWorkflowStateTransportAction.java +++ b/src/main/java/org/opensearch/flowframework/transport/GetWorkflowStateTransportAction.java @@ -14,7 +14,6 @@ import org.opensearch.ExceptionsHelper; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Settings; @@ -30,6 +29,7 @@ import org.opensearch.remote.metadata.client.SdkClient; import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import static org.opensearch.flowframework.common.FlowFrameworkSettings.FILTER_BY_BACKEND_ROLES; import static org.opensearch.flowframework.util.ParseUtils.resolveUserAndExecute; diff --git a/src/main/java/org/opensearch/flowframework/transport/GetWorkflowTransportAction.java b/src/main/java/org/opensearch/flowframework/transport/GetWorkflowTransportAction.java index ed70e65b..8b86499d 100644 --- a/src/main/java/org/opensearch/flowframework/transport/GetWorkflowTransportAction.java +++ b/src/main/java/org/opensearch/flowframework/transport/GetWorkflowTransportAction.java @@ -14,7 +14,6 @@ import org.opensearch.ExceptionsHelper; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Settings; @@ -33,6 +32,7 @@ import org.opensearch.remote.metadata.client.SdkClient; import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import static org.opensearch.flowframework.common.CommonValue.GLOBAL_CONTEXT_INDEX; import static org.opensearch.flowframework.common.FlowFrameworkSettings.FILTER_BY_BACKEND_ROLES; diff --git a/src/main/java/org/opensearch/flowframework/transport/ProvisionWorkflowTransportAction.java b/src/main/java/org/opensearch/flowframework/transport/ProvisionWorkflowTransportAction.java index d5550a8f..76ec812d 100644 --- a/src/main/java/org/opensearch/flowframework/transport/ProvisionWorkflowTransportAction.java +++ b/src/main/java/org/opensearch/flowframework/transport/ProvisionWorkflowTransportAction.java @@ -15,7 +15,6 @@ import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; import org.opensearch.action.support.PlainActionFuture; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Settings; @@ -41,6 +40,7 @@ import org.opensearch.remote.metadata.client.SdkClient; import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import java.time.Instant; import java.util.Collections; diff --git a/src/main/java/org/opensearch/flowframework/transport/ReprovisionWorkflowTransportAction.java b/src/main/java/org/opensearch/flowframework/transport/ReprovisionWorkflowTransportAction.java index ec5637cd..4b17095d 100644 --- a/src/main/java/org/opensearch/flowframework/transport/ReprovisionWorkflowTransportAction.java +++ b/src/main/java/org/opensearch/flowframework/transport/ReprovisionWorkflowTransportAction.java @@ -15,7 +15,6 @@ import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; import org.opensearch.action.support.PlainActionFuture; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Settings; @@ -45,6 +44,7 @@ import org.opensearch.tasks.Task; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import java.time.Instant; import java.util.Collections; diff --git a/src/main/java/org/opensearch/flowframework/transport/handler/SearchHandler.java b/src/main/java/org/opensearch/flowframework/transport/handler/SearchHandler.java index 5b914fb4..20cd0ea1 100644 --- a/src/main/java/org/opensearch/flowframework/transport/handler/SearchHandler.java +++ b/src/main/java/org/opensearch/flowframework/transport/handler/SearchHandler.java @@ -12,7 +12,6 @@ import org.apache.logging.log4j.Logger; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; @@ -25,6 +24,7 @@ import org.opensearch.remote.metadata.client.SearchDataObjectRequest; import org.opensearch.remote.metadata.common.SdkClientUtils; import org.opensearch.search.builder.SearchSourceBuilder; +import org.opensearch.transport.client.Client; import java.util.Arrays; diff --git a/src/main/java/org/opensearch/flowframework/util/EncryptorUtils.java b/src/main/java/org/opensearch/flowframework/util/EncryptorUtils.java index e271d6a5..ae0cb58f 100644 --- a/src/main/java/org/opensearch/flowframework/util/EncryptorUtils.java +++ b/src/main/java/org/opensearch/flowframework/util/EncryptorUtils.java @@ -12,7 +12,6 @@ import org.apache.logging.log4j.Logger; import org.opensearch.ExceptionsHelper; import org.opensearch.action.get.GetResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.Nullable; import org.opensearch.common.util.concurrent.ThreadContext; @@ -31,6 +30,7 @@ import org.opensearch.remote.metadata.client.SdkClient; import org.opensearch.remote.metadata.common.SdkClientUtils; import org.opensearch.search.fetch.subphase.FetchSourceContext; +import org.opensearch.transport.client.Client; import javax.crypto.spec.SecretKeySpec; diff --git a/src/main/java/org/opensearch/flowframework/util/ParseUtils.java b/src/main/java/org/opensearch/flowframework/util/ParseUtils.java index 3d6eea42..a0e94b94 100644 --- a/src/main/java/org/opensearch/flowframework/util/ParseUtils.java +++ b/src/main/java/org/opensearch/flowframework/util/ParseUtils.java @@ -15,7 +15,6 @@ import org.apache.logging.log4j.message.ParameterizedMessageFactory; import org.apache.lucene.search.join.ScoreMode; import org.opensearch.action.get.GetResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.Booleans; import org.opensearch.common.io.Streams; @@ -47,6 +46,7 @@ import org.opensearch.remote.metadata.client.SdkClient; import org.opensearch.remote.metadata.common.SdkClientUtils; import org.opensearch.search.builder.SearchSourceBuilder; +import org.opensearch.transport.client.Client; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/src/main/java/org/opensearch/flowframework/util/WorkflowTimeoutUtility.java b/src/main/java/org/opensearch/flowframework/util/WorkflowTimeoutUtility.java index 97192cd7..a724a450 100644 --- a/src/main/java/org/opensearch/flowframework/util/WorkflowTimeoutUtility.java +++ b/src/main/java/org/opensearch/flowframework/util/WorkflowTimeoutUtility.java @@ -11,7 +11,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.ExceptionsHelper; -import org.opensearch.client.Client; import org.opensearch.common.unit.TimeValue; import org.opensearch.core.action.ActionListener; import org.opensearch.flowframework.exception.FlowFrameworkException; @@ -20,6 +19,7 @@ import org.opensearch.flowframework.transport.WorkflowResponse; import org.opensearch.threadpool.Scheduler; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.Client; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/src/main/java/org/opensearch/flowframework/workflow/AbstractCreatePipelineStep.java b/src/main/java/org/opensearch/flowframework/workflow/AbstractCreatePipelineStep.java index dba5466b..3670b133 100644 --- a/src/main/java/org/opensearch/flowframework/workflow/AbstractCreatePipelineStep.java +++ b/src/main/java/org/opensearch/flowframework/workflow/AbstractCreatePipelineStep.java @@ -16,8 +16,6 @@ import org.opensearch.action.search.PutSearchPipelineRequest; import org.opensearch.action.support.PlainActionFuture; import org.opensearch.action.support.clustermanager.AcknowledgedResponse; -import org.opensearch.client.Client; -import org.opensearch.client.ClusterAdminClient; import org.opensearch.common.xcontent.XContentType; import org.opensearch.core.action.ActionListener; import org.opensearch.core.common.bytes.BytesArray; @@ -26,6 +24,8 @@ import org.opensearch.flowframework.exception.WorkflowStepException; import org.opensearch.flowframework.indices.FlowFrameworkIndicesHandler; import org.opensearch.flowframework.util.ParseUtils; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.ClusterAdminClient; import java.nio.charset.StandardCharsets; import java.util.Map; diff --git a/src/main/java/org/opensearch/flowframework/workflow/AbstractUpdatePipelineStep.java b/src/main/java/org/opensearch/flowframework/workflow/AbstractUpdatePipelineStep.java index 2dd7448c..709708ff 100644 --- a/src/main/java/org/opensearch/flowframework/workflow/AbstractUpdatePipelineStep.java +++ b/src/main/java/org/opensearch/flowframework/workflow/AbstractUpdatePipelineStep.java @@ -14,14 +14,14 @@ import org.opensearch.ExceptionsHelper; import org.opensearch.action.support.PlainActionFuture; import org.opensearch.action.support.clustermanager.AcknowledgedResponse; -import org.opensearch.client.Client; -import org.opensearch.client.ClusterAdminClient; import org.opensearch.core.action.ActionListener; import org.opensearch.core.common.bytes.BytesArray; import org.opensearch.core.common.bytes.BytesReference; import org.opensearch.flowframework.exception.FlowFrameworkException; import org.opensearch.flowframework.exception.WorkflowStepException; import org.opensearch.flowframework.util.ParseUtils; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.ClusterAdminClient; import java.nio.charset.StandardCharsets; import java.util.Map; diff --git a/src/main/java/org/opensearch/flowframework/workflow/CreateIndexStep.java b/src/main/java/org/opensearch/flowframework/workflow/CreateIndexStep.java index 7f9233f7..54727a21 100644 --- a/src/main/java/org/opensearch/flowframework/workflow/CreateIndexStep.java +++ b/src/main/java/org/opensearch/flowframework/workflow/CreateIndexStep.java @@ -14,7 +14,6 @@ import org.opensearch.ExceptionsHelper; import org.opensearch.action.admin.indices.create.CreateIndexRequest; import org.opensearch.action.support.PlainActionFuture; -import org.opensearch.client.Client; import org.opensearch.common.xcontent.LoggingDeprecationHandler; import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.core.action.ActionListener; @@ -26,6 +25,7 @@ import org.opensearch.flowframework.indices.FlowFrameworkIndicesHandler; import org.opensearch.flowframework.util.ParseUtils; import org.opensearch.index.mapper.MapperService; +import org.opensearch.transport.client.Client; import java.nio.charset.StandardCharsets; import java.util.Collections; diff --git a/src/main/java/org/opensearch/flowframework/workflow/CreateIngestPipelineStep.java b/src/main/java/org/opensearch/flowframework/workflow/CreateIngestPipelineStep.java index 13f1b6fe..5a0029d7 100644 --- a/src/main/java/org/opensearch/flowframework/workflow/CreateIngestPipelineStep.java +++ b/src/main/java/org/opensearch/flowframework/workflow/CreateIngestPipelineStep.java @@ -8,8 +8,8 @@ */ package org.opensearch.flowframework.workflow; -import org.opensearch.client.Client; import org.opensearch.flowframework.indices.FlowFrameworkIndicesHandler; +import org.opensearch.transport.client.Client; /** * Step to create an ingest pipeline diff --git a/src/main/java/org/opensearch/flowframework/workflow/CreateSearchPipelineStep.java b/src/main/java/org/opensearch/flowframework/workflow/CreateSearchPipelineStep.java index 67bc5fc0..4dbdbf85 100644 --- a/src/main/java/org/opensearch/flowframework/workflow/CreateSearchPipelineStep.java +++ b/src/main/java/org/opensearch/flowframework/workflow/CreateSearchPipelineStep.java @@ -8,8 +8,8 @@ */ package org.opensearch.flowframework.workflow; -import org.opensearch.client.Client; import org.opensearch.flowframework.indices.FlowFrameworkIndicesHandler; +import org.opensearch.transport.client.Client; /** * Step to create a search pipeline diff --git a/src/main/java/org/opensearch/flowframework/workflow/DeleteIndexStep.java b/src/main/java/org/opensearch/flowframework/workflow/DeleteIndexStep.java index e7691800..e2d09b7c 100644 --- a/src/main/java/org/opensearch/flowframework/workflow/DeleteIndexStep.java +++ b/src/main/java/org/opensearch/flowframework/workflow/DeleteIndexStep.java @@ -14,10 +14,10 @@ import org.opensearch.ExceptionsHelper; import org.opensearch.action.admin.indices.delete.DeleteIndexRequest; import org.opensearch.action.support.PlainActionFuture; -import org.opensearch.client.Client; import org.opensearch.core.action.ActionListener; import org.opensearch.flowframework.exception.WorkflowStepException; import org.opensearch.flowframework.util.ParseUtils; +import org.opensearch.transport.client.Client; import java.util.Collections; import java.util.Map; diff --git a/src/main/java/org/opensearch/flowframework/workflow/DeleteIngestPipelineStep.java b/src/main/java/org/opensearch/flowframework/workflow/DeleteIngestPipelineStep.java index 6f0cd85d..dd4a95e2 100644 --- a/src/main/java/org/opensearch/flowframework/workflow/DeleteIngestPipelineStep.java +++ b/src/main/java/org/opensearch/flowframework/workflow/DeleteIngestPipelineStep.java @@ -14,10 +14,10 @@ import org.opensearch.ExceptionsHelper; import org.opensearch.action.ingest.DeletePipelineRequest; import org.opensearch.action.support.PlainActionFuture; -import org.opensearch.client.Client; import org.opensearch.core.action.ActionListener; import org.opensearch.flowframework.exception.WorkflowStepException; import org.opensearch.flowframework.util.ParseUtils; +import org.opensearch.transport.client.Client; import java.util.Collections; import java.util.Map; diff --git a/src/main/java/org/opensearch/flowframework/workflow/DeleteSearchPipelineStep.java b/src/main/java/org/opensearch/flowframework/workflow/DeleteSearchPipelineStep.java index d4e15f92..c2046ca5 100644 --- a/src/main/java/org/opensearch/flowframework/workflow/DeleteSearchPipelineStep.java +++ b/src/main/java/org/opensearch/flowframework/workflow/DeleteSearchPipelineStep.java @@ -14,10 +14,10 @@ import org.opensearch.ExceptionsHelper; import org.opensearch.action.search.DeleteSearchPipelineRequest; import org.opensearch.action.support.PlainActionFuture; -import org.opensearch.client.Client; import org.opensearch.core.action.ActionListener; import org.opensearch.flowframework.exception.WorkflowStepException; import org.opensearch.flowframework.util.ParseUtils; +import org.opensearch.transport.client.Client; import java.util.Collections; import java.util.Map; diff --git a/src/main/java/org/opensearch/flowframework/workflow/ReindexStep.java b/src/main/java/org/opensearch/flowframework/workflow/ReindexStep.java index f7b5c0ee..1d221f60 100644 --- a/src/main/java/org/opensearch/flowframework/workflow/ReindexStep.java +++ b/src/main/java/org/opensearch/flowframework/workflow/ReindexStep.java @@ -13,7 +13,6 @@ import org.apache.logging.log4j.message.ParameterizedMessageFactory; import org.opensearch.ExceptionsHelper; import org.opensearch.action.support.PlainActionFuture; -import org.opensearch.client.Client; import org.opensearch.common.Booleans; import org.opensearch.core.action.ActionListener; import org.opensearch.core.common.Strings; @@ -25,6 +24,7 @@ import org.opensearch.index.reindex.BulkByScrollResponse; import org.opensearch.index.reindex.ReindexAction; import org.opensearch.index.reindex.ReindexRequest; +import org.opensearch.transport.client.Client; import java.util.Map; import java.util.Set; diff --git a/src/main/java/org/opensearch/flowframework/workflow/UpdateIndexStep.java b/src/main/java/org/opensearch/flowframework/workflow/UpdateIndexStep.java index 1965b614..b527f4c1 100644 --- a/src/main/java/org/opensearch/flowframework/workflow/UpdateIndexStep.java +++ b/src/main/java/org/opensearch/flowframework/workflow/UpdateIndexStep.java @@ -15,7 +15,6 @@ import org.opensearch.action.admin.indices.settings.get.GetSettingsRequest; import org.opensearch.action.admin.indices.settings.put.UpdateSettingsRequest; import org.opensearch.action.support.PlainActionFuture; -import org.opensearch.client.Client; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.core.action.ActionListener; @@ -26,6 +25,7 @@ import org.opensearch.flowframework.exception.FlowFrameworkException; import org.opensearch.flowframework.exception.WorkflowStepException; import org.opensearch.flowframework.util.ParseUtils; +import org.opensearch.transport.client.Client; import java.nio.charset.StandardCharsets; import java.util.Collections; diff --git a/src/main/java/org/opensearch/flowframework/workflow/UpdateIngestPipelineStep.java b/src/main/java/org/opensearch/flowframework/workflow/UpdateIngestPipelineStep.java index a2d3a690..653e63b1 100644 --- a/src/main/java/org/opensearch/flowframework/workflow/UpdateIngestPipelineStep.java +++ b/src/main/java/org/opensearch/flowframework/workflow/UpdateIngestPipelineStep.java @@ -12,11 +12,11 @@ import org.apache.logging.log4j.Logger; import org.opensearch.action.ingest.PutPipelineRequest; import org.opensearch.action.support.clustermanager.AcknowledgedResponse; -import org.opensearch.client.Client; -import org.opensearch.client.ClusterAdminClient; import org.opensearch.common.xcontent.XContentType; import org.opensearch.core.action.ActionListener; import org.opensearch.core.common.bytes.BytesReference; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.ClusterAdminClient; /** * Step to update an ingest pipeline diff --git a/src/main/java/org/opensearch/flowframework/workflow/UpdateSearchPipelineStep.java b/src/main/java/org/opensearch/flowframework/workflow/UpdateSearchPipelineStep.java index 9b91e94a..d094325d 100644 --- a/src/main/java/org/opensearch/flowframework/workflow/UpdateSearchPipelineStep.java +++ b/src/main/java/org/opensearch/flowframework/workflow/UpdateSearchPipelineStep.java @@ -12,11 +12,11 @@ import org.apache.logging.log4j.Logger; import org.opensearch.action.search.PutSearchPipelineRequest; import org.opensearch.action.support.clustermanager.AcknowledgedResponse; -import org.opensearch.client.Client; -import org.opensearch.client.ClusterAdminClient; import org.opensearch.common.xcontent.XContentType; import org.opensearch.core.action.ActionListener; import org.opensearch.core.common.bytes.BytesReference; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.ClusterAdminClient; /** * Step to update a search pipeline diff --git a/src/main/java/org/opensearch/flowframework/workflow/WorkflowStepFactory.java b/src/main/java/org/opensearch/flowframework/workflow/WorkflowStepFactory.java index a63c187d..ad05302f 100644 --- a/src/main/java/org/opensearch/flowframework/workflow/WorkflowStepFactory.java +++ b/src/main/java/org/opensearch/flowframework/workflow/WorkflowStepFactory.java @@ -11,7 +11,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessageFactory; -import org.opensearch.client.Client; import org.opensearch.common.unit.TimeValue; import org.opensearch.core.common.Strings; import org.opensearch.core.rest.RestStatus; @@ -22,6 +21,7 @@ import org.opensearch.flowframework.model.WorkflowValidator; import org.opensearch.ml.client.MachineLearningNodeClient; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.Client; import java.util.Collection; import java.util.Collections; diff --git a/src/test/java/org/opensearch/flowframework/FlowFrameworkPluginTests.java b/src/test/java/org/opensearch/flowframework/FlowFrameworkPluginTests.java index bec97bec..8c0f6593 100644 --- a/src/test/java/org/opensearch/flowframework/FlowFrameworkPluginTests.java +++ b/src/test/java/org/opensearch/flowframework/FlowFrameworkPluginTests.java @@ -8,9 +8,6 @@ */ package org.opensearch.flowframework; -import org.opensearch.client.AdminClient; -import org.opensearch.client.Client; -import org.opensearch.client.ClusterAdminClient; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Setting; @@ -20,6 +17,9 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.ClusterAdminClient; import java.io.IOException; import java.util.Collection; diff --git a/src/test/java/org/opensearch/flowframework/FlowFrameworkTenantAwareRestTestCase.java b/src/test/java/org/opensearch/flowframework/FlowFrameworkTenantAwareRestTestCase.java index bb2c520d..d6454071 100644 --- a/src/test/java/org/opensearch/flowframework/FlowFrameworkTenantAwareRestTestCase.java +++ b/src/test/java/org/opensearch/flowframework/FlowFrameworkTenantAwareRestTestCase.java @@ -206,7 +206,7 @@ protected static void deleteAndWaitForSearch(String tenantId, String restPath, S Response response = makeRequest(searchRequest, GET, restPath + "_search"); assertOK(response); SearchResponse searchResponse = searchResponseFromResponse(response); - assertEquals(hits, searchResponse.getHits().getTotalHits().value); + assertEquals(hits, searchResponse.getHits().getTotalHits().value()); }, 20, TimeUnit.SECONDS); } } diff --git a/src/test/java/org/opensearch/flowframework/indices/FlowFrameworkIndicesHandlerTests.java b/src/test/java/org/opensearch/flowframework/indices/FlowFrameworkIndicesHandlerTests.java index e2976e8b..cd1e2437 100644 --- a/src/test/java/org/opensearch/flowframework/indices/FlowFrameworkIndicesHandlerTests.java +++ b/src/test/java/org/opensearch/flowframework/indices/FlowFrameworkIndicesHandlerTests.java @@ -20,9 +20,6 @@ import org.opensearch.action.support.clustermanager.AcknowledgedResponse; import org.opensearch.action.update.UpdateRequest; import org.opensearch.action.update.UpdateResponse; -import org.opensearch.client.AdminClient; -import org.opensearch.client.Client; -import org.opensearch.client.IndicesAdminClient; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.IndexMetadata; @@ -55,6 +52,9 @@ import org.opensearch.remote.metadata.client.impl.SdkClientFactory; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.IndicesAdminClient; import java.io.IOException; import java.time.Instant; diff --git a/src/test/java/org/opensearch/flowframework/model/WorkflowValidatorTests.java b/src/test/java/org/opensearch/flowframework/model/WorkflowValidatorTests.java index 37526f1b..3dc06470 100644 --- a/src/test/java/org/opensearch/flowframework/model/WorkflowValidatorTests.java +++ b/src/test/java/org/opensearch/flowframework/model/WorkflowValidatorTests.java @@ -8,7 +8,6 @@ */ package org.opensearch.flowframework.model; -import org.opensearch.client.Client; import org.opensearch.flowframework.common.FlowFrameworkSettings; import org.opensearch.flowframework.indices.FlowFrameworkIndicesHandler; import org.opensearch.flowframework.workflow.WorkflowProcessSorter; @@ -17,6 +16,7 @@ import org.opensearch.ml.client.MachineLearningNodeClient; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.Client; import java.io.IOException; import java.util.ArrayList; diff --git a/src/test/java/org/opensearch/flowframework/rest/RestCreateWorkflowActionTests.java b/src/test/java/org/opensearch/flowframework/rest/RestCreateWorkflowActionTests.java index dd230243..3cff549f 100644 --- a/src/test/java/org/opensearch/flowframework/rest/RestCreateWorkflowActionTests.java +++ b/src/test/java/org/opensearch/flowframework/rest/RestCreateWorkflowActionTests.java @@ -9,7 +9,6 @@ package org.opensearch.flowframework.rest; import org.opensearch.Version; -import org.opensearch.client.node.NodeClient; import org.opensearch.core.action.ActionListener; import org.opensearch.core.common.bytes.BytesArray; import org.opensearch.core.rest.RestStatus; @@ -28,6 +27,7 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.rest.FakeRestChannel; import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.transport.client.node.NodeClient; import java.util.Collections; import java.util.List; diff --git a/src/test/java/org/opensearch/flowframework/rest/RestDeleteWorkflowActionTests.java b/src/test/java/org/opensearch/flowframework/rest/RestDeleteWorkflowActionTests.java index e8c9463f..5405294a 100644 --- a/src/test/java/org/opensearch/flowframework/rest/RestDeleteWorkflowActionTests.java +++ b/src/test/java/org/opensearch/flowframework/rest/RestDeleteWorkflowActionTests.java @@ -8,7 +8,6 @@ */ package org.opensearch.flowframework.rest; -import org.opensearch.client.node.NodeClient; import org.opensearch.core.rest.RestStatus; import org.opensearch.flowframework.common.FlowFrameworkSettings; import org.opensearch.rest.RestHandler; @@ -16,6 +15,7 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.rest.FakeRestChannel; import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.transport.client.node.NodeClient; import java.util.List; import java.util.Locale; diff --git a/src/test/java/org/opensearch/flowframework/rest/RestDeprovisionWorkflowActionTests.java b/src/test/java/org/opensearch/flowframework/rest/RestDeprovisionWorkflowActionTests.java index 0d24b033..d38e2d81 100644 --- a/src/test/java/org/opensearch/flowframework/rest/RestDeprovisionWorkflowActionTests.java +++ b/src/test/java/org/opensearch/flowframework/rest/RestDeprovisionWorkflowActionTests.java @@ -8,7 +8,6 @@ */ package org.opensearch.flowframework.rest; -import org.opensearch.client.node.NodeClient; import org.opensearch.core.action.ActionListener; import org.opensearch.core.rest.RestStatus; import org.opensearch.flowframework.common.FlowFrameworkSettings; @@ -20,6 +19,7 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.rest.FakeRestChannel; import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.transport.client.node.NodeClient; import java.util.List; import java.util.Locale; diff --git a/src/test/java/org/opensearch/flowframework/rest/RestGetWorkflowActionTests.java b/src/test/java/org/opensearch/flowframework/rest/RestGetWorkflowActionTests.java index 7833a5cc..f9d338de 100644 --- a/src/test/java/org/opensearch/flowframework/rest/RestGetWorkflowActionTests.java +++ b/src/test/java/org/opensearch/flowframework/rest/RestGetWorkflowActionTests.java @@ -8,7 +8,6 @@ */ package org.opensearch.flowframework.rest; -import org.opensearch.client.node.NodeClient; import org.opensearch.core.rest.RestStatus; import org.opensearch.flowframework.common.FlowFrameworkSettings; import org.opensearch.rest.RestHandler; @@ -16,6 +15,7 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.rest.FakeRestChannel; import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.transport.client.node.NodeClient; import java.util.List; import java.util.Locale; diff --git a/src/test/java/org/opensearch/flowframework/rest/RestGetWorkflowStateActionTests.java b/src/test/java/org/opensearch/flowframework/rest/RestGetWorkflowStateActionTests.java index e9a8d91c..fd0db875 100644 --- a/src/test/java/org/opensearch/flowframework/rest/RestGetWorkflowStateActionTests.java +++ b/src/test/java/org/opensearch/flowframework/rest/RestGetWorkflowStateActionTests.java @@ -8,7 +8,6 @@ */ package org.opensearch.flowframework.rest; -import org.opensearch.client.node.NodeClient; import org.opensearch.core.rest.RestStatus; import org.opensearch.flowframework.common.FlowFrameworkSettings; import org.opensearch.rest.RestHandler; @@ -16,6 +15,7 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.rest.FakeRestChannel; import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.transport.client.node.NodeClient; import java.util.List; import java.util.Locale; diff --git a/src/test/java/org/opensearch/flowframework/rest/RestGetWorkflowStepActionTests.java b/src/test/java/org/opensearch/flowframework/rest/RestGetWorkflowStepActionTests.java index 08e6abb0..0b388f09 100644 --- a/src/test/java/org/opensearch/flowframework/rest/RestGetWorkflowStepActionTests.java +++ b/src/test/java/org/opensearch/flowframework/rest/RestGetWorkflowStepActionTests.java @@ -8,8 +8,6 @@ */ package org.opensearch.flowframework.rest; -import org.opensearch.client.Client; -import org.opensearch.client.node.NodeClient; import org.opensearch.core.action.ActionListener; import org.opensearch.core.rest.RestStatus; import org.opensearch.flowframework.common.FlowFrameworkSettings; @@ -26,6 +24,8 @@ import org.opensearch.test.rest.FakeRestChannel; import org.opensearch.test.rest.FakeRestRequest; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.node.NodeClient; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/org/opensearch/flowframework/rest/RestProvisionWorkflowActionTests.java b/src/test/java/org/opensearch/flowframework/rest/RestProvisionWorkflowActionTests.java index 625e48e3..ed2816c4 100644 --- a/src/test/java/org/opensearch/flowframework/rest/RestProvisionWorkflowActionTests.java +++ b/src/test/java/org/opensearch/flowframework/rest/RestProvisionWorkflowActionTests.java @@ -8,7 +8,6 @@ */ package org.opensearch.flowframework.rest; -import org.opensearch.client.node.NodeClient; import org.opensearch.core.action.ActionListener; import org.opensearch.core.common.bytes.BytesArray; import org.opensearch.core.rest.RestStatus; @@ -21,6 +20,7 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.rest.FakeRestChannel; import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.transport.client.node.NodeClient; import java.util.List; import java.util.Locale; diff --git a/src/test/java/org/opensearch/flowframework/rest/RestSearchWorkflowActionTests.java b/src/test/java/org/opensearch/flowframework/rest/RestSearchWorkflowActionTests.java index c35512d4..cb6c8ee3 100644 --- a/src/test/java/org/opensearch/flowframework/rest/RestSearchWorkflowActionTests.java +++ b/src/test/java/org/opensearch/flowframework/rest/RestSearchWorkflowActionTests.java @@ -8,7 +8,6 @@ */ package org.opensearch.flowframework.rest; -import org.opensearch.client.node.NodeClient; import org.opensearch.core.common.bytes.BytesArray; import org.opensearch.core.rest.RestStatus; import org.opensearch.core.xcontent.MediaTypeRegistry; @@ -19,6 +18,7 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.rest.FakeRestChannel; import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.transport.client.node.NodeClient; import java.util.List; import java.util.Locale; diff --git a/src/test/java/org/opensearch/flowframework/rest/RestSearchWorkflowStateActionTests.java b/src/test/java/org/opensearch/flowframework/rest/RestSearchWorkflowStateActionTests.java index a1e90616..aa5e5c86 100644 --- a/src/test/java/org/opensearch/flowframework/rest/RestSearchWorkflowStateActionTests.java +++ b/src/test/java/org/opensearch/flowframework/rest/RestSearchWorkflowStateActionTests.java @@ -8,7 +8,6 @@ */ package org.opensearch.flowframework.rest; -import org.opensearch.client.node.NodeClient; import org.opensearch.core.common.bytes.BytesArray; import org.opensearch.core.rest.RestStatus; import org.opensearch.core.xcontent.MediaTypeRegistry; @@ -19,6 +18,7 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.rest.FakeRestChannel; import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.transport.client.node.NodeClient; import java.util.List; import java.util.Locale; diff --git a/src/test/java/org/opensearch/flowframework/transport/CreateWorkflowTransportActionTests.java b/src/test/java/org/opensearch/flowframework/transport/CreateWorkflowTransportActionTests.java index 52f2e74d..f095a22f 100644 --- a/src/test/java/org/opensearch/flowframework/transport/CreateWorkflowTransportActionTests.java +++ b/src/test/java/org/opensearch/flowframework/transport/CreateWorkflowTransportActionTests.java @@ -19,7 +19,6 @@ import org.opensearch.action.search.ShardSearchFailure; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.update.UpdateResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.IndexMetadata; @@ -52,6 +51,7 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import java.io.IOException; import java.time.Instant; diff --git a/src/test/java/org/opensearch/flowframework/transport/DeleteWorkflowTransportActionTests.java b/src/test/java/org/opensearch/flowframework/transport/DeleteWorkflowTransportActionTests.java index 569e8042..0e259cb1 100644 --- a/src/test/java/org/opensearch/flowframework/transport/DeleteWorkflowTransportActionTests.java +++ b/src/test/java/org/opensearch/flowframework/transport/DeleteWorkflowTransportActionTests.java @@ -12,7 +12,6 @@ import org.opensearch.action.delete.DeleteRequest; import org.opensearch.action.delete.DeleteResponse; import org.opensearch.action.support.ActionFilters; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; @@ -29,6 +28,7 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import java.util.Arrays; import java.util.Collections; diff --git a/src/test/java/org/opensearch/flowframework/transport/DeprovisionWorkflowTransportActionTests.java b/src/test/java/org/opensearch/flowframework/transport/DeprovisionWorkflowTransportActionTests.java index 951c59bd..6cfaac9f 100644 --- a/src/test/java/org/opensearch/flowframework/transport/DeprovisionWorkflowTransportActionTests.java +++ b/src/test/java/org/opensearch/flowframework/transport/DeprovisionWorkflowTransportActionTests.java @@ -11,7 +11,6 @@ import org.opensearch.action.LatchedActionListener; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.PlainActionFuture; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; @@ -40,6 +39,7 @@ import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import org.junit.AfterClass; import java.util.Arrays; diff --git a/src/test/java/org/opensearch/flowframework/transport/GetWorkflowStateTransportActionTests.java b/src/test/java/org/opensearch/flowframework/transport/GetWorkflowStateTransportActionTests.java index 306c746b..6755c45b 100644 --- a/src/test/java/org/opensearch/flowframework/transport/GetWorkflowStateTransportActionTests.java +++ b/src/test/java/org/opensearch/flowframework/transport/GetWorkflowStateTransportActionTests.java @@ -11,7 +11,6 @@ import org.opensearch.action.get.GetRequest; import org.opensearch.action.get.GetResponse; import org.opensearch.action.support.ActionFilters; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.settings.ClusterSettings; @@ -39,6 +38,7 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import org.junit.Assert; import java.io.IOException; diff --git a/src/test/java/org/opensearch/flowframework/transport/GetWorkflowTransportActionTests.java b/src/test/java/org/opensearch/flowframework/transport/GetWorkflowTransportActionTests.java index 57cc5d70..9b8cfc56 100644 --- a/src/test/java/org/opensearch/flowframework/transport/GetWorkflowTransportActionTests.java +++ b/src/test/java/org/opensearch/flowframework/transport/GetWorkflowTransportActionTests.java @@ -12,7 +12,6 @@ import org.opensearch.action.get.GetRequest; import org.opensearch.action.get.GetResponse; import org.opensearch.action.support.ActionFilters; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; @@ -37,6 +36,7 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import java.util.Arrays; import java.util.Collections; diff --git a/src/test/java/org/opensearch/flowframework/transport/ProvisionWorkflowTransportActionTests.java b/src/test/java/org/opensearch/flowframework/transport/ProvisionWorkflowTransportActionTests.java index 4ad32c48..e1193f6f 100644 --- a/src/test/java/org/opensearch/flowframework/transport/ProvisionWorkflowTransportActionTests.java +++ b/src/test/java/org/opensearch/flowframework/transport/ProvisionWorkflowTransportActionTests.java @@ -14,7 +14,6 @@ import org.opensearch.action.index.IndexResponse; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.update.UpdateResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; @@ -43,6 +42,7 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import java.util.Arrays; import java.util.Collections; diff --git a/src/test/java/org/opensearch/flowframework/transport/ReprovisionWorkflowTransportActionTests.java b/src/test/java/org/opensearch/flowframework/transport/ReprovisionWorkflowTransportActionTests.java index b1c648a2..eb3611bd 100644 --- a/src/test/java/org/opensearch/flowframework/transport/ReprovisionWorkflowTransportActionTests.java +++ b/src/test/java/org/opensearch/flowframework/transport/ReprovisionWorkflowTransportActionTests.java @@ -10,7 +10,6 @@ import org.opensearch.action.support.ActionFilters; import org.opensearch.action.update.UpdateResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; @@ -36,6 +35,7 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import java.util.Arrays; import java.util.Collections; diff --git a/src/test/java/org/opensearch/flowframework/transport/SearchWorkflowStateTransportActionTests.java b/src/test/java/org/opensearch/flowframework/transport/SearchWorkflowStateTransportActionTests.java index 898840e5..fdb58524 100644 --- a/src/test/java/org/opensearch/flowframework/transport/SearchWorkflowStateTransportActionTests.java +++ b/src/test/java/org/opensearch/flowframework/transport/SearchWorkflowStateTransportActionTests.java @@ -11,7 +11,6 @@ import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; import org.opensearch.action.support.ActionFilters; -import org.opensearch.client.Client; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.core.action.ActionListener; @@ -21,6 +20,7 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.nullable; diff --git a/src/test/java/org/opensearch/flowframework/transport/SearchWorkflowTransportActionTests.java b/src/test/java/org/opensearch/flowframework/transport/SearchWorkflowTransportActionTests.java index 8d33630d..cc4ea969 100644 --- a/src/test/java/org/opensearch/flowframework/transport/SearchWorkflowTransportActionTests.java +++ b/src/test/java/org/opensearch/flowframework/transport/SearchWorkflowTransportActionTests.java @@ -11,7 +11,6 @@ import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; import org.opensearch.action.support.ActionFilters; -import org.opensearch.client.Client; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.core.action.ActionListener; @@ -21,6 +20,7 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.nullable; diff --git a/src/test/java/org/opensearch/flowframework/transport/handler/SearchHandlerTests.java b/src/test/java/org/opensearch/flowframework/transport/handler/SearchHandlerTests.java index 98ae3ab4..c1bc5820 100644 --- a/src/test/java/org/opensearch/flowframework/transport/handler/SearchHandlerTests.java +++ b/src/test/java/org/opensearch/flowframework/transport/handler/SearchHandlerTests.java @@ -10,7 +10,6 @@ import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; @@ -23,6 +22,7 @@ import org.opensearch.remote.metadata.client.impl.SdkClientFactory; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.Client; import org.junit.Before; import java.util.Collections; diff --git a/src/test/java/org/opensearch/flowframework/util/EncryptorUtilsTests.java b/src/test/java/org/opensearch/flowframework/util/EncryptorUtilsTests.java index 68d5d415..388bc614 100644 --- a/src/test/java/org/opensearch/flowframework/util/EncryptorUtilsTests.java +++ b/src/test/java/org/opensearch/flowframework/util/EncryptorUtilsTests.java @@ -13,7 +13,6 @@ import org.opensearch.action.get.GetResponse; import org.opensearch.action.index.IndexRequest; import org.opensearch.action.index.IndexResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.Metadata; import org.opensearch.cluster.service.ClusterService; @@ -33,6 +32,7 @@ import org.opensearch.remote.metadata.client.impl.SdkClientFactory; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.Client; import java.io.IOException; import java.time.Instant; diff --git a/src/test/java/org/opensearch/flowframework/util/WorkflowTimeoutUtilityTests.java b/src/test/java/org/opensearch/flowframework/util/WorkflowTimeoutUtilityTests.java index a27531f1..c7b9f3fb 100644 --- a/src/test/java/org/opensearch/flowframework/util/WorkflowTimeoutUtilityTests.java +++ b/src/test/java/org/opensearch/flowframework/util/WorkflowTimeoutUtilityTests.java @@ -8,7 +8,6 @@ */ package org.opensearch.flowframework.util; -import org.opensearch.client.Client; import org.opensearch.common.unit.TimeValue; import org.opensearch.core.action.ActionListener; import org.opensearch.flowframework.TestHelpers; @@ -19,6 +18,7 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.Scheduler; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.Client; import java.time.Instant; import java.util.Collections; diff --git a/src/test/java/org/opensearch/flowframework/workflow/CreateIndexStepTests.java b/src/test/java/org/opensearch/flowframework/workflow/CreateIndexStepTests.java index 42a12478..75b9888f 100644 --- a/src/test/java/org/opensearch/flowframework/workflow/CreateIndexStepTests.java +++ b/src/test/java/org/opensearch/flowframework/workflow/CreateIndexStepTests.java @@ -12,9 +12,6 @@ import org.opensearch.action.admin.indices.create.CreateIndexRequest; import org.opensearch.action.admin.indices.create.CreateIndexResponse; import org.opensearch.action.support.PlainActionFuture; -import org.opensearch.client.AdminClient; -import org.opensearch.client.Client; -import org.opensearch.client.IndicesAdminClient; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.Metadata; import org.opensearch.common.settings.Settings; @@ -24,6 +21,9 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.RemoteTransportException; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.IndicesAdminClient; import java.io.IOException; import java.util.Collections; diff --git a/src/test/java/org/opensearch/flowframework/workflow/CreateIngestPipelineStepTests.java b/src/test/java/org/opensearch/flowframework/workflow/CreateIngestPipelineStepTests.java index 629de6b2..ec9bfcdf 100644 --- a/src/test/java/org/opensearch/flowframework/workflow/CreateIngestPipelineStepTests.java +++ b/src/test/java/org/opensearch/flowframework/workflow/CreateIngestPipelineStepTests.java @@ -11,12 +11,12 @@ import org.opensearch.action.ingest.PutPipelineRequest; import org.opensearch.action.support.PlainActionFuture; import org.opensearch.action.support.clustermanager.AcknowledgedResponse; -import org.opensearch.client.AdminClient; -import org.opensearch.client.Client; -import org.opensearch.client.ClusterAdminClient; import org.opensearch.core.action.ActionListener; import org.opensearch.flowframework.indices.FlowFrameworkIndicesHandler; import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.ClusterAdminClient; import java.io.IOException; import java.util.Collections; diff --git a/src/test/java/org/opensearch/flowframework/workflow/CreateSearchPipelineStepTests.java b/src/test/java/org/opensearch/flowframework/workflow/CreateSearchPipelineStepTests.java index 49c7b225..6e247db2 100644 --- a/src/test/java/org/opensearch/flowframework/workflow/CreateSearchPipelineStepTests.java +++ b/src/test/java/org/opensearch/flowframework/workflow/CreateSearchPipelineStepTests.java @@ -11,12 +11,12 @@ import org.opensearch.action.search.PutSearchPipelineRequest; import org.opensearch.action.support.PlainActionFuture; import org.opensearch.action.support.clustermanager.AcknowledgedResponse; -import org.opensearch.client.AdminClient; -import org.opensearch.client.Client; -import org.opensearch.client.ClusterAdminClient; import org.opensearch.core.action.ActionListener; import org.opensearch.flowframework.indices.FlowFrameworkIndicesHandler; import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.ClusterAdminClient; import java.io.IOException; import java.util.Collections; diff --git a/src/test/java/org/opensearch/flowframework/workflow/DeleteIndexStepTests.java b/src/test/java/org/opensearch/flowframework/workflow/DeleteIndexStepTests.java index 08f1a6bb..72585b6b 100644 --- a/src/test/java/org/opensearch/flowframework/workflow/DeleteIndexStepTests.java +++ b/src/test/java/org/opensearch/flowframework/workflow/DeleteIndexStepTests.java @@ -12,13 +12,13 @@ import org.opensearch.action.delete.DeleteResponse; import org.opensearch.action.support.PlainActionFuture; import org.opensearch.action.support.clustermanager.AcknowledgedResponse; -import org.opensearch.client.AdminClient; -import org.opensearch.client.Client; -import org.opensearch.client.IndicesAdminClient; import org.opensearch.core.action.ActionListener; import org.opensearch.core.rest.RestStatus; import org.opensearch.flowframework.exception.FlowFrameworkException; import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.IndicesAdminClient; import java.io.IOException; import java.util.Collections; diff --git a/src/test/java/org/opensearch/flowframework/workflow/DeleteIngestPipelineStepTests.java b/src/test/java/org/opensearch/flowframework/workflow/DeleteIngestPipelineStepTests.java index 034ccaab..245f834a 100644 --- a/src/test/java/org/opensearch/flowframework/workflow/DeleteIngestPipelineStepTests.java +++ b/src/test/java/org/opensearch/flowframework/workflow/DeleteIngestPipelineStepTests.java @@ -12,13 +12,13 @@ import org.opensearch.action.ingest.DeletePipelineRequest; import org.opensearch.action.support.PlainActionFuture; import org.opensearch.action.support.clustermanager.AcknowledgedResponse; -import org.opensearch.client.AdminClient; -import org.opensearch.client.Client; -import org.opensearch.client.ClusterAdminClient; import org.opensearch.core.action.ActionListener; import org.opensearch.core.rest.RestStatus; import org.opensearch.flowframework.exception.FlowFrameworkException; import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.ClusterAdminClient; import java.io.IOException; import java.util.Collections; diff --git a/src/test/java/org/opensearch/flowframework/workflow/DeleteSearchPipelineStepTests.java b/src/test/java/org/opensearch/flowframework/workflow/DeleteSearchPipelineStepTests.java index 9addea3d..43f055aa 100644 --- a/src/test/java/org/opensearch/flowframework/workflow/DeleteSearchPipelineStepTests.java +++ b/src/test/java/org/opensearch/flowframework/workflow/DeleteSearchPipelineStepTests.java @@ -12,13 +12,13 @@ import org.opensearch.action.search.DeleteSearchPipelineRequest; import org.opensearch.action.support.PlainActionFuture; import org.opensearch.action.support.clustermanager.AcknowledgedResponse; -import org.opensearch.client.AdminClient; -import org.opensearch.client.Client; -import org.opensearch.client.ClusterAdminClient; import org.opensearch.core.action.ActionListener; import org.opensearch.core.rest.RestStatus; import org.opensearch.flowframework.exception.FlowFrameworkException; import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.ClusterAdminClient; import java.io.IOException; import java.util.Collections; diff --git a/src/test/java/org/opensearch/flowframework/workflow/ReindexStepTests.java b/src/test/java/org/opensearch/flowframework/workflow/ReindexStepTests.java index 234881ea..332ac7c3 100644 --- a/src/test/java/org/opensearch/flowframework/workflow/ReindexStepTests.java +++ b/src/test/java/org/opensearch/flowframework/workflow/ReindexStepTests.java @@ -11,7 +11,6 @@ import org.apache.lucene.tests.util.LuceneTestCase; import org.opensearch.OpenSearchException; import org.opensearch.action.support.PlainActionFuture; -import org.opensearch.client.Client; import org.opensearch.common.Randomness; import org.opensearch.common.unit.TimeValue; import org.opensearch.core.action.ActionListener; @@ -20,6 +19,7 @@ import org.opensearch.index.reindex.BulkByScrollTask; import org.opensearch.index.reindex.ReindexRequest; import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.transport.client.Client; import java.io.IOException; import java.util.Collections; diff --git a/src/test/java/org/opensearch/flowframework/workflow/UpdateIndexStepTests.java b/src/test/java/org/opensearch/flowframework/workflow/UpdateIndexStepTests.java index ebb5870d..48102755 100644 --- a/src/test/java/org/opensearch/flowframework/workflow/UpdateIndexStepTests.java +++ b/src/test/java/org/opensearch/flowframework/workflow/UpdateIndexStepTests.java @@ -13,12 +13,12 @@ import org.opensearch.action.admin.indices.settings.put.UpdateSettingsRequest; import org.opensearch.action.support.PlainActionFuture; import org.opensearch.action.support.clustermanager.AcknowledgedResponse; -import org.opensearch.client.AdminClient; -import org.opensearch.client.Client; -import org.opensearch.client.IndicesAdminClient; import org.opensearch.common.settings.Settings; import org.opensearch.core.action.ActionListener; import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.IndicesAdminClient; import java.io.IOException; import java.util.Collections; diff --git a/src/test/java/org/opensearch/flowframework/workflow/UpdateIngestPipelineStepTests.java b/src/test/java/org/opensearch/flowframework/workflow/UpdateIngestPipelineStepTests.java index 0bc97cfb..a06cdbab 100644 --- a/src/test/java/org/opensearch/flowframework/workflow/UpdateIngestPipelineStepTests.java +++ b/src/test/java/org/opensearch/flowframework/workflow/UpdateIngestPipelineStepTests.java @@ -11,11 +11,11 @@ import org.opensearch.action.ingest.PutPipelineRequest; import org.opensearch.action.support.PlainActionFuture; import org.opensearch.action.support.clustermanager.AcknowledgedResponse; -import org.opensearch.client.AdminClient; -import org.opensearch.client.Client; -import org.opensearch.client.ClusterAdminClient; import org.opensearch.core.action.ActionListener; import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.ClusterAdminClient; import java.io.IOException; import java.util.Collections; diff --git a/src/test/java/org/opensearch/flowframework/workflow/UpdateSearchPipelineStepTests.java b/src/test/java/org/opensearch/flowframework/workflow/UpdateSearchPipelineStepTests.java index a190e0d9..33abeeee 100644 --- a/src/test/java/org/opensearch/flowframework/workflow/UpdateSearchPipelineStepTests.java +++ b/src/test/java/org/opensearch/flowframework/workflow/UpdateSearchPipelineStepTests.java @@ -11,11 +11,11 @@ import org.opensearch.action.search.PutSearchPipelineRequest; import org.opensearch.action.support.PlainActionFuture; import org.opensearch.action.support.clustermanager.AcknowledgedResponse; -import org.opensearch.client.AdminClient; -import org.opensearch.client.Client; -import org.opensearch.client.ClusterAdminClient; import org.opensearch.core.action.ActionListener; import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.ClusterAdminClient; import java.io.IOException; import java.util.Collections; diff --git a/src/test/java/org/opensearch/flowframework/workflow/WorkflowProcessSorterTests.java b/src/test/java/org/opensearch/flowframework/workflow/WorkflowProcessSorterTests.java index a05cc8db..4d7375d6 100644 --- a/src/test/java/org/opensearch/flowframework/workflow/WorkflowProcessSorterTests.java +++ b/src/test/java/org/opensearch/flowframework/workflow/WorkflowProcessSorterTests.java @@ -9,8 +9,6 @@ package org.opensearch.flowframework.workflow; import org.opensearch.Version; -import org.opensearch.client.AdminClient; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Setting; @@ -32,6 +30,8 @@ import org.opensearch.threadpool.ScalingExecutorBuilder; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.Client; import org.junit.AfterClass; import org.junit.BeforeClass; From dd72763151559dc9540f1cd2525867e97441ca7d Mon Sep 17 00:00:00 2001 From: Daniel Widdis Date: Wed, 12 Feb 2025 23:20:53 -0500 Subject: [PATCH 5/6] fixup Signed-off-by: Owais --- build.gradle | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 68237162..a5290c43 100644 --- a/build.gradle +++ b/build.gradle @@ -15,14 +15,10 @@ buildscript { opensearch_build = version_tokens[0] + '.0' plugin_no_snapshot = opensearch_build if (buildVersionQualifier) { - // TODO: when upstream plugin dependencies are on alpha1, switch to opensearch_build and remove this - opensearch_build_noalpha = opensearch_build opensearch_build += "-${buildVersionQualifier}" plugin_no_snapshot += "-${buildVersionQualifier}" } if (isSnapshot) { - // TODO: when upstream plugin dependencies are on alpha1, switch to opensearch_build and remove this - opensearch_build_noalpha += "-SNAPSHOT" opensearch_build += "-SNAPSHOT" } opensearch_group = "org.opensearch" @@ -171,8 +167,7 @@ configurations { dependencies { implementation "org.opensearch:opensearch:${opensearch_version}" - // TODO remove _noalpha - api group: 'org.opensearch', name:'opensearch-ml-client', version: "${opensearch_build_noalpha}" + api group: 'org.opensearch', name:'opensearch-ml-client', version: "${opensearch_build}" api(group: 'org.opensearch.client', name: 'opensearch-rest-client', version: "${opensearch_version}") { exclude group: "org.apache.httpcomponents.client5", module: "httpclient5" } @@ -206,11 +201,9 @@ dependencies { // ZipArchive dependencies used for integration tests // Check the order in case of transitive dependencies zipArchive group: 'org.opensearch.plugin', name:'opensearch-job-scheduler', version: "${opensearch_build}" - // TODO remove _noalpha - zipArchive group: 'org.opensearch.plugin', name:'opensearch-ml-plugin', version: "${opensearch_build_noalpha}" + zipArchive group: 'org.opensearch.plugin', name:'opensearch-ml-plugin', version: "${opensearch_build}" zipArchive group: 'org.opensearch.plugin', name:'opensearch-knn', version: "${opensearch_build}" - // TODO remove _noalpha - zipArchive group: 'org.opensearch.plugin', name:'neural-search', version: "${opensearch_build_noalpha}" + zipArchive group: 'org.opensearch.plugin', name:'neural-search', version: "${opensearch_build}" secureIntegTestPluginArchive group: 'org.opensearch.plugin', name:'opensearch-security', version: "${opensearch_build}" configurations.all { From f25e96f2b9815937d3ee85518ddf98880e9dc771 Mon Sep 17 00:00:00 2001 From: Owais Date: Mon, 17 Feb 2025 11:39:30 -0800 Subject: [PATCH 6/6] Handled TODO Signed-off-by: Owais --- .../java/org/opensearch/flowframework/FlowFrameworkPlugin.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/opensearch/flowframework/FlowFrameworkPlugin.java b/src/main/java/org/opensearch/flowframework/FlowFrameworkPlugin.java index 774e8739..4b3a8647 100644 --- a/src/main/java/org/opensearch/flowframework/FlowFrameworkPlugin.java +++ b/src/main/java/org/opensearch/flowframework/FlowFrameworkPlugin.java @@ -136,8 +136,7 @@ public Collection createComponents( ) { Settings settings = environment.settings(); flowFrameworkSettings = new FlowFrameworkSettings(clusterService, settings); - // TODO: Commented out to compile. Uncomment out when ML Commons is on alpha1 - MachineLearningNodeClient mlClient = null; // new MachineLearningNodeClient(client); + MachineLearningNodeClient mlClient = new MachineLearningNodeClient(client); SdkClient sdkClient = SdkClientFactory.createSdkClient( client, xContentRegistry,