From b1dbde9a14d0bf14ac649fe4f33731de349e1e88 Mon Sep 17 00:00:00 2001 From: zhichao-aws Date: Thu, 27 Feb 2025 14:20:39 +0800 Subject: [PATCH] fix compile Signed-off-by: zhichao-aws --- src/main/java/org/opensearch/agent/ToolPlugin.java | 2 +- .../org/opensearch/agent/tools/AbstractRetrieverTool.java | 2 +- .../java/org/opensearch/agent/tools/CreateAlertTool.java | 2 +- .../opensearch/agent/tools/CreateAnomalyDetectorTool.java | 2 +- .../java/org/opensearch/agent/tools/LogPatternTool.java | 2 +- .../opensearch/agent/tools/NeuralSparseSearchTool.java | 2 +- src/main/java/org/opensearch/agent/tools/PPLTool.java | 2 +- src/main/java/org/opensearch/agent/tools/RAGTool.java | 3 +-- .../java/org/opensearch/agent/tools/SearchAlertsTool.java | 4 ++-- .../agent/tools/SearchAnomalyDetectorsTool.java | 2 +- .../opensearch/agent/tools/SearchAnomalyResultsTool.java | 4 ++-- .../org/opensearch/agent/tools/SearchMonitorsTool.java | 4 ++-- .../java/org/opensearch/agent/tools/VectorDBTool.java | 2 +- .../agent/tools/AbstractRetrieverToolTests.java | 2 +- .../org/opensearch/agent/tools/CreateAlertToolTests.java | 6 +++--- .../agent/tools/CreateAnomalyDetectorToolTests.java | 6 +++--- .../org/opensearch/agent/tools/LogPatternToolTests.java | 2 +- .../java/org/opensearch/agent/tools/PPLToolTests.java | 6 +++--- .../java/org/opensearch/agent/tools/RAGToolTests.java | 2 +- .../org/opensearch/agent/tools/SearchAlertsToolTests.java | 8 ++++---- .../agent/tools/SearchAnomalyDetectorsToolTests.java | 2 +- .../agent/tools/SearchAnomalyResultsToolTests.java | 2 +- .../opensearch/agent/tools/SearchMonitorsToolTests.java | 8 ++++---- 23 files changed, 38 insertions(+), 39 deletions(-) diff --git a/src/main/java/org/opensearch/agent/ToolPlugin.java b/src/main/java/org/opensearch/agent/ToolPlugin.java index 019d5b44..4cd21a76 100644 --- a/src/main/java/org/opensearch/agent/ToolPlugin.java +++ b/src/main/java/org/opensearch/agent/ToolPlugin.java @@ -21,7 +21,6 @@ import org.opensearch.agent.tools.SearchAnomalyResultsTool; import org.opensearch.agent.tools.SearchMonitorsTool; import org.opensearch.agent.tools.VectorDBTool; -import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.service.ClusterService; import org.opensearch.core.common.io.stream.NamedWriteableRegistry; @@ -34,6 +33,7 @@ import org.opensearch.repositories.RepositoriesService; import org.opensearch.script.ScriptService; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.Client; import org.opensearch.watcher.ResourceWatcherService; import lombok.SneakyThrows; diff --git a/src/main/java/org/opensearch/agent/tools/AbstractRetrieverTool.java b/src/main/java/org/opensearch/agent/tools/AbstractRetrieverTool.java index 5abcd758..1a8dd9e7 100644 --- a/src/main/java/org/opensearch/agent/tools/AbstractRetrieverTool.java +++ b/src/main/java/org/opensearch/agent/tools/AbstractRetrieverTool.java @@ -16,7 +16,6 @@ import org.apache.commons.lang3.StringUtils; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; import org.opensearch.common.xcontent.LoggingDeprecationHandler; import org.opensearch.common.xcontent.XContentType; import org.opensearch.core.action.ActionListener; @@ -25,6 +24,7 @@ import org.opensearch.ml.common.spi.tools.Tool; import org.opensearch.search.SearchHit; import org.opensearch.search.builder.SearchSourceBuilder; +import org.opensearch.transport.client.Client; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/org/opensearch/agent/tools/CreateAlertTool.java b/src/main/java/org/opensearch/agent/tools/CreateAlertTool.java index 57e306a3..410d3362 100644 --- a/src/main/java/org/opensearch/agent/tools/CreateAlertTool.java +++ b/src/main/java/org/opensearch/agent/tools/CreateAlertTool.java @@ -25,7 +25,6 @@ import org.opensearch.action.support.IndicesOptions; import org.opensearch.agent.tools.utils.ToolConstants.ModelType; import org.opensearch.agent.tools.utils.ToolHelper; -import org.opensearch.client.Client; import org.opensearch.cluster.metadata.MappingMetadata; import org.opensearch.core.action.ActionListener; import org.opensearch.core.common.Strings; @@ -40,6 +39,7 @@ import org.opensearch.ml.common.transport.prediction.MLPredictionTaskAction; import org.opensearch.ml.common.transport.prediction.MLPredictionTaskRequest; import org.opensearch.ml.common.utils.StringUtils; +import org.opensearch.transport.client.Client; import com.google.gson.reflect.TypeToken; diff --git a/src/main/java/org/opensearch/agent/tools/CreateAnomalyDetectorTool.java b/src/main/java/org/opensearch/agent/tools/CreateAnomalyDetectorTool.java index 0f33d38f..dc89bcad 100644 --- a/src/main/java/org/opensearch/agent/tools/CreateAnomalyDetectorTool.java +++ b/src/main/java/org/opensearch/agent/tools/CreateAnomalyDetectorTool.java @@ -31,7 +31,6 @@ import org.opensearch.action.ActionRequest; import org.opensearch.action.admin.indices.mapping.get.GetMappingsRequest; import org.opensearch.agent.tools.utils.ToolHelper; -import org.opensearch.client.Client; import org.opensearch.cluster.metadata.MappingMetadata; import org.opensearch.core.action.ActionListener; import org.opensearch.core.common.Strings; @@ -45,6 +44,7 @@ import org.opensearch.ml.common.spi.tools.WithModelTool; import org.opensearch.ml.common.transport.prediction.MLPredictionTaskAction; import org.opensearch.ml.common.transport.prediction.MLPredictionTaskRequest; +import org.opensearch.transport.client.Client; import com.google.common.collect.ImmutableMap; diff --git a/src/main/java/org/opensearch/agent/tools/LogPatternTool.java b/src/main/java/org/opensearch/agent/tools/LogPatternTool.java index b941d867..31c1e832 100644 --- a/src/main/java/org/opensearch/agent/tools/LogPatternTool.java +++ b/src/main/java/org/opensearch/agent/tools/LogPatternTool.java @@ -26,7 +26,6 @@ import org.opensearch.action.search.SearchResponse; import org.opensearch.agent.tools.utils.BrainLogParser; import org.opensearch.agent.tools.utils.ToolHelper; -import org.opensearch.client.Client; import org.opensearch.core.action.ActionListener; import org.opensearch.core.common.logging.LoggerMessageFormat; import org.opensearch.core.common.util.CollectionUtils; @@ -37,6 +36,7 @@ import org.opensearch.sql.plugin.transport.TransportPPLQueryRequest; import org.opensearch.sql.plugin.transport.TransportPPLQueryResponse; import org.opensearch.sql.ppl.domain.PPLQueryRequest; +import org.opensearch.transport.client.Client; import com.google.common.annotations.VisibleForTesting; import com.google.gson.reflect.TypeToken; diff --git a/src/main/java/org/opensearch/agent/tools/NeuralSparseSearchTool.java b/src/main/java/org/opensearch/agent/tools/NeuralSparseSearchTool.java index 0440fe6b..fe5e42f1 100644 --- a/src/main/java/org/opensearch/agent/tools/NeuralSparseSearchTool.java +++ b/src/main/java/org/opensearch/agent/tools/NeuralSparseSearchTool.java @@ -15,10 +15,10 @@ import java.util.Map; import org.apache.commons.lang3.StringUtils; -import org.opensearch.client.Client; import org.opensearch.core.xcontent.NamedXContentRegistry; import org.opensearch.ml.common.spi.tools.ToolAnnotation; import org.opensearch.ml.common.spi.tools.WithModelTool; +import org.opensearch.transport.client.Client; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/org/opensearch/agent/tools/PPLTool.java b/src/main/java/org/opensearch/agent/tools/PPLTool.java index 3a88a2d2..1cc73488 100644 --- a/src/main/java/org/opensearch/agent/tools/PPLTool.java +++ b/src/main/java/org/opensearch/agent/tools/PPLTool.java @@ -36,7 +36,6 @@ import org.opensearch.action.admin.indices.mapping.get.GetMappingsRequest; import org.opensearch.action.search.SearchRequest; import org.opensearch.agent.tools.utils.ToolHelper; -import org.opensearch.client.Client; import org.opensearch.cluster.metadata.MappingMetadata; import org.opensearch.core.action.ActionListener; import org.opensearch.core.action.ActionResponse; @@ -57,6 +56,7 @@ import org.opensearch.sql.plugin.transport.TransportPPLQueryRequest; import org.opensearch.sql.plugin.transport.TransportPPLQueryResponse; import org.opensearch.sql.ppl.domain.PPLQueryRequest; +import org.opensearch.transport.client.Client; import com.google.common.collect.ImmutableMap; import com.google.gson.Gson; diff --git a/src/main/java/org/opensearch/agent/tools/RAGTool.java b/src/main/java/org/opensearch/agent/tools/RAGTool.java index b68dbb69..eec0706d 100644 --- a/src/main/java/org/opensearch/agent/tools/RAGTool.java +++ b/src/main/java/org/opensearch/agent/tools/RAGTool.java @@ -9,7 +9,6 @@ import static org.opensearch.agent.tools.AbstractRetrieverTool.*; import static org.opensearch.agent.tools.utils.CommonConstants.COMMON_MODEL_ID_FIELD; import static org.opensearch.ml.common.CommonValue.TENANT_ID_FIELD; -import static org.opensearch.ml.common.utils.StringUtils.gson; import static org.opensearch.ml.common.utils.StringUtils.toJson; import java.util.HashMap; @@ -17,7 +16,6 @@ import java.util.Map; import org.opensearch.action.ActionRequest; -import org.opensearch.client.Client; import org.opensearch.core.action.ActionListener; import org.opensearch.core.xcontent.NamedXContentRegistry; import org.opensearch.ml.common.FunctionName; @@ -30,6 +28,7 @@ import org.opensearch.ml.common.spi.tools.WithModelTool; import org.opensearch.ml.common.transport.prediction.MLPredictionTaskAction; import org.opensearch.ml.common.transport.prediction.MLPredictionTaskRequest; +import org.opensearch.transport.client.Client; import com.google.gson.Gson; import com.google.gson.JsonObject; diff --git a/src/main/java/org/opensearch/agent/tools/SearchAlertsTool.java b/src/main/java/org/opensearch/agent/tools/SearchAlertsTool.java index 7be36955..ab66cff1 100644 --- a/src/main/java/org/opensearch/agent/tools/SearchAlertsTool.java +++ b/src/main/java/org/opensearch/agent/tools/SearchAlertsTool.java @@ -11,8 +11,6 @@ import java.util.Map; import org.apache.commons.lang3.StringUtils; -import org.opensearch.client.Client; -import org.opensearch.client.node.NodeClient; import org.opensearch.commons.alerting.AlertingPluginInterface; import org.opensearch.commons.alerting.action.GetAlertsRequest; import org.opensearch.commons.alerting.action.GetAlertsResponse; @@ -23,6 +21,8 @@ import org.opensearch.ml.common.spi.tools.Parser; import org.opensearch.ml.common.spi.tools.Tool; import org.opensearch.ml.common.spi.tools.ToolAnnotation; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.node.NodeClient; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/org/opensearch/agent/tools/SearchAnomalyDetectorsTool.java b/src/main/java/org/opensearch/agent/tools/SearchAnomalyDetectorsTool.java index c8e4ab8a..b9ded4ac 100644 --- a/src/main/java/org/opensearch/agent/tools/SearchAnomalyDetectorsTool.java +++ b/src/main/java/org/opensearch/agent/tools/SearchAnomalyDetectorsTool.java @@ -23,7 +23,6 @@ import org.opensearch.ad.transport.GetAnomalyDetectorResponse; import org.opensearch.agent.tools.utils.ToolConstants; import org.opensearch.agent.tools.utils.ToolConstants.DetectorStateString; -import org.opensearch.client.Client; import org.opensearch.common.lucene.uid.Versions; import org.opensearch.core.action.ActionListener; import org.opensearch.core.common.io.stream.NamedWriteableRegistry; @@ -41,6 +40,7 @@ import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.search.sort.SortOrder; import org.opensearch.timeseries.transport.GetConfigRequest; +import org.opensearch.transport.client.Client; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/org/opensearch/agent/tools/SearchAnomalyResultsTool.java b/src/main/java/org/opensearch/agent/tools/SearchAnomalyResultsTool.java index a2973d6b..933428a4 100644 --- a/src/main/java/org/opensearch/agent/tools/SearchAnomalyResultsTool.java +++ b/src/main/java/org/opensearch/agent/tools/SearchAnomalyResultsTool.java @@ -14,7 +14,6 @@ import org.opensearch.action.search.SearchResponse; import org.opensearch.ad.client.AnomalyDetectionNodeClient; import org.opensearch.agent.tools.utils.ToolConstants; -import org.opensearch.client.Client; import org.opensearch.core.action.ActionListener; import org.opensearch.core.common.io.stream.NamedWriteableRegistry; import org.opensearch.index.IndexNotFoundException; @@ -31,6 +30,7 @@ import org.opensearch.search.SearchHits; import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.search.sort.SortOrder; +import org.opensearch.transport.client.Client; import lombok.Getter; import lombok.Setter; @@ -181,7 +181,7 @@ private void processHits(SearchHits searchHits, ActionListener listener) sb.append("}"); } sb.append("]"); - sb.append("TotalAnomalyResults=").append(searchHits.getTotalHits().value); + sb.append("TotalAnomalyResults=").append(searchHits.getTotalHits().value()); listener.onResponse((T) sb.toString()); } diff --git a/src/main/java/org/opensearch/agent/tools/SearchMonitorsTool.java b/src/main/java/org/opensearch/agent/tools/SearchMonitorsTool.java index 433994cf..8cb81b07 100644 --- a/src/main/java/org/opensearch/agent/tools/SearchMonitorsTool.java +++ b/src/main/java/org/opensearch/agent/tools/SearchMonitorsTool.java @@ -16,8 +16,6 @@ import org.apache.lucene.search.join.ScoreMode; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; -import org.opensearch.client.node.NodeClient; import org.opensearch.commons.alerting.AlertingPluginInterface; import org.opensearch.commons.alerting.action.SearchMonitorRequest; import org.opensearch.commons.alerting.model.ScheduledJob; @@ -35,6 +33,8 @@ import org.opensearch.search.SearchHit; import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.search.sort.SortOrder; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.node.NodeClient; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/org/opensearch/agent/tools/VectorDBTool.java b/src/main/java/org/opensearch/agent/tools/VectorDBTool.java index 968ad1bd..6c544e24 100644 --- a/src/main/java/org/opensearch/agent/tools/VectorDBTool.java +++ b/src/main/java/org/opensearch/agent/tools/VectorDBTool.java @@ -15,10 +15,10 @@ import java.util.Map; import org.apache.commons.lang3.StringUtils; -import org.opensearch.client.Client; import org.opensearch.core.xcontent.NamedXContentRegistry; import org.opensearch.ml.common.spi.tools.ToolAnnotation; import org.opensearch.ml.common.spi.tools.WithModelTool; +import org.opensearch.transport.client.Client; import lombok.Builder; import lombok.Getter; diff --git a/src/test/java/org/opensearch/agent/tools/AbstractRetrieverToolTests.java b/src/test/java/org/opensearch/agent/tools/AbstractRetrieverToolTests.java index 04b5f473..63ed33af 100644 --- a/src/test/java/org/opensearch/agent/tools/AbstractRetrieverToolTests.java +++ b/src/test/java/org/opensearch/agent/tools/AbstractRetrieverToolTests.java @@ -23,7 +23,6 @@ import org.mockito.Mockito; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.json.JsonXContent; import org.opensearch.core.action.ActionListener; @@ -31,6 +30,7 @@ import org.opensearch.core.xcontent.NamedXContentRegistry; import org.opensearch.ml.common.spi.tools.Tool; import org.opensearch.search.SearchModule; +import org.opensearch.transport.client.Client; import lombok.SneakyThrows; diff --git a/src/test/java/org/opensearch/agent/tools/CreateAlertToolTests.java b/src/test/java/org/opensearch/agent/tools/CreateAlertToolTests.java index 6df57965..63732157 100644 --- a/src/test/java/org/opensearch/agent/tools/CreateAlertToolTests.java +++ b/src/test/java/org/opensearch/agent/tools/CreateAlertToolTests.java @@ -27,9 +27,6 @@ import org.mockito.MockitoAnnotations; import org.opensearch.action.admin.indices.get.GetIndexResponse; import org.opensearch.action.admin.indices.mapping.get.GetMappingsResponse; -import org.opensearch.client.AdminClient; -import org.opensearch.client.Client; -import org.opensearch.client.IndicesAdminClient; import org.opensearch.cluster.metadata.MappingMetadata; import org.opensearch.common.action.ActionFuture; import org.opensearch.core.action.ActionListener; @@ -40,6 +37,9 @@ import org.opensearch.ml.common.output.model.ModelTensors; import org.opensearch.ml.common.transport.MLTaskResponse; import org.opensearch.ml.common.transport.prediction.MLPredictionTaskAction; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.IndicesAdminClient; import com.google.common.collect.ImmutableMap; diff --git a/src/test/java/org/opensearch/agent/tools/CreateAnomalyDetectorToolTests.java b/src/test/java/org/opensearch/agent/tools/CreateAnomalyDetectorToolTests.java index 5aacc12b..2d7992f6 100644 --- a/src/test/java/org/opensearch/agent/tools/CreateAnomalyDetectorToolTests.java +++ b/src/test/java/org/opensearch/agent/tools/CreateAnomalyDetectorToolTests.java @@ -23,9 +23,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.opensearch.action.admin.indices.mapping.get.GetMappingsResponse; -import org.opensearch.client.AdminClient; -import org.opensearch.client.Client; -import org.opensearch.client.IndicesAdminClient; import org.opensearch.cluster.metadata.MappingMetadata; import org.opensearch.core.action.ActionListener; import org.opensearch.ml.common.output.model.MLResultDataType; @@ -34,6 +31,9 @@ import org.opensearch.ml.common.output.model.ModelTensors; import org.opensearch.ml.common.transport.MLTaskResponse; import org.opensearch.ml.common.transport.prediction.MLPredictionTaskAction; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.IndicesAdminClient; import com.google.common.collect.ImmutableMap; diff --git a/src/test/java/org/opensearch/agent/tools/LogPatternToolTests.java b/src/test/java/org/opensearch/agent/tools/LogPatternToolTests.java index b8c8ddaf..2df7b1ff 100644 --- a/src/test/java/org/opensearch/agent/tools/LogPatternToolTests.java +++ b/src/test/java/org/opensearch/agent/tools/LogPatternToolTests.java @@ -39,7 +39,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.core.action.ActionListener; import org.opensearch.core.common.bytes.BytesReference; @@ -48,6 +47,7 @@ import org.opensearch.search.SearchHits; import org.opensearch.sql.plugin.transport.PPLQueryAction; import org.opensearch.sql.plugin.transport.TransportPPLQueryResponse; +import org.opensearch.transport.client.Client; import com.google.common.collect.ImmutableMap; import com.google.gson.JsonElement; diff --git a/src/test/java/org/opensearch/agent/tools/PPLToolTests.java b/src/test/java/org/opensearch/agent/tools/PPLToolTests.java index 1ef25fba..5669e639 100644 --- a/src/test/java/org/opensearch/agent/tools/PPLToolTests.java +++ b/src/test/java/org/opensearch/agent/tools/PPLToolTests.java @@ -25,9 +25,6 @@ import org.mockito.MockitoAnnotations; import org.opensearch.action.admin.indices.mapping.get.GetMappingsResponse; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.AdminClient; -import org.opensearch.client.Client; -import org.opensearch.client.IndicesAdminClient; import org.opensearch.cluster.metadata.MappingMetadata; import org.opensearch.core.action.ActionListener; import org.opensearch.core.common.bytes.BytesArray; @@ -42,6 +39,9 @@ import org.opensearch.search.SearchHits; import org.opensearch.sql.plugin.transport.PPLQueryAction; import org.opensearch.sql.plugin.transport.TransportPPLQueryResponse; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.IndicesAdminClient; import com.google.common.collect.ImmutableMap; diff --git a/src/test/java/org/opensearch/agent/tools/RAGToolTests.java b/src/test/java/org/opensearch/agent/tools/RAGToolTests.java index b6b85da1..d0d28b90 100644 --- a/src/test/java/org/opensearch/agent/tools/RAGToolTests.java +++ b/src/test/java/org/opensearch/agent/tools/RAGToolTests.java @@ -31,7 +31,6 @@ import org.mockito.Mock; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; import org.opensearch.common.xcontent.json.JsonXContent; import org.opensearch.core.ParseField; import org.opensearch.core.action.ActionListener; @@ -46,6 +45,7 @@ import org.opensearch.ml.common.transport.MLTaskResponse; import org.opensearch.ml.common.transport.prediction.MLPredictionTaskAction; import org.opensearch.ml.repackage.com.google.common.collect.ImmutableMap; +import org.opensearch.transport.client.Client; import lombok.SneakyThrows; diff --git a/src/test/java/org/opensearch/agent/tools/SearchAlertsToolTests.java b/src/test/java/org/opensearch/agent/tools/SearchAlertsToolTests.java index ac1a8b3b..f10f6e87 100644 --- a/src/test/java/org/opensearch/agent/tools/SearchAlertsToolTests.java +++ b/src/test/java/org/opensearch/agent/tools/SearchAlertsToolTests.java @@ -26,14 +26,14 @@ import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.opensearch.action.ActionType; -import org.opensearch.client.AdminClient; -import org.opensearch.client.ClusterAdminClient; -import org.opensearch.client.IndicesAdminClient; -import org.opensearch.client.node.NodeClient; import org.opensearch.commons.alerting.action.GetAlertsResponse; import org.opensearch.commons.alerting.model.Alert; import org.opensearch.core.action.ActionListener; import org.opensearch.ml.common.spi.tools.Tool; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.ClusterAdminClient; +import org.opensearch.transport.client.IndicesAdminClient; +import org.opensearch.transport.client.node.NodeClient; public class SearchAlertsToolTests { @Mock diff --git a/src/test/java/org/opensearch/agent/tools/SearchAnomalyDetectorsToolTests.java b/src/test/java/org/opensearch/agent/tools/SearchAnomalyDetectorsToolTests.java index 63e64da3..66e1c7d8 100644 --- a/src/test/java/org/opensearch/agent/tools/SearchAnomalyDetectorsToolTests.java +++ b/src/test/java/org/opensearch/agent/tools/SearchAnomalyDetectorsToolTests.java @@ -37,7 +37,6 @@ import org.opensearch.ad.transport.SearchAnomalyDetectorAction; import org.opensearch.agent.TestHelpers; import org.opensearch.agent.tools.utils.ToolConstants.DetectorStateString; -import org.opensearch.client.node.NodeClient; import org.opensearch.common.xcontent.XContentType; import org.opensearch.core.action.ActionListener; import org.opensearch.core.common.bytes.BytesReference; @@ -46,6 +45,7 @@ import org.opensearch.ml.common.spi.tools.Tool; import org.opensearch.search.SearchHit; import org.opensearch.timeseries.model.IntervalTimeConfiguration; +import org.opensearch.transport.client.node.NodeClient; public class SearchAnomalyDetectorsToolTests { @Mock diff --git a/src/test/java/org/opensearch/agent/tools/SearchAnomalyResultsToolTests.java b/src/test/java/org/opensearch/agent/tools/SearchAnomalyResultsToolTests.java index ba11702f..99a2363a 100644 --- a/src/test/java/org/opensearch/agent/tools/SearchAnomalyResultsToolTests.java +++ b/src/test/java/org/opensearch/agent/tools/SearchAnomalyResultsToolTests.java @@ -33,7 +33,6 @@ import org.opensearch.action.search.SearchResponse; import org.opensearch.action.search.SearchResponseSections; import org.opensearch.agent.tools.utils.ToolConstants; -import org.opensearch.client.node.NodeClient; import org.opensearch.common.xcontent.XContentType; import org.opensearch.core.action.ActionListener; import org.opensearch.core.common.bytes.BytesReference; @@ -43,6 +42,7 @@ import org.opensearch.search.SearchHit; import org.opensearch.search.SearchHits; import org.opensearch.search.aggregations.Aggregations; +import org.opensearch.transport.client.node.NodeClient; public class SearchAnomalyResultsToolTests { @Mock diff --git a/src/test/java/org/opensearch/agent/tools/SearchMonitorsToolTests.java b/src/test/java/org/opensearch/agent/tools/SearchMonitorsToolTests.java index 68f80d0c..575db493 100644 --- a/src/test/java/org/opensearch/agent/tools/SearchMonitorsToolTests.java +++ b/src/test/java/org/opensearch/agent/tools/SearchMonitorsToolTests.java @@ -30,10 +30,6 @@ import org.opensearch.action.ActionType; import org.opensearch.action.search.SearchResponse; import org.opensearch.action.search.SearchResponseSections; -import org.opensearch.client.AdminClient; -import org.opensearch.client.ClusterAdminClient; -import org.opensearch.client.IndicesAdminClient; -import org.opensearch.client.node.NodeClient; import org.opensearch.common.xcontent.XContentType; import org.opensearch.commons.alerting.model.CronSchedule; import org.opensearch.commons.alerting.model.DataSources; @@ -46,6 +42,10 @@ import org.opensearch.search.SearchHit; import org.opensearch.search.SearchHits; import org.opensearch.search.aggregations.Aggregations; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.ClusterAdminClient; +import org.opensearch.transport.client.IndicesAdminClient; +import org.opensearch.transport.client.node.NodeClient; public class SearchMonitorsToolTests { @Mock