From b93daec35762af469befc869d8df3c02b08627de Mon Sep 17 00:00:00 2001 From: Daniel Widdis Date: Fri, 7 Feb 2025 13:55:41 -0800 Subject: [PATCH] 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/FlowFrameworkPluginIT.java | 4 ++-- .../flowframework/FlowFrameworkPluginTests.java | 6 +++--- .../flowframework/FlowFrameworkRestTestCase.java | 10 +++++----- .../FlowFrameworkTenantAwareRestTestCase.java | 4 ++-- .../opensearch/flowframework/TestHelpers.java | 10 +++++----- .../FlowFrameworkBackwardsCompatibilityIT.java | 2 +- .../FlowFrameworkIndicesHandlerTests.java | 6 +++--- .../model/WorkflowValidatorTests.java | 2 +- .../rest/FlowFrameworkRestApiIT.java | 4 ++-- .../rest/FlowFrameworkSecureRestApiIT.java | 6 +++--- .../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 +- .../rest/RestWorkflowStateTenantAwareIT.java | 4 ++-- .../rest/RestWorkflowTenantAwareIT.java | 4 ++-- .../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 ++-- 79 files changed, 134 insertions(+), 127 deletions(-) diff --git a/build.gradle b/build.gradle index 2ae1c6967..68237162b 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 440ddaeac..774e8739c 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 cb46bf7c4..6ff43bfb4 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 e5ae25287..659a1a4bd 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 a3beab336..e91678d58 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 65251d235..dda629e3a 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 783404ff0..3b81955a6 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 3a05b4fb4..372856ccc 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 286d4d1e1..1fa9dafbd 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 d970a080d..5d4a81236 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 fa53aec27..bb853224f 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 d398f7c76..b2530ac90 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 81c724065..59f3a4aa5 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 5eacbc699..3a96230cc 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 59d7f7294..36c843f19 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 ed70e65b2..8b86499d3 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 d5550a8f5..76ec812d9 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 ec5637cdb..4b17095d6 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 5b914fb4a..20cd0ea1f 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 52a7d2251..de7e68f0a 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 3d6eea424..a0e94b948 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 2b2e7cc46..8055b9e5a 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 dba5466b5..3670b1335 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 2dd7448c2..709708ff6 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 7f9233f7b..54727a215 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 13f1b6fe5..5a0029d73 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 67bc5fc0d..4dbdbf859 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 e76918004..e2d09b7c4 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 6f0cd85d5..dd4a95e2f 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 d4e15f92e..c2046ca59 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 f7b5c0eef..1d221f60b 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 1965b6149..b527f4c1d 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 a2d3a6902..653e63b1f 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 9b91e94af..d094325d9 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 a63c187d7..ad05302f7 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/FlowFrameworkPluginIT.java b/src/test/java/org/opensearch/flowframework/FlowFrameworkPluginIT.java index 31e58882f..0a75ccfe3 100644 --- a/src/test/java/org/opensearch/flowframework/FlowFrameworkPluginIT.java +++ b/src/test/java/org/opensearch/flowframework/FlowFrameworkPluginIT.java @@ -10,9 +10,9 @@ import org.apache.hc.core5.http.ParseException; import org.apache.hc.core5.http.io.entity.EntityUtils; -import org.opensearch.client.Request; -import org.opensearch.client.Response; import org.opensearch.test.rest.OpenSearchRestTestCase; +import org.opensearch.transport.client.Request; +import org.opensearch.transport.client.Response; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/src/test/java/org/opensearch/flowframework/FlowFrameworkPluginTests.java b/src/test/java/org/opensearch/flowframework/FlowFrameworkPluginTests.java index bec97becc..8c0f65930 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/FlowFrameworkRestTestCase.java b/src/test/java/org/opensearch/flowframework/FlowFrameworkRestTestCase.java index 4dbb88efe..50e289311 100644 --- a/src/test/java/org/opensearch/flowframework/FlowFrameworkRestTestCase.java +++ b/src/test/java/org/opensearch/flowframework/FlowFrameworkRestTestCase.java @@ -28,11 +28,6 @@ import org.apache.hc.core5.util.Timeout; import org.opensearch.action.ingest.GetPipelineResponse; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Request; -import org.opensearch.client.Response; -import org.opensearch.client.ResponseException; -import org.opensearch.client.RestClient; -import org.opensearch.client.RestClientBuilder; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.ThreadContext; @@ -52,6 +47,11 @@ import org.opensearch.flowframework.util.ParseUtils; import org.opensearch.ml.repackage.com.google.common.collect.ImmutableList; import org.opensearch.test.rest.OpenSearchRestTestCase; +import org.opensearch.transport.client.Request; +import org.opensearch.transport.client.Response; +import org.opensearch.transport.client.ResponseException; +import org.opensearch.transport.client.RestClient; +import org.opensearch.transport.client.RestClientBuilder; import org.junit.After; import org.junit.Before; diff --git a/src/test/java/org/opensearch/flowframework/FlowFrameworkTenantAwareRestTestCase.java b/src/test/java/org/opensearch/flowframework/FlowFrameworkTenantAwareRestTestCase.java index bb2c520d1..f00fd39d8 100644 --- a/src/test/java/org/opensearch/flowframework/FlowFrameworkTenantAwareRestTestCase.java +++ b/src/test/java/org/opensearch/flowframework/FlowFrameworkTenantAwareRestTestCase.java @@ -11,8 +11,6 @@ import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.message.BasicHeader; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Response; -import org.opensearch.client.ResponseException; import org.opensearch.common.xcontent.json.JsonXContent; import org.opensearch.core.common.bytes.BytesArray; import org.opensearch.core.rest.RestStatus; @@ -21,6 +19,8 @@ import org.opensearch.core.xcontent.XContentParser; import org.opensearch.rest.RestRequest; import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.transport.client.Response; +import org.opensearch.transport.client.ResponseException; import java.io.IOException; import java.util.HashMap; diff --git a/src/test/java/org/opensearch/flowframework/TestHelpers.java b/src/test/java/org/opensearch/flowframework/TestHelpers.java index ee4db5c53..d31484cce 100644 --- a/src/test/java/org/opensearch/flowframework/TestHelpers.java +++ b/src/test/java/org/opensearch/flowframework/TestHelpers.java @@ -13,11 +13,6 @@ import org.apache.hc.core5.http.io.entity.StringEntity; import org.opensearch.action.get.GetResponse; import org.opensearch.action.search.SearchRequest; -import org.opensearch.client.Request; -import org.opensearch.client.RequestOptions; -import org.opensearch.client.Response; -import org.opensearch.client.RestClient; -import org.opensearch.client.WarningsHandler; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; @@ -40,6 +35,11 @@ import org.opensearch.index.query.BoolQueryBuilder; import org.opensearch.index.query.MatchAllQueryBuilder; import org.opensearch.search.builder.SearchSourceBuilder; +import org.opensearch.transport.client.Request; +import org.opensearch.transport.client.RequestOptions; +import org.opensearch.transport.client.Response; +import org.opensearch.transport.client.RestClient; +import org.opensearch.transport.client.WarningsHandler; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/test/java/org/opensearch/flowframework/bwc/FlowFrameworkBackwardsCompatibilityIT.java b/src/test/java/org/opensearch/flowframework/bwc/FlowFrameworkBackwardsCompatibilityIT.java index 108252465..9d60cc976 100644 --- a/src/test/java/org/opensearch/flowframework/bwc/FlowFrameworkBackwardsCompatibilityIT.java +++ b/src/test/java/org/opensearch/flowframework/bwc/FlowFrameworkBackwardsCompatibilityIT.java @@ -12,12 +12,12 @@ import org.apache.hc.core5.http.ParseException; import org.apache.hc.core5.http.io.entity.EntityUtils; import org.apache.hc.core5.http.message.BasicHeader; -import org.opensearch.client.Response; import org.opensearch.common.settings.Settings; import org.opensearch.core.rest.RestStatus; import org.opensearch.flowframework.TestHelpers; import org.opensearch.flowframework.model.Template; import org.opensearch.test.rest.OpenSearchRestTestCase; +import org.opensearch.transport.client.Response; import org.junit.Before; import java.io.IOException; diff --git a/src/test/java/org/opensearch/flowframework/indices/FlowFrameworkIndicesHandlerTests.java b/src/test/java/org/opensearch/flowframework/indices/FlowFrameworkIndicesHandlerTests.java index e2976e8b9..cd1e2437c 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 37526f1b0..3dc06470c 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/FlowFrameworkRestApiIT.java b/src/test/java/org/opensearch/flowframework/rest/FlowFrameworkRestApiIT.java index f1b0775f5..bb93cd96d 100644 --- a/src/test/java/org/opensearch/flowframework/rest/FlowFrameworkRestApiIT.java +++ b/src/test/java/org/opensearch/flowframework/rest/FlowFrameworkRestApiIT.java @@ -11,8 +11,6 @@ import org.apache.hc.core5.http.io.entity.EntityUtils; import org.opensearch.action.ingest.GetPipelineResponse; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Response; -import org.opensearch.client.ResponseException; import org.opensearch.core.rest.RestStatus; import org.opensearch.flowframework.FlowFrameworkRestTestCase; import org.opensearch.flowframework.TestHelpers; @@ -25,6 +23,8 @@ import org.opensearch.flowframework.model.WorkflowEdge; import org.opensearch.flowframework.model.WorkflowNode; import org.opensearch.flowframework.model.WorkflowState; +import org.opensearch.transport.client.Response; +import org.opensearch.transport.client.ResponseException; import org.junit.Before; import org.junit.ComparisonFailure; diff --git a/src/test/java/org/opensearch/flowframework/rest/FlowFrameworkSecureRestApiIT.java b/src/test/java/org/opensearch/flowframework/rest/FlowFrameworkSecureRestApiIT.java index f1fb6aaa8..a9684f37f 100644 --- a/src/test/java/org/opensearch/flowframework/rest/FlowFrameworkSecureRestApiIT.java +++ b/src/test/java/org/opensearch/flowframework/rest/FlowFrameworkSecureRestApiIT.java @@ -11,9 +11,6 @@ import org.apache.hc.core5.http.HttpHost; import org.opensearch.action.ingest.GetPipelineResponse; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Response; -import org.opensearch.client.ResponseException; -import org.opensearch.client.RestClient; import org.opensearch.commons.rest.SecureRestClientBuilder; import org.opensearch.core.rest.RestStatus; import org.opensearch.flowframework.FlowFrameworkRestTestCase; @@ -24,6 +21,9 @@ import org.opensearch.flowframework.model.Template; import org.opensearch.flowframework.model.Workflow; import org.opensearch.flowframework.model.WorkflowNode; +import org.opensearch.transport.client.Response; +import org.opensearch.transport.client.ResponseException; +import org.opensearch.transport.client.RestClient; import org.junit.After; import org.junit.Before; diff --git a/src/test/java/org/opensearch/flowframework/rest/RestCreateWorkflowActionTests.java b/src/test/java/org/opensearch/flowframework/rest/RestCreateWorkflowActionTests.java index dd230243c..3cff549fb 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 e8c9463f4..5405294ac 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 0d24b033a..d38e2d81a 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 7833a5cc4..f9d338de9 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 e9a8d91ca..fd0db8757 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 08e6abb01..0b388f098 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 625e48e34..ed2816c49 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 c35512d4b..cb6c8ee31 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 a1e906164..aa5e5c862 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/rest/RestWorkflowStateTenantAwareIT.java b/src/test/java/org/opensearch/flowframework/rest/RestWorkflowStateTenantAwareIT.java index 378286674..d2a708707 100644 --- a/src/test/java/org/opensearch/flowframework/rest/RestWorkflowStateTenantAwareIT.java +++ b/src/test/java/org/opensearch/flowframework/rest/RestWorkflowStateTenantAwareIT.java @@ -9,11 +9,11 @@ package org.opensearch.flowframework.rest; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Response; -import org.opensearch.client.ResponseException; import org.opensearch.flowframework.FlowFrameworkTenantAwareRestTestCase; import org.opensearch.flowframework.util.ParseUtils; import org.opensearch.rest.RestRequest; +import org.opensearch.transport.client.Response; +import org.opensearch.transport.client.ResponseException; import java.io.IOException; import java.util.List; diff --git a/src/test/java/org/opensearch/flowframework/rest/RestWorkflowTenantAwareIT.java b/src/test/java/org/opensearch/flowframework/rest/RestWorkflowTenantAwareIT.java index 0120f65f2..072ec9b7e 100644 --- a/src/test/java/org/opensearch/flowframework/rest/RestWorkflowTenantAwareIT.java +++ b/src/test/java/org/opensearch/flowframework/rest/RestWorkflowTenantAwareIT.java @@ -9,11 +9,11 @@ package org.opensearch.flowframework.rest; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Response; -import org.opensearch.client.ResponseException; import org.opensearch.flowframework.FlowFrameworkTenantAwareRestTestCase; import org.opensearch.flowframework.util.ParseUtils; import org.opensearch.rest.RestRequest; +import org.opensearch.transport.client.Response; +import org.opensearch.transport.client.ResponseException; import java.io.IOException; import java.util.Map; diff --git a/src/test/java/org/opensearch/flowframework/transport/CreateWorkflowTransportActionTests.java b/src/test/java/org/opensearch/flowframework/transport/CreateWorkflowTransportActionTests.java index 52f2e74db..f095a22f4 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 569e80426..0e259cb1c 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 951c59bd2..6cfaac9fd 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 306c746b0..6755c45b8 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 57cc5d708..9b8cfc566 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 4ad32c48b..e1193f6fa 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 b1c648a24..eb3611bde 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 898840e59..fdb585245 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 8d33630dc..cc4ea9691 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 98ae3ab47..c1bc58206 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 68d5d4155..388bc614c 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 a27531f18..c7b9f3fb4 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 42a124780..75b9888fc 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 629de6b21..ec9bfcdf5 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 49c7b225b..6e247db27 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 08f1a6bbe..72585b6b0 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 034ccaab2..245f834a7 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 9addea3d6..43f055aaa 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 234881ea2..332ac7c36 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 ebb5870df..481027551 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 0bc97cfbe..a06cdbaba 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 a190e0d97..33abeeee5 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 a05cc8db1..4d7375d6b 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;