From 645c0a31cdbb4a180df31f4cf012a0120ad134e9 Mon Sep 17 00:00:00 2001 From: Kaituo Li Date: Thu, 20 Feb 2025 09:06:22 -0800 Subject: [PATCH] Fix breaking changes for 3.0.0 releas This PR updates imports and method references for bumping version to 3.0 alpha. Specifically, - Replace `import org.opensearch.client.Client;` with `import org.opensearch.transport.client.Client;` - Replace `getTotalHits().value` with `getTotalHits().value()` - Replace `import org.opensearch.action.support.master.AcknowledgedResponse;` with `import org.opensearch.action.support.clustermanager.AcknowledgedResponse;` - Replace `import org.opensearch.client.node.NodeClient;` with `import org.opensearch.transport.client.node.NodeClient;` - Replace `import org.opensearch.client.ClusterAdminClient;` with `import org.opensearch.transport.client.ClusterAdminClient;` - Replace `import org.opensearch.client.AdminClient;` with `import org.opensearch.transport.client.AdminClient;` - Replace `import org.opensearch.client.IndicesAdminClient;` with `import org.opensearch.transport.client.IndicesAdminClient;` - Rename `masterNodeId` to `clusterManagerNodeId` These changes align with similar PR: https://github.com/opensearch-project/flow-framework/pull/1026/files Testing done: * gradle build Signed-off-by: Kaituo Li --- CHANGELOG.md | 2 ++ build.gradle | 4 ++-- .../org/opensearch/ad/ADEntityProfileRunner.java | 2 +- .../java/org/opensearch/ad/ADTaskProfileRunner.java | 2 +- .../opensearch/ad/AnomalyDetectorProfileRunner.java | 2 +- .../ad/ExecuteADResultResponseRecorder.java | 2 +- .../ad/client/AnomalyDetectionNodeClient.java | 2 +- .../org/opensearch/ad/indices/ADIndexManagement.java | 2 +- .../java/org/opensearch/ad/ml/ADCheckpointDao.java | 2 +- .../ad/rest/RestAnomalyDetectorJobAction.java | 2 +- .../ad/rest/RestDeleteAnomalyDetectorAction.java | 2 +- .../ad/rest/RestDeleteAnomalyResultsAction.java | 2 +- .../ad/rest/RestExecuteAnomalyDetectorAction.java | 2 +- .../ad/rest/RestGetAnomalyDetectorAction.java | 2 +- .../ad/rest/RestIndexAnomalyDetectorAction.java | 2 +- .../ad/rest/RestPreviewAnomalyDetectorAction.java | 3 ++- .../ad/rest/RestSearchAnomalyDetectorInfoAction.java | 3 ++- .../ad/rest/RestSearchAnomalyResultAction.java | 2 +- .../ad/rest/RestSearchTopAnomalyResultAction.java | 2 +- .../ad/rest/RestStatsAnomalyDetectorAction.java | 2 +- .../ad/rest/RestValidateAnomalyDetectorAction.java | 2 +- .../ad/rest/handler/ADIndexJobActionHandler.java | 2 +- .../rest/handler/ADModelValidationActionHandler.java | 2 +- .../AbstractAnomalyDetectorActionHandler.java | 2 +- .../handler/IndexAnomalyDetectorActionHandler.java | 2 +- .../ValidateAnomalyDetectorActionHandler.java | 2 +- .../org/opensearch/ad/task/ADBatchTaskRunner.java | 2 +- .../java/org/opensearch/ad/task/ADTaskManager.java | 6 +++--- .../ad/transport/ADResultBulkTransportAction.java | 2 +- .../opensearch/ad/transport/ADResultProcessor.java | 2 +- .../ad/transport/ADSingleStreamResultAction.java | 2 +- .../transport/AnomalyDetectorJobTransportAction.java | 2 +- .../ad/transport/AnomalyResultTransportAction.java | 2 +- .../DeleteAnomalyDetectorTransportAction.java | 2 +- .../DeleteAnomalyResultsTransportAction.java | 2 +- .../ad/transport/EntityADResultAction.java | 2 +- .../ad/transport/EntityADResultTransportAction.java | 2 +- .../transport/GetAnomalyDetectorTransportAction.java | 2 +- .../IndexAnomalyDetectorTransportAction.java | 2 +- .../PreviewAnomalyDetectorTransportAction.java | 2 +- .../SearchAnomalyDetectorInfoTransportAction.java | 2 +- .../SearchAnomalyResultTransportAction.java | 2 +- .../SearchTopAnomalyResultTransportAction.java | 2 +- .../StatsAnomalyDetectorTransportAction.java | 4 ++-- .../ad/transport/StopDetectorTransportAction.java | 2 +- .../ValidateAnomalyDetectorTransportAction.java | 2 +- .../ADIndexMemoryPressureAwareResultHandler.java | 2 +- .../ad/transport/handler/ADSearchHandler.java | 2 +- .../ExecuteForecastResultResponseRecorder.java | 2 +- .../forecast/ForecastEntityProfileRunner.java | 2 +- .../opensearch/forecast/ForecastProfileRunner.java | 2 +- .../forecast/indices/ForecastIndexManagement.java | 2 +- .../forecast/ml/ForecastCheckpointDao.java | 2 +- .../forecast/rest/RestDeleteForecasterAction.java | 2 +- .../forecast/rest/RestForecasterJobAction.java | 2 +- .../forecast/rest/RestForecasterSuggestAction.java | 2 +- .../forecast/rest/RestGetForecasterAction.java | 2 +- .../forecast/rest/RestIndexForecasterAction.java | 2 +- .../forecast/rest/RestRunOnceForecasterAction.java | 2 +- .../rest/RestSearchForecasterInfoAction.java | 3 ++- .../rest/RestSearchTopForecastResultAction.java | 2 +- .../forecast/rest/RestStatsForecasterAction.java | 2 +- .../forecast/rest/RestValidateForecasterAction.java | 2 +- .../handler/AbstractForecasterActionHandler.java | 2 +- .../rest/handler/ForecastIndexJobActionHandler.java | 2 +- .../ForecastModelValidationActionHandler.java | 2 +- .../rest/handler/IndexForecasterActionHandler.java | 2 +- .../handler/ValidateForecasterActionHandler.java | 2 +- .../forecast/task/ForecastTaskManager.java | 2 +- .../transport/DeleteForecasterTransportAction.java | 2 +- .../transport/EntityForecastResultAction.java | 2 +- .../EntityForecastResultTransportAction.java | 2 +- .../transport/ForecastImputeMissingValueAction.java | 2 +- .../transport/ForecastResultBulkTransportAction.java | 2 +- .../forecast/transport/ForecastResultProcessor.java | 2 +- .../transport/ForecastResultTransportAction.java | 2 +- .../transport/ForecastRunOnceTransportAction.java | 4 ++-- .../transport/ForecastSingleStreamResultAction.java | 2 +- .../transport/ForecasterJobTransportAction.java | 2 +- .../transport/GetForecasterTransportAction.java | 2 +- .../transport/IndexForecasterTransportAction.java | 2 +- .../SearchForecasterInfoTransportAction.java | 2 +- .../SearchTopForecastResultTransportAction.java | 2 +- .../transport/StatsForecasterTransportAction.java | 2 +- .../transport/StopForecasterTransportAction.java | 2 +- .../SuggestForecasterParamTransportAction.java | 2 +- .../transport/ValidateForecasterTransportAction.java | 2 +- ...orecastIndexMemoryPressureAwareResultHandler.java | 2 +- .../transport/handler/ForecastSearchHandler.java | 2 +- .../opensearch/timeseries/EntityProfileRunner.java | 2 +- .../timeseries/ExecuteResultResponseRecorder.java | 4 ++-- .../java/org/opensearch/timeseries/JobProcessor.java | 2 +- .../org/opensearch/timeseries/NodeStateManager.java | 2 +- .../org/opensearch/timeseries/ProfileRunner.java | 4 ++-- .../java/org/opensearch/timeseries/ProfileUtil.java | 2 +- .../timeseries/TimeSeriesAnalyticsPlugin.java | 2 +- .../timeseries/cluster/ADDataMigrator.java | 6 +++--- .../cluster/ClusterManagerEventListener.java | 2 +- .../org/opensearch/timeseries/cluster/HashRing.java | 6 +++--- .../opensearch/timeseries/cluster/HourlyCron.java | 2 +- .../timeseries/cluster/diskcleanup/IndexCleanup.java | 2 +- .../timeseries/feature/CompositeRetriever.java | 2 +- .../timeseries/feature/SearchFeatureDao.java | 2 +- .../timeseries/indices/IndexManagement.java | 6 +++--- .../org/opensearch/timeseries/ml/CheckpointDao.java | 2 +- .../timeseries/rest/AbstractSearchAction.java | 2 +- .../timeseries/rest/RestValidateAction.java | 2 +- .../handler/AbstractTimeSeriesActionHandler.java | 10 +++++----- .../rest/handler/ConfigUpdateConfirmer.java | 2 +- .../rest/handler/IndexJobActionHandler.java | 2 +- .../timeseries/rest/handler/IntervalCalculation.java | 2 +- .../timeseries/rest/handler/LatestTimeRetriever.java | 2 +- .../rest/handler/ModelValidationActionHandler.java | 2 +- .../org/opensearch/timeseries/task/TaskManager.java | 4 ++-- .../AbstractSingleStreamResultTransportAction.java | 2 +- .../transport/BaseDeleteConfigTransportAction.java | 2 +- .../transport/BaseGetConfigTransportAction.java | 2 +- .../timeseries/transport/BaseJobTransportAction.java | 2 +- .../BaseSearchConfigInfoTransportAction.java | 6 +++--- .../transport/BaseStatsTransportAction.java | 2 +- .../BaseSuggestConfigParamTransportAction.java | 2 +- .../transport/BaseValidateConfigTransportAction.java | 2 +- .../timeseries/transport/EntityResultProcessor.java | 2 +- .../transport/ResultBulkTransportAction.java | 2 +- .../timeseries/transport/ResultProcessor.java | 4 ++-- .../IndexMemoryPressureAwareResultHandler.java | 2 +- .../transport/handler/ResultBulkIndexingHandler.java | 2 +- .../transport/handler/ResultIndexingHandler.java | 2 +- .../timeseries/transport/handler/SearchHandler.java | 2 +- .../org/opensearch/timeseries/util/ClientUtil.java | 2 +- .../timeseries/util/CrossClusterConfigUtils.java | 4 ++-- .../org/opensearch/timeseries/util/ParseUtils.java | 2 +- .../timeseries/util/SecurityClientUtil.java | 2 +- .../get/AbstractForecasterActionHandlerTestCase.java | 2 +- .../get/IndexAnomalyDetectorActionHandlerTests.java | 2 +- .../get/IndexForecasterActionHandlerTests.java | 2 +- .../ValidateAnomalyDetectorActionHandlerTests.java | 4 ++-- .../get/ValidateForecasterActionHandlerTests.java | 2 +- src/test/java/org/opensearch/ad/ADIntegTestCase.java | 10 +++++----- .../opensearch/ad/AbstractProfileRunnerTests.java | 2 +- .../opensearch/ad/AnomalyDetectorJobRunnerTests.java | 6 +++--- .../org/opensearch/ad/EntityProfileRunnerTests.java | 2 +- .../opensearch/ad/MultiEntityProfileRunnerTests.java | 2 +- .../ad/OldAnomalyDetectorProfileRunner.java | 2 +- .../ad/client/AnomalyDetectionNodeClientTests.java | 12 ++++++------ .../opensearch/ad/cluster/ADDataMigratorTests.java | 2 +- .../ad/cluster/ClusterManagerEventListenerTests.java | 2 +- .../org/opensearch/ad/cluster/HashRingTests.java | 6 +++--- .../org/opensearch/ad/cluster/HourlyCronTests.java | 2 +- .../ad/cluster/diskcleanup/IndexCleanupTests.java | 4 ++-- .../org/opensearch/ad/indices/CustomIndexTests.java | 2 +- .../ad/indices/InitAnomalyDetectionIndicesTests.java | 6 +++--- .../org/opensearch/ad/indices/RolloverTests.java | 10 +++++----- .../opensearch/ad/indices/UpdateMappingTests.java | 8 ++++---- .../org/opensearch/ad/ml/AbstractCosineDataTest.java | 2 +- .../org/opensearch/ad/ml/CheckpointDaoTests.java | 2 +- .../org/opensearch/ad/ml/CheckpointDeleteTests.java | 2 +- .../opensearch/ad/mock/plugin/MockReindexPlugin.java | 4 ++-- ...ockAnomalyDetectorJobTransportActionWithUser.java | 2 +- .../org/opensearch/ad/plugin/MockReindexPlugin.java | 4 ++-- .../IndexAnomalyDetectorJobActionHandlerTests.java | 2 +- .../ad/rest/handler/StartDetectorTests.java | 2 +- .../ad/rest/handler/StartHistoricalTests.java | 2 +- .../org/opensearch/ad/task/ADTaskManagerTests.java | 4 ++-- .../opensearch/ad/transport/AnomalyResultTests.java | 2 +- .../DeleteAnomalyResultsTransportActionTests.java | 4 ++-- .../org/opensearch/ad/transport/DeleteTests.java | 2 +- .../transport/EntityResultTransportActionTests.java | 2 +- .../ad/transport/GetAnomalyDetectorTests.java | 2 +- .../IndexAnomalyDetectorTransportActionTests.java | 2 +- .../ad/transport/MultiEntityResultTests.java | 4 ++-- .../PreviewAnomalyDetectorTransportActionTests.java | 2 +- .../ad/transport/SearchADTasksActionTests.java | 4 ++-- .../transport/SearchADTasksTransportActionTests.java | 4 ++-- .../transport/SearchAnomalyDetectorActionTests.java | 4 ++-- .../ad/transport/SearchAnomalyResultActionTests.java | 6 +++--- .../SearchTopAnomalyResultTransportActionTests.java | 2 +- .../ad/transport/handler/ADSearchHandlerTests.java | 2 +- .../transport/handler/AbstractIndexHandlerTest.java | 2 +- .../handler/AnomalyResultBulkIndexHandlerTests.java | 2 +- .../java/org/opensearch/ad/util/IndexUtilsTests.java | 4 ++-- .../forecast/AbstractForecastSyntheticDataTest.java | 2 +- .../forecast/SingleStreamProfileRunnerTests.java | 2 +- .../forecast/indices/ForecastResultIndexTests.java | 8 ++++---- .../forecast/rest/SecureForecastRestIT.java | 12 ++++++------ .../timeseries/AbstractTimeSeriesTest.java | 2 +- .../opensearch/timeseries/NodeStateManagerTests.java | 2 +- .../java/org/opensearch/timeseries/TestHelpers.java | 4 ++-- .../opensearch/timeseries/TimeSeriesPluginTests.java | 2 +- .../feature/NoPowermockSearchFeatureDaoTests.java | 2 +- .../feature/SearchFeatureDaoParamTests.java | 2 +- .../timeseries/feature/SearchFeatureDaoTests.java | 2 +- .../rest/handler/IntervalCalculationTests.java | 2 +- .../transport/ADResultBulkTransportActionTests.java | 2 +- .../transport/ADStatsNodesTransportActionTests.java | 2 +- .../transport/AnomalyDetectorJobActionTests.java | 2 +- .../AnomalyDetectorJobTransportActionTests.java | 2 +- .../transport/DeleteAnomalyDetectorTests.java | 2 +- .../ForecastResultBulkTransportActionTests.java | 2 +- .../SearchAnomalyDetectorInfoActionTests.java | 2 +- .../opensearch/timeseries/util/ClientUtilTests.java | 2 +- .../util/CrossClusterConfigUtilsTests.java | 4 ++-- 202 files changed, 273 insertions(+), 268 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02527e3f6..47075965b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) ### Documentation ### Maintenance +- Fix breaking changes for 3.0.0 release ([#1424](https://github.com/opensearch-project/anomaly-detection/pull/1424)) + ### Refactoring ## [Unreleased 2.x](https://github.com/opensearch-project/anomaly-detection/compare/2.19...2.x) diff --git a/build.gradle b/build.gradle index 5002dc9e9..e36a50f15 100644 --- a/build.gradle +++ b/build.gradle @@ -18,8 +18,8 @@ buildscript { ext { opensearch_group = "org.opensearch" isSnapshot = "true" == System.getProperty("build.snapshot", "true") - opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT") - buildVersionQualifier = System.getProperty("build.version_qualifier", "") + opensearch_version = System.getProperty("opensearch.version", "3.0.0-alpha1-SNAPSHOT") + buildVersionQualifier = System.getProperty("build.version_qualifier", "alpha1") // 3.0.0-SNAPSHOT -> 3.0.0.0-SNAPSHOT version_tokens = opensearch_version.tokenize('-') opensearch_build = version_tokens[0] + '.0' diff --git a/src/main/java/org/opensearch/ad/ADEntityProfileRunner.java b/src/main/java/org/opensearch/ad/ADEntityProfileRunner.java index 897c853f1..3047aad2e 100644 --- a/src/main/java/org/opensearch/ad/ADEntityProfileRunner.java +++ b/src/main/java/org/opensearch/ad/ADEntityProfileRunner.java @@ -16,11 +16,11 @@ import org.opensearch.ad.model.AnomalyResult; import org.opensearch.ad.settings.ADNumericSetting; import org.opensearch.ad.transport.ADEntityProfileAction; -import org.opensearch.client.Client; import org.opensearch.core.xcontent.NamedXContentRegistry; import org.opensearch.timeseries.AnalysisType; import org.opensearch.timeseries.EntityProfileRunner; import org.opensearch.timeseries.util.SecurityClientUtil; +import org.opensearch.transport.client.Client; public class ADEntityProfileRunner extends EntityProfileRunner { diff --git a/src/main/java/org/opensearch/ad/ADTaskProfileRunner.java b/src/main/java/org/opensearch/ad/ADTaskProfileRunner.java index 6e3d6db3b..800eaa0d9 100644 --- a/src/main/java/org/opensearch/ad/ADTaskProfileRunner.java +++ b/src/main/java/org/opensearch/ad/ADTaskProfileRunner.java @@ -15,11 +15,11 @@ import org.opensearch.ad.transport.ADTaskProfileAction; import org.opensearch.ad.transport.ADTaskProfileNodeResponse; import org.opensearch.ad.transport.ADTaskProfileRequest; -import org.opensearch.client.Client; import org.opensearch.core.action.ActionListener; import org.opensearch.timeseries.TaskProfileRunner; import org.opensearch.timeseries.cluster.HashRing; import org.opensearch.timeseries.model.EntityTaskProfile; +import org.opensearch.transport.client.Client; public class ADTaskProfileRunner implements TaskProfileRunner { public final Logger logger = LogManager.getLogger(ADTaskProfileRunner.class); diff --git a/src/main/java/org/opensearch/ad/AnomalyDetectorProfileRunner.java b/src/main/java/org/opensearch/ad/AnomalyDetectorProfileRunner.java index d50588b08..4e4a12740 100644 --- a/src/main/java/org/opensearch/ad/AnomalyDetectorProfileRunner.java +++ b/src/main/java/org/opensearch/ad/AnomalyDetectorProfileRunner.java @@ -24,7 +24,6 @@ import org.opensearch.ad.task.ADTaskCacheManager; import org.opensearch.ad.task.ADTaskManager; import org.opensearch.ad.transport.ADProfileAction; -import org.opensearch.client.Client; import org.opensearch.core.xcontent.NamedXContentRegistry; import org.opensearch.timeseries.AnalysisType; import org.opensearch.timeseries.ProfileRunner; @@ -32,6 +31,7 @@ import org.opensearch.timeseries.util.DiscoveryNodeFilterer; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; /** * Since version 2.15, we have merged the single-stream and HC detector workflows. Consequently, separate logic for profiling is no longer necessary. diff --git a/src/main/java/org/opensearch/ad/ExecuteADResultResponseRecorder.java b/src/main/java/org/opensearch/ad/ExecuteADResultResponseRecorder.java index e1d042267..a13485829 100644 --- a/src/main/java/org/opensearch/ad/ExecuteADResultResponseRecorder.java +++ b/src/main/java/org/opensearch/ad/ExecuteADResultResponseRecorder.java @@ -25,7 +25,6 @@ import org.opensearch.ad.task.ADTaskCacheManager; import org.opensearch.ad.task.ADTaskManager; import org.opensearch.ad.transport.ADProfileAction; -import org.opensearch.client.Client; import org.opensearch.commons.authuser.User; import org.opensearch.threadpool.ThreadPool; import org.opensearch.timeseries.AnalysisType; @@ -36,6 +35,7 @@ import org.opensearch.timeseries.transport.ResultResponse; import org.opensearch.timeseries.transport.handler.ResultBulkIndexingHandler; import org.opensearch.timeseries.util.DiscoveryNodeFilterer; +import org.opensearch.transport.client.Client; public class ExecuteADResultResponseRecorder extends ExecuteResultResponseRecorder { diff --git a/src/main/java/org/opensearch/ad/client/AnomalyDetectionNodeClient.java b/src/main/java/org/opensearch/ad/client/AnomalyDetectionNodeClient.java index 93023a2c8..188691fc7 100644 --- a/src/main/java/org/opensearch/ad/client/AnomalyDetectionNodeClient.java +++ b/src/main/java/org/opensearch/ad/client/AnomalyDetectionNodeClient.java @@ -13,11 +13,11 @@ import org.opensearch.ad.transport.GetAnomalyDetectorResponse; import org.opensearch.ad.transport.SearchAnomalyDetectorAction; import org.opensearch.ad.transport.SearchAnomalyResultAction; -import org.opensearch.client.Client; import org.opensearch.core.action.ActionListener; import org.opensearch.core.action.ActionResponse; import org.opensearch.core.common.io.stream.NamedWriteableRegistry; import org.opensearch.timeseries.transport.GetConfigRequest; +import org.opensearch.transport.client.Client; public class AnomalyDetectionNodeClient implements AnomalyDetectionClient { private final Client client; diff --git a/src/main/java/org/opensearch/ad/indices/ADIndexManagement.java b/src/main/java/org/opensearch/ad/indices/ADIndexManagement.java index 9b057ad45..fb23a9de4 100644 --- a/src/main/java/org/opensearch/ad/indices/ADIndexManagement.java +++ b/src/main/java/org/opensearch/ad/indices/ADIndexManagement.java @@ -33,7 +33,6 @@ import org.opensearch.ad.constant.ADCommonName; import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.ad.model.AnomalyResult; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentType; @@ -45,6 +44,7 @@ import org.opensearch.timeseries.common.exception.EndRunException; import org.opensearch.timeseries.indices.IndexManagement; import org.opensearch.timeseries.util.DiscoveryNodeFilterer; +import org.opensearch.transport.client.Client; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/org/opensearch/ad/ml/ADCheckpointDao.java b/src/main/java/org/opensearch/ad/ml/ADCheckpointDao.java index 54e133406..992be5421 100644 --- a/src/main/java/org/opensearch/ad/ml/ADCheckpointDao.java +++ b/src/main/java/org/opensearch/ad/ml/ADCheckpointDao.java @@ -38,7 +38,6 @@ import org.opensearch.ad.constant.ADCommonName; import org.opensearch.ad.indices.ADIndex; import org.opensearch.ad.indices.ADIndexManagement; -import org.opensearch.client.Client; import org.opensearch.core.action.ActionListener; import org.opensearch.index.IndexNotFoundException; import org.opensearch.index.query.MatchQueryBuilder; @@ -52,6 +51,7 @@ import org.opensearch.timeseries.ml.SingleStreamModelIdMapper; import org.opensearch.timeseries.model.Entity; import org.opensearch.timeseries.util.ClientUtil; +import org.opensearch.transport.client.Client; import com.amazon.randomcutforest.RandomCutForest; import com.amazon.randomcutforest.config.Precision; diff --git a/src/main/java/org/opensearch/ad/rest/RestAnomalyDetectorJobAction.java b/src/main/java/org/opensearch/ad/rest/RestAnomalyDetectorJobAction.java index 14ef4c652..68b2e3c13 100644 --- a/src/main/java/org/opensearch/ad/rest/RestAnomalyDetectorJobAction.java +++ b/src/main/java/org/opensearch/ad/rest/RestAnomalyDetectorJobAction.java @@ -23,7 +23,6 @@ import org.opensearch.ad.constant.ADCommonMessages; import org.opensearch.ad.settings.ADEnabledSetting; import org.opensearch.ad.transport.AnomalyDetectorJobAction; -import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; @@ -33,6 +32,7 @@ import org.opensearch.timeseries.model.DateRange; import org.opensearch.timeseries.rest.RestJobAction; import org.opensearch.timeseries.transport.JobRequest; +import org.opensearch.transport.client.node.NodeClient; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/org/opensearch/ad/rest/RestDeleteAnomalyDetectorAction.java b/src/main/java/org/opensearch/ad/rest/RestDeleteAnomalyDetectorAction.java index 1ad4f0a9a..711978385 100644 --- a/src/main/java/org/opensearch/ad/rest/RestDeleteAnomalyDetectorAction.java +++ b/src/main/java/org/opensearch/ad/rest/RestDeleteAnomalyDetectorAction.java @@ -20,12 +20,12 @@ import org.opensearch.ad.constant.ADCommonMessages; import org.opensearch.ad.settings.ADEnabledSetting; import org.opensearch.ad.transport.DeleteAnomalyDetectorAction; -import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; import org.opensearch.timeseries.TimeSeriesAnalyticsPlugin; import org.opensearch.timeseries.transport.DeleteConfigRequest; +import org.opensearch.transport.client.node.NodeClient; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/org/opensearch/ad/rest/RestDeleteAnomalyResultsAction.java b/src/main/java/org/opensearch/ad/rest/RestDeleteAnomalyResultsAction.java index 84b41f8a8..c039d2436 100644 --- a/src/main/java/org/opensearch/ad/rest/RestDeleteAnomalyResultsAction.java +++ b/src/main/java/org/opensearch/ad/rest/RestDeleteAnomalyResultsAction.java @@ -22,7 +22,6 @@ import org.opensearch.ad.constant.ADCommonMessages; import org.opensearch.ad.settings.ADEnabledSetting; import org.opensearch.ad.transport.DeleteAnomalyResultsAction; -import org.opensearch.client.node.NodeClient; import org.opensearch.core.action.ActionListener; import org.opensearch.core.rest.RestStatus; import org.opensearch.core.xcontent.ToXContent; @@ -33,6 +32,7 @@ import org.opensearch.rest.RestRequest; import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.timeseries.TimeSeriesAnalyticsPlugin; +import org.opensearch.transport.client.node.NodeClient; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/org/opensearch/ad/rest/RestExecuteAnomalyDetectorAction.java b/src/main/java/org/opensearch/ad/rest/RestExecuteAnomalyDetectorAction.java index d52749a02..3493d2fb2 100644 --- a/src/main/java/org/opensearch/ad/rest/RestExecuteAnomalyDetectorAction.java +++ b/src/main/java/org/opensearch/ad/rest/RestExecuteAnomalyDetectorAction.java @@ -28,7 +28,6 @@ import org.opensearch.ad.settings.ADEnabledSetting; import org.opensearch.ad.transport.AnomalyResultAction; import org.opensearch.ad.transport.AnomalyResultRequest; -import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; @@ -39,6 +38,7 @@ import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; import org.opensearch.timeseries.TimeSeriesAnalyticsPlugin; +import org.opensearch.transport.client.node.NodeClient; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/org/opensearch/ad/rest/RestGetAnomalyDetectorAction.java b/src/main/java/org/opensearch/ad/rest/RestGetAnomalyDetectorAction.java index 8ef0bb473..57a7f1ff6 100644 --- a/src/main/java/org/opensearch/ad/rest/RestGetAnomalyDetectorAction.java +++ b/src/main/java/org/opensearch/ad/rest/RestGetAnomalyDetectorAction.java @@ -24,7 +24,6 @@ import org.opensearch.ad.constant.ADCommonMessages; import org.opensearch.ad.settings.ADEnabledSetting; import org.opensearch.ad.transport.GetAnomalyDetectorAction; -import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestActions; @@ -32,6 +31,7 @@ import org.opensearch.timeseries.TimeSeriesAnalyticsPlugin; import org.opensearch.timeseries.transport.GetConfigRequest; import org.opensearch.timeseries.util.RestHandlerUtils; +import org.opensearch.transport.client.node.NodeClient; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/org/opensearch/ad/rest/RestIndexAnomalyDetectorAction.java b/src/main/java/org/opensearch/ad/rest/RestIndexAnomalyDetectorAction.java index 8f5b5645d..3851f0403 100644 --- a/src/main/java/org/opensearch/ad/rest/RestIndexAnomalyDetectorAction.java +++ b/src/main/java/org/opensearch/ad/rest/RestIndexAnomalyDetectorAction.java @@ -30,7 +30,6 @@ import org.opensearch.ad.transport.IndexAnomalyDetectorAction; import org.opensearch.ad.transport.IndexAnomalyDetectorRequest; import org.opensearch.ad.transport.IndexAnomalyDetectorResponse; -import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.core.rest.RestStatus; @@ -43,6 +42,7 @@ import org.opensearch.rest.RestResponse; import org.opensearch.rest.action.RestResponseListener; import org.opensearch.timeseries.TimeSeriesAnalyticsPlugin; +import org.opensearch.transport.client.node.NodeClient; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/org/opensearch/ad/rest/RestPreviewAnomalyDetectorAction.java b/src/main/java/org/opensearch/ad/rest/RestPreviewAnomalyDetectorAction.java index cd495517c..28356e7ed 100644 --- a/src/main/java/org/opensearch/ad/rest/RestPreviewAnomalyDetectorAction.java +++ b/src/main/java/org/opensearch/ad/rest/RestPreviewAnomalyDetectorAction.java @@ -53,7 +53,8 @@ public String getName() { } @Override - protected RestChannelConsumer prepareRequest(RestRequest request, org.opensearch.client.node.NodeClient client) throws IOException { + protected RestChannelConsumer prepareRequest(RestRequest request, org.opensearch.transport.client.node.NodeClient client) + throws IOException { if (!ADEnabledSetting.isADEnabled()) { throw new IllegalStateException(ADCommonMessages.DISABLED_ERR_MSG); } diff --git a/src/main/java/org/opensearch/ad/rest/RestSearchAnomalyDetectorInfoAction.java b/src/main/java/org/opensearch/ad/rest/RestSearchAnomalyDetectorInfoAction.java index 0b7f748c7..c620b0d9c 100644 --- a/src/main/java/org/opensearch/ad/rest/RestSearchAnomalyDetectorInfoAction.java +++ b/src/main/java/org/opensearch/ad/rest/RestSearchAnomalyDetectorInfoAction.java @@ -46,7 +46,8 @@ public String getName() { } @Override - protected RestChannelConsumer prepareRequest(RestRequest request, org.opensearch.client.node.NodeClient client) throws IOException { + protected RestChannelConsumer prepareRequest(RestRequest request, org.opensearch.transport.client.node.NodeClient client) + throws IOException { if (!ADEnabledSetting.isADEnabled()) { throw new IllegalStateException(ADCommonMessages.DISABLED_ERR_MSG); } diff --git a/src/main/java/org/opensearch/ad/rest/RestSearchAnomalyResultAction.java b/src/main/java/org/opensearch/ad/rest/RestSearchAnomalyResultAction.java index b014ca753..ecef154c2 100644 --- a/src/main/java/org/opensearch/ad/rest/RestSearchAnomalyResultAction.java +++ b/src/main/java/org/opensearch/ad/rest/RestSearchAnomalyResultAction.java @@ -25,10 +25,10 @@ import org.opensearch.ad.model.AnomalyResult; import org.opensearch.ad.settings.ADEnabledSetting; import org.opensearch.ad.transport.SearchAnomalyResultAction; -import org.opensearch.client.node.NodeClient; import org.opensearch.rest.RestRequest; import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.timeseries.TimeSeriesAnalyticsPlugin; +import org.opensearch.transport.client.node.NodeClient; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/org/opensearch/ad/rest/RestSearchTopAnomalyResultAction.java b/src/main/java/org/opensearch/ad/rest/RestSearchTopAnomalyResultAction.java index 45b8da8a0..58982cc32 100644 --- a/src/main/java/org/opensearch/ad/rest/RestSearchTopAnomalyResultAction.java +++ b/src/main/java/org/opensearch/ad/rest/RestSearchTopAnomalyResultAction.java @@ -21,13 +21,13 @@ import org.opensearch.ad.settings.ADEnabledSetting; import org.opensearch.ad.transport.SearchTopAnomalyResultAction; import org.opensearch.ad.transport.SearchTopAnomalyResultRequest; -import org.opensearch.client.node.NodeClient; import org.opensearch.core.xcontent.XContentParser; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; import org.opensearch.timeseries.TimeSeriesAnalyticsPlugin; import org.opensearch.timeseries.util.RestHandlerUtils; +import org.opensearch.transport.client.node.NodeClient; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/org/opensearch/ad/rest/RestStatsAnomalyDetectorAction.java b/src/main/java/org/opensearch/ad/rest/RestStatsAnomalyDetectorAction.java index ddceab44a..e329b0e0c 100644 --- a/src/main/java/org/opensearch/ad/rest/RestStatsAnomalyDetectorAction.java +++ b/src/main/java/org/opensearch/ad/rest/RestStatsAnomalyDetectorAction.java @@ -20,12 +20,12 @@ import org.opensearch.ad.settings.ADEnabledSetting; import org.opensearch.ad.stats.ADStats; import org.opensearch.ad.transport.StatsAnomalyDetectorAction; -import org.opensearch.client.node.NodeClient; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; import org.opensearch.timeseries.rest.RestStatsAction; import org.opensearch.timeseries.transport.StatsRequest; import org.opensearch.timeseries.util.DiscoveryNodeFilterer; +import org.opensearch.transport.client.node.NodeClient; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/org/opensearch/ad/rest/RestValidateAnomalyDetectorAction.java b/src/main/java/org/opensearch/ad/rest/RestValidateAnomalyDetectorAction.java index 369e795a1..3c65212fd 100644 --- a/src/main/java/org/opensearch/ad/rest/RestValidateAnomalyDetectorAction.java +++ b/src/main/java/org/opensearch/ad/rest/RestValidateAnomalyDetectorAction.java @@ -22,7 +22,6 @@ import org.opensearch.ad.constant.ADCommonMessages; import org.opensearch.ad.settings.ADEnabledSetting; import org.opensearch.ad.transport.ValidateAnomalyDetectorAction; -import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.core.xcontent.XContentParser; @@ -35,6 +34,7 @@ import org.opensearch.timeseries.model.ConfigValidationIssue; import org.opensearch.timeseries.rest.RestValidateAction; import org.opensearch.timeseries.transport.ValidateConfigRequest; +import org.opensearch.transport.client.node.NodeClient; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/org/opensearch/ad/rest/handler/ADIndexJobActionHandler.java b/src/main/java/org/opensearch/ad/rest/handler/ADIndexJobActionHandler.java index fc0eb5cfe..3ad724442 100644 --- a/src/main/java/org/opensearch/ad/rest/handler/ADIndexJobActionHandler.java +++ b/src/main/java/org/opensearch/ad/rest/handler/ADIndexJobActionHandler.java @@ -24,7 +24,6 @@ import org.opensearch.ad.transport.AnomalyResultAction; import org.opensearch.ad.transport.AnomalyResultRequest; import org.opensearch.ad.transport.StopDetectorAction; -import org.opensearch.client.Client; import org.opensearch.common.settings.Settings; import org.opensearch.commons.authuser.User; import org.opensearch.core.action.ActionListener; @@ -37,6 +36,7 @@ import org.opensearch.timeseries.transport.JobResponse; import org.opensearch.timeseries.transport.ResultRequest; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class ADIndexJobActionHandler extends IndexJobActionHandler { diff --git a/src/main/java/org/opensearch/ad/rest/handler/ADModelValidationActionHandler.java b/src/main/java/org/opensearch/ad/rest/handler/ADModelValidationActionHandler.java index 35f3c5834..85424aaeb 100644 --- a/src/main/java/org/opensearch/ad/rest/handler/ADModelValidationActionHandler.java +++ b/src/main/java/org/opensearch/ad/rest/handler/ADModelValidationActionHandler.java @@ -8,7 +8,6 @@ import java.time.Clock; import org.opensearch.ad.model.AnomalyDetector; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; @@ -21,6 +20,7 @@ import org.opensearch.timeseries.rest.handler.ModelValidationActionHandler; import org.opensearch.timeseries.transport.ValidateConfigResponse; import org.opensearch.timeseries.util.SecurityClientUtil; +import org.opensearch.transport.client.Client; public class ADModelValidationActionHandler extends ModelValidationActionHandler { diff --git a/src/main/java/org/opensearch/ad/rest/handler/AbstractAnomalyDetectorActionHandler.java b/src/main/java/org/opensearch/ad/rest/handler/AbstractAnomalyDetectorActionHandler.java index 13f70c840..6da22da4c 100644 --- a/src/main/java/org/opensearch/ad/rest/handler/AbstractAnomalyDetectorActionHandler.java +++ b/src/main/java/org/opensearch/ad/rest/handler/AbstractAnomalyDetectorActionHandler.java @@ -32,7 +32,6 @@ import org.opensearch.ad.task.ADTaskCacheManager; import org.opensearch.ad.task.ADTaskManager; import org.opensearch.ad.transport.IndexAnomalyDetectorResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; @@ -54,6 +53,7 @@ import org.opensearch.timeseries.transport.ValidateConfigResponse; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import com.google.common.collect.Sets; diff --git a/src/main/java/org/opensearch/ad/rest/handler/IndexAnomalyDetectorActionHandler.java b/src/main/java/org/opensearch/ad/rest/handler/IndexAnomalyDetectorActionHandler.java index a600d8750..821a1c771 100644 --- a/src/main/java/org/opensearch/ad/rest/handler/IndexAnomalyDetectorActionHandler.java +++ b/src/main/java/org/opensearch/ad/rest/handler/IndexAnomalyDetectorActionHandler.java @@ -16,7 +16,6 @@ import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.ad.task.ADTaskManager; import org.opensearch.ad.transport.IndexAnomalyDetectorResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; @@ -26,6 +25,7 @@ import org.opensearch.timeseries.feature.SearchFeatureDao; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; /** * Anomaly detector REST action handler to process POST/PUT request. diff --git a/src/main/java/org/opensearch/ad/rest/handler/ValidateAnomalyDetectorActionHandler.java b/src/main/java/org/opensearch/ad/rest/handler/ValidateAnomalyDetectorActionHandler.java index cf52a2237..9f84aa782 100644 --- a/src/main/java/org/opensearch/ad/rest/handler/ValidateAnomalyDetectorActionHandler.java +++ b/src/main/java/org/opensearch/ad/rest/handler/ValidateAnomalyDetectorActionHandler.java @@ -14,7 +14,6 @@ import java.time.Clock; import org.opensearch.ad.indices.ADIndexManagement; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; @@ -25,6 +24,7 @@ import org.opensearch.timeseries.model.Config; import org.opensearch.timeseries.transport.ValidateConfigResponse; import org.opensearch.timeseries.util.SecurityClientUtil; +import org.opensearch.transport.client.Client; /** * Anomaly detector REST action handler to process POST request. diff --git a/src/main/java/org/opensearch/ad/task/ADBatchTaskRunner.java b/src/main/java/org/opensearch/ad/task/ADBatchTaskRunner.java index 20c87d1b6..2f6f38d2a 100644 --- a/src/main/java/org/opensearch/ad/task/ADBatchTaskRunner.java +++ b/src/main/java/org/opensearch/ad/task/ADBatchTaskRunner.java @@ -57,7 +57,6 @@ import org.opensearch.ad.transport.ADBatchAnomalyResultResponse; import org.opensearch.ad.transport.ADBatchTaskRemoteExecutionAction; import org.opensearch.ad.transport.ADStatsNodesAction; -import org.opensearch.client.Client; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.CheckedRunnable; @@ -106,6 +105,7 @@ import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportRequestOptions; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import com.amazon.randomcutforest.RandomCutForest; import com.amazon.randomcutforest.parkservices.ThresholdedRandomCutForest; diff --git a/src/main/java/org/opensearch/ad/task/ADTaskManager.java b/src/main/java/org/opensearch/ad/task/ADTaskManager.java index e6aeadb54..f0b2f7b40 100644 --- a/src/main/java/org/opensearch/ad/task/ADTaskManager.java +++ b/src/main/java/org/opensearch/ad/task/ADTaskManager.java @@ -80,7 +80,6 @@ import org.opensearch.ad.transport.ADStatsNodesAction; import org.opensearch.ad.transport.ForwardADTaskAction; import org.opensearch.ad.transport.ForwardADTaskRequest; -import org.opensearch.client.Client; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; @@ -133,6 +132,7 @@ import org.opensearch.timeseries.util.ParseUtils; import org.opensearch.transport.TransportRequestOptions; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -1300,7 +1300,7 @@ public void countEntityTasksByState(String detectorTaskId, List taskS request.indices(DETECTION_STATE_INDEX); client.search(request, ActionListener.wrap(r -> { TotalHits totalHits = r.getHits().getTotalHits(); - listener.onResponse(totalHits.value); + listener.onResponse(totalHits.value()); }, e -> listener.onFailure(e))); } @@ -1839,7 +1839,7 @@ public void maintainRunningHistoricalTasks(TransportService transportService, in searchRequest.indices(DETECTION_STATE_INDEX); client.search(searchRequest, ActionListener.wrap(r -> { - if (r == null || r.getHits().getTotalHits() == null || r.getHits().getTotalHits().value == 0) { + if (r == null || r.getHits().getTotalHits() == null || r.getHits().getTotalHits().value() == 0) { return; } ConcurrentLinkedQueue taskQueue = new ConcurrentLinkedQueue<>(); diff --git a/src/main/java/org/opensearch/ad/transport/ADResultBulkTransportAction.java b/src/main/java/org/opensearch/ad/transport/ADResultBulkTransportAction.java index ef451208b..a5c28029d 100644 --- a/src/main/java/org/opensearch/ad/transport/ADResultBulkTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/ADResultBulkTransportAction.java @@ -26,7 +26,6 @@ import org.opensearch.ad.constant.ADCommonName; import org.opensearch.ad.model.AnomalyResult; import org.opensearch.ad.ratelimit.ADResultWriteRequest; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Settings; @@ -35,6 +34,7 @@ import org.opensearch.timeseries.transport.ResultBulkTransportAction; import org.opensearch.timeseries.util.RestHandlerUtils; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class ADResultBulkTransportAction extends ResultBulkTransportAction { diff --git a/src/main/java/org/opensearch/ad/transport/ADResultProcessor.java b/src/main/java/org/opensearch/ad/transport/ADResultProcessor.java index b7564b38e..97792d862 100644 --- a/src/main/java/org/opensearch/ad/transport/ADResultProcessor.java +++ b/src/main/java/org/opensearch/ad/transport/ADResultProcessor.java @@ -20,7 +20,6 @@ import org.opensearch.ad.stats.ADStats; import org.opensearch.ad.task.ADTaskCacheManager; import org.opensearch.ad.task.ADTaskManager; -import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.service.ClusterService; @@ -40,6 +39,7 @@ import org.opensearch.timeseries.transport.ResultProcessor; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class ADResultProcessor extends ResultProcessor { diff --git a/src/main/java/org/opensearch/ad/transport/ADSingleStreamResultAction.java b/src/main/java/org/opensearch/ad/transport/ADSingleStreamResultAction.java index 9a5c74373..67e3e978e 100644 --- a/src/main/java/org/opensearch/ad/transport/ADSingleStreamResultAction.java +++ b/src/main/java/org/opensearch/ad/transport/ADSingleStreamResultAction.java @@ -6,7 +6,7 @@ package org.opensearch.ad.transport; import org.opensearch.action.ActionType; -import org.opensearch.action.support.master.AcknowledgedResponse; +import org.opensearch.action.support.clustermanager.AcknowledgedResponse; import org.opensearch.ad.constant.ADCommonValue; public class ADSingleStreamResultAction extends ActionType { diff --git a/src/main/java/org/opensearch/ad/transport/AnomalyDetectorJobTransportAction.java b/src/main/java/org/opensearch/ad/transport/AnomalyDetectorJobTransportAction.java index 358c9a062..4c666d5e6 100644 --- a/src/main/java/org/opensearch/ad/transport/AnomalyDetectorJobTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/AnomalyDetectorJobTransportAction.java @@ -27,13 +27,13 @@ import org.opensearch.ad.rest.handler.ADIndexJobActionHandler; import org.opensearch.ad.task.ADTaskCacheManager; import org.opensearch.ad.task.ADTaskManager; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Settings; import org.opensearch.core.xcontent.NamedXContentRegistry; import org.opensearch.timeseries.transport.BaseJobTransportAction; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class AnomalyDetectorJobTransportAction extends BaseJobTransportAction { diff --git a/src/main/java/org/opensearch/ad/transport/AnomalyResultTransportAction.java b/src/main/java/org/opensearch/ad/transport/AnomalyResultTransportAction.java index d8a726d5d..e84941510 100644 --- a/src/main/java/org/opensearch/ad/transport/AnomalyResultTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/AnomalyResultTransportAction.java @@ -25,7 +25,6 @@ import org.opensearch.ad.settings.AnomalyDetectorSettings; import org.opensearch.ad.stats.ADStats; import org.opensearch.ad.task.ADTaskManager; -import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; @@ -48,6 +47,7 @@ import org.opensearch.timeseries.transport.ResultProcessor; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class AnomalyResultTransportAction extends HandledTransportAction { diff --git a/src/main/java/org/opensearch/ad/transport/DeleteAnomalyDetectorTransportAction.java b/src/main/java/org/opensearch/ad/transport/DeleteAnomalyDetectorTransportAction.java index 33124125d..0518d5e59 100644 --- a/src/main/java/org/opensearch/ad/transport/DeleteAnomalyDetectorTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/DeleteAnomalyDetectorTransportAction.java @@ -21,7 +21,6 @@ import org.opensearch.ad.settings.AnomalyDetectorSettings; import org.opensearch.ad.task.ADTaskCacheManager; import org.opensearch.ad.task.ADTaskManager; -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.timeseries.NodeStateManager; import org.opensearch.timeseries.transport.BaseDeleteConfigTransportAction; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class DeleteAnomalyDetectorTransportAction extends BaseDeleteConfigTransportAction { diff --git a/src/main/java/org/opensearch/ad/transport/DeleteAnomalyResultsTransportAction.java b/src/main/java/org/opensearch/ad/transport/DeleteAnomalyResultsTransportAction.java index 8c218ac64..13fbd94ee 100644 --- a/src/main/java/org/opensearch/ad/transport/DeleteAnomalyResultsTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/DeleteAnomalyResultsTransportAction.java @@ -19,7 +19,6 @@ import org.apache.logging.log4j.Logger; 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; @@ -32,6 +31,7 @@ import org.opensearch.tasks.Task; import org.opensearch.timeseries.util.ParseUtils; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class DeleteAnomalyResultsTransportAction extends HandledTransportAction { diff --git a/src/main/java/org/opensearch/ad/transport/EntityADResultAction.java b/src/main/java/org/opensearch/ad/transport/EntityADResultAction.java index f17c23416..64084de6f 100644 --- a/src/main/java/org/opensearch/ad/transport/EntityADResultAction.java +++ b/src/main/java/org/opensearch/ad/transport/EntityADResultAction.java @@ -12,7 +12,7 @@ package org.opensearch.ad.transport; import org.opensearch.action.ActionType; -import org.opensearch.action.support.master.AcknowledgedResponse; +import org.opensearch.action.support.clustermanager.AcknowledgedResponse; import org.opensearch.ad.constant.ADCommonValue; public class EntityADResultAction extends ActionType { diff --git a/src/main/java/org/opensearch/ad/transport/EntityADResultTransportAction.java b/src/main/java/org/opensearch/ad/transport/EntityADResultTransportAction.java index 5aba6acc1..c5ebcda19 100644 --- a/src/main/java/org/opensearch/ad/transport/EntityADResultTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/EntityADResultTransportAction.java @@ -17,7 +17,7 @@ import org.apache.logging.log4j.Logger; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; -import org.opensearch.action.support.master.AcknowledgedResponse; +import org.opensearch.action.support.clustermanager.AcknowledgedResponse; import org.opensearch.ad.caching.ADCacheProvider; import org.opensearch.ad.caching.ADPriorityCache; import org.opensearch.ad.indices.ADIndex; diff --git a/src/main/java/org/opensearch/ad/transport/GetAnomalyDetectorTransportAction.java b/src/main/java/org/opensearch/ad/transport/GetAnomalyDetectorTransportAction.java index 46e246191..9a4767246 100644 --- a/src/main/java/org/opensearch/ad/transport/GetAnomalyDetectorTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/GetAnomalyDetectorTransportAction.java @@ -30,7 +30,6 @@ import org.opensearch.ad.settings.AnomalyDetectorSettings; import org.opensearch.ad.task.ADTaskCacheManager; import org.opensearch.ad.task.ADTaskManager; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Settings; @@ -43,6 +42,7 @@ import org.opensearch.timeseries.util.DiscoveryNodeFilterer; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class GetAnomalyDetectorTransportAction extends BaseGetConfigTransportAction { diff --git a/src/main/java/org/opensearch/ad/transport/IndexAnomalyDetectorTransportAction.java b/src/main/java/org/opensearch/ad/transport/IndexAnomalyDetectorTransportAction.java index 5d9b69910..18e6091ca 100644 --- a/src/main/java/org/opensearch/ad/transport/IndexAnomalyDetectorTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/IndexAnomalyDetectorTransportAction.java @@ -32,7 +32,6 @@ import org.opensearch.ad.rest.handler.IndexAnomalyDetectorActionHandler; import org.opensearch.ad.settings.AnomalyDetectorSettings; import org.opensearch.ad.task.ADTaskManager; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Settings; @@ -51,6 +50,7 @@ import org.opensearch.timeseries.util.ParseUtils; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class IndexAnomalyDetectorTransportAction extends HandledTransportAction { private static final Logger LOG = LogManager.getLogger(IndexAnomalyDetectorTransportAction.class); diff --git a/src/main/java/org/opensearch/ad/transport/PreviewAnomalyDetectorTransportAction.java b/src/main/java/org/opensearch/ad/transport/PreviewAnomalyDetectorTransportAction.java index ef82c43b2..54021dd18 100644 --- a/src/main/java/org/opensearch/ad/transport/PreviewAnomalyDetectorTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/PreviewAnomalyDetectorTransportAction.java @@ -37,7 +37,6 @@ import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.ad.model.AnomalyResult; import org.opensearch.ad.settings.AnomalyDetectorSettings; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.CheckedConsumer; import org.opensearch.common.inject.Inject; @@ -58,6 +57,7 @@ import org.opensearch.timeseries.util.ParseUtils; import org.opensearch.timeseries.util.RestHandlerUtils; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class PreviewAnomalyDetectorTransportAction extends HandledTransportAction { diff --git a/src/main/java/org/opensearch/ad/transport/SearchAnomalyDetectorInfoTransportAction.java b/src/main/java/org/opensearch/ad/transport/SearchAnomalyDetectorInfoTransportAction.java index c83ac9ebd..82e71fa69 100644 --- a/src/main/java/org/opensearch/ad/transport/SearchAnomalyDetectorInfoTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/SearchAnomalyDetectorInfoTransportAction.java @@ -12,11 +12,11 @@ package org.opensearch.ad.transport; import org.opensearch.action.support.ActionFilters; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.timeseries.transport.BaseSearchConfigInfoTransportAction; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class SearchAnomalyDetectorInfoTransportAction extends BaseSearchConfigInfoTransportAction { diff --git a/src/main/java/org/opensearch/ad/transport/SearchAnomalyResultTransportAction.java b/src/main/java/org/opensearch/ad/transport/SearchAnomalyResultTransportAction.java index 2ae1f93d5..dd3f79f0c 100644 --- a/src/main/java/org/opensearch/ad/transport/SearchAnomalyResultTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/SearchAnomalyResultTransportAction.java @@ -31,7 +31,6 @@ import org.opensearch.action.support.IndicesOptions; import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.ad.transport.handler.ADSearchHandler; -import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; @@ -46,6 +45,7 @@ import org.opensearch.tasks.Task; import org.opensearch.timeseries.constant.CommonName; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import com.google.common.annotations.VisibleForTesting; diff --git a/src/main/java/org/opensearch/ad/transport/SearchTopAnomalyResultTransportAction.java b/src/main/java/org/opensearch/ad/transport/SearchTopAnomalyResultTransportAction.java index d7b05f647..fe84d6c78 100644 --- a/src/main/java/org/opensearch/ad/transport/SearchTopAnomalyResultTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/SearchTopAnomalyResultTransportAction.java @@ -35,7 +35,6 @@ import org.opensearch.ad.model.AnomalyResult; import org.opensearch.ad.model.AnomalyResultBucket; import org.opensearch.ad.transport.handler.ADSearchHandler; -import org.opensearch.client.Client; import org.opensearch.common.inject.Inject; import org.opensearch.core.action.ActionListener; import org.opensearch.core.common.Strings; @@ -66,6 +65,7 @@ import org.opensearch.timeseries.transport.GetConfigRequest; import org.opensearch.timeseries.util.QueryUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; /** * Transport action to fetch top anomaly results for some HC detector. Generates a diff --git a/src/main/java/org/opensearch/ad/transport/StatsAnomalyDetectorTransportAction.java b/src/main/java/org/opensearch/ad/transport/StatsAnomalyDetectorTransportAction.java index d96887e12..17a51e9a9 100644 --- a/src/main/java/org/opensearch/ad/transport/StatsAnomalyDetectorTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/StatsAnomalyDetectorTransportAction.java @@ -18,7 +18,6 @@ import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.ad.model.AnomalyDetectorType; import org.opensearch.ad.stats.ADStats; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.core.action.ActionListener; @@ -33,6 +32,7 @@ import org.opensearch.timeseries.transport.StatsResponse; import org.opensearch.timeseries.util.MultiResponsesDelegateActionListener; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class StatsAnomalyDetectorTransportAction extends BaseStatsTransportAction { public static final String DETECTOR_TYPE_AGG = "detector_type_agg"; @@ -77,7 +77,7 @@ protected void getClusterStats( client.search(request, ActionListener.wrap(r -> { StringTerms aggregation = r.getAggregations().get(DETECTOR_TYPE_AGG); List buckets = aggregation.getBuckets(); - long totalDetectors = r.getHits().getTotalHits().value; + long totalDetectors = r.getHits().getTotalHits().value(); long totalSingleEntityDetectors = 0; long totalMultiEntityDetectors = 0; for (StringTerms.Bucket b : buckets) { diff --git a/src/main/java/org/opensearch/ad/transport/StopDetectorTransportAction.java b/src/main/java/org/opensearch/ad/transport/StopDetectorTransportAction.java index 074165a35..8052aac1e 100644 --- a/src/main/java/org/opensearch/ad/transport/StopDetectorTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/StopDetectorTransportAction.java @@ -21,7 +21,6 @@ import org.opensearch.action.FailedNodeException; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; -import org.opensearch.client.Client; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.inject.Inject; import org.opensearch.core.action.ActionListener; @@ -32,6 +31,7 @@ import org.opensearch.timeseries.transport.StopConfigResponse; import org.opensearch.timeseries.util.DiscoveryNodeFilterer; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class StopDetectorTransportAction extends HandledTransportAction { diff --git a/src/main/java/org/opensearch/ad/transport/ValidateAnomalyDetectorTransportAction.java b/src/main/java/org/opensearch/ad/transport/ValidateAnomalyDetectorTransportAction.java index 1b27a4349..6a6407b5d 100644 --- a/src/main/java/org/opensearch/ad/transport/ValidateAnomalyDetectorTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/ValidateAnomalyDetectorTransportAction.java @@ -19,7 +19,6 @@ import org.opensearch.ad.indices.ADIndex; import org.opensearch.ad.indices.ADIndexManagement; import org.opensearch.ad.rest.handler.ValidateAnomalyDetectorActionHandler; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Settings; @@ -35,6 +34,7 @@ import org.opensearch.timeseries.transport.ValidateConfigResponse; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class ValidateAnomalyDetectorTransportAction extends BaseValidateConfigTransportAction { public static final Logger logger = LogManager.getLogger(ValidateAnomalyDetectorTransportAction.class); diff --git a/src/main/java/org/opensearch/ad/transport/handler/ADIndexMemoryPressureAwareResultHandler.java b/src/main/java/org/opensearch/ad/transport/handler/ADIndexMemoryPressureAwareResultHandler.java index 149c934f2..8a6f87f9b 100644 --- a/src/main/java/org/opensearch/ad/transport/handler/ADIndexMemoryPressureAwareResultHandler.java +++ b/src/main/java/org/opensearch/ad/transport/handler/ADIndexMemoryPressureAwareResultHandler.java @@ -19,7 +19,6 @@ import org.opensearch.ad.ratelimit.ADResultWriteRequest; import org.opensearch.ad.transport.ADResultBulkAction; import org.opensearch.ad.transport.ADResultBulkRequest; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.core.action.ActionListener; @@ -27,6 +26,7 @@ import org.opensearch.timeseries.constant.CommonMessages; import org.opensearch.timeseries.transport.ResultBulkResponse; import org.opensearch.timeseries.transport.handler.IndexMemoryPressureAwareResultHandler; +import org.opensearch.transport.client.Client; public class ADIndexMemoryPressureAwareResultHandler extends IndexMemoryPressureAwareResultHandler { diff --git a/src/main/java/org/opensearch/ad/transport/handler/ADSearchHandler.java b/src/main/java/org/opensearch/ad/transport/handler/ADSearchHandler.java index 7a5312652..995aa6fc2 100644 --- a/src/main/java/org/opensearch/ad/transport/handler/ADSearchHandler.java +++ b/src/main/java/org/opensearch/ad/transport/handler/ADSearchHandler.java @@ -12,10 +12,10 @@ package org.opensearch.ad.transport.handler; import org.opensearch.ad.settings.AnomalyDetectorSettings; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.timeseries.transport.handler.SearchHandler; +import org.opensearch.transport.client.Client; /** * Handle general search request, check user role and return search response. diff --git a/src/main/java/org/opensearch/forecast/ExecuteForecastResultResponseRecorder.java b/src/main/java/org/opensearch/forecast/ExecuteForecastResultResponseRecorder.java index 16db8cb0d..e74234f24 100644 --- a/src/main/java/org/opensearch/forecast/ExecuteForecastResultResponseRecorder.java +++ b/src/main/java/org/opensearch/forecast/ExecuteForecastResultResponseRecorder.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Optional; -import org.opensearch.client.Client; import org.opensearch.commons.authuser.User; import org.opensearch.forecast.indices.ForecastIndex; import org.opensearch.forecast.indices.ForecastIndexManagement; @@ -28,6 +27,7 @@ import org.opensearch.timeseries.transport.ResultResponse; import org.opensearch.timeseries.transport.handler.ResultBulkIndexingHandler; import org.opensearch.timeseries.util.DiscoveryNodeFilterer; +import org.opensearch.transport.client.Client; public class ExecuteForecastResultResponseRecorder extends ExecuteResultResponseRecorder { diff --git a/src/main/java/org/opensearch/forecast/ForecastEntityProfileRunner.java b/src/main/java/org/opensearch/forecast/ForecastEntityProfileRunner.java index e1dcaebfd..3bbba3c3b 100644 --- a/src/main/java/org/opensearch/forecast/ForecastEntityProfileRunner.java +++ b/src/main/java/org/opensearch/forecast/ForecastEntityProfileRunner.java @@ -5,7 +5,6 @@ package org.opensearch.forecast; -import org.opensearch.client.Client; import org.opensearch.core.xcontent.NamedXContentRegistry; import org.opensearch.forecast.constant.ForecastCommonName; import org.opensearch.forecast.indices.ForecastIndex; @@ -15,6 +14,7 @@ import org.opensearch.timeseries.AnalysisType; import org.opensearch.timeseries.EntityProfileRunner; import org.opensearch.timeseries.util.SecurityClientUtil; +import org.opensearch.transport.client.Client; public class ForecastEntityProfileRunner extends EntityProfileRunner { diff --git a/src/main/java/org/opensearch/forecast/ForecastProfileRunner.java b/src/main/java/org/opensearch/forecast/ForecastProfileRunner.java index 10c1301fd..265dd5d9c 100644 --- a/src/main/java/org/opensearch/forecast/ForecastProfileRunner.java +++ b/src/main/java/org/opensearch/forecast/ForecastProfileRunner.java @@ -5,7 +5,6 @@ package org.opensearch.forecast; -import org.opensearch.client.Client; import org.opensearch.core.xcontent.NamedXContentRegistry; import org.opensearch.forecast.indices.ForecastIndex; import org.opensearch.forecast.indices.ForecastIndexManagement; @@ -24,6 +23,7 @@ import org.opensearch.timeseries.util.DiscoveryNodeFilterer; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class ForecastProfileRunner extends ProfileRunner { diff --git a/src/main/java/org/opensearch/forecast/indices/ForecastIndexManagement.java b/src/main/java/org/opensearch/forecast/indices/ForecastIndexManagement.java index b4a669a47..8235561fb 100644 --- a/src/main/java/org/opensearch/forecast/indices/ForecastIndexManagement.java +++ b/src/main/java/org/opensearch/forecast/indices/ForecastIndexManagement.java @@ -32,7 +32,6 @@ import org.opensearch.action.admin.indices.create.CreateIndexResponse; import org.opensearch.action.delete.DeleteRequest; import org.opensearch.action.index.IndexRequest; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentType; @@ -50,6 +49,7 @@ import org.opensearch.timeseries.function.ExecutorFunction; import org.opensearch.timeseries.indices.IndexManagement; import org.opensearch.timeseries.util.DiscoveryNodeFilterer; +import org.opensearch.transport.client.Client; public class ForecastIndexManagement extends IndexManagement { private static final Logger logger = LogManager.getLogger(ForecastIndexManagement.class); diff --git a/src/main/java/org/opensearch/forecast/ml/ForecastCheckpointDao.java b/src/main/java/org/opensearch/forecast/ml/ForecastCheckpointDao.java index dc6fa4d50..67e1d9614 100644 --- a/src/main/java/org/opensearch/forecast/ml/ForecastCheckpointDao.java +++ b/src/main/java/org/opensearch/forecast/ml/ForecastCheckpointDao.java @@ -29,7 +29,6 @@ import org.opensearch.action.get.GetRequest; import org.opensearch.action.get.GetResponse; import org.opensearch.action.support.IndicesOptions; -import org.opensearch.client.Client; import org.opensearch.core.action.ActionListener; import org.opensearch.forecast.constant.ForecastCommonName; import org.opensearch.forecast.indices.ForecastIndex; @@ -45,6 +44,7 @@ import org.opensearch.timeseries.ml.Sample; import org.opensearch.timeseries.model.Entity; import org.opensearch.timeseries.util.ClientUtil; +import org.opensearch.transport.client.Client; import com.amazon.randomcutforest.parkservices.RCFCaster; import com.amazon.randomcutforest.parkservices.state.RCFCasterMapper; diff --git a/src/main/java/org/opensearch/forecast/rest/RestDeleteForecasterAction.java b/src/main/java/org/opensearch/forecast/rest/RestDeleteForecasterAction.java index 54be0bb31..005832785 100644 --- a/src/main/java/org/opensearch/forecast/rest/RestDeleteForecasterAction.java +++ b/src/main/java/org/opensearch/forecast/rest/RestDeleteForecasterAction.java @@ -11,7 +11,6 @@ import java.util.List; import java.util.Locale; -import org.opensearch.client.node.NodeClient; import org.opensearch.forecast.constant.ForecastCommonMessages; import org.opensearch.forecast.settings.ForecastEnabledSetting; import org.opensearch.forecast.transport.DeleteForecasterAction; @@ -20,6 +19,7 @@ import org.opensearch.rest.action.RestToXContentListener; import org.opensearch.timeseries.TimeSeriesAnalyticsPlugin; import org.opensearch.timeseries.transport.DeleteConfigRequest; +import org.opensearch.transport.client.node.NodeClient; import org.owasp.encoder.Encode; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/org/opensearch/forecast/rest/RestForecasterJobAction.java b/src/main/java/org/opensearch/forecast/rest/RestForecasterJobAction.java index a5f98829b..3030aff44 100644 --- a/src/main/java/org/opensearch/forecast/rest/RestForecasterJobAction.java +++ b/src/main/java/org/opensearch/forecast/rest/RestForecasterJobAction.java @@ -13,7 +13,6 @@ import java.util.List; import java.util.Locale; -import org.opensearch.client.node.NodeClient; import org.opensearch.forecast.constant.ForecastCommonMessages; import org.opensearch.forecast.settings.ForecastEnabledSetting; import org.opensearch.forecast.transport.ForecasterJobAction; @@ -23,6 +22,7 @@ import org.opensearch.timeseries.model.DateRange; import org.opensearch.timeseries.rest.RestJobAction; import org.opensearch.timeseries.transport.JobRequest; +import org.opensearch.transport.client.node.NodeClient; import org.owasp.encoder.Encode; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/org/opensearch/forecast/rest/RestForecasterSuggestAction.java b/src/main/java/org/opensearch/forecast/rest/RestForecasterSuggestAction.java index 16a06336e..e33d7f541 100644 --- a/src/main/java/org/opensearch/forecast/rest/RestForecasterSuggestAction.java +++ b/src/main/java/org/opensearch/forecast/rest/RestForecasterSuggestAction.java @@ -21,7 +21,6 @@ import java.util.Locale; import java.util.concurrent.TimeUnit; -import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.ValidationException; import org.opensearch.common.settings.Settings; @@ -37,6 +36,7 @@ import org.opensearch.timeseries.AnalysisType; import org.opensearch.timeseries.TimeSeriesAnalyticsPlugin; import org.opensearch.timeseries.transport.SuggestConfigParamRequest; +import org.opensearch.transport.client.node.NodeClient; import org.owasp.encoder.Encode; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/org/opensearch/forecast/rest/RestGetForecasterAction.java b/src/main/java/org/opensearch/forecast/rest/RestGetForecasterAction.java index 968c0ad27..0820da423 100644 --- a/src/main/java/org/opensearch/forecast/rest/RestGetForecasterAction.java +++ b/src/main/java/org/opensearch/forecast/rest/RestGetForecasterAction.java @@ -18,7 +18,6 @@ import java.util.List; import java.util.Locale; -import org.opensearch.client.node.NodeClient; import org.opensearch.forecast.constant.ForecastCommonMessages; import org.opensearch.forecast.settings.ForecastEnabledSetting; import org.opensearch.forecast.transport.GetForecasterAction; @@ -29,6 +28,7 @@ import org.opensearch.timeseries.TimeSeriesAnalyticsPlugin; import org.opensearch.timeseries.transport.GetConfigRequest; import org.opensearch.timeseries.util.RestHandlerUtils; +import org.opensearch.transport.client.node.NodeClient; import org.owasp.encoder.Encode; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/org/opensearch/forecast/rest/RestIndexForecasterAction.java b/src/main/java/org/opensearch/forecast/rest/RestIndexForecasterAction.java index acb25d5f6..3510c3aae 100644 --- a/src/main/java/org/opensearch/forecast/rest/RestIndexForecasterAction.java +++ b/src/main/java/org/opensearch/forecast/rest/RestIndexForecasterAction.java @@ -25,7 +25,6 @@ import org.apache.logging.log4j.Logger; import org.opensearch.OpenSearchStatusException; import org.opensearch.action.support.WriteRequest; -import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.core.rest.RestStatus; @@ -46,6 +45,7 @@ import org.opensearch.timeseries.TimeSeriesAnalyticsPlugin; import org.opensearch.timeseries.common.exception.ValidationException; import org.opensearch.timeseries.model.Config; +import org.opensearch.transport.client.node.NodeClient; import org.owasp.encoder.Encode; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/org/opensearch/forecast/rest/RestRunOnceForecasterAction.java b/src/main/java/org/opensearch/forecast/rest/RestRunOnceForecasterAction.java index 042e21820..e23c274a6 100644 --- a/src/main/java/org/opensearch/forecast/rest/RestRunOnceForecasterAction.java +++ b/src/main/java/org/opensearch/forecast/rest/RestRunOnceForecasterAction.java @@ -19,7 +19,6 @@ import java.util.Locale; import org.joda.time.Instant; -import org.opensearch.client.node.NodeClient; import org.opensearch.forecast.constant.ForecastCommonMessages; import org.opensearch.forecast.settings.ForecastEnabledSetting; import org.opensearch.forecast.transport.ForecastResultRequest; @@ -28,6 +27,7 @@ import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; import org.opensearch.timeseries.TimeSeriesAnalyticsPlugin; +import org.opensearch.transport.client.node.NodeClient; import org.owasp.encoder.Encode; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/org/opensearch/forecast/rest/RestSearchForecasterInfoAction.java b/src/main/java/org/opensearch/forecast/rest/RestSearchForecasterInfoAction.java index 16cc54ecd..27df7ab58 100644 --- a/src/main/java/org/opensearch/forecast/rest/RestSearchForecasterInfoAction.java +++ b/src/main/java/org/opensearch/forecast/rest/RestSearchForecasterInfoAction.java @@ -43,7 +43,8 @@ public String getName() { } @Override - protected RestChannelConsumer prepareRequest(RestRequest request, org.opensearch.client.node.NodeClient client) throws IOException { + protected RestChannelConsumer prepareRequest(RestRequest request, org.opensearch.transport.client.node.NodeClient client) + throws IOException { if (!ForecastEnabledSetting.isForecastEnabled()) { throw new IllegalStateException(ForecastCommonMessages.DISABLED_ERR_MSG); } diff --git a/src/main/java/org/opensearch/forecast/rest/RestSearchTopForecastResultAction.java b/src/main/java/org/opensearch/forecast/rest/RestSearchTopForecastResultAction.java index 49e922e9b..08ad6972b 100644 --- a/src/main/java/org/opensearch/forecast/rest/RestSearchTopForecastResultAction.java +++ b/src/main/java/org/opensearch/forecast/rest/RestSearchTopForecastResultAction.java @@ -17,7 +17,6 @@ import java.util.List; import java.util.Locale; -import org.opensearch.client.node.NodeClient; import org.opensearch.core.xcontent.XContentParser; import org.opensearch.forecast.constant.ForecastCommonMessages; import org.opensearch.forecast.settings.ForecastEnabledSetting; @@ -28,6 +27,7 @@ import org.opensearch.rest.action.RestToXContentListener; import org.opensearch.timeseries.TimeSeriesAnalyticsPlugin; import org.opensearch.timeseries.util.RestHandlerUtils; +import org.opensearch.transport.client.node.NodeClient; import org.owasp.encoder.Encode; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/org/opensearch/forecast/rest/RestStatsForecasterAction.java b/src/main/java/org/opensearch/forecast/rest/RestStatsForecasterAction.java index e4f6f5edd..0b78ad746 100644 --- a/src/main/java/org/opensearch/forecast/rest/RestStatsForecasterAction.java +++ b/src/main/java/org/opensearch/forecast/rest/RestStatsForecasterAction.java @@ -13,7 +13,6 @@ import java.util.List; -import org.opensearch.client.node.NodeClient; import org.opensearch.forecast.constant.ForecastCommonMessages; import org.opensearch.forecast.settings.ForecastEnabledSetting; import org.opensearch.forecast.stats.ForecastStats; @@ -24,6 +23,7 @@ import org.opensearch.timeseries.rest.RestStatsAction; import org.opensearch.timeseries.transport.StatsRequest; import org.opensearch.timeseries.util.DiscoveryNodeFilterer; +import org.opensearch.transport.client.node.NodeClient; import org.owasp.encoder.Encode; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/org/opensearch/forecast/rest/RestValidateForecasterAction.java b/src/main/java/org/opensearch/forecast/rest/RestValidateForecasterAction.java index 93ff62288..39c9b6e44 100644 --- a/src/main/java/org/opensearch/forecast/rest/RestValidateForecasterAction.java +++ b/src/main/java/org/opensearch/forecast/rest/RestValidateForecasterAction.java @@ -19,7 +19,6 @@ import java.util.List; import java.util.Locale; -import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.core.xcontent.XContentParser; @@ -35,6 +34,7 @@ import org.opensearch.timeseries.model.ConfigValidationIssue; import org.opensearch.timeseries.rest.RestValidateAction; import org.opensearch.timeseries.transport.ValidateConfigRequest; +import org.opensearch.transport.client.node.NodeClient; import org.owasp.encoder.Encode; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/org/opensearch/forecast/rest/handler/AbstractForecasterActionHandler.java b/src/main/java/org/opensearch/forecast/rest/handler/AbstractForecasterActionHandler.java index 01edc14ef..3af8a34fb 100644 --- a/src/main/java/org/opensearch/forecast/rest/handler/AbstractForecasterActionHandler.java +++ b/src/main/java/org/opensearch/forecast/rest/handler/AbstractForecasterActionHandler.java @@ -22,7 +22,6 @@ import org.opensearch.action.get.GetResponse; import org.opensearch.action.index.IndexResponse; import org.opensearch.action.support.WriteRequest; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; @@ -52,6 +51,7 @@ import org.opensearch.timeseries.transport.ValidateConfigResponse; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import com.google.common.collect.Sets; diff --git a/src/main/java/org/opensearch/forecast/rest/handler/ForecastIndexJobActionHandler.java b/src/main/java/org/opensearch/forecast/rest/handler/ForecastIndexJobActionHandler.java index c746eba79..574b279c5 100644 --- a/src/main/java/org/opensearch/forecast/rest/handler/ForecastIndexJobActionHandler.java +++ b/src/main/java/org/opensearch/forecast/rest/handler/ForecastIndexJobActionHandler.java @@ -11,7 +11,6 @@ import java.util.List; import org.opensearch.OpenSearchStatusException; -import org.opensearch.client.Client; import org.opensearch.common.settings.Settings; import org.opensearch.commons.authuser.User; import org.opensearch.core.action.ActionListener; @@ -36,6 +35,7 @@ import org.opensearch.timeseries.transport.JobResponse; import org.opensearch.timeseries.transport.ResultRequest; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class ForecastIndexJobActionHandler extends IndexJobActionHandler { diff --git a/src/main/java/org/opensearch/forecast/rest/handler/ForecastModelValidationActionHandler.java b/src/main/java/org/opensearch/forecast/rest/handler/ForecastModelValidationActionHandler.java index f06021e1f..fb1c73cc0 100644 --- a/src/main/java/org/opensearch/forecast/rest/handler/ForecastModelValidationActionHandler.java +++ b/src/main/java/org/opensearch/forecast/rest/handler/ForecastModelValidationActionHandler.java @@ -7,7 +7,6 @@ import java.time.Clock; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; @@ -21,6 +20,7 @@ import org.opensearch.timeseries.rest.handler.ModelValidationActionHandler; import org.opensearch.timeseries.transport.ValidateConfigResponse; import org.opensearch.timeseries.util.SecurityClientUtil; +import org.opensearch.transport.client.Client; public class ForecastModelValidationActionHandler extends ModelValidationActionHandler { diff --git a/src/main/java/org/opensearch/forecast/rest/handler/IndexForecasterActionHandler.java b/src/main/java/org/opensearch/forecast/rest/handler/IndexForecasterActionHandler.java index 78cce651b..1b87044b3 100644 --- a/src/main/java/org/opensearch/forecast/rest/handler/IndexForecasterActionHandler.java +++ b/src/main/java/org/opensearch/forecast/rest/handler/IndexForecasterActionHandler.java @@ -12,7 +12,6 @@ package org.opensearch.forecast.rest.handler; import org.opensearch.action.support.WriteRequest; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; @@ -26,6 +25,7 @@ import org.opensearch.timeseries.feature.SearchFeatureDao; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; /** * process create/update forecaster request diff --git a/src/main/java/org/opensearch/forecast/rest/handler/ValidateForecasterActionHandler.java b/src/main/java/org/opensearch/forecast/rest/handler/ValidateForecasterActionHandler.java index 8ebf9ea5e..2af2b10a6 100644 --- a/src/main/java/org/opensearch/forecast/rest/handler/ValidateForecasterActionHandler.java +++ b/src/main/java/org/opensearch/forecast/rest/handler/ValidateForecasterActionHandler.java @@ -7,7 +7,6 @@ import java.time.Clock; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; @@ -19,6 +18,7 @@ import org.opensearch.timeseries.model.Config; import org.opensearch.timeseries.transport.ValidateConfigResponse; import org.opensearch.timeseries.util.SecurityClientUtil; +import org.opensearch.transport.client.Client; /** * ValidateForecasterActionHandler extends the AbstractForecasterActionHandler to specifically handle diff --git a/src/main/java/org/opensearch/forecast/task/ForecastTaskManager.java b/src/main/java/org/opensearch/forecast/task/ForecastTaskManager.java index 2f51f544f..3289f4faf 100644 --- a/src/main/java/org/opensearch/forecast/task/ForecastTaskManager.java +++ b/src/main/java/org/opensearch/forecast/task/ForecastTaskManager.java @@ -43,7 +43,6 @@ import org.opensearch.action.support.WriteRequest; import org.opensearch.action.update.UpdateRequest; import org.opensearch.action.update.UpdateResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; @@ -79,6 +78,7 @@ import org.opensearch.timeseries.util.ExceptionUtil; import org.opensearch.timeseries.util.ParseUtils; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class ForecastTaskManager extends TaskManager { diff --git a/src/main/java/org/opensearch/forecast/transport/DeleteForecasterTransportAction.java b/src/main/java/org/opensearch/forecast/transport/DeleteForecasterTransportAction.java index bf6094934..b15968643 100644 --- a/src/main/java/org/opensearch/forecast/transport/DeleteForecasterTransportAction.java +++ b/src/main/java/org/opensearch/forecast/transport/DeleteForecasterTransportAction.java @@ -6,7 +6,6 @@ package org.opensearch.forecast.transport; import org.opensearch.action.support.ActionFilters; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Settings; @@ -23,6 +22,7 @@ import org.opensearch.timeseries.task.TaskCacheManager; import org.opensearch.timeseries.transport.BaseDeleteConfigTransportAction; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class DeleteForecasterTransportAction extends BaseDeleteConfigTransportAction { diff --git a/src/main/java/org/opensearch/forecast/transport/EntityForecastResultAction.java b/src/main/java/org/opensearch/forecast/transport/EntityForecastResultAction.java index 77eec3d51..18c3b95b1 100644 --- a/src/main/java/org/opensearch/forecast/transport/EntityForecastResultAction.java +++ b/src/main/java/org/opensearch/forecast/transport/EntityForecastResultAction.java @@ -11,7 +11,7 @@ package org.opensearch.forecast.transport; import org.opensearch.action.ActionType; -import org.opensearch.action.support.master.AcknowledgedResponse; +import org.opensearch.action.support.clustermanager.AcknowledgedResponse; import org.opensearch.forecast.constant.ForecastCommonValue; public class EntityForecastResultAction extends ActionType { diff --git a/src/main/java/org/opensearch/forecast/transport/EntityForecastResultTransportAction.java b/src/main/java/org/opensearch/forecast/transport/EntityForecastResultTransportAction.java index 17e7e2be9..07e441eb7 100644 --- a/src/main/java/org/opensearch/forecast/transport/EntityForecastResultTransportAction.java +++ b/src/main/java/org/opensearch/forecast/transport/EntityForecastResultTransportAction.java @@ -16,7 +16,7 @@ import org.apache.logging.log4j.Logger; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; -import org.opensearch.action.support.master.AcknowledgedResponse; +import org.opensearch.action.support.clustermanager.AcknowledgedResponse; import org.opensearch.common.inject.Inject; import org.opensearch.core.action.ActionListener; import org.opensearch.forecast.caching.ForecastCacheProvider; diff --git a/src/main/java/org/opensearch/forecast/transport/ForecastImputeMissingValueAction.java b/src/main/java/org/opensearch/forecast/transport/ForecastImputeMissingValueAction.java index 8e6c59aaa..d8694bd1c 100644 --- a/src/main/java/org/opensearch/forecast/transport/ForecastImputeMissingValueAction.java +++ b/src/main/java/org/opensearch/forecast/transport/ForecastImputeMissingValueAction.java @@ -6,7 +6,7 @@ package org.opensearch.forecast.transport; import org.opensearch.action.ActionType; -import org.opensearch.action.support.master.AcknowledgedResponse; +import org.opensearch.action.support.clustermanager.AcknowledgedResponse; import org.opensearch.forecast.constant.ForecastCommonValue; public class ForecastImputeMissingValueAction extends ActionType { diff --git a/src/main/java/org/opensearch/forecast/transport/ForecastResultBulkTransportAction.java b/src/main/java/org/opensearch/forecast/transport/ForecastResultBulkTransportAction.java index dcdd0680a..43d012d94 100644 --- a/src/main/java/org/opensearch/forecast/transport/ForecastResultBulkTransportAction.java +++ b/src/main/java/org/opensearch/forecast/transport/ForecastResultBulkTransportAction.java @@ -18,7 +18,6 @@ import org.opensearch.action.bulk.BulkRequest; import org.opensearch.action.support.ActionFilters; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Settings; @@ -28,6 +27,7 @@ import org.opensearch.index.IndexingPressure; import org.opensearch.timeseries.transport.ResultBulkTransportAction; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class ForecastResultBulkTransportAction extends ResultBulkTransportAction { diff --git a/src/main/java/org/opensearch/forecast/transport/ForecastResultProcessor.java b/src/main/java/org/opensearch/forecast/transport/ForecastResultProcessor.java index bc8241e5a..45d86e1ba 100644 --- a/src/main/java/org/opensearch/forecast/transport/ForecastResultProcessor.java +++ b/src/main/java/org/opensearch/forecast/transport/ForecastResultProcessor.java @@ -12,7 +12,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Setting; @@ -38,6 +37,7 @@ import org.opensearch.timeseries.transport.ResultProcessor; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class ForecastResultProcessor extends ResultProcessor { diff --git a/src/main/java/org/opensearch/forecast/transport/ForecastResultTransportAction.java b/src/main/java/org/opensearch/forecast/transport/ForecastResultTransportAction.java index ba5dc64ea..1bdd97e8d 100644 --- a/src/main/java/org/opensearch/forecast/transport/ForecastResultTransportAction.java +++ b/src/main/java/org/opensearch/forecast/transport/ForecastResultTransportAction.java @@ -13,7 +13,6 @@ import org.apache.logging.log4j.Logger; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; -import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; @@ -48,6 +47,7 @@ import org.opensearch.timeseries.transport.ResultProcessor; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class ForecastResultTransportAction extends HandledTransportAction { diff --git a/src/main/java/org/opensearch/forecast/transport/ForecastRunOnceTransportAction.java b/src/main/java/org/opensearch/forecast/transport/ForecastRunOnceTransportAction.java index f157c4d6f..5c49bc73b 100644 --- a/src/main/java/org/opensearch/forecast/transport/ForecastRunOnceTransportAction.java +++ b/src/main/java/org/opensearch/forecast/transport/ForecastRunOnceTransportAction.java @@ -25,7 +25,6 @@ import org.opensearch.action.search.SearchRequest; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; -import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; @@ -74,6 +73,7 @@ import org.opensearch.timeseries.util.ParseUtils; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import com.google.common.collect.ImmutableMap; @@ -280,7 +280,7 @@ private void checkForecastResults(String forecastID, String taskId, Config confi client.search(request, ActionListener.wrap(searchResponse -> { SearchHits hits = searchResponse.getHits(); - if (hits.getTotalHits().value > 0) { + if (hits.getTotalHits().value() > 0) { // has at least one result updateTaskState(forecastID, taskId, TaskState.TEST_COMPLETE); } else { diff --git a/src/main/java/org/opensearch/forecast/transport/ForecastSingleStreamResultAction.java b/src/main/java/org/opensearch/forecast/transport/ForecastSingleStreamResultAction.java index 6b8687b82..c6b1d8d63 100644 --- a/src/main/java/org/opensearch/forecast/transport/ForecastSingleStreamResultAction.java +++ b/src/main/java/org/opensearch/forecast/transport/ForecastSingleStreamResultAction.java @@ -12,7 +12,7 @@ package org.opensearch.forecast.transport; import org.opensearch.action.ActionType; -import org.opensearch.action.support.master.AcknowledgedResponse; +import org.opensearch.action.support.clustermanager.AcknowledgedResponse; import org.opensearch.forecast.constant.ForecastCommonValue; public class ForecastSingleStreamResultAction extends ActionType { diff --git a/src/main/java/org/opensearch/forecast/transport/ForecasterJobTransportAction.java b/src/main/java/org/opensearch/forecast/transport/ForecasterJobTransportAction.java index b6f35c27f..2742ea636 100644 --- a/src/main/java/org/opensearch/forecast/transport/ForecasterJobTransportAction.java +++ b/src/main/java/org/opensearch/forecast/transport/ForecasterJobTransportAction.java @@ -11,7 +11,6 @@ import static org.opensearch.forecast.settings.ForecastSettings.FORECAST_REQUEST_TIMEOUT; import org.opensearch.action.support.ActionFilters; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Settings; @@ -28,6 +27,7 @@ import org.opensearch.timeseries.task.TaskCacheManager; import org.opensearch.timeseries.transport.BaseJobTransportAction; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class ForecasterJobTransportAction extends BaseJobTransportAction { diff --git a/src/main/java/org/opensearch/forecast/transport/GetForecasterTransportAction.java b/src/main/java/org/opensearch/forecast/transport/GetForecasterTransportAction.java index 08bfa79d0..73aabc0b0 100644 --- a/src/main/java/org/opensearch/forecast/transport/GetForecasterTransportAction.java +++ b/src/main/java/org/opensearch/forecast/transport/GetForecasterTransportAction.java @@ -14,7 +14,6 @@ import java.util.Optional; import org.opensearch.action.support.ActionFilters; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Settings; @@ -40,6 +39,7 @@ import org.opensearch.timeseries.util.DiscoveryNodeFilterer; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class GetForecasterTransportAction extends BaseGetConfigTransportAction { diff --git a/src/main/java/org/opensearch/forecast/transport/IndexForecasterTransportAction.java b/src/main/java/org/opensearch/forecast/transport/IndexForecasterTransportAction.java index c9bc28b72..9196a5bfa 100644 --- a/src/main/java/org/opensearch/forecast/transport/IndexForecasterTransportAction.java +++ b/src/main/java/org/opensearch/forecast/transport/IndexForecasterTransportAction.java @@ -28,7 +28,6 @@ import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; import org.opensearch.action.support.WriteRequest; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Settings; @@ -50,6 +49,7 @@ import org.opensearch.timeseries.function.ExecutorFunction; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class IndexForecasterTransportAction extends HandledTransportAction { private static final Logger LOG = LogManager.getLogger(IndexForecasterTransportAction.class); diff --git a/src/main/java/org/opensearch/forecast/transport/SearchForecasterInfoTransportAction.java b/src/main/java/org/opensearch/forecast/transport/SearchForecasterInfoTransportAction.java index 7131c65a4..1ef83816d 100644 --- a/src/main/java/org/opensearch/forecast/transport/SearchForecasterInfoTransportAction.java +++ b/src/main/java/org/opensearch/forecast/transport/SearchForecasterInfoTransportAction.java @@ -12,10 +12,10 @@ package org.opensearch.forecast.transport; import org.opensearch.action.support.ActionFilters; -import org.opensearch.client.Client; import org.opensearch.common.inject.Inject; import org.opensearch.timeseries.transport.BaseSearchConfigInfoTransportAction; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class SearchForecasterInfoTransportAction extends BaseSearchConfigInfoTransportAction { diff --git a/src/main/java/org/opensearch/forecast/transport/SearchTopForecastResultTransportAction.java b/src/main/java/org/opensearch/forecast/transport/SearchTopForecastResultTransportAction.java index f81912f1e..fdb6d295c 100644 --- a/src/main/java/org/opensearch/forecast/transport/SearchTopForecastResultTransportAction.java +++ b/src/main/java/org/opensearch/forecast/transport/SearchTopForecastResultTransportAction.java @@ -34,7 +34,6 @@ import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.GroupedActionListener; import org.opensearch.action.support.HandledTransportAction; -import org.opensearch.client.Client; import org.opensearch.cluster.routing.Preference; import org.opensearch.common.inject.Inject; import org.opensearch.core.action.ActionListener; @@ -76,6 +75,7 @@ import org.opensearch.timeseries.util.ParseUtils; import org.opensearch.timeseries.util.QueryUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; /** * Transport action to fetch top forecast results for HC forecaster. diff --git a/src/main/java/org/opensearch/forecast/transport/StatsForecasterTransportAction.java b/src/main/java/org/opensearch/forecast/transport/StatsForecasterTransportAction.java index d2c6d3619..007a70c06 100644 --- a/src/main/java/org/opensearch/forecast/transport/StatsForecasterTransportAction.java +++ b/src/main/java/org/opensearch/forecast/transport/StatsForecasterTransportAction.java @@ -15,7 +15,6 @@ import org.apache.logging.log4j.Logger; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.support.ActionFilters; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.core.action.ActionListener; @@ -35,6 +34,7 @@ import org.opensearch.timeseries.transport.StatsResponse; import org.opensearch.timeseries.util.MultiResponsesDelegateActionListener; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class StatsForecasterTransportAction extends BaseStatsTransportAction { public final Logger logger = LogManager.getLogger(StatsForecasterTransportAction.class); diff --git a/src/main/java/org/opensearch/forecast/transport/StopForecasterTransportAction.java b/src/main/java/org/opensearch/forecast/transport/StopForecasterTransportAction.java index a3a35e3f2..2fb5dba8d 100644 --- a/src/main/java/org/opensearch/forecast/transport/StopForecasterTransportAction.java +++ b/src/main/java/org/opensearch/forecast/transport/StopForecasterTransportAction.java @@ -21,7 +21,6 @@ import org.opensearch.action.FailedNodeException; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; -import org.opensearch.client.Client; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.inject.Inject; import org.opensearch.core.action.ActionListener; @@ -32,6 +31,7 @@ import org.opensearch.timeseries.transport.StopConfigResponse; import org.opensearch.timeseries.util.DiscoveryNodeFilterer; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class StopForecasterTransportAction extends HandledTransportAction { diff --git a/src/main/java/org/opensearch/forecast/transport/SuggestForecasterParamTransportAction.java b/src/main/java/org/opensearch/forecast/transport/SuggestForecasterParamTransportAction.java index b632ef866..9557e331e 100644 --- a/src/main/java/org/opensearch/forecast/transport/SuggestForecasterParamTransportAction.java +++ b/src/main/java/org/opensearch/forecast/transport/SuggestForecasterParamTransportAction.java @@ -12,7 +12,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.action.support.ActionFilters; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.ValidationException; import org.opensearch.common.inject.Inject; @@ -32,6 +31,7 @@ import org.opensearch.timeseries.util.MultiResponsesDelegateActionListener; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class SuggestForecasterParamTransportAction extends BaseSuggestConfigParamTransportAction { public static final Logger logger = LogManager.getLogger(SuggestForecasterParamTransportAction.class); diff --git a/src/main/java/org/opensearch/forecast/transport/ValidateForecasterTransportAction.java b/src/main/java/org/opensearch/forecast/transport/ValidateForecasterTransportAction.java index 781488dc2..2ba9e4a1c 100644 --- a/src/main/java/org/opensearch/forecast/transport/ValidateForecasterTransportAction.java +++ b/src/main/java/org/opensearch/forecast/transport/ValidateForecasterTransportAction.java @@ -10,7 +10,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.action.support.ActionFilters; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Settings; @@ -29,6 +28,7 @@ import org.opensearch.timeseries.transport.ValidateConfigResponse; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class ValidateForecasterTransportAction extends BaseValidateConfigTransportAction { public static final Logger logger = LogManager.getLogger(ValidateForecasterTransportAction.class); diff --git a/src/main/java/org/opensearch/forecast/transport/handler/ForecastIndexMemoryPressureAwareResultHandler.java b/src/main/java/org/opensearch/forecast/transport/handler/ForecastIndexMemoryPressureAwareResultHandler.java index 95ea64ef0..d74138aa1 100644 --- a/src/main/java/org/opensearch/forecast/transport/handler/ForecastIndexMemoryPressureAwareResultHandler.java +++ b/src/main/java/org/opensearch/forecast/transport/handler/ForecastIndexMemoryPressureAwareResultHandler.java @@ -13,7 +13,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.core.action.ActionListener; @@ -27,6 +26,7 @@ import org.opensearch.timeseries.constant.CommonMessages; import org.opensearch.timeseries.transport.ResultBulkResponse; import org.opensearch.timeseries.transport.handler.IndexMemoryPressureAwareResultHandler; +import org.opensearch.transport.client.Client; public class ForecastIndexMemoryPressureAwareResultHandler extends IndexMemoryPressureAwareResultHandler { diff --git a/src/main/java/org/opensearch/forecast/transport/handler/ForecastSearchHandler.java b/src/main/java/org/opensearch/forecast/transport/handler/ForecastSearchHandler.java index 61979f534..fc6e1e3ea 100644 --- a/src/main/java/org/opensearch/forecast/transport/handler/ForecastSearchHandler.java +++ b/src/main/java/org/opensearch/forecast/transport/handler/ForecastSearchHandler.java @@ -11,11 +11,11 @@ package org.opensearch.forecast.transport.handler; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.forecast.settings.ForecastSettings; import org.opensearch.timeseries.transport.handler.SearchHandler; +import org.opensearch.transport.client.Client; /** * Handle general search request, check user role and return search response. diff --git a/src/main/java/org/opensearch/timeseries/EntityProfileRunner.java b/src/main/java/org/opensearch/timeseries/EntityProfileRunner.java index eb6307ddd..75b4a58f5 100644 --- a/src/main/java/org/opensearch/timeseries/EntityProfileRunner.java +++ b/src/main/java/org/opensearch/timeseries/EntityProfileRunner.java @@ -26,7 +26,6 @@ import org.opensearch.action.get.GetRequest; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.routing.Preference; import org.opensearch.common.xcontent.LoggingDeprecationHandler; import org.opensearch.common.xcontent.XContentType; @@ -57,6 +56,7 @@ import org.opensearch.timeseries.util.MultiResponsesDelegateActionListener; import org.opensearch.timeseries.util.ParseUtils; import org.opensearch.timeseries.util.SecurityClientUtil; +import org.opensearch.transport.client.Client; public class EntityProfileRunner> extends AbstractProfileRunner { private final Logger logger = LogManager.getLogger(EntityProfileRunner.class); diff --git a/src/main/java/org/opensearch/timeseries/ExecuteResultResponseRecorder.java b/src/main/java/org/opensearch/timeseries/ExecuteResultResponseRecorder.java index 7a6f70003..ad2add1ef 100644 --- a/src/main/java/org/opensearch/timeseries/ExecuteResultResponseRecorder.java +++ b/src/main/java/org/opensearch/timeseries/ExecuteResultResponseRecorder.java @@ -20,7 +20,6 @@ import org.opensearch.ad.constant.ADCommonMessages; import org.opensearch.ad.transport.RCFPollingAction; import org.opensearch.ad.transport.RCFPollingRequest; -import org.opensearch.client.Client; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.unit.TimeValue; import org.opensearch.commons.authuser.User; @@ -47,6 +46,7 @@ import org.opensearch.timeseries.transport.handler.ResultBulkIndexingHandler; import org.opensearch.timeseries.util.DiscoveryNodeFilterer; import org.opensearch.timeseries.util.ExceptionUtil; +import org.opensearch.transport.client.Client; public abstract class ExecuteResultResponseRecorder & TimeSeriesIndex, IndexManagementType extends IndexManagement, TaskCacheManagerType extends TaskCacheManager, TaskTypeEnum extends TaskType, TaskClass extends TimeSeriesTask, TaskManagerType extends TaskManager, IndexableResultType extends IndexableResult, ProfileActionType extends ActionType> { @@ -324,7 +324,7 @@ private void confirmTotalRCFUpdatesFound( ActionListener.completeWith(listener, () -> { SearchHits hits = searchResponse.getHits(); Long correctedTotalUpdates = rcfTotalUpdates; - if (hits.getTotalHits().value > 0L) { + if (hits.getTotalHits().value() > 0L) { // correct the number if we have already had results after job enabling time // so that the detector won't stay initialized correctedTotalUpdates = Long.valueOf(rcfMinSamples); diff --git a/src/main/java/org/opensearch/timeseries/JobProcessor.java b/src/main/java/org/opensearch/timeseries/JobProcessor.java index 4900fc916..c163827b5 100644 --- a/src/main/java/org/opensearch/timeseries/JobProcessor.java +++ b/src/main/java/org/opensearch/timeseries/JobProcessor.java @@ -20,7 +20,6 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; import org.opensearch.action.ActionType; -import org.opensearch.client.Client; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; import org.opensearch.commons.InjectSecurity; @@ -51,6 +50,7 @@ import org.opensearch.timeseries.transport.ResultRequest; import org.opensearch.timeseries.transport.ResultResponse; import org.opensearch.timeseries.util.SecurityUtil; +import org.opensearch.transport.client.Client; import com.google.common.base.Throwables; diff --git a/src/main/java/org/opensearch/timeseries/NodeStateManager.java b/src/main/java/org/opensearch/timeseries/NodeStateManager.java index 37f3336f6..0287e5709 100644 --- a/src/main/java/org/opensearch/timeseries/NodeStateManager.java +++ b/src/main/java/org/opensearch/timeseries/NodeStateManager.java @@ -26,7 +26,6 @@ import org.opensearch.action.get.GetResponse; import org.opensearch.ad.constant.ADCommonName; import org.opensearch.ad.model.AnomalyDetector; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.lease.Releasable; import org.opensearch.common.settings.Setting; @@ -51,6 +50,7 @@ import org.opensearch.timeseries.util.ClientUtil; import org.opensearch.timeseries.util.ExceptionUtil; import org.opensearch.timeseries.util.RestHandlerUtils; +import org.opensearch.transport.client.Client; public class NodeStateManager implements MaintenanceState, CleanState, ExceptionRecorder { private static final Logger LOG = LogManager.getLogger(NodeStateManager.class); diff --git a/src/main/java/org/opensearch/timeseries/ProfileRunner.java b/src/main/java/org/opensearch/timeseries/ProfileRunner.java index d6b00cfb6..99703f881 100644 --- a/src/main/java/org/opensearch/timeseries/ProfileRunner.java +++ b/src/main/java/org/opensearch/timeseries/ProfileRunner.java @@ -22,7 +22,6 @@ import org.opensearch.action.get.GetRequest; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.xcontent.LoggingDeprecationHandler; import org.opensearch.common.xcontent.XContentType; @@ -63,6 +62,7 @@ import org.opensearch.timeseries.util.MultiResponsesDelegateActionListener; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public abstract class ProfileRunner & TimeSeriesIndex, IndexManagementType extends IndexManagement, TaskProfileType extends TaskProfile, TaskManagerType extends TaskManager, ConfigProfileType extends ConfigProfile, ProfileActionType extends ActionType, TaskProfileRunnerType extends TaskProfileRunner> extends AbstractProfileRunner { @@ -457,7 +457,7 @@ private ActionListener onInittedEver( ) { return ActionListener.wrap(searchResponse -> { SearchHits hits = searchResponse.getHits(); - if (hits.getTotalHits().value == 0L) { + if (hits.getTotalHits().value() == 0L) { processInitResponse(config, profilesToCollect, totalUpdates, false, profileBuilder, listener); } else { createRunningStateAndInitProgress(profilesToCollect, profileBuilder); diff --git a/src/main/java/org/opensearch/timeseries/ProfileUtil.java b/src/main/java/org/opensearch/timeseries/ProfileUtil.java index 2711dc392..aee9bd0b9 100644 --- a/src/main/java/org/opensearch/timeseries/ProfileUtil.java +++ b/src/main/java/org/opensearch/timeseries/ProfileUtil.java @@ -15,7 +15,6 @@ import org.opensearch.action.search.SearchResponse; import org.opensearch.ad.constant.ADCommonName; import org.opensearch.ad.model.AnomalyResult; -import org.opensearch.client.Client; import org.opensearch.core.action.ActionListener; import org.opensearch.forecast.constant.ForecastCommonName; import org.opensearch.forecast.indices.ForecastIndex; @@ -26,6 +25,7 @@ import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.timeseries.constant.CommonName; import org.opensearch.timeseries.model.Config; +import org.opensearch.transport.client.Client; public class ProfileUtil { /** diff --git a/src/main/java/org/opensearch/timeseries/TimeSeriesAnalyticsPlugin.java b/src/main/java/org/opensearch/timeseries/TimeSeriesAnalyticsPlugin.java index 719ec88ac..3a5a1287b 100644 --- a/src/main/java/org/opensearch/timeseries/TimeSeriesAnalyticsPlugin.java +++ b/src/main/java/org/opensearch/timeseries/TimeSeriesAnalyticsPlugin.java @@ -157,7 +157,6 @@ import org.opensearch.ad.transport.ValidateAnomalyDetectorTransportAction; import org.opensearch.ad.transport.handler.ADIndexMemoryPressureAwareResultHandler; import org.opensearch.ad.transport.handler.ADSearchHandler; -import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.service.ClusterService; @@ -305,6 +304,7 @@ import org.opensearch.timeseries.util.DiscoveryNodeFilterer; import org.opensearch.timeseries.util.IndexUtils; import org.opensearch.timeseries.util.SecurityClientUtil; +import org.opensearch.transport.client.Client; import org.opensearch.watcher.ResourceWatcherService; import com.amazon.randomcutforest.parkservices.RCFCaster; diff --git a/src/main/java/org/opensearch/timeseries/cluster/ADDataMigrator.java b/src/main/java/org/opensearch/timeseries/cluster/ADDataMigrator.java index 7dfcf37fb..f30b7bc73 100644 --- a/src/main/java/org/opensearch/timeseries/cluster/ADDataMigrator.java +++ b/src/main/java/org/opensearch/timeseries/cluster/ADDataMigrator.java @@ -39,7 +39,6 @@ import org.opensearch.ad.model.ADTaskType; import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.ad.model.DetectorInternalState; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.core.action.ActionListener; @@ -59,6 +58,7 @@ import org.opensearch.timeseries.model.TaskState; import org.opensearch.timeseries.model.TimeSeriesTask; import org.opensearch.timeseries.util.ExceptionUtil; +import org.opensearch.transport.client.Client; /** * Migrate AD data to support backward compatibility. @@ -132,7 +132,7 @@ public void migrateDetectorInternalStateToRealtimeTask() { .size(MAX_DETECTOR_UPPER_LIMIT); SearchRequest searchRequest = new SearchRequest(CommonName.JOB_INDEX).source(searchSourceBuilder); client.search(searchRequest, ActionListener.wrap(r -> { - if (r == null || r.getHits().getTotalHits() == null || r.getHits().getTotalHits().value == 0) { + if (r == null || r.getHits().getTotalHits() == null || r.getHits().getTotalHits().value() == 0) { logger.info("No anomaly detector job found, no need to migrate"); return; } @@ -218,7 +218,7 @@ private void checkIfRealtimeTaskExistsAndBackfill( SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder().query(query).size(1); SearchRequest searchRequest = new SearchRequest(DETECTION_STATE_INDEX).source(searchSourceBuilder); client.search(searchRequest, ActionListener.wrap(r -> { - if (r != null && r.getHits().getTotalHits().value > 0) { + if (r != null && r.getHits().getTotalHits().value() > 0) { // Backfill next realtime job backfillRealtimeTask(detectorJobs, migrateAll); return; diff --git a/src/main/java/org/opensearch/timeseries/cluster/ClusterManagerEventListener.java b/src/main/java/org/opensearch/timeseries/cluster/ClusterManagerEventListener.java index e4bd8ae1d..ab6d04a45 100644 --- a/src/main/java/org/opensearch/timeseries/cluster/ClusterManagerEventListener.java +++ b/src/main/java/org/opensearch/timeseries/cluster/ClusterManagerEventListener.java @@ -17,7 +17,6 @@ import java.util.List; import org.opensearch.ad.cluster.diskcleanup.ADCheckpointIndexRetention; -import org.opensearch.client.Client; import org.opensearch.cluster.LocalNodeClusterManagerListener; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.lifecycle.LifecycleListener; @@ -31,6 +30,7 @@ import org.opensearch.timeseries.util.ClientUtil; import org.opensearch.timeseries.util.DateUtils; import org.opensearch.timeseries.util.DiscoveryNodeFilterer; +import org.opensearch.transport.client.Client; import com.google.common.annotations.VisibleForTesting; diff --git a/src/main/java/org/opensearch/timeseries/cluster/HashRing.java b/src/main/java/org/opensearch/timeseries/cluster/HashRing.java index daea6f930..6915f4b97 100644 --- a/src/main/java/org/opensearch/timeseries/cluster/HashRing.java +++ b/src/main/java/org/opensearch/timeseries/cluster/HashRing.java @@ -38,9 +38,6 @@ import org.opensearch.action.admin.cluster.node.info.NodesInfoRequest; import org.opensearch.action.admin.cluster.node.info.PluginsAndModules; import org.opensearch.ad.ml.ADModelManager; -import org.opensearch.client.AdminClient; -import org.opensearch.client.Client; -import org.opensearch.client.ClusterAdminClient; import org.opensearch.cluster.ClusterChangedEvent; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodes; @@ -55,6 +52,9 @@ import org.opensearch.timeseries.constant.CommonName; import org.opensearch.timeseries.ml.SingleStreamModelIdMapper; import org.opensearch.timeseries.util.DiscoveryNodeFilterer; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.ClusterAdminClient; import com.google.common.collect.Sets; diff --git a/src/main/java/org/opensearch/timeseries/cluster/HourlyCron.java b/src/main/java/org/opensearch/timeseries/cluster/HourlyCron.java index 4381ade8d..4978f9d53 100644 --- a/src/main/java/org/opensearch/timeseries/cluster/HourlyCron.java +++ b/src/main/java/org/opensearch/timeseries/cluster/HourlyCron.java @@ -15,11 +15,11 @@ import org.apache.logging.log4j.Logger; import org.opensearch.action.FailedNodeException; import org.opensearch.ad.transport.CronAction; -import org.opensearch.client.Client; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.core.action.ActionListener; import org.opensearch.timeseries.transport.CronRequest; import org.opensearch.timeseries.util.DiscoveryNodeFilterer; +import org.opensearch.transport.client.Client; public class HourlyCron implements Runnable { private static final Logger LOG = LogManager.getLogger(HourlyCron.class); diff --git a/src/main/java/org/opensearch/timeseries/cluster/diskcleanup/IndexCleanup.java b/src/main/java/org/opensearch/timeseries/cluster/diskcleanup/IndexCleanup.java index 899f41a73..d0fc5d798 100644 --- a/src/main/java/org/opensearch/timeseries/cluster/diskcleanup/IndexCleanup.java +++ b/src/main/java/org/opensearch/timeseries/cluster/diskcleanup/IndexCleanup.java @@ -21,7 +21,6 @@ import org.opensearch.action.admin.indices.stats.IndicesStatsResponse; import org.opensearch.action.admin.indices.stats.ShardStats; import org.opensearch.action.support.IndicesOptions; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.core.action.ActionListener; @@ -30,6 +29,7 @@ import org.opensearch.index.reindex.DeleteByQueryRequest; import org.opensearch.index.store.StoreStats; import org.opensearch.timeseries.util.ClientUtil; +import org.opensearch.transport.client.Client; /** * Clean up the old docs for indices. diff --git a/src/main/java/org/opensearch/timeseries/feature/CompositeRetriever.java b/src/main/java/org/opensearch/timeseries/feature/CompositeRetriever.java index 767c6d2fe..6eb227d05 100644 --- a/src/main/java/org/opensearch/timeseries/feature/CompositeRetriever.java +++ b/src/main/java/org/opensearch/timeseries/feature/CompositeRetriever.java @@ -27,7 +27,6 @@ import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; import org.opensearch.action.support.IndicesOptions; -import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; @@ -50,6 +49,7 @@ import org.opensearch.timeseries.model.Feature; import org.opensearch.timeseries.util.ParseUtils; import org.opensearch.timeseries.util.SecurityClientUtil; +import org.opensearch.transport.client.Client; /** * diff --git a/src/main/java/org/opensearch/timeseries/feature/SearchFeatureDao.java b/src/main/java/org/opensearch/timeseries/feature/SearchFeatureDao.java index beeba3dc6..b71e32549 100644 --- a/src/main/java/org/opensearch/timeseries/feature/SearchFeatureDao.java +++ b/src/main/java/org/opensearch/timeseries/feature/SearchFeatureDao.java @@ -37,7 +37,6 @@ import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; import org.opensearch.ad.model.AnomalyDetector; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.commons.authuser.User; @@ -70,6 +69,7 @@ import org.opensearch.timeseries.model.IntervalTimeConfiguration; import org.opensearch.timeseries.util.ParseUtils; import org.opensearch.timeseries.util.SecurityClientUtil; +import org.opensearch.transport.client.Client; /** * DAO for features from search. diff --git a/src/main/java/org/opensearch/timeseries/indices/IndexManagement.java b/src/main/java/org/opensearch/timeseries/indices/IndexManagement.java index 2606b1ee4..a36a37f22 100644 --- a/src/main/java/org/opensearch/timeseries/indices/IndexManagement.java +++ b/src/main/java/org/opensearch/timeseries/indices/IndexManagement.java @@ -52,8 +52,6 @@ import org.opensearch.action.search.SearchRequest; import org.opensearch.action.support.GroupedActionListener; import org.opensearch.action.support.IndicesOptions; -import org.opensearch.client.AdminClient; -import org.opensearch.client.Client; import org.opensearch.cluster.LocalNodeClusterManagerListener; import org.opensearch.cluster.metadata.AliasMetadata; import org.opensearch.cluster.metadata.IndexMetadata; @@ -89,6 +87,8 @@ import org.opensearch.timeseries.model.Config; import org.opensearch.timeseries.settings.TimeSeriesSettings; import org.opensearch.timeseries.util.DiscoveryNodeFilterer; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.Client; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Charsets; @@ -809,7 +809,7 @@ private void getConfigsWithCustomResultIndexAlias(ActionListener> l .indices(new String[] { configIndex.getIndexName() }) .source(new SearchSourceBuilder().size(10000).query(boolQuery)); client.search(searchRequest, ActionListener.wrap(r -> { - if (r == null || r.getHits().getTotalHits() == null || r.getHits().getTotalHits().value == 0) { + if (r == null || r.getHits().getTotalHits() == null || r.getHits().getTotalHits().value() == 0) { logger.info("no config available."); listener.onResponse(new ArrayList()); return; diff --git a/src/main/java/org/opensearch/timeseries/ml/CheckpointDao.java b/src/main/java/org/opensearch/timeseries/ml/CheckpointDao.java index e79a5ed68..da3131718 100644 --- a/src/main/java/org/opensearch/timeseries/ml/CheckpointDao.java +++ b/src/main/java/org/opensearch/timeseries/ml/CheckpointDao.java @@ -43,7 +43,6 @@ import org.opensearch.action.get.MultiGetResponse; import org.opensearch.action.update.UpdateRequest; import org.opensearch.action.update.UpdateResponse; -import org.opensearch.client.Client; import org.opensearch.core.action.ActionListener; import org.opensearch.index.IndexNotFoundException; import org.opensearch.index.reindex.BulkByScrollResponse; @@ -55,6 +54,7 @@ import org.opensearch.timeseries.indices.IndexManagement; import org.opensearch.timeseries.indices.TimeSeriesIndex; import org.opensearch.timeseries.util.ClientUtil; +import org.opensearch.transport.client.Client; import com.google.gson.Gson; diff --git a/src/main/java/org/opensearch/timeseries/rest/AbstractSearchAction.java b/src/main/java/org/opensearch/timeseries/rest/AbstractSearchAction.java index 65a16a8d3..8f463c773 100644 --- a/src/main/java/org/opensearch/timeseries/rest/AbstractSearchAction.java +++ b/src/main/java/org/opensearch/timeseries/rest/AbstractSearchAction.java @@ -25,7 +25,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.ToXContentObject; import org.opensearch.rest.BaseRestHandler; @@ -35,6 +34,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 org.owasp.encoder.Encode; /** diff --git a/src/main/java/org/opensearch/timeseries/rest/RestValidateAction.java b/src/main/java/org/opensearch/timeseries/rest/RestValidateAction.java index e9da98c8d..e8e1dbb90 100644 --- a/src/main/java/org/opensearch/timeseries/rest/RestValidateAction.java +++ b/src/main/java/org/opensearch/timeseries/rest/RestValidateAction.java @@ -21,7 +21,6 @@ import org.apache.commons.lang3.StringUtils; import org.opensearch.ad.model.AnomalyDetector; -import org.opensearch.client.node.NodeClient; import org.opensearch.common.unit.TimeValue; import org.opensearch.core.rest.RestStatus; import org.opensearch.core.xcontent.XContentParser; @@ -36,6 +35,7 @@ import org.opensearch.timeseries.rest.handler.AbstractTimeSeriesActionHandler; import org.opensearch.timeseries.transport.ValidateConfigRequest; import org.opensearch.timeseries.transport.ValidateConfigResponse; +import org.opensearch.transport.client.node.NodeClient; /** * This class consists of the REST handler to validate anomaly detector configurations. diff --git a/src/main/java/org/opensearch/timeseries/rest/handler/AbstractTimeSeriesActionHandler.java b/src/main/java/org/opensearch/timeseries/rest/handler/AbstractTimeSeriesActionHandler.java index be16e2e0a..286093f81 100644 --- a/src/main/java/org/opensearch/timeseries/rest/handler/AbstractTimeSeriesActionHandler.java +++ b/src/main/java/org/opensearch/timeseries/rest/handler/AbstractTimeSeriesActionHandler.java @@ -39,7 +39,6 @@ import org.opensearch.action.support.IndicesOptions; import org.opensearch.action.support.WriteRequest; import org.opensearch.action.support.replication.ReplicationResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; @@ -80,6 +79,7 @@ import org.opensearch.timeseries.task.TaskManager; import org.opensearch.timeseries.util.*; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import com.google.common.collect.Sets; @@ -748,7 +748,7 @@ protected void createConfig(boolean indexingDryRun, ActionListener listener) protected void onSearchTotalConfigResponse(SearchResponse response, boolean indexingDryRun, ActionListener listener) throws IOException { - if (response.getHits().getTotalHits().value >= getMaxSingleStreamConfigs()) { + if (response.getHits().getTotalHits().value() >= getMaxSingleStreamConfigs()) { String errorMsgSingleEntity = getExceedMaxSingleStreamConfigsErrorMsg(getMaxSingleStreamConfigs()); logger.error(errorMsgSingleEntity); if (indexingDryRun) { @@ -763,7 +763,7 @@ protected void onSearchTotalConfigResponse(SearchResponse response, boolean inde protected void onSearchHCConfigResponse(SearchResponse response, String detectorId, boolean indexingDryRun, ActionListener listener) throws IOException { - if (response.getHits().getTotalHits().value >= getMaxHCConfigs()) { + if (response.getHits().getTotalHits().value() >= getMaxHCConfigs()) { String errorMsg = getExceedMaxHCConfigsErrorMsg(getMaxHCConfigs()); logger.error(errorMsg); if (indexingDryRun) { @@ -918,7 +918,7 @@ protected void onSearchConfigInputIndicesResponse( boolean indexingDryRun, ActionListener listener ) throws IOException { - if (response.getHits().getTotalHits().value == 0) { + if (response.getHits().getTotalHits().value() == 0) { String errorMsg = getNoDocsInUserIndexErrorMsg(Arrays.toString(config.getIndices().toArray(new String[0]))); logger.error(errorMsg); if (indexingDryRun) { @@ -958,7 +958,7 @@ protected void checkConfigNameExists(String configId, boolean indexingDryRun, Ac protected void onSearchConfigNameResponse(SearchResponse response, String name, boolean indexingDryRun, ActionListener listener) throws IOException { - if (response.getHits().getTotalHits().value > 0) { + if (response.getHits().getTotalHits().value() > 0) { String errorMsg = getDuplicateConfigErrorMsg(name); logger.warn(errorMsg); if (indexingDryRun) { diff --git a/src/main/java/org/opensearch/timeseries/rest/handler/ConfigUpdateConfirmer.java b/src/main/java/org/opensearch/timeseries/rest/handler/ConfigUpdateConfirmer.java index e60b6e945..b6ebaff9d 100644 --- a/src/main/java/org/opensearch/timeseries/rest/handler/ConfigUpdateConfirmer.java +++ b/src/main/java/org/opensearch/timeseries/rest/handler/ConfigUpdateConfirmer.java @@ -22,7 +22,6 @@ import org.opensearch.action.get.GetRequest; import org.opensearch.action.get.GetResponse; import org.opensearch.ad.model.ADTask; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.core.action.ActionListener; import org.opensearch.core.rest.RestStatus; @@ -39,6 +38,7 @@ import org.opensearch.timeseries.task.TaskManager; import org.opensearch.timeseries.util.RestHandlerUtils; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; /** * Get job to make sure job has been stopped before updating a config. diff --git a/src/main/java/org/opensearch/timeseries/rest/handler/IndexJobActionHandler.java b/src/main/java/org/opensearch/timeseries/rest/handler/IndexJobActionHandler.java index f185aa620..deb06d917 100644 --- a/src/main/java/org/opensearch/timeseries/rest/handler/IndexJobActionHandler.java +++ b/src/main/java/org/opensearch/timeseries/rest/handler/IndexJobActionHandler.java @@ -35,7 +35,6 @@ import org.opensearch.action.index.IndexRequest; import org.opensearch.action.index.IndexResponse; import org.opensearch.action.support.WriteRequest; -import org.opensearch.client.Client; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; @@ -76,6 +75,7 @@ import org.opensearch.timeseries.util.ExceptionUtil; import org.opensearch.timeseries.util.RestHandlerUtils; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import com.google.common.base.Throwables; diff --git a/src/main/java/org/opensearch/timeseries/rest/handler/IntervalCalculation.java b/src/main/java/org/opensearch/timeseries/rest/handler/IntervalCalculation.java index 53c503626..a9e57906e 100644 --- a/src/main/java/org/opensearch/timeseries/rest/handler/IntervalCalculation.java +++ b/src/main/java/org/opensearch/timeseries/rest/handler/IntervalCalculation.java @@ -17,7 +17,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.common.unit.TimeValue; import org.opensearch.commons.authuser.User; import org.opensearch.core.action.ActionListener; @@ -33,6 +32,7 @@ import org.opensearch.timeseries.model.ValidationIssueType; import org.opensearch.timeseries.settings.TimeSeriesSettings; import org.opensearch.timeseries.util.SecurityClientUtil; +import org.opensearch.transport.client.Client; public class IntervalCalculation { private final Logger logger = LogManager.getLogger(IntervalCalculation.class); diff --git a/src/main/java/org/opensearch/timeseries/rest/handler/LatestTimeRetriever.java b/src/main/java/org/opensearch/timeseries/rest/handler/LatestTimeRetriever.java index 241f4b645..17ed29db8 100644 --- a/src/main/java/org/opensearch/timeseries/rest/handler/LatestTimeRetriever.java +++ b/src/main/java/org/opensearch/timeseries/rest/handler/LatestTimeRetriever.java @@ -18,7 +18,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.common.unit.TimeValue; import org.opensearch.commons.authuser.User; import org.opensearch.core.action.ActionListener; @@ -42,6 +41,7 @@ import org.opensearch.timeseries.model.IntervalTimeConfiguration; import org.opensearch.timeseries.settings.TimeSeriesSettings; import org.opensearch.timeseries.util.SecurityClientUtil; +import org.opensearch.transport.client.Client; public class LatestTimeRetriever { public static final Logger logger = LogManager.getLogger(LatestTimeRetriever.class); diff --git a/src/main/java/org/opensearch/timeseries/rest/handler/ModelValidationActionHandler.java b/src/main/java/org/opensearch/timeseries/rest/handler/ModelValidationActionHandler.java index 226c6a778..397406843 100644 --- a/src/main/java/org/opensearch/timeseries/rest/handler/ModelValidationActionHandler.java +++ b/src/main/java/org/opensearch/timeseries/rest/handler/ModelValidationActionHandler.java @@ -24,7 +24,6 @@ import org.opensearch.OpenSearchStatusException; 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.Settings; import org.opensearch.common.unit.TimeValue; @@ -52,6 +51,7 @@ import org.opensearch.timeseries.transport.ValidateConfigResponse; import org.opensearch.timeseries.util.MultiResponsesDelegateActionListener; import org.opensearch.timeseries.util.SecurityClientUtil; +import org.opensearch.transport.client.Client; /** *

This class executes all validation checks that are not blocking on the 'model' level. diff --git a/src/main/java/org/opensearch/timeseries/task/TaskManager.java b/src/main/java/org/opensearch/timeseries/task/TaskManager.java index cd0967555..27bc9c723 100644 --- a/src/main/java/org/opensearch/timeseries/task/TaskManager.java +++ b/src/main/java/org/opensearch/timeseries/task/TaskManager.java @@ -52,7 +52,6 @@ import org.opensearch.action.update.UpdateResponse; import org.opensearch.ad.model.ADTask; import org.opensearch.ad.model.ADTaskType; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; @@ -106,6 +105,7 @@ import org.opensearch.timeseries.util.ParseUtils; import org.opensearch.timeseries.util.RestHandlerUtils; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import com.google.common.collect.ImmutableMap; @@ -569,7 +569,7 @@ public void getAndExecuteOnLatestTasks( // getTotalHits will be null when we track_total_hits is false in the query request. // Add more checking here to cover some unknown cases. List tsTasks = new ArrayList<>(); - if (r == null || r.getHits().getTotalHits() == null || r.getHits().getTotalHits().value == 0) { + if (r == null || r.getHits().getTotalHits() == null || r.getHits().getTotalHits().value() == 0) { // don't throw exception here as consumer functions need to handle missing task // in different way. function.accept(tsTasks); diff --git a/src/main/java/org/opensearch/timeseries/transport/AbstractSingleStreamResultTransportAction.java b/src/main/java/org/opensearch/timeseries/transport/AbstractSingleStreamResultTransportAction.java index 98ae9ee24..3d8412448 100644 --- a/src/main/java/org/opensearch/timeseries/transport/AbstractSingleStreamResultTransportAction.java +++ b/src/main/java/org/opensearch/timeseries/transport/AbstractSingleStreamResultTransportAction.java @@ -13,7 +13,7 @@ import org.apache.logging.log4j.message.ParameterizedMessage; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; -import org.opensearch.action.support.master.AcknowledgedResponse; +import org.opensearch.action.support.clustermanager.AcknowledgedResponse; import org.opensearch.core.action.ActionListener; import org.opensearch.tasks.Task; import org.opensearch.threadpool.ThreadPool; diff --git a/src/main/java/org/opensearch/timeseries/transport/BaseDeleteConfigTransportAction.java b/src/main/java/org/opensearch/timeseries/transport/BaseDeleteConfigTransportAction.java index 6245464a9..d850374d2 100644 --- a/src/main/java/org/opensearch/timeseries/transport/BaseDeleteConfigTransportAction.java +++ b/src/main/java/org/opensearch/timeseries/transport/BaseDeleteConfigTransportAction.java @@ -25,7 +25,6 @@ import org.opensearch.action.support.HandledTransportAction; import org.opensearch.action.support.WriteRequest; import org.opensearch.ad.model.ADTask; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; @@ -52,6 +51,7 @@ import org.opensearch.timeseries.util.ParseUtils; import org.opensearch.timeseries.util.RestHandlerUtils; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public abstract class BaseDeleteConfigTransportAction & TimeSeriesIndex, IndexManagementType extends IndexManagement, TaskManagerType extends TaskManager, ConfigType extends Config> extends HandledTransportAction { diff --git a/src/main/java/org/opensearch/timeseries/transport/BaseGetConfigTransportAction.java b/src/main/java/org/opensearch/timeseries/transport/BaseGetConfigTransportAction.java index b803a4851..cb82e623d 100644 --- a/src/main/java/org/opensearch/timeseries/transport/BaseGetConfigTransportAction.java +++ b/src/main/java/org/opensearch/timeseries/transport/BaseGetConfigTransportAction.java @@ -31,7 +31,6 @@ import org.opensearch.action.get.MultiGetResponse; 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.CheckedConsumer; import org.opensearch.common.settings.Setting; @@ -71,6 +70,7 @@ import org.opensearch.timeseries.util.RestHandlerUtils; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import com.google.common.collect.Sets; diff --git a/src/main/java/org/opensearch/timeseries/transport/BaseJobTransportAction.java b/src/main/java/org/opensearch/timeseries/transport/BaseJobTransportAction.java index 99f4a69b3..21119bcfb 100644 --- a/src/main/java/org/opensearch/timeseries/transport/BaseJobTransportAction.java +++ b/src/main/java/org/opensearch/timeseries/transport/BaseJobTransportAction.java @@ -13,7 +13,6 @@ import org.opensearch.action.ActionType; 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.settings.Setting; import org.opensearch.common.settings.Settings; @@ -37,6 +36,7 @@ import org.opensearch.timeseries.util.ParseUtils; import org.opensearch.timeseries.util.RestHandlerUtils; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public abstract class BaseJobTransportAction & TimeSeriesIndex, IndexManagementType extends IndexManagement, TaskCacheManagerType extends TaskCacheManager, TaskTypeEnum extends TaskType, TaskClass extends TimeSeriesTask, TaskManagerType extends TaskManager, IndexableResultType extends IndexableResult, ProfileActionType extends ActionType, ExecuteResultResponseRecorderType extends ExecuteResultResponseRecorder, IndexJobActionHandlerType extends IndexJobActionHandler> extends HandledTransportAction { diff --git a/src/main/java/org/opensearch/timeseries/transport/BaseSearchConfigInfoTransportAction.java b/src/main/java/org/opensearch/timeseries/transport/BaseSearchConfigInfoTransportAction.java index 536bb1466..cf48880d0 100644 --- a/src/main/java/org/opensearch/timeseries/transport/BaseSearchConfigInfoTransportAction.java +++ b/src/main/java/org/opensearch/timeseries/transport/BaseSearchConfigInfoTransportAction.java @@ -13,7 +13,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.common.util.concurrent.ThreadContext; import org.opensearch.core.action.ActionListener; import org.opensearch.index.IndexNotFoundException; @@ -25,6 +24,7 @@ import org.opensearch.timeseries.constant.CommonName; import org.opensearch.timeseries.util.RestHandlerUtils; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public abstract class BaseSearchConfigInfoTransportAction extends HandledTransportAction { @@ -57,7 +57,7 @@ protected void doExecute(Task task, SearchConfigInfoRequest request, ActionListe @Override public void onResponse(SearchResponse searchResponse) { SearchConfigInfoResponse response = new SearchConfigInfoResponse( - searchResponse.getHits().getTotalHits().value, + searchResponse.getHits().getTotalHits().value(), false ); listener.onResponse(response); @@ -85,7 +85,7 @@ public void onFailure(Exception e) { @Override public void onResponse(SearchResponse searchResponse) { boolean nameExists = false; - nameExists = searchResponse.getHits().getTotalHits().value > 0; + nameExists = searchResponse.getHits().getTotalHits().value() > 0; SearchConfigInfoResponse response = new SearchConfigInfoResponse(0, nameExists); listener.onResponse(response); } diff --git a/src/main/java/org/opensearch/timeseries/transport/BaseStatsTransportAction.java b/src/main/java/org/opensearch/timeseries/transport/BaseStatsTransportAction.java index 72c533e2e..e4d3f7623 100644 --- a/src/main/java/org/opensearch/timeseries/transport/BaseStatsTransportAction.java +++ b/src/main/java/org/opensearch/timeseries/transport/BaseStatsTransportAction.java @@ -16,7 +16,6 @@ import org.opensearch.OpenSearchStatusException; 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.util.concurrent.ThreadContext; import org.opensearch.core.action.ActionListener; @@ -26,6 +25,7 @@ import org.opensearch.timeseries.stats.Stats; import org.opensearch.timeseries.util.MultiResponsesDelegateActionListener; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public abstract class BaseStatsTransportAction extends HandledTransportAction { public final Logger logger = LogManager.getLogger(BaseStatsTransportAction.class); diff --git a/src/main/java/org/opensearch/timeseries/transport/BaseSuggestConfigParamTransportAction.java b/src/main/java/org/opensearch/timeseries/transport/BaseSuggestConfigParamTransportAction.java index 77a35cb29..759d57972 100644 --- a/src/main/java/org/opensearch/timeseries/transport/BaseSuggestConfigParamTransportAction.java +++ b/src/main/java/org/opensearch/timeseries/transport/BaseSuggestConfigParamTransportAction.java @@ -20,7 +20,6 @@ import org.apache.logging.log4j.Logger; 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.settings.Setting; import org.opensearch.common.settings.Settings; @@ -42,6 +41,7 @@ import org.opensearch.timeseries.util.ParseUtils; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import com.google.common.collect.Sets; diff --git a/src/main/java/org/opensearch/timeseries/transport/BaseValidateConfigTransportAction.java b/src/main/java/org/opensearch/timeseries/transport/BaseValidateConfigTransportAction.java index d2fe30c02..d64e1d80e 100644 --- a/src/main/java/org/opensearch/timeseries/transport/BaseValidateConfigTransportAction.java +++ b/src/main/java/org/opensearch/timeseries/transport/BaseValidateConfigTransportAction.java @@ -15,7 +15,6 @@ import org.opensearch.action.search.SearchRequest; 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.settings.Setting; import org.opensearch.common.settings.Settings; @@ -43,6 +42,7 @@ import org.opensearch.timeseries.util.ParseUtils; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public abstract class BaseValidateConfigTransportAction & TimeSeriesIndex, IndexManagementType extends IndexManagement> extends HandledTransportAction { diff --git a/src/main/java/org/opensearch/timeseries/transport/EntityResultProcessor.java b/src/main/java/org/opensearch/timeseries/transport/EntityResultProcessor.java index 4d9722097..c10f753e1 100644 --- a/src/main/java/org/opensearch/timeseries/transport/EntityResultProcessor.java +++ b/src/main/java/org/opensearch/timeseries/transport/EntityResultProcessor.java @@ -17,7 +17,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; -import org.opensearch.action.support.master.AcknowledgedResponse; +import org.opensearch.action.support.clustermanager.AcknowledgedResponse; import org.opensearch.core.action.ActionListener; import org.opensearch.threadpool.ThreadPool; import org.opensearch.timeseries.AnalysisType; diff --git a/src/main/java/org/opensearch/timeseries/transport/ResultBulkTransportAction.java b/src/main/java/org/opensearch/timeseries/transport/ResultBulkTransportAction.java index 6177eaae9..f12c8394f 100644 --- a/src/main/java/org/opensearch/timeseries/transport/ResultBulkTransportAction.java +++ b/src/main/java/org/opensearch/timeseries/transport/ResultBulkTransportAction.java @@ -25,7 +25,6 @@ import org.opensearch.action.index.IndexRequest; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; -import org.opensearch.client.Client; import org.opensearch.common.settings.Settings; import org.opensearch.core.action.ActionListener; import org.opensearch.core.common.io.stream.Writeable; @@ -40,6 +39,7 @@ import org.opensearch.timeseries.util.BulkUtil; import org.opensearch.timeseries.util.RestHandlerUtils; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; @SuppressWarnings("rawtypes") public abstract class ResultBulkTransportAction, ResultBulkRequestType extends ResultBulkRequest> diff --git a/src/main/java/org/opensearch/timeseries/transport/ResultProcessor.java b/src/main/java/org/opensearch/timeseries/transport/ResultProcessor.java index 2b7ebca65..b4d9fc30a 100644 --- a/src/main/java/org/opensearch/timeseries/transport/ResultProcessor.java +++ b/src/main/java/org/opensearch/timeseries/transport/ResultProcessor.java @@ -37,8 +37,7 @@ import org.opensearch.action.search.SearchPhaseExecutionException; import org.opensearch.action.search.ShardSearchFailure; import org.opensearch.action.support.IndicesOptions; -import org.opensearch.action.support.master.AcknowledgedResponse; -import org.opensearch.client.Client; +import org.opensearch.action.support.clustermanager.AcknowledgedResponse; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.block.ClusterBlockLevel; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; @@ -93,6 +92,7 @@ import org.opensearch.transport.ReceiveTimeoutTransportException; import org.opensearch.transport.TransportRequestOptions; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public abstract class ResultProcessor, TaskCacheManagerType extends TaskCacheManager, TaskTypeEnum extends TaskType, TaskClass extends TimeSeriesTask, IndexType extends Enum & TimeSeriesIndex, IndexManagementType extends IndexManagement, TaskManagerType extends TaskManager> { diff --git a/src/main/java/org/opensearch/timeseries/transport/handler/IndexMemoryPressureAwareResultHandler.java b/src/main/java/org/opensearch/timeseries/transport/handler/IndexMemoryPressureAwareResultHandler.java index a5f914f4e..29b52e8f5 100644 --- a/src/main/java/org/opensearch/timeseries/transport/handler/IndexMemoryPressureAwareResultHandler.java +++ b/src/main/java/org/opensearch/timeseries/transport/handler/IndexMemoryPressureAwareResultHandler.java @@ -20,7 +20,6 @@ import org.apache.logging.log4j.Logger; import org.opensearch.ExceptionsHelper; import org.opensearch.ResourceAlreadyExistsException; -import org.opensearch.client.Client; import org.opensearch.cluster.block.ClusterBlockException; import org.opensearch.cluster.block.ClusterBlockLevel; import org.opensearch.cluster.service.ClusterService; @@ -32,6 +31,7 @@ import org.opensearch.timeseries.model.IndexableResult; import org.opensearch.timeseries.ratelimit.ResultWriteRequest; import org.opensearch.timeseries.transport.ResultBulkRequest; +import org.opensearch.transport.client.Client; /** * Different from ResultIndexingHandler and ResultBulkIndexingHandler, this class uses diff --git a/src/main/java/org/opensearch/timeseries/transport/handler/ResultBulkIndexingHandler.java b/src/main/java/org/opensearch/timeseries/transport/handler/ResultBulkIndexingHandler.java index 2dddaa475..edb8b2616 100644 --- a/src/main/java/org/opensearch/timeseries/transport/handler/ResultBulkIndexingHandler.java +++ b/src/main/java/org/opensearch/timeseries/transport/handler/ResultBulkIndexingHandler.java @@ -22,7 +22,6 @@ import org.opensearch.action.bulk.BulkRequestBuilder; import org.opensearch.action.bulk.BulkResponse; import org.opensearch.action.index.IndexRequest; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; @@ -38,6 +37,7 @@ import org.opensearch.timeseries.util.ClientUtil; import org.opensearch.timeseries.util.IndexUtils; import org.opensearch.timeseries.util.RestHandlerUtils; +import org.opensearch.transport.client.Client; /** * diff --git a/src/main/java/org/opensearch/timeseries/transport/handler/ResultIndexingHandler.java b/src/main/java/org/opensearch/timeseries/transport/handler/ResultIndexingHandler.java index 1647fa01a..a5f948348 100644 --- a/src/main/java/org/opensearch/timeseries/transport/handler/ResultIndexingHandler.java +++ b/src/main/java/org/opensearch/timeseries/transport/handler/ResultIndexingHandler.java @@ -24,7 +24,6 @@ import org.opensearch.action.bulk.BackoffPolicy; import org.opensearch.action.index.IndexRequest; import org.opensearch.action.index.IndexResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.block.ClusterBlockLevel; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Setting; @@ -42,6 +41,7 @@ import org.opensearch.timeseries.util.ClientUtil; import org.opensearch.timeseries.util.IndexUtils; import org.opensearch.timeseries.util.RestHandlerUtils; +import org.opensearch.transport.client.Client; public class ResultIndexingHandler & TimeSeriesIndex, IndexManagementType extends IndexManagement> { private static final Logger LOG = LogManager.getLogger(ResultIndexingHandler.class); diff --git a/src/main/java/org/opensearch/timeseries/transport/handler/SearchHandler.java b/src/main/java/org/opensearch/timeseries/transport/handler/SearchHandler.java index e4c9a893e..b26db95b6 100644 --- a/src/main/java/org/opensearch/timeseries/transport/handler/SearchHandler.java +++ b/src/main/java/org/opensearch/timeseries/transport/handler/SearchHandler.java @@ -18,7 +18,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; @@ -27,6 +26,7 @@ import org.opensearch.core.action.ActionListener; import org.opensearch.timeseries.constant.CommonMessages; import org.opensearch.timeseries.util.ParseUtils; +import org.opensearch.transport.client.Client; /** * Handle general search request, check user role and return search response. diff --git a/src/main/java/org/opensearch/timeseries/util/ClientUtil.java b/src/main/java/org/opensearch/timeseries/util/ClientUtil.java index 394065b2c..158cfb189 100644 --- a/src/main/java/org/opensearch/timeseries/util/ClientUtil.java +++ b/src/main/java/org/opensearch/timeseries/util/ClientUtil.java @@ -15,10 +15,10 @@ import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionType; -import org.opensearch.client.Client; import org.opensearch.common.inject.Inject; import org.opensearch.core.action.ActionListener; import org.opensearch.core.action.ActionResponse; +import org.opensearch.transport.client.Client; public class ClientUtil { private Client client; diff --git a/src/main/java/org/opensearch/timeseries/util/CrossClusterConfigUtils.java b/src/main/java/org/opensearch/timeseries/util/CrossClusterConfigUtils.java index b59e015eb..9c491f58b 100644 --- a/src/main/java/org/opensearch/timeseries/util/CrossClusterConfigUtils.java +++ b/src/main/java/org/opensearch/timeseries/util/CrossClusterConfigUtils.java @@ -12,9 +12,9 @@ import org.apache.commons.lang3.tuple.Pair; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.client.Client; -import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.service.ClusterService; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.node.NodeClient; public class CrossClusterConfigUtils { private static final Logger logger = LogManager.getLogger(ParseUtils.class); diff --git a/src/main/java/org/opensearch/timeseries/util/ParseUtils.java b/src/main/java/org/opensearch/timeseries/util/ParseUtils.java index 7d7ac7889..6445d1e35 100644 --- a/src/main/java/org/opensearch/timeseries/util/ParseUtils.java +++ b/src/main/java/org/opensearch/timeseries/util/ParseUtils.java @@ -39,7 +39,6 @@ import org.opensearch.action.get.GetRequest; import org.opensearch.action.get.GetResponse; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.xcontent.LoggingDeprecationHandler; import org.opensearch.common.xcontent.XContentType; @@ -78,6 +77,7 @@ import org.opensearch.timeseries.model.Feature; import org.opensearch.timeseries.model.FeatureData; import org.opensearch.timeseries.model.IntervalTimeConfiguration; +import org.opensearch.transport.client.Client; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/org/opensearch/timeseries/util/SecurityClientUtil.java b/src/main/java/org/opensearch/timeseries/util/SecurityClientUtil.java index 7e7321161..06cccafe5 100644 --- a/src/main/java/org/opensearch/timeseries/util/SecurityClientUtil.java +++ b/src/main/java/org/opensearch/timeseries/util/SecurityClientUtil.java @@ -15,7 +15,6 @@ import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionType; -import org.opensearch.client.Client; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; @@ -24,6 +23,7 @@ import org.opensearch.core.action.ActionResponse; import org.opensearch.timeseries.AnalysisType; import org.opensearch.timeseries.NodeStateManager; +import org.opensearch.transport.client.Client; public class SecurityClientUtil { private static final String INJECTION_ID = "direct"; diff --git a/src/test/java/org/opensearch/action/admin/indices/mapping/get/AbstractForecasterActionHandlerTestCase.java b/src/test/java/org/opensearch/action/admin/indices/mapping/get/AbstractForecasterActionHandlerTestCase.java index d1228ae98..825c66e7b 100644 --- a/src/test/java/org/opensearch/action/admin/indices/mapping/get/AbstractForecasterActionHandlerTestCase.java +++ b/src/test/java/org/opensearch/action/admin/indices/mapping/get/AbstractForecasterActionHandlerTestCase.java @@ -16,7 +16,6 @@ import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.opensearch.action.support.WriteRequest; -import org.opensearch.client.Client; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.Metadata; @@ -42,6 +41,7 @@ import org.opensearch.timeseries.transport.ValidateConfigResponse; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import com.google.common.collect.ImmutableList; diff --git a/src/test/java/org/opensearch/action/admin/indices/mapping/get/IndexAnomalyDetectorActionHandlerTests.java b/src/test/java/org/opensearch/action/admin/indices/mapping/get/IndexAnomalyDetectorActionHandlerTests.java index a504bfdab..356242c19 100644 --- a/src/test/java/org/opensearch/action/admin/indices/mapping/get/IndexAnomalyDetectorActionHandlerTests.java +++ b/src/test/java/org/opensearch/action/admin/indices/mapping/get/IndexAnomalyDetectorActionHandlerTests.java @@ -47,7 +47,6 @@ import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.ad.rest.handler.IndexAnomalyDetectorActionHandler; import org.opensearch.ad.task.ADTaskManager; -import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.Metadata; @@ -69,6 +68,7 @@ import org.opensearch.timeseries.feature.SearchFeatureDao; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.node.NodeClient; /** * diff --git a/src/test/java/org/opensearch/action/admin/indices/mapping/get/IndexForecasterActionHandlerTests.java b/src/test/java/org/opensearch/action/admin/indices/mapping/get/IndexForecasterActionHandlerTests.java index 86702129e..582b9ccdf 100644 --- a/src/test/java/org/opensearch/action/admin/indices/mapping/get/IndexForecasterActionHandlerTests.java +++ b/src/test/java/org/opensearch/action/admin/indices/mapping/get/IndexForecasterActionHandlerTests.java @@ -39,7 +39,6 @@ import org.opensearch.action.search.ShardSearchFailure; import org.opensearch.action.support.replication.ReplicationResponse; import org.opensearch.action.support.replication.ReplicationResponse.ShardInfo; -import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.routing.AllocationId; import org.opensearch.common.settings.Settings; @@ -61,6 +60,7 @@ import org.opensearch.timeseries.constant.CommonName; import org.opensearch.timeseries.rest.handler.AggregationPrep; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.node.NodeClient; import com.google.common.collect.ImmutableList; diff --git a/src/test/java/org/opensearch/action/admin/indices/mapping/get/ValidateAnomalyDetectorActionHandlerTests.java b/src/test/java/org/opensearch/action/admin/indices/mapping/get/ValidateAnomalyDetectorActionHandlerTests.java index 1509999e9..e08004084 100644 --- a/src/test/java/org/opensearch/action/admin/indices/mapping/get/ValidateAnomalyDetectorActionHandlerTests.java +++ b/src/test/java/org/opensearch/action/admin/indices/mapping/get/ValidateAnomalyDetectorActionHandlerTests.java @@ -42,8 +42,6 @@ import org.opensearch.ad.rest.handler.ValidateAnomalyDetectorActionHandler; import org.opensearch.ad.task.ADTaskCacheManager; import org.opensearch.ad.task.ADTaskManager; -import org.opensearch.client.Client; -import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; @@ -63,6 +61,8 @@ import org.opensearch.timeseries.transport.ValidateConfigResponse; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.node.NodeClient; import com.google.common.collect.ImmutableList; diff --git a/src/test/java/org/opensearch/action/admin/indices/mapping/get/ValidateForecasterActionHandlerTests.java b/src/test/java/org/opensearch/action/admin/indices/mapping/get/ValidateForecasterActionHandlerTests.java index 10077f462..1e19dc4ae 100644 --- a/src/test/java/org/opensearch/action/admin/indices/mapping/get/ValidateForecasterActionHandlerTests.java +++ b/src/test/java/org/opensearch/action/admin/indices/mapping/get/ValidateForecasterActionHandlerTests.java @@ -17,13 +17,13 @@ import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionType; -import org.opensearch.client.node.NodeClient; import org.opensearch.common.settings.Settings; import org.opensearch.core.action.ActionListener; import org.opensearch.core.action.ActionResponse; import org.opensearch.forecast.rest.handler.ValidateForecasterActionHandler; import org.opensearch.timeseries.common.exception.ValidationException; import org.opensearch.timeseries.model.ValidationAspect; +import org.opensearch.transport.client.node.NodeClient; public class ValidateForecasterActionHandlerTests extends AbstractForecasterActionHandlerTestCase { protected ValidateForecasterActionHandler handler; diff --git a/src/test/java/org/opensearch/ad/ADIntegTestCase.java b/src/test/java/org/opensearch/ad/ADIntegTestCase.java index 5bc7134d6..e6e5dd995 100644 --- a/src/test/java/org/opensearch/ad/ADIntegTestCase.java +++ b/src/test/java/org/opensearch/ad/ADIntegTestCase.java @@ -39,15 +39,13 @@ import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; import org.opensearch.action.support.WriteRequest; -import org.opensearch.action.support.master.AcknowledgedResponse; +import org.opensearch.action.support.clustermanager.AcknowledgedResponse; import org.opensearch.ad.constant.ADCommonName; import org.opensearch.ad.indices.ADIndexManagement; import org.opensearch.ad.mock.plugin.MockReindexPlugin; import org.opensearch.ad.model.ADTask; import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.ad.model.AnomalyResult; -import org.opensearch.client.Client; -import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.core.rest.RestStatus; @@ -66,6 +64,8 @@ import org.opensearch.timeseries.constant.CommonName; import org.opensearch.timeseries.model.Feature; import org.opensearch.timeseries.util.RestHandlerUtils; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.node.NodeClient; import com.google.common.collect.ImmutableMap; @@ -247,7 +247,7 @@ public long countDocs(String indexName) { searchSourceBuilder.query(new MatchAllQueryBuilder()).size(0); request.indices(indexName).source(searchSourceBuilder); SearchResponse searchResponse = client().search(request).actionGet(timeout); - return searchResponse.getHits().getTotalHits().value; + return searchResponse.getHits().getTotalHits().value(); } public long countDetectorDocs(String detectorId) { @@ -256,7 +256,7 @@ public long countDetectorDocs(String detectorId) { searchSourceBuilder.query(new TermQueryBuilder("detector_id", detectorId)).size(10); request.indices(ADCommonName.DETECTION_STATE_INDEX).source(searchSourceBuilder); SearchResponse searchResponse = client().search(request).actionGet(timeout); - return searchResponse.getHits().getTotalHits().value; + return searchResponse.getHits().getTotalHits().value(); } public ClusterUpdateSettingsResponse updateTransientSettings(Map settings) { diff --git a/src/test/java/org/opensearch/ad/AbstractProfileRunnerTests.java b/src/test/java/org/opensearch/ad/AbstractProfileRunnerTests.java index 61ca1b2a1..292537dcb 100644 --- a/src/test/java/org/opensearch/ad/AbstractProfileRunnerTests.java +++ b/src/test/java/org/opensearch/ad/AbstractProfileRunnerTests.java @@ -34,7 +34,6 @@ import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.ad.task.ADTaskManager; import org.opensearch.ad.transport.AnomalyResultTests; -import org.opensearch.client.Client; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.node.DiscoveryNode; @@ -46,6 +45,7 @@ import org.opensearch.timeseries.util.DiscoveryNodeFilterer; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class AbstractProfileRunnerTests extends AbstractTimeSeriesTest { protected enum DetectorStatus { diff --git a/src/test/java/org/opensearch/ad/AnomalyDetectorJobRunnerTests.java b/src/test/java/org/opensearch/ad/AnomalyDetectorJobRunnerTests.java index 97faa29f5..ad0a5dd6d 100644 --- a/src/test/java/org/opensearch/ad/AnomalyDetectorJobRunnerTests.java +++ b/src/test/java/org/opensearch/ad/AnomalyDetectorJobRunnerTests.java @@ -67,9 +67,6 @@ import org.opensearch.ad.task.ADTaskManager; import org.opensearch.ad.transport.AnomalyResultAction; import org.opensearch.ad.transport.AnomalyResultResponse; -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.Metadata; @@ -116,6 +113,9 @@ import org.opensearch.timeseries.transport.handler.ResultBulkIndexingHandler; import org.opensearch.timeseries.util.ClientUtil; import org.opensearch.timeseries.util.DiscoveryNodeFilterer; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.IndicesAdminClient; import com.google.common.collect.ImmutableList; diff --git a/src/test/java/org/opensearch/ad/EntityProfileRunnerTests.java b/src/test/java/org/opensearch/ad/EntityProfileRunnerTests.java index 62ba6a35e..6df4d4255 100644 --- a/src/test/java/org/opensearch/ad/EntityProfileRunnerTests.java +++ b/src/test/java/org/opensearch/ad/EntityProfileRunnerTests.java @@ -34,7 +34,6 @@ import org.opensearch.ad.constant.ADCommonName; import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.ad.transport.ADEntityProfileAction; -import org.opensearch.client.Client; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.settings.Settings; import org.opensearch.core.action.ActionListener; @@ -63,6 +62,7 @@ import org.opensearch.timeseries.model.ModelProfileOnNode; import org.opensearch.timeseries.transport.EntityProfileResponse; import org.opensearch.timeseries.util.SecurityClientUtil; +import org.opensearch.transport.client.Client; public class EntityProfileRunnerTests extends AbstractTimeSeriesTest { private AnomalyDetector detector; diff --git a/src/test/java/org/opensearch/ad/MultiEntityProfileRunnerTests.java b/src/test/java/org/opensearch/ad/MultiEntityProfileRunnerTests.java index a6d2228f2..c016a2864 100644 --- a/src/test/java/org/opensearch/ad/MultiEntityProfileRunnerTests.java +++ b/src/test/java/org/opensearch/ad/MultiEntityProfileRunnerTests.java @@ -51,7 +51,6 @@ import org.opensearch.ad.transport.ADProfileAction; import org.opensearch.ad.transport.AnomalyResultTests; import org.opensearch.ad.util.*; -import org.opensearch.client.Client; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.settings.Settings; @@ -70,6 +69,7 @@ import org.opensearch.timeseries.util.DiscoveryNodeFilterer; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class MultiEntityProfileRunnerTests extends AbstractTimeSeriesTest { private AnomalyDetectorProfileRunner runner; diff --git a/src/test/java/org/opensearch/ad/OldAnomalyDetectorProfileRunner.java b/src/test/java/org/opensearch/ad/OldAnomalyDetectorProfileRunner.java index ed9ad4ec0..9674a22ea 100644 --- a/src/test/java/org/opensearch/ad/OldAnomalyDetectorProfileRunner.java +++ b/src/test/java/org/opensearch/ad/OldAnomalyDetectorProfileRunner.java @@ -35,7 +35,6 @@ import org.opensearch.ad.transport.RCFPollingAction; import org.opensearch.ad.transport.RCFPollingRequest; import org.opensearch.ad.transport.RCFPollingResponse; -import org.opensearch.client.Client; import org.opensearch.common.xcontent.LoggingDeprecationHandler; import org.opensearch.common.xcontent.XContentType; import org.opensearch.core.action.ActionListener; @@ -56,6 +55,7 @@ import org.opensearch.timeseries.util.MultiResponsesDelegateActionListener; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; /** * Profile runner that deals with single stream detectors have different workflow (e.g., require RCFPollingAction diff --git a/src/test/java/org/opensearch/ad/client/AnomalyDetectionNodeClientTests.java b/src/test/java/org/opensearch/ad/client/AnomalyDetectionNodeClientTests.java index ab45d56c3..93a463cf7 100644 --- a/src/test/java/org/opensearch/ad/client/AnomalyDetectionNodeClientTests.java +++ b/src/test/java/org/opensearch/ad/client/AnomalyDetectionNodeClientTests.java @@ -35,7 +35,6 @@ import org.opensearch.ad.model.DetectorProfile; import org.opensearch.ad.transport.GetAnomalyDetectorAction; import org.opensearch.ad.transport.GetAnomalyDetectorResponse; -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; @@ -48,6 +47,7 @@ import org.opensearch.timeseries.model.ConfigState; import org.opensearch.timeseries.model.Job; import org.opensearch.timeseries.transport.GetConfigRequest; +import org.opensearch.transport.client.Client; import com.google.common.collect.ImmutableList; @@ -73,7 +73,7 @@ public void testSearchAnomalyDetectors_NoIndices() { deleteIndexIfExists(ADCommonName.ANOMALY_RESULT_INDEX_ALIAS); SearchResponse searchResponse = adClient.searchAnomalyDetectors(TestHelpers.matchAllRequest()).actionGet(10000); - assertEquals(0, searchResponse.getInternalResponse().hits().getTotalHits().value); + assertEquals(0, searchResponse.getInternalResponse().hits().getTotalHits().value()); } @Test @@ -82,7 +82,7 @@ public void testSearchAnomalyDetectors_Empty() throws IOException { createDetectorIndex(); SearchResponse searchResponse = adClient.searchAnomalyDetectors(TestHelpers.matchAllRequest()).actionGet(10000); - assertEquals(0, searchResponse.getInternalResponse().hits().getTotalHits().value); + assertEquals(0, searchResponse.getInternalResponse().hits().getTotalHits().value()); } @Test @@ -107,7 +107,7 @@ public void searchAnomalyDetectors_Populated() throws IOException { SearchRequest request = new SearchRequest().source(searchSourceBuilder); SearchResponse searchResponse = adClient.searchAnomalyDetectors(request).actionGet(10000); - assertEquals(1, searchResponse.getInternalResponse().hits().getTotalHits().value); + assertEquals(1, searchResponse.getInternalResponse().hits().getTotalHits().value()); assertEquals(detectorId, searchResponse.getInternalResponse().hits().getAt(0).getId()); } @@ -126,7 +126,7 @@ public void testSearchAnomalyResults_Empty() throws IOException { SearchResponse searchResponse = adClient .searchAnomalyResults(TestHelpers.matchAllRequest().indices(ALL_AD_RESULTS_INDEX_PATTERN)) .actionGet(10000); - assertEquals(0, searchResponse.getInternalResponse().hits().getTotalHits().value); + assertEquals(0, searchResponse.getInternalResponse().hits().getTotalHits().value()); } @Test @@ -139,7 +139,7 @@ public void testSearchAnomalyResults_Populated() throws IOException { .searchAnomalyResults(TestHelpers.matchAllRequest().indices(ALL_AD_RESULTS_INDEX_PATTERN)) .actionGet(10000); - assertEquals(1, searchResponse.getInternalResponse().hits().getTotalHits().value); + assertEquals(1, searchResponse.getInternalResponse().hits().getTotalHits().value()); assertEquals(adResultId, searchResponse.getInternalResponse().hits().getAt(0).getId()); } diff --git a/src/test/java/org/opensearch/ad/cluster/ADDataMigratorTests.java b/src/test/java/org/opensearch/ad/cluster/ADDataMigratorTests.java index 928a0ddaf..2be7bb58f 100644 --- a/src/test/java/org/opensearch/ad/cluster/ADDataMigratorTests.java +++ b/src/test/java/org/opensearch/ad/cluster/ADDataMigratorTests.java @@ -34,7 +34,6 @@ import org.opensearch.action.search.ShardSearchFailure; import org.opensearch.ad.ADUnitTestCase; import org.opensearch.ad.indices.ADIndexManagement; -import org.opensearch.client.Client; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.service.ClusterService; import org.opensearch.core.action.ActionListener; @@ -49,6 +48,7 @@ import org.opensearch.timeseries.TestHelpers; import org.opensearch.timeseries.cluster.ADDataMigrator; import org.opensearch.timeseries.constant.CommonName; +import org.opensearch.transport.client.Client; public class ADDataMigratorTests extends ADUnitTestCase { private Client client; diff --git a/src/test/java/org/opensearch/ad/cluster/ClusterManagerEventListenerTests.java b/src/test/java/org/opensearch/ad/cluster/ClusterManagerEventListenerTests.java index 7fca91596..f6fe95866 100644 --- a/src/test/java/org/opensearch/ad/cluster/ClusterManagerEventListenerTests.java +++ b/src/test/java/org/opensearch/ad/cluster/ClusterManagerEventListenerTests.java @@ -29,7 +29,6 @@ import org.junit.Before; import org.opensearch.ad.settings.AnomalyDetectorSettings; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.lifecycle.LifecycleListener; import org.opensearch.common.settings.ClusterSettings; @@ -45,6 +44,7 @@ import org.opensearch.timeseries.constant.CommonName; import org.opensearch.timeseries.util.ClientUtil; import org.opensearch.timeseries.util.DiscoveryNodeFilterer; +import org.opensearch.transport.client.Client; public class ClusterManagerEventListenerTests extends AbstractTimeSeriesTest { private ClusterService clusterService; diff --git a/src/test/java/org/opensearch/ad/cluster/HashRingTests.java b/src/test/java/org/opensearch/ad/cluster/HashRingTests.java index 9d6f5347a..d2779dbbd 100644 --- a/src/test/java/org/opensearch/ad/cluster/HashRingTests.java +++ b/src/test/java/org/opensearch/ad/cluster/HashRingTests.java @@ -38,9 +38,6 @@ import org.opensearch.ad.ADUnitTestCase; import org.opensearch.ad.constant.ADCommonName; import org.opensearch.ad.ml.ADModelManager; -import org.opensearch.client.AdminClient; -import org.opensearch.client.Client; -import org.opensearch.client.ClusterAdminClient; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodes; @@ -55,6 +52,9 @@ import org.opensearch.timeseries.cluster.HashRing; import org.opensearch.timeseries.constant.CommonName; import org.opensearch.timeseries.util.DiscoveryNodeFilterer; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.ClusterAdminClient; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/src/test/java/org/opensearch/ad/cluster/HourlyCronTests.java b/src/test/java/org/opensearch/ad/cluster/HourlyCronTests.java index 831b546da..d054ad7d1 100644 --- a/src/test/java/org/opensearch/ad/cluster/HourlyCronTests.java +++ b/src/test/java/org/opensearch/ad/cluster/HourlyCronTests.java @@ -28,7 +28,6 @@ import org.opensearch.Version; import org.opensearch.action.FailedNodeException; import org.opensearch.ad.transport.CronAction; -import org.opensearch.client.Client; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.service.ClusterService; @@ -41,6 +40,7 @@ import org.opensearch.timeseries.transport.CronNodeResponse; import org.opensearch.timeseries.transport.CronResponse; import org.opensearch.timeseries.util.DiscoveryNodeFilterer; +import org.opensearch.transport.client.Client; import test.org.opensearch.ad.util.ClusterCreation; diff --git a/src/test/java/org/opensearch/ad/cluster/diskcleanup/IndexCleanupTests.java b/src/test/java/org/opensearch/ad/cluster/diskcleanup/IndexCleanupTests.java index 399da125e..e2ad645bf 100644 --- a/src/test/java/org/opensearch/ad/cluster/diskcleanup/IndexCleanupTests.java +++ b/src/test/java/org/opensearch/ad/cluster/diskcleanup/IndexCleanupTests.java @@ -28,8 +28,6 @@ import org.opensearch.action.admin.indices.stats.CommonStats; import org.opensearch.action.admin.indices.stats.IndicesStatsResponse; import org.opensearch.action.admin.indices.stats.ShardStats; -import org.opensearch.client.Client; -import org.opensearch.client.IndicesAdminClient; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; @@ -39,6 +37,8 @@ import org.opensearch.timeseries.AbstractTimeSeriesTest; import org.opensearch.timeseries.cluster.diskcleanup.IndexCleanup; import org.opensearch.timeseries.util.ClientUtil; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.IndicesAdminClient; public class IndexCleanupTests extends AbstractTimeSeriesTest { diff --git a/src/test/java/org/opensearch/ad/indices/CustomIndexTests.java b/src/test/java/org/opensearch/ad/indices/CustomIndexTests.java index 983d3a8b8..ba9404633 100644 --- a/src/test/java/org/opensearch/ad/indices/CustomIndexTests.java +++ b/src/test/java/org/opensearch/ad/indices/CustomIndexTests.java @@ -26,7 +26,6 @@ import org.opensearch.Version; import org.opensearch.ad.model.AnomalyResult; import org.opensearch.ad.settings.AnomalyDetectorSettings; -import org.opensearch.client.Client; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.IndexMetadata; @@ -41,6 +40,7 @@ import org.opensearch.timeseries.constant.CommonName; import org.opensearch.timeseries.settings.TimeSeriesSettings; import org.opensearch.timeseries.util.DiscoveryNodeFilterer; +import org.opensearch.transport.client.Client; public class CustomIndexTests extends AbstractTimeSeriesTest { ADIndexManagement adIndices; diff --git a/src/test/java/org/opensearch/ad/indices/InitAnomalyDetectionIndicesTests.java b/src/test/java/org/opensearch/ad/indices/InitAnomalyDetectionIndicesTests.java index ec541a294..0cc85c528 100644 --- a/src/test/java/org/opensearch/ad/indices/InitAnomalyDetectionIndicesTests.java +++ b/src/test/java/org/opensearch/ad/indices/InitAnomalyDetectionIndicesTests.java @@ -30,9 +30,6 @@ import org.opensearch.action.admin.indices.create.CreateIndexResponse; import org.opensearch.ad.constant.ADCommonName; import org.opensearch.ad.settings.AnomalyDetectorSettings; -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.Metadata; @@ -46,6 +43,9 @@ import org.opensearch.timeseries.constant.CommonName; import org.opensearch.timeseries.settings.TimeSeriesSettings; import org.opensearch.timeseries.util.DiscoveryNodeFilterer; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.IndicesAdminClient; public class InitAnomalyDetectionIndicesTests extends AbstractTimeSeriesTest { Client client; diff --git a/src/test/java/org/opensearch/ad/indices/RolloverTests.java b/src/test/java/org/opensearch/ad/indices/RolloverTests.java index 865858dcd..0fadf9ef2 100644 --- a/src/test/java/org/opensearch/ad/indices/RolloverTests.java +++ b/src/test/java/org/opensearch/ad/indices/RolloverTests.java @@ -40,14 +40,10 @@ import org.opensearch.action.admin.indices.rollover.RolloverResponse; import org.opensearch.action.search.SearchResponse; import org.opensearch.action.search.ShardSearchFailure; -import org.opensearch.action.support.master.AcknowledgedResponse; +import org.opensearch.action.support.clustermanager.AcknowledgedResponse; import org.opensearch.ad.constant.ADCommonName; import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.ad.settings.AnomalyDetectorSettings; -import org.opensearch.client.AdminClient; -import org.opensearch.client.Client; -import org.opensearch.client.ClusterAdminClient; -import org.opensearch.client.IndicesAdminClient; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.AliasMetadata; @@ -70,6 +66,10 @@ import org.opensearch.timeseries.TestHelpers; import org.opensearch.timeseries.settings.TimeSeriesSettings; import org.opensearch.timeseries.util.DiscoveryNodeFilterer; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.ClusterAdminClient; +import org.opensearch.transport.client.IndicesAdminClient; public class RolloverTests extends AbstractTimeSeriesTest { private ADIndexManagement adIndices; diff --git a/src/test/java/org/opensearch/ad/indices/UpdateMappingTests.java b/src/test/java/org/opensearch/ad/indices/UpdateMappingTests.java index e86a26e55..0118ec02f 100644 --- a/src/test/java/org/opensearch/ad/indices/UpdateMappingTests.java +++ b/src/test/java/org/opensearch/ad/indices/UpdateMappingTests.java @@ -40,11 +40,8 @@ import org.opensearch.action.admin.indices.settings.get.GetSettingsResponse; import org.opensearch.action.admin.indices.settings.put.UpdateSettingsRequest; import org.opensearch.action.search.SearchResponse; -import org.opensearch.action.support.master.AcknowledgedResponse; +import org.opensearch.action.support.clustermanager.AcknowledgedResponse; import org.opensearch.ad.settings.AnomalyDetectorSettings; -import org.opensearch.client.AdminClient; -import org.opensearch.client.Client; -import org.opensearch.client.IndicesAdminClient; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.AliasMetadata; import org.opensearch.cluster.metadata.IndexMetadata; @@ -60,6 +57,9 @@ import org.opensearch.timeseries.AbstractTimeSeriesTest; import org.opensearch.timeseries.settings.TimeSeriesSettings; import org.opensearch.timeseries.util.DiscoveryNodeFilterer; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.IndicesAdminClient; public class UpdateMappingTests extends AbstractTimeSeriesTest { private static String resultIndexName; diff --git a/src/test/java/org/opensearch/ad/ml/AbstractCosineDataTest.java b/src/test/java/org/opensearch/ad/ml/AbstractCosineDataTest.java index 0f7716bce..d05574fb3 100644 --- a/src/test/java/org/opensearch/ad/ml/AbstractCosineDataTest.java +++ b/src/test/java/org/opensearch/ad/ml/AbstractCosineDataTest.java @@ -34,7 +34,6 @@ import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.ad.ratelimit.ADCheckpointWriteWorker; import org.opensearch.ad.settings.AnomalyDetectorSettings; -import org.opensearch.client.Client; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; @@ -59,6 +58,7 @@ import org.opensearch.timeseries.settings.TimeSeriesSettings; import org.opensearch.timeseries.util.ClientUtil; import org.opensearch.timeseries.util.SecurityClientUtil; +import org.opensearch.transport.client.Client; import com.amazon.randomcutforest.parkservices.ThresholdedRandomCutForest; import com.google.common.collect.ImmutableList; diff --git a/src/test/java/org/opensearch/ad/ml/CheckpointDaoTests.java b/src/test/java/org/opensearch/ad/ml/CheckpointDaoTests.java index b482422ee..17b8fc9d0 100644 --- a/src/test/java/org/opensearch/ad/ml/CheckpointDaoTests.java +++ b/src/test/java/org/opensearch/ad/ml/CheckpointDaoTests.java @@ -91,7 +91,6 @@ import org.opensearch.action.update.UpdateResponse; import org.opensearch.ad.constant.ADCommonName; import org.opensearch.ad.indices.ADIndexManagement; -import org.opensearch.client.Client; import org.opensearch.core.action.ActionListener; import org.opensearch.core.index.shard.ShardId; import org.opensearch.index.IndexNotFoundException; @@ -104,6 +103,7 @@ import org.opensearch.timeseries.ml.Sample; import org.opensearch.timeseries.settings.TimeSeriesSettings; import org.opensearch.timeseries.util.ClientUtil; +import org.opensearch.transport.client.Client; import com.amazon.randomcutforest.RandomCutForest; import com.amazon.randomcutforest.config.Precision; diff --git a/src/test/java/org/opensearch/ad/ml/CheckpointDeleteTests.java b/src/test/java/org/opensearch/ad/ml/CheckpointDeleteTests.java index c55d04781..bae93106a 100644 --- a/src/test/java/org/opensearch/ad/ml/CheckpointDeleteTests.java +++ b/src/test/java/org/opensearch/ad/ml/CheckpointDeleteTests.java @@ -29,7 +29,6 @@ import org.opensearch.OpenSearchException; import org.opensearch.ad.constant.ADCommonName; import org.opensearch.ad.indices.ADIndexManagement; -import org.opensearch.client.Client; import org.opensearch.core.action.ActionListener; import org.opensearch.index.IndexNotFoundException; import org.opensearch.index.reindex.BulkByScrollResponse; @@ -38,6 +37,7 @@ import org.opensearch.timeseries.AbstractTimeSeriesTest; import org.opensearch.timeseries.ml.CheckpointDao; import org.opensearch.timeseries.util.ClientUtil; +import org.opensearch.transport.client.Client; import com.amazon.randomcutforest.parkservices.state.ThresholdedRandomCutForestMapper; import com.amazon.randomcutforest.parkservices.state.ThresholdedRandomCutForestState; diff --git a/src/test/java/org/opensearch/ad/mock/plugin/MockReindexPlugin.java b/src/test/java/org/opensearch/ad/mock/plugin/MockReindexPlugin.java index f8c54b112..6323ced7e 100644 --- a/src/test/java/org/opensearch/ad/mock/plugin/MockReindexPlugin.java +++ b/src/test/java/org/opensearch/ad/mock/plugin/MockReindexPlugin.java @@ -28,7 +28,6 @@ import org.opensearch.ad.constant.ADCommonName; import org.opensearch.ad.mock.transport.MockAnomalyDetectorJobAction; import org.opensearch.ad.mock.transport.MockAnomalyDetectorJobTransportActionWithUser; -import org.opensearch.client.Client; import org.opensearch.common.inject.Inject; import org.opensearch.common.unit.TimeValue; import org.opensearch.core.action.ActionListener; @@ -46,6 +45,7 @@ import org.opensearch.tasks.Task; import org.opensearch.timeseries.TestHelpers; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import com.google.common.collect.ImmutableList; @@ -109,7 +109,7 @@ protected void doExecute(Task task, DeleteByQueryRequest request, ActionListener try { SearchRequest searchRequest = request.getSearchRequest(); client.search(searchRequest, ActionListener.wrap(r -> { - long totalHits = r.getHits().getTotalHits().value; + long totalHits = r.getHits().getTotalHits().value(); Iterator iterator = r.getHits().iterator(); BulkRequestBuilder bulkRequestBuilder = client.prepareBulk(); while (iterator.hasNext()) { diff --git a/src/test/java/org/opensearch/ad/mock/transport/MockAnomalyDetectorJobTransportActionWithUser.java b/src/test/java/org/opensearch/ad/mock/transport/MockAnomalyDetectorJobTransportActionWithUser.java index 3adeead1c..1c694c2fa 100644 --- a/src/test/java/org/opensearch/ad/mock/transport/MockAnomalyDetectorJobTransportActionWithUser.java +++ b/src/test/java/org/opensearch/ad/mock/transport/MockAnomalyDetectorJobTransportActionWithUser.java @@ -25,7 +25,6 @@ import org.opensearch.ad.rest.handler.ADIndexJobActionHandler; import org.opensearch.ad.task.ADTaskManager; import org.opensearch.ad.transport.AnomalyDetectorJobTransportAction; -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.timeseries.transport.JobResponse; import org.opensearch.timeseries.util.RestHandlerUtils; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class MockAnomalyDetectorJobTransportActionWithUser extends HandledTransportAction { private final Logger logger = LogManager.getLogger(AnomalyDetectorJobTransportAction.class); diff --git a/src/test/java/org/opensearch/ad/plugin/MockReindexPlugin.java b/src/test/java/org/opensearch/ad/plugin/MockReindexPlugin.java index b03c3f017..287a15184 100644 --- a/src/test/java/org/opensearch/ad/plugin/MockReindexPlugin.java +++ b/src/test/java/org/opensearch/ad/plugin/MockReindexPlugin.java @@ -27,7 +27,6 @@ import org.opensearch.action.support.HandledTransportAction; import org.opensearch.action.support.WriteRequest; import org.opensearch.ad.constant.ADCommonName; -import org.opensearch.client.Client; import org.opensearch.common.inject.Inject; import org.opensearch.common.unit.TimeValue; import org.opensearch.core.action.ActionListener; @@ -45,6 +44,7 @@ import org.opensearch.tasks.Task; import org.opensearch.timeseries.TestHelpers; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import com.google.common.collect.ImmutableList; @@ -163,7 +163,7 @@ private void finish() { protected void doExecute(Task task, DeleteByQueryRequest request, ActionListener listener) { SearchRequest searchRequest = request.getSearchRequest(); client.search(searchRequest, ActionListener.wrap(r -> { - long totalHits = r.getHits().getTotalHits().value; + long totalHits = r.getHits().getTotalHits().value(); MultiResponsesActionListener delegateListener = new MultiResponsesActionListener(listener, totalHits); Iterator iterator = r.getHits().iterator(); while (iterator.hasNext()) { diff --git a/src/test/java/org/opensearch/ad/rest/handler/IndexAnomalyDetectorJobActionHandlerTests.java b/src/test/java/org/opensearch/ad/rest/handler/IndexAnomalyDetectorJobActionHandlerTests.java index 5ba75b9bc..5a927aa83 100644 --- a/src/test/java/org/opensearch/ad/rest/handler/IndexAnomalyDetectorJobActionHandlerTests.java +++ b/src/test/java/org/opensearch/ad/rest/handler/IndexAnomalyDetectorJobActionHandlerTests.java @@ -45,7 +45,6 @@ import org.opensearch.ad.transport.ADProfileAction; import org.opensearch.ad.transport.AnomalyResultAction; import org.opensearch.ad.transport.AnomalyResultResponse; -import org.opensearch.client.Client; import org.opensearch.common.settings.Settings; import org.opensearch.core.action.ActionListener; import org.opensearch.core.xcontent.NamedXContentRegistry; @@ -63,6 +62,7 @@ import org.opensearch.timeseries.transport.handler.ResultBulkIndexingHandler; import org.opensearch.timeseries.util.DiscoveryNodeFilterer; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import com.google.common.collect.ImmutableList; diff --git a/src/test/java/org/opensearch/ad/rest/handler/StartDetectorTests.java b/src/test/java/org/opensearch/ad/rest/handler/StartDetectorTests.java index 3d88bb1ca..d05c2ecc8 100644 --- a/src/test/java/org/opensearch/ad/rest/handler/StartDetectorTests.java +++ b/src/test/java/org/opensearch/ad/rest/handler/StartDetectorTests.java @@ -35,7 +35,6 @@ import org.opensearch.ad.indices.ADIndexManagement; import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.ad.task.ADTaskManager; -import org.opensearch.client.Client; import org.opensearch.common.settings.Settings; import org.opensearch.commons.authuser.User; import org.opensearch.core.action.ActionListener; @@ -46,6 +45,7 @@ import org.opensearch.timeseries.model.DateRange; import org.opensearch.timeseries.transport.JobResponse; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import com.google.common.collect.ImmutableList; diff --git a/src/test/java/org/opensearch/ad/rest/handler/StartHistoricalTests.java b/src/test/java/org/opensearch/ad/rest/handler/StartHistoricalTests.java index 1493820ef..f709a3ef8 100644 --- a/src/test/java/org/opensearch/ad/rest/handler/StartHistoricalTests.java +++ b/src/test/java/org/opensearch/ad/rest/handler/StartHistoricalTests.java @@ -42,7 +42,6 @@ import org.opensearch.ad.settings.AnomalyDetectorSettings; import org.opensearch.ad.task.ADTaskCacheManager; import org.opensearch.ad.task.ADTaskManager; -import org.opensearch.client.Client; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; @@ -63,6 +62,7 @@ import org.opensearch.timeseries.util.ClientUtil; import org.opensearch.timeseries.util.DiscoveryNodeFilterer; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import com.google.common.collect.ImmutableList; diff --git a/src/test/java/org/opensearch/ad/task/ADTaskManagerTests.java b/src/test/java/org/opensearch/ad/task/ADTaskManagerTests.java index 0142a0047..04f5e9844 100644 --- a/src/test/java/org/opensearch/ad/task/ADTaskManagerTests.java +++ b/src/test/java/org/opensearch/ad/task/ADTaskManagerTests.java @@ -88,7 +88,6 @@ import org.opensearch.ad.transport.ADTaskProfileNodeResponse; import org.opensearch.ad.transport.ADTaskProfileResponse; import org.opensearch.ad.transport.ForwardADTaskRequest; -import org.opensearch.client.Client; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.block.ClusterBlocks; @@ -143,6 +142,7 @@ import org.opensearch.timeseries.util.DiscoveryNodeFilterer; import org.opensearch.transport.TransportResponseHandler; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import com.amazon.randomcutforest.RandomCutForest; import com.amazon.randomcutforest.parkservices.ThresholdedRandomCutForest; @@ -307,7 +307,7 @@ public void onFailure(Exception e) {} ); ClusterState initialClusterState = ClusterState .builder(new ClusterName(ClusterServiceUtils.class.getSimpleName())) - .nodes(DiscoveryNodes.builder().add(node1).localNodeId(node1.getId()).masterNodeId(node1.getId())) + .nodes(DiscoveryNodes.builder().add(node1).localNodeId(node1.getId()).clusterManagerNodeId(node1.getId())) .blocks(ClusterBlocks.EMPTY_CLUSTER_BLOCK) .build(); clusterService.getClusterApplierService().setInitialState(initialClusterState); diff --git a/src/test/java/org/opensearch/ad/transport/AnomalyResultTests.java b/src/test/java/org/opensearch/ad/transport/AnomalyResultTests.java index 9c3828443..90ee3912e 100644 --- a/src/test/java/org/opensearch/ad/transport/AnomalyResultTests.java +++ b/src/test/java/org/opensearch/ad/transport/AnomalyResultTests.java @@ -84,7 +84,6 @@ import org.opensearch.ad.settings.AnomalyDetectorSettings; import org.opensearch.ad.stats.ADStats; import org.opensearch.ad.task.ADTaskManager; -import org.opensearch.client.Client; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.block.ClusterBlocks; @@ -139,6 +138,7 @@ import org.opensearch.transport.TransportRequestOptions; import org.opensearch.transport.TransportResponseHandler; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import com.google.gson.JsonElement; diff --git a/src/test/java/org/opensearch/ad/transport/DeleteAnomalyResultsTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/DeleteAnomalyResultsTransportActionTests.java index 5653a577c..6eb27a086 100644 --- a/src/test/java/org/opensearch/ad/transport/DeleteAnomalyResultsTransportActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/DeleteAnomalyResultsTransportActionTests.java @@ -35,7 +35,7 @@ public void testDeleteADResultAction() throws IOException, InterruptedException String adResultId = createADResult(TestHelpers.randomAnomalyDetectResult()); SearchResponse searchResponse = client().execute(SearchAnomalyResultAction.INSTANCE, matchAllRequest()).actionGet(10000); - assertEquals(1, searchResponse.getInternalResponse().hits().getTotalHits().value); + assertEquals(1, searchResponse.getInternalResponse().hits().getTotalHits().value()); assertEquals(adResultId, searchResponse.getInternalResponse().hits().getAt(0).getId()); DeleteByQueryRequest deleteByQueryRequest = new DeleteByQueryRequest(ANOMALY_RESULT_INDEX_ALIAS); @@ -45,7 +45,7 @@ public void testDeleteADResultAction() throws IOException, InterruptedException .actionGet(20000); waitUntil(() -> { SearchResponse response = client().execute(SearchAnomalyResultAction.INSTANCE, matchAllRequest()).actionGet(10000); - return response.getInternalResponse().hits().getTotalHits().value == 0; + return response.getInternalResponse().hits().getTotalHits().value() == 0; }, 90, TimeUnit.SECONDS); assertEquals(1, deleteADResultResponse.getDeleted()); } diff --git a/src/test/java/org/opensearch/ad/transport/DeleteTests.java b/src/test/java/org/opensearch/ad/transport/DeleteTests.java index 8fed76042..28df496d1 100644 --- a/src/test/java/org/opensearch/ad/transport/DeleteTests.java +++ b/src/test/java/org/opensearch/ad/transport/DeleteTests.java @@ -40,7 +40,6 @@ import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.PlainActionFuture; import org.opensearch.ad.common.exception.JsonPathNotFoundException; -import org.opensearch.client.Client; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.service.ClusterService; @@ -65,6 +64,7 @@ import org.opensearch.timeseries.transport.StopConfigResponse; import org.opensearch.timeseries.util.DiscoveryNodeFilterer; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import test.org.opensearch.ad.util.ClusterCreation; import test.org.opensearch.ad.util.JsonDeserializer; diff --git a/src/test/java/org/opensearch/ad/transport/EntityResultTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/EntityResultTransportActionTests.java index 9f31d0719..06518bea4 100644 --- a/src/test/java/org/opensearch/ad/transport/EntityResultTransportActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/EntityResultTransportActionTests.java @@ -47,7 +47,7 @@ import org.opensearch.action.ActionRequestValidationException; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.PlainActionFuture; -import org.opensearch.action.support.master.AcknowledgedResponse; +import org.opensearch.action.support.clustermanager.AcknowledgedResponse; import org.opensearch.ad.AnomalyDetectorJobRunnerTests; import org.opensearch.ad.caching.ADCacheProvider; import org.opensearch.ad.caching.ADPriorityCache; diff --git a/src/test/java/org/opensearch/ad/transport/GetAnomalyDetectorTests.java b/src/test/java/org/opensearch/ad/transport/GetAnomalyDetectorTests.java index 7aed2eae0..beb507636 100644 --- a/src/test/java/org/opensearch/ad/transport/GetAnomalyDetectorTests.java +++ b/src/test/java/org/opensearch/ad/transport/GetAnomalyDetectorTests.java @@ -42,7 +42,6 @@ import org.opensearch.ad.model.ADTaskType; import org.opensearch.ad.settings.AnomalyDetectorSettings; import org.opensearch.ad.task.ADTaskManager; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; @@ -61,6 +60,7 @@ import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.Transport; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class GetAnomalyDetectorTests extends AbstractTimeSeriesTest { private GetAnomalyDetectorTransportAction action; diff --git a/src/test/java/org/opensearch/ad/transport/IndexAnomalyDetectorTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/IndexAnomalyDetectorTransportActionTests.java index c59108c17..a0ca77eb0 100644 --- a/src/test/java/org/opensearch/ad/transport/IndexAnomalyDetectorTransportActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/IndexAnomalyDetectorTransportActionTests.java @@ -40,7 +40,6 @@ import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.ad.settings.AnomalyDetectorSettings; import org.opensearch.ad.task.ADTaskManager; -import org.opensearch.client.Client; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.IndexMetadata; @@ -64,6 +63,7 @@ import org.opensearch.timeseries.feature.SearchFeatureDao; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import com.google.common.collect.ImmutableMap; diff --git a/src/test/java/org/opensearch/ad/transport/MultiEntityResultTests.java b/src/test/java/org/opensearch/ad/transport/MultiEntityResultTests.java index cd1505ced..1b9ddbf42 100644 --- a/src/test/java/org/opensearch/ad/transport/MultiEntityResultTests.java +++ b/src/test/java/org/opensearch/ad/transport/MultiEntityResultTests.java @@ -64,7 +64,7 @@ import org.opensearch.action.search.ShardSearchFailure; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.PlainActionFuture; -import org.opensearch.action.support.master.AcknowledgedResponse; +import org.opensearch.action.support.clustermanager.AcknowledgedResponse; import org.opensearch.ad.caching.ADCacheProvider; import org.opensearch.ad.caching.ADPriorityCache; import org.opensearch.ad.indices.ADIndexManagement; @@ -81,7 +81,6 @@ import org.opensearch.ad.settings.AnomalyDetectorSettings; import org.opensearch.ad.stats.ADStats; import org.opensearch.ad.task.ADTaskManager; -import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodeRole; @@ -134,6 +133,7 @@ import org.opensearch.transport.TransportRequestOptions; import org.opensearch.transport.TransportResponseHandler; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import com.google.common.collect.ImmutableList; diff --git a/src/test/java/org/opensearch/ad/transport/PreviewAnomalyDetectorTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/PreviewAnomalyDetectorTransportActionTests.java index d32c3222f..843646dff 100644 --- a/src/test/java/org/opensearch/ad/transport/PreviewAnomalyDetectorTransportActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/PreviewAnomalyDetectorTransportActionTests.java @@ -49,7 +49,6 @@ import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.ad.model.AnomalyResult; import org.opensearch.ad.settings.AnomalyDetectorSettings; -import org.opensearch.client.Client; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.IndexMetadata; @@ -75,6 +74,7 @@ import org.opensearch.timeseries.feature.Features; import org.opensearch.timeseries.util.RestHandlerUtils; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import com.google.common.collect.ImmutableMap; diff --git a/src/test/java/org/opensearch/ad/transport/SearchADTasksActionTests.java b/src/test/java/org/opensearch/ad/transport/SearchADTasksActionTests.java index 0d7ea4d9d..cb1ce8cb8 100644 --- a/src/test/java/org/opensearch/ad/transport/SearchADTasksActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/SearchADTasksActionTests.java @@ -29,7 +29,7 @@ public void testSearchADTasksAction() throws IOException { String adTaskId = createADTask(TestHelpers.randomAdTask()); SearchResponse searchResponse = client().execute(SearchADTasksAction.INSTANCE, matchAllRequest()).actionGet(10000); - assertEquals(1, searchResponse.getInternalResponse().hits().getTotalHits().value); + assertEquals(1, searchResponse.getInternalResponse().hits().getTotalHits().value()); assertEquals(adTaskId, searchResponse.getInternalResponse().hits().getAt(0).getId()); } @@ -37,7 +37,7 @@ public void testSearchADTasksAction() throws IOException { public void testNoIndex() { deleteIndexIfExists(ADCommonName.DETECTION_STATE_INDEX); SearchResponse searchResponse = client().execute(SearchADTasksAction.INSTANCE, matchAllRequest()).actionGet(10000); - assertEquals(0, searchResponse.getInternalResponse().hits().getTotalHits().value); + assertEquals(0, searchResponse.getInternalResponse().hits().getTotalHits().value()); } } diff --git a/src/test/java/org/opensearch/ad/transport/SearchADTasksTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/SearchADTasksTransportActionTests.java index 65b0ee95d..95fe3fb24 100644 --- a/src/test/java/org/opensearch/ad/transport/SearchADTasksTransportActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/SearchADTasksTransportActionTests.java @@ -67,7 +67,7 @@ public void testSearchWithNoTasks() throws IOException { createDetectionStateIndex(); SearchRequest request = searchRequest(false); SearchResponse response = client().execute(SearchADTasksAction.INSTANCE, request).actionGet(10000); - assertEquals(0, response.getHits().getTotalHits().value); + assertEquals(0, response.getHits().getTotalHits().value()); } @Ignore @@ -75,7 +75,7 @@ public void testSearchWithExistingTask() throws IOException { startHistoricalAnalysis(startTime, endTime); SearchRequest searchRequest = searchRequest(true); SearchResponse response = client().execute(SearchADTasksAction.INSTANCE, searchRequest).actionGet(10000); - assertEquals(1, response.getHits().getTotalHits().value); + assertEquals(1, response.getHits().getTotalHits().value()); } private SearchRequest searchRequest(boolean isLatest) { diff --git a/src/test/java/org/opensearch/ad/transport/SearchAnomalyDetectorActionTests.java b/src/test/java/org/opensearch/ad/transport/SearchAnomalyDetectorActionTests.java index 96099af31..20d77124e 100644 --- a/src/test/java/org/opensearch/ad/transport/SearchAnomalyDetectorActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/SearchAnomalyDetectorActionTests.java @@ -57,7 +57,7 @@ public void testSearchDetectorAction() throws IOException { SearchRequest request = new SearchRequest().source(searchSourceBuilder); SearchResponse searchResponse = client().execute(SearchAnomalyDetectorAction.INSTANCE, request).actionGet(10000); - assertEquals(1, searchResponse.getInternalResponse().hits().getTotalHits().value); + assertEquals(1, searchResponse.getInternalResponse().hits().getTotalHits().value()); assertEquals(detectorId, searchResponse.getInternalResponse().hits().getAt(0).getId()); } @@ -69,7 +69,7 @@ public void testNoIndex() { SearchRequest request = new SearchRequest().source(searchSourceBuilder); SearchResponse searchResponse = client().execute(SearchAnomalyDetectorAction.INSTANCE, request).actionGet(10000); - assertEquals(0, searchResponse.getInternalResponse().hits().getTotalHits().value); + assertEquals(0, searchResponse.getInternalResponse().hits().getTotalHits().value()); } } diff --git a/src/test/java/org/opensearch/ad/transport/SearchAnomalyResultActionTests.java b/src/test/java/org/opensearch/ad/transport/SearchAnomalyResultActionTests.java index df7844ef1..9384e8fd8 100644 --- a/src/test/java/org/opensearch/ad/transport/SearchAnomalyResultActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/SearchAnomalyResultActionTests.java @@ -42,7 +42,6 @@ import org.opensearch.ad.constant.ADCommonName; import org.opensearch.ad.settings.AnomalyDetectorSettings; import org.opensearch.ad.transport.handler.ADSearchHandler; -import org.opensearch.client.Client; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.service.ClusterService; @@ -63,6 +62,7 @@ import org.opensearch.timeseries.TestHelpers; import org.opensearch.transport.Transport; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import com.google.common.collect.ImmutableList; @@ -292,7 +292,7 @@ public void testSearchResultAction() throws IOException { SearchResponse searchResponse = client() .execute(SearchAnomalyResultAction.INSTANCE, matchAllRequest().indices(ALL_AD_RESULTS_INDEX_PATTERN)) .actionGet(10000); - assertEquals(1, searchResponse.getInternalResponse().hits().getTotalHits().value); + assertEquals(1, searchResponse.getInternalResponse().hits().getTotalHits().value()); assertEquals(adResultId, searchResponse.getInternalResponse().hits().getAt(0).getId()); } @@ -303,7 +303,7 @@ public void testNoIndex() { SearchResponse searchResponse = client() .execute(SearchAnomalyResultAction.INSTANCE, matchAllRequest().indices(ALL_AD_RESULTS_INDEX_PATTERN)) .actionGet(10000); - assertEquals(0, searchResponse.getHits().getTotalHits().value); + assertEquals(0, searchResponse.getHits().getTotalHits().value()); } private List createBuckets() { diff --git a/src/test/java/org/opensearch/ad/transport/SearchTopAnomalyResultTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/SearchTopAnomalyResultTransportActionTests.java index a7b785f69..9c948d114 100644 --- a/src/test/java/org/opensearch/ad/transport/SearchTopAnomalyResultTransportActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/SearchTopAnomalyResultTransportActionTests.java @@ -30,7 +30,6 @@ import org.opensearch.ad.constant.ADCommonName; import org.opensearch.ad.model.AnomalyResultBucket; import org.opensearch.ad.transport.handler.ADSearchHandler; -import org.opensearch.client.Client; import org.opensearch.core.action.ActionListener; import org.opensearch.search.SearchHits; import org.opensearch.search.aggregations.Aggregation; @@ -40,6 +39,7 @@ import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.timeseries.TestHelpers; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import com.google.common.collect.ImmutableList; diff --git a/src/test/java/org/opensearch/ad/transport/handler/ADSearchHandlerTests.java b/src/test/java/org/opensearch/ad/transport/handler/ADSearchHandlerTests.java index 50ae050f3..3cc8ffd24 100644 --- a/src/test/java/org/opensearch/ad/transport/handler/ADSearchHandlerTests.java +++ b/src/test/java/org/opensearch/ad/transport/handler/ADSearchHandlerTests.java @@ -24,7 +24,6 @@ import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; import org.opensearch.ad.ADUnitTestCase; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; @@ -32,6 +31,7 @@ import org.opensearch.commons.ConfigConstants; import org.opensearch.core.action.ActionListener; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.Client; public class ADSearchHandlerTests extends ADUnitTestCase { diff --git a/src/test/java/org/opensearch/ad/transport/handler/AbstractIndexHandlerTest.java b/src/test/java/org/opensearch/ad/transport/handler/AbstractIndexHandlerTest.java index 6d2a34f4c..655c72426 100644 --- a/src/test/java/org/opensearch/ad/transport/handler/AbstractIndexHandlerTest.java +++ b/src/test/java/org/opensearch/ad/transport/handler/AbstractIndexHandlerTest.java @@ -29,7 +29,6 @@ import org.opensearch.ad.constant.ADCommonName; import org.opensearch.ad.indices.ADIndexManagement; import org.opensearch.ad.transport.AnomalyResultTests; -import org.opensearch.client.Client; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.block.ClusterBlocks; @@ -45,6 +44,7 @@ import org.opensearch.timeseries.TestHelpers; import org.opensearch.timeseries.util.ClientUtil; import org.opensearch.timeseries.util.IndexUtils; +import org.opensearch.transport.client.Client; public abstract class AbstractIndexHandlerTest extends AbstractTimeSeriesTest { enum IndexCreation { diff --git a/src/test/java/org/opensearch/ad/transport/handler/AnomalyResultBulkIndexHandlerTests.java b/src/test/java/org/opensearch/ad/transport/handler/AnomalyResultBulkIndexHandlerTests.java index d7cbd9817..26f11cb9b 100644 --- a/src/test/java/org/opensearch/ad/transport/handler/AnomalyResultBulkIndexHandlerTests.java +++ b/src/test/java/org/opensearch/ad/transport/handler/AnomalyResultBulkIndexHandlerTests.java @@ -40,7 +40,6 @@ import org.opensearch.ad.indices.ADIndexManagement; import org.opensearch.ad.model.AnomalyResult; import org.opensearch.ad.settings.AnomalyDetectorSettings; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.core.action.ActionListener; @@ -54,6 +53,7 @@ import org.opensearch.timeseries.transport.handler.ResultBulkIndexingHandler; import org.opensearch.timeseries.util.ClientUtil; import org.opensearch.timeseries.util.IndexUtils; +import org.opensearch.transport.client.Client; import com.google.common.collect.ImmutableList; diff --git a/src/test/java/org/opensearch/ad/util/IndexUtilsTests.java b/src/test/java/org/opensearch/ad/util/IndexUtilsTests.java index cbbffb869..0d26473f6 100644 --- a/src/test/java/org/opensearch/ad/util/IndexUtilsTests.java +++ b/src/test/java/org/opensearch/ad/util/IndexUtilsTests.java @@ -15,12 +15,12 @@ import org.junit.Before; import org.junit.Test; -import org.opensearch.action.support.master.AcknowledgedResponse; -import org.opensearch.client.Client; +import org.opensearch.action.support.clustermanager.AcknowledgedResponse; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.test.OpenSearchIntegTestCase; import org.opensearch.timeseries.util.ClientUtil; import org.opensearch.timeseries.util.IndexUtils; +import org.opensearch.transport.client.Client; public class IndexUtilsTests extends OpenSearchIntegTestCase { diff --git a/src/test/java/org/opensearch/forecast/AbstractForecastSyntheticDataTest.java b/src/test/java/org/opensearch/forecast/AbstractForecastSyntheticDataTest.java index d17783e1b..ee1b36296 100644 --- a/src/test/java/org/opensearch/forecast/AbstractForecastSyntheticDataTest.java +++ b/src/test/java/org/opensearch/forecast/AbstractForecastSyntheticDataTest.java @@ -165,7 +165,7 @@ protected List waitUntilTaskReachState(String forecasterId, Set protected List toHits(Response response) throws UnsupportedOperationException, IOException { SearchResponse searchResponse = SearchResponse .fromXContent(createParser(JsonXContent.jsonXContent, response.getEntity().getContent())); - long total = searchResponse.getHits().getTotalHits().value; + long total = searchResponse.getHits().getTotalHits().value(); if (total == 0) { return new ArrayList<>(); } diff --git a/src/test/java/org/opensearch/forecast/SingleStreamProfileRunnerTests.java b/src/test/java/org/opensearch/forecast/SingleStreamProfileRunnerTests.java index abe3d1fcf..c91ba1f9a 100644 --- a/src/test/java/org/opensearch/forecast/SingleStreamProfileRunnerTests.java +++ b/src/test/java/org/opensearch/forecast/SingleStreamProfileRunnerTests.java @@ -35,7 +35,6 @@ import org.opensearch.action.get.GetResponse; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.settings.Settings; @@ -62,6 +61,7 @@ import org.opensearch.timeseries.util.DiscoveryNodeFilterer; import org.opensearch.timeseries.util.SecurityClientUtil; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class SingleStreamProfileRunnerTests extends AbstractTimeSeriesTest { private ForecastProfileRunner runner; diff --git a/src/test/java/org/opensearch/forecast/indices/ForecastResultIndexTests.java b/src/test/java/org/opensearch/forecast/indices/ForecastResultIndexTests.java index 5e2f0ec84..40d617b8d 100644 --- a/src/test/java/org/opensearch/forecast/indices/ForecastResultIndexTests.java +++ b/src/test/java/org/opensearch/forecast/indices/ForecastResultIndexTests.java @@ -26,10 +26,6 @@ import org.opensearch.action.admin.cluster.state.ClusterStateRequest; import org.opensearch.action.admin.cluster.state.ClusterStateResponse; import org.opensearch.action.admin.indices.create.CreateIndexResponse; -import org.opensearch.client.AdminClient; -import org.opensearch.client.Client; -import org.opensearch.client.ClusterAdminClient; -import org.opensearch.client.IndicesAdminClient; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.IndexMetadata; @@ -50,6 +46,10 @@ import org.opensearch.timeseries.indices.IndexManagement; import org.opensearch.timeseries.settings.TimeSeriesSettings; import org.opensearch.timeseries.util.DiscoveryNodeFilterer; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.ClusterAdminClient; +import org.opensearch.transport.client.IndicesAdminClient; public class ForecastResultIndexTests extends AbstractTimeSeriesTest { private ForecastIndexManagement forecastIndices; diff --git a/src/test/java/org/opensearch/forecast/rest/SecureForecastRestIT.java b/src/test/java/org/opensearch/forecast/rest/SecureForecastRestIT.java index c293af9d4..80bf75050 100644 --- a/src/test/java/org/opensearch/forecast/rest/SecureForecastRestIT.java +++ b/src/test/java/org/opensearch/forecast/rest/SecureForecastRestIT.java @@ -935,7 +935,7 @@ public void testAuthApi() throws IOException, InterruptedException { ); SearchResponse searchResponse = SearchResponse .fromXContent(createParser(JsonXContent.jsonXContent, response.getEntity().getContent())); - long total = searchResponse.getHits().getTotalHits().value; + long total = searchResponse.getHits().getTotalHits().value(); assertTrue("got: " + total, total > 0); // case 13: read access user can validate forecaster @@ -1054,7 +1054,7 @@ public void testAuthApi() throws IOException, InterruptedException { null ); searchResponse = SearchResponse.fromXContent(createParser(JsonXContent.jsonXContent, response.getEntity().getContent())); - total = searchResponse.getHits().getTotalHits().value; + total = searchResponse.getHits().getTotalHits().value(); assertTrue("got: " + total, total > 0); // case 18: read access user cannot update forecaster @@ -1228,7 +1228,7 @@ public void testAuthApi() throws IOException, InterruptedException { null ); searchResponse = SearchResponse.fromXContent(createParser(JsonXContent.jsonXContent, response.getEntity().getContent())); - total = searchResponse.getHits().getTotalHits().value; + total = searchResponse.getHits().getTotalHits().value(); assertTrue("got: " + total, total == 0); } finally { disableFilterBy(); @@ -1368,7 +1368,7 @@ public void testFilterBy() throws IOException { ); SearchResponse searchResponse = SearchResponse .fromXContent(createParser(JsonXContent.jsonXContent, response.getEntity().getContent())); - long total = searchResponse.getHits().getTotalHits().value; + long total = searchResponse.getHits().getTotalHits().value(); assertTrue("got: " + total, total == 1); response = TestHelpers @@ -1381,7 +1381,7 @@ public void testFilterBy() throws IOException { null ); searchResponse = SearchResponse.fromXContent(createParser(JsonXContent.jsonXContent, response.getEntity().getContent())); - total = searchResponse.getHits().getTotalHits().value; + total = searchResponse.getHits().getTotalHits().value(); assertTrue("got: " + total, total == 1); // case 2: Full access user cannot start/stop/delete forecaster created by other user @@ -1577,7 +1577,7 @@ public void testResultAccess() throws IOException, InterruptedException { Response response = searchResultMatchAll(sdeLimitedClient, "opensearch-forecast-result*"); SearchResponse searchResponse = SearchResponse .fromXContent(createParser(JsonXContent.jsonXContent, response.getEntity().getContent())); - long total = searchResponse.getHits().getTotalHits().value; + long total = searchResponse.getHits().getTotalHits().value(); assertEquals("actual: " + total, 0, total); } finally { disableFilterBy(); diff --git a/src/test/java/org/opensearch/timeseries/AbstractTimeSeriesTest.java b/src/test/java/org/opensearch/timeseries/AbstractTimeSeriesTest.java index 0b5999a4e..5123e982a 100644 --- a/src/test/java/org/opensearch/timeseries/AbstractTimeSeriesTest.java +++ b/src/test/java/org/opensearch/timeseries/AbstractTimeSeriesTest.java @@ -57,7 +57,6 @@ import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.ad.model.AnomalyResult; import org.opensearch.ad.model.DetectorInternalState; -import org.opensearch.client.Client; import org.opensearch.cluster.metadata.AliasMetadata; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.node.DiscoveryNode; @@ -91,6 +90,7 @@ import org.opensearch.timeseries.util.ClientUtil; import org.opensearch.transport.TransportInterceptor; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; diff --git a/src/test/java/org/opensearch/timeseries/NodeStateManagerTests.java b/src/test/java/org/opensearch/timeseries/NodeStateManagerTests.java index 73acb5cf2..beb9339a2 100644 --- a/src/test/java/org/opensearch/timeseries/NodeStateManagerTests.java +++ b/src/test/java/org/opensearch/timeseries/NodeStateManagerTests.java @@ -46,7 +46,6 @@ import org.opensearch.action.get.GetResponse; import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.ad.transport.AnomalyResultTests; -import org.opensearch.client.Client; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodeRole; import org.opensearch.cluster.service.ClusterService; @@ -65,6 +64,7 @@ import org.opensearch.timeseries.model.Job; import org.opensearch.timeseries.settings.TimeSeriesSettings; import org.opensearch.timeseries.util.ClientUtil; +import org.opensearch.transport.client.Client; import com.google.common.collect.ImmutableMap; diff --git a/src/test/java/org/opensearch/timeseries/TestHelpers.java b/src/test/java/org/opensearch/timeseries/TestHelpers.java index b4bd580a0..aceb06576 100644 --- a/src/test/java/org/opensearch/timeseries/TestHelpers.java +++ b/src/test/java/org/opensearch/timeseries/TestHelpers.java @@ -79,8 +79,6 @@ import org.opensearch.ad.model.ExpectedValueList; import org.opensearch.ad.model.Rule; import org.opensearch.ad.ratelimit.ADResultWriteRequest; -import org.opensearch.client.AdminClient; -import org.opensearch.client.Client; import org.opensearch.client.Request; import org.opensearch.client.RequestOptions; import org.opensearch.client.Response; @@ -159,6 +157,8 @@ import org.opensearch.timeseries.model.ValidationIssueType; import org.opensearch.timeseries.ratelimit.RequestPriority; import org.opensearch.timeseries.settings.TimeSeriesSettings; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.Client; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/src/test/java/org/opensearch/timeseries/TimeSeriesPluginTests.java b/src/test/java/org/opensearch/timeseries/TimeSeriesPluginTests.java index 6c1f913c4..b7148a4d9 100644 --- a/src/test/java/org/opensearch/timeseries/TimeSeriesPluginTests.java +++ b/src/test/java/org/opensearch/timeseries/TimeSeriesPluginTests.java @@ -18,13 +18,13 @@ import org.apache.commons.pool2.impl.GenericObjectPool; import org.opensearch.ad.ADUnitTestCase; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.Client; import io.protostuff.LinkedBuffer; diff --git a/src/test/java/org/opensearch/timeseries/feature/NoPowermockSearchFeatureDaoTests.java b/src/test/java/org/opensearch/timeseries/feature/NoPowermockSearchFeatureDaoTests.java index 836f0eafa..c51bc27b8 100644 --- a/src/test/java/org/opensearch/timeseries/feature/NoPowermockSearchFeatureDaoTests.java +++ b/src/test/java/org/opensearch/timeseries/feature/NoPowermockSearchFeatureDaoTests.java @@ -58,7 +58,6 @@ import org.opensearch.action.search.ShardSearchFailure; import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.ad.settings.AnomalyDetectorSettings; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.lease.Releasables; import org.opensearch.common.settings.ClusterSettings; @@ -106,6 +105,7 @@ import org.opensearch.timeseries.model.IntervalTimeConfiguration; import org.opensearch.timeseries.settings.TimeSeriesSettings; import org.opensearch.timeseries.util.SecurityClientUtil; +import org.opensearch.transport.client.Client; import com.google.common.collect.ImmutableList; diff --git a/src/test/java/org/opensearch/timeseries/feature/SearchFeatureDaoParamTests.java b/src/test/java/org/opensearch/timeseries/feature/SearchFeatureDaoParamTests.java index c9cdd44cb..095cba4da 100644 --- a/src/test/java/org/opensearch/timeseries/feature/SearchFeatureDaoParamTests.java +++ b/src/test/java/org/opensearch/timeseries/feature/SearchFeatureDaoParamTests.java @@ -45,7 +45,6 @@ import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; import org.opensearch.ad.model.AnomalyDetector; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.action.ActionFuture; import org.opensearch.common.settings.Settings; @@ -72,6 +71,7 @@ import org.opensearch.timeseries.model.IntervalTimeConfiguration; import org.opensearch.timeseries.settings.TimeSeriesSettings; import org.opensearch.timeseries.util.SecurityClientUtil; +import org.opensearch.transport.client.Client; import junitparams.JUnitParamsRunner; import junitparams.Parameters; diff --git a/src/test/java/org/opensearch/timeseries/feature/SearchFeatureDaoTests.java b/src/test/java/org/opensearch/timeseries/feature/SearchFeatureDaoTests.java index 06750c674..894a596cf 100644 --- a/src/test/java/org/opensearch/timeseries/feature/SearchFeatureDaoTests.java +++ b/src/test/java/org/opensearch/timeseries/feature/SearchFeatureDaoTests.java @@ -54,7 +54,6 @@ import org.opensearch.action.search.SearchResponseSections; import org.opensearch.action.search.ShardSearchFailure; import org.opensearch.ad.model.AnomalyDetector; -import org.opensearch.client.Client; import org.opensearch.common.action.ActionFuture; import org.opensearch.common.settings.Settings; import org.opensearch.common.time.DateFormatter; @@ -92,6 +91,7 @@ import org.opensearch.timeseries.model.IntervalTimeConfiguration; import org.opensearch.timeseries.settings.TimeSeriesSettings; import org.opensearch.timeseries.util.SecurityClientUtil; +import org.opensearch.transport.client.Client; public class SearchFeatureDaoTests { private SearchFeatureDao searchFeatureDao; diff --git a/src/test/java/org/opensearch/timeseries/indices/rest/handler/IntervalCalculationTests.java b/src/test/java/org/opensearch/timeseries/indices/rest/handler/IntervalCalculationTests.java index 96ed15438..195a46cb8 100644 --- a/src/test/java/org/opensearch/timeseries/indices/rest/handler/IntervalCalculationTests.java +++ b/src/test/java/org/opensearch/timeseries/indices/rest/handler/IntervalCalculationTests.java @@ -20,7 +20,6 @@ import org.opensearch.action.search.SearchResponse; import org.opensearch.action.search.SearchResponseSections; import org.opensearch.action.search.ShardSearchFailure; -import org.opensearch.client.Client; import org.opensearch.common.unit.TimeValue; import org.opensearch.commons.authuser.User; import org.opensearch.core.action.ActionListener; @@ -44,6 +43,7 @@ import org.opensearch.timeseries.rest.handler.IntervalCalculation; import org.opensearch.timeseries.rest.handler.IntervalCalculation.IntervalRecommendationListener; import org.opensearch.timeseries.util.SecurityClientUtil; +import org.opensearch.transport.client.Client; public class IntervalCalculationTests extends OpenSearchTestCase { diff --git a/src/test/java/org/opensearch/timeseries/transport/ADResultBulkTransportActionTests.java b/src/test/java/org/opensearch/timeseries/transport/ADResultBulkTransportActionTests.java index e497988fc..790f83122 100644 --- a/src/test/java/org/opensearch/timeseries/transport/ADResultBulkTransportActionTests.java +++ b/src/test/java/org/opensearch/timeseries/transport/ADResultBulkTransportActionTests.java @@ -35,7 +35,6 @@ import org.opensearch.ad.transport.ADResultBulkRequest; import org.opensearch.ad.transport.ADResultBulkTransportAction; import org.opensearch.ad.transport.AnomalyResultTests; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.settings.Settings; @@ -46,6 +45,7 @@ import org.opensearch.timeseries.TestHelpers; import org.opensearch.timeseries.constant.CommonMessages; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class ADResultBulkTransportActionTests extends AbstractTimeSeriesTest { private ADResultBulkTransportAction resultBulk; diff --git a/src/test/java/org/opensearch/timeseries/transport/ADStatsNodesTransportActionTests.java b/src/test/java/org/opensearch/timeseries/transport/ADStatsNodesTransportActionTests.java index 8bcc0163d..f57921098 100644 --- a/src/test/java/org/opensearch/timeseries/transport/ADStatsNodesTransportActionTests.java +++ b/src/test/java/org/opensearch/timeseries/transport/ADStatsNodesTransportActionTests.java @@ -33,7 +33,6 @@ import org.opensearch.ad.stats.suppliers.ADModelsOnNodeSupplier; import org.opensearch.ad.task.ADTaskManager; import org.opensearch.ad.transport.ADStatsNodesTransportAction; -import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; @@ -49,6 +48,7 @@ import org.opensearch.timeseries.stats.suppliers.SettableSupplier; import org.opensearch.timeseries.util.IndexUtils; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class ADStatsNodesTransportActionTests extends OpenSearchIntegTestCase { diff --git a/src/test/java/org/opensearch/timeseries/transport/AnomalyDetectorJobActionTests.java b/src/test/java/org/opensearch/timeseries/transport/AnomalyDetectorJobActionTests.java index aef2e29de..7819fa2d1 100644 --- a/src/test/java/org/opensearch/timeseries/transport/AnomalyDetectorJobActionTests.java +++ b/src/test/java/org/opensearch/timeseries/transport/AnomalyDetectorJobActionTests.java @@ -28,7 +28,6 @@ import org.opensearch.ad.settings.AnomalyDetectorSettings; import org.opensearch.ad.transport.AnomalyDetectorJobAction; import org.opensearch.ad.transport.AnomalyDetectorJobTransportAction; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.settings.ClusterSettings; @@ -42,6 +41,7 @@ import org.opensearch.threadpool.ThreadPool; import org.opensearch.timeseries.model.DateRange; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class AnomalyDetectorJobActionTests extends OpenSearchIntegTestCase { private AnomalyDetectorJobTransportAction action; diff --git a/src/test/java/org/opensearch/timeseries/transport/AnomalyDetectorJobTransportActionTests.java b/src/test/java/org/opensearch/timeseries/transport/AnomalyDetectorJobTransportActionTests.java index aa8c74c11..967c57207 100644 --- a/src/test/java/org/opensearch/timeseries/transport/AnomalyDetectorJobTransportActionTests.java +++ b/src/test/java/org/opensearch/timeseries/transport/AnomalyDetectorJobTransportActionTests.java @@ -48,7 +48,6 @@ import org.opensearch.ad.transport.GetAnomalyDetectorAction; import org.opensearch.ad.transport.GetAnomalyDetectorResponse; import org.opensearch.ad.transport.StatsAnomalyDetectorAction; -import org.opensearch.client.Client; import org.opensearch.common.lucene.uid.Versions; import org.opensearch.common.settings.Settings; import org.opensearch.core.action.ActionListener; @@ -62,6 +61,7 @@ import org.opensearch.timeseries.model.Job; import org.opensearch.timeseries.model.TaskState; import org.opensearch.timeseries.stats.StatNames; +import org.opensearch.transport.client.Client; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/src/test/java/org/opensearch/timeseries/transport/DeleteAnomalyDetectorTests.java b/src/test/java/org/opensearch/timeseries/transport/DeleteAnomalyDetectorTests.java index 49e0484c8..5d7210310 100644 --- a/src/test/java/org/opensearch/timeseries/transport/DeleteAnomalyDetectorTests.java +++ b/src/test/java/org/opensearch/timeseries/transport/DeleteAnomalyDetectorTests.java @@ -39,7 +39,6 @@ import org.opensearch.ad.settings.AnomalyDetectorSettings; import org.opensearch.ad.task.ADTaskManager; import org.opensearch.ad.transport.DeleteAnomalyDetectorTransportAction; -import org.opensearch.client.Client; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.IndexMetadata; @@ -64,6 +63,7 @@ import org.opensearch.timeseries.model.Job; import org.opensearch.transport.Transport; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class DeleteAnomalyDetectorTests extends AbstractTimeSeriesTest { private DeleteAnomalyDetectorTransportAction action; diff --git a/src/test/java/org/opensearch/timeseries/transport/ForecastResultBulkTransportActionTests.java b/src/test/java/org/opensearch/timeseries/transport/ForecastResultBulkTransportActionTests.java index f5cead05e..132c6cf44 100644 --- a/src/test/java/org/opensearch/timeseries/transport/ForecastResultBulkTransportActionTests.java +++ b/src/test/java/org/opensearch/timeseries/transport/ForecastResultBulkTransportActionTests.java @@ -24,7 +24,6 @@ import org.opensearch.action.bulk.BulkResponse; 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.Settings; import org.opensearch.core.action.ActionListener; @@ -38,6 +37,7 @@ import org.opensearch.timeseries.AbstractTimeSeriesTest; import org.opensearch.timeseries.TestHelpers; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class ForecastResultBulkTransportActionTests extends AbstractTimeSeriesTest { diff --git a/src/test/java/org/opensearch/timeseries/transport/SearchAnomalyDetectorInfoActionTests.java b/src/test/java/org/opensearch/timeseries/transport/SearchAnomalyDetectorInfoActionTests.java index 47a5d0877..6dfad592f 100644 --- a/src/test/java/org/opensearch/timeseries/transport/SearchAnomalyDetectorInfoActionTests.java +++ b/src/test/java/org/opensearch/timeseries/transport/SearchAnomalyDetectorInfoActionTests.java @@ -32,7 +32,6 @@ import org.opensearch.ad.settings.AnomalyDetectorSettings; import org.opensearch.ad.transport.SearchAnomalyDetectorInfoAction; import org.opensearch.ad.transport.SearchAnomalyDetectorInfoTransportAction; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.settings.ClusterSettings; @@ -46,6 +45,7 @@ import org.opensearch.threadpool.ThreadPool; import org.opensearch.timeseries.TestHelpers; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.Client; public class SearchAnomalyDetectorInfoActionTests extends OpenSearchIntegTestCase { private SearchConfigInfoRequest request; diff --git a/src/test/java/org/opensearch/timeseries/util/ClientUtilTests.java b/src/test/java/org/opensearch/timeseries/util/ClientUtilTests.java index 031c234c8..1feea0711 100644 --- a/src/test/java/org/opensearch/timeseries/util/ClientUtilTests.java +++ b/src/test/java/org/opensearch/timeseries/util/ClientUtilTests.java @@ -20,10 +20,10 @@ import org.opensearch.ad.transport.AnomalyResultAction; import org.opensearch.ad.transport.AnomalyResultRequest; import org.opensearch.ad.transport.AnomalyResultResponse; -import org.opensearch.client.Client; import org.opensearch.core.action.ActionListener; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.timeseries.model.FeatureData; +import org.opensearch.transport.client.Client; public class ClientUtilTests extends OpenSearchTestCase { private AnomalyResultRequest asyncRequest; diff --git a/src/test/java/org/opensearch/timeseries/util/CrossClusterConfigUtilsTests.java b/src/test/java/org/opensearch/timeseries/util/CrossClusterConfigUtilsTests.java index dfc46c6d8..bf34147d6 100644 --- a/src/test/java/org/opensearch/timeseries/util/CrossClusterConfigUtilsTests.java +++ b/src/test/java/org/opensearch/timeseries/util/CrossClusterConfigUtilsTests.java @@ -18,11 +18,11 @@ import org.apache.commons.lang3.tuple.Pair; import org.junit.Before; -import org.opensearch.client.Client; -import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.service.ClusterService; import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.node.NodeClient; public class CrossClusterConfigUtilsTests extends OpenSearchTestCase {