From 1a30d60b5f9358e2e378755ba34ed19bdb6cfe09 Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 13:06:44 -0700 Subject: [PATCH] Address core changes (#522) (#523) Signed-off-by: Khushboo Rajput (cherry picked from commit 2046483fd7bf582e95cbaeb4f8349883a8c21ac3) Co-authored-by: Khushboo Rajput <59671881+khushbr@users.noreply.github.com> --- licenses/netty-buffer-4.1.94.Final.jar.sha1 | 1 - licenses/netty-buffer-4.1.96.Final.jar.sha1 | 1 + licenses/netty-codec-4.1.94.Final.jar.sha1 | 1 - licenses/netty-codec-4.1.96.Final.jar.sha1 | 1 + licenses/netty-codec-http-4.1.94.Final.jar.sha1 | 1 - licenses/netty-codec-http-4.1.96.Final.jar.sha1 | 1 + licenses/netty-codec-http2-4.1.94.Final.jar.sha1 | 1 - licenses/netty-codec-http2-4.1.96.Final.jar.sha1 | 1 + licenses/netty-codec-socks-4.1.94.Final.jar.sha1 | 1 - licenses/netty-codec-socks-4.1.96.Final.jar.sha1 | 1 + licenses/netty-common-4.1.94.Final.jar.sha1 | 1 - licenses/netty-common-4.1.96.Final.jar.sha1 | 1 + licenses/netty-handler-4.1.94.Final.jar.sha1 | 1 - licenses/netty-handler-4.1.96.Final.jar.sha1 | 1 + licenses/netty-handler-proxy-4.1.94.Final.jar.sha1 | 1 - licenses/netty-handler-proxy-4.1.96.Final.jar.sha1 | 1 + licenses/netty-resolver-4.1.94.Final.jar.sha1 | 1 - licenses/netty-resolver-4.1.96.Final.jar.sha1 | 1 + licenses/netty-transport-4.1.94.Final.jar.sha1 | 1 - licenses/netty-transport-4.1.96.Final.jar.sha1 | 1 + ...tty-transport-native-unix-common-4.1.94.Final.jar.sha1 | 1 - ...tty-transport-native-unix-common-4.1.96.Final.jar.sha1 | 1 + .../performance-analyzer-commons-1.0.0-SNAPSHOT.jar.sha1 | 2 +- .../performanceanalyzer/OpenSearchResources.java | 2 +- .../performanceanalyzer/PerformanceAnalyzerPlugin.java | 6 +++--- .../action/PerformanceAnalyzerActionFilter.java | 4 ++-- .../action/PerformanceAnalyzerActionListener.java | 2 +- .../collectors/CircuitBreakerCollector.java | 2 +- .../collectors/NodeStatsAllShardsMetricsCollector.java | 2 +- .../collectors/NodeStatsFixedShardsMetricsCollector.java | 2 +- .../config/setting/ClusterSettingsManager.java | 2 +- .../config/PerformanceAnalyzerClusterConfigAction.java | 2 +- .../config/PerformanceAnalyzerConfigAction.java | 2 +- .../PerformanceAnalyzerOverridesClusterConfigAction.java | 2 +- .../config/PerformanceAnalyzerResourceProvider.java | 2 +- .../http_action/whoami/TransportWhoAmIAction.java | 2 +- .../http_action/whoami/WhoAmIAction.java | 2 +- .../http_action/whoami/WhoAmIRequest.java | 2 +- .../http_action/whoami/WhoAmIResponse.java | 4 ++-- .../transport/PerformanceAnalyzerTransportChannel.java | 2 +- .../org/opensearch/performanceanalyzer/util/Utils.java | 2 +- .../PerformanceAnalyzerPluginTests.java | 4 ++-- .../action/PerformanceAnalyzerActionFilterTests.java | 4 ++-- .../action/PerformanceAnalyzerActionListenerTests.java | 6 +++--- .../collectors/CircuitBreakerCollectorTests.java | 2 +- .../PerformanceAnalyzerClusterConfigActionTests.java | 6 +++--- .../config/PerformanceAnalyzerConfigActionTests.java | 6 +++--- ...formanceAnalyzerOverridesClusterConfigActionTests.java | 6 +++--- .../config/PerformanceAnalyzerResourceProviderTests.java | 2 +- .../http_action/whoami/WhoAmITests.java | 4 ++-- .../performanceanalyzer/hwnet/CollectMetricsTests.java | 8 ++++---- .../listener/PerformanceAnalyzerSearchListenerTests.java | 2 +- .../PerformanceAnalyzerTransportChannelTests.java | 2 +- .../PerformanceAnalyzerTransportRequestHandlerTests.java | 2 +- 54 files changed, 61 insertions(+), 61 deletions(-) delete mode 100644 licenses/netty-buffer-4.1.94.Final.jar.sha1 create mode 100644 licenses/netty-buffer-4.1.96.Final.jar.sha1 delete mode 100644 licenses/netty-codec-4.1.94.Final.jar.sha1 create mode 100644 licenses/netty-codec-4.1.96.Final.jar.sha1 delete mode 100644 licenses/netty-codec-http-4.1.94.Final.jar.sha1 create mode 100644 licenses/netty-codec-http-4.1.96.Final.jar.sha1 delete mode 100644 licenses/netty-codec-http2-4.1.94.Final.jar.sha1 create mode 100644 licenses/netty-codec-http2-4.1.96.Final.jar.sha1 delete mode 100644 licenses/netty-codec-socks-4.1.94.Final.jar.sha1 create mode 100644 licenses/netty-codec-socks-4.1.96.Final.jar.sha1 delete mode 100644 licenses/netty-common-4.1.94.Final.jar.sha1 create mode 100644 licenses/netty-common-4.1.96.Final.jar.sha1 delete mode 100644 licenses/netty-handler-4.1.94.Final.jar.sha1 create mode 100644 licenses/netty-handler-4.1.96.Final.jar.sha1 delete mode 100644 licenses/netty-handler-proxy-4.1.94.Final.jar.sha1 create mode 100644 licenses/netty-handler-proxy-4.1.96.Final.jar.sha1 delete mode 100644 licenses/netty-resolver-4.1.94.Final.jar.sha1 create mode 100644 licenses/netty-resolver-4.1.96.Final.jar.sha1 delete mode 100644 licenses/netty-transport-4.1.94.Final.jar.sha1 create mode 100644 licenses/netty-transport-4.1.96.Final.jar.sha1 delete mode 100644 licenses/netty-transport-native-unix-common-4.1.94.Final.jar.sha1 create mode 100644 licenses/netty-transport-native-unix-common-4.1.96.Final.jar.sha1 diff --git a/licenses/netty-buffer-4.1.94.Final.jar.sha1 b/licenses/netty-buffer-4.1.94.Final.jar.sha1 deleted file mode 100644 index 05b1c2a4..00000000 --- a/licenses/netty-buffer-4.1.94.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -eec248b26f16e888688e5bb37b7eeda76b78d2f7 \ No newline at end of file diff --git a/licenses/netty-buffer-4.1.96.Final.jar.sha1 b/licenses/netty-buffer-4.1.96.Final.jar.sha1 new file mode 100644 index 00000000..7abdb33d --- /dev/null +++ b/licenses/netty-buffer-4.1.96.Final.jar.sha1 @@ -0,0 +1 @@ +4b80fffbe77485b457bf844289bf1801f61b9e91 \ No newline at end of file diff --git a/licenses/netty-codec-4.1.94.Final.jar.sha1 b/licenses/netty-codec-4.1.94.Final.jar.sha1 deleted file mode 100644 index baa7e25f..00000000 --- a/licenses/netty-codec-4.1.94.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c70ef20ca338558147887df60f46341bc47f6900 \ No newline at end of file diff --git a/licenses/netty-codec-4.1.96.Final.jar.sha1 b/licenses/netty-codec-4.1.96.Final.jar.sha1 new file mode 100644 index 00000000..8fdb32be --- /dev/null +++ b/licenses/netty-codec-4.1.96.Final.jar.sha1 @@ -0,0 +1 @@ +9cfe430f8b14e7ba86969d8e1126aa0aae4d18f0 \ No newline at end of file diff --git a/licenses/netty-codec-http-4.1.94.Final.jar.sha1 b/licenses/netty-codec-http-4.1.94.Final.jar.sha1 deleted file mode 100644 index 8c018be2..00000000 --- a/licenses/netty-codec-http-4.1.94.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9e5404764092c1f6305ad5719078f46ab228d587 \ No newline at end of file diff --git a/licenses/netty-codec-http-4.1.96.Final.jar.sha1 b/licenses/netty-codec-http-4.1.96.Final.jar.sha1 new file mode 100644 index 00000000..dfb0cf39 --- /dev/null +++ b/licenses/netty-codec-http-4.1.96.Final.jar.sha1 @@ -0,0 +1 @@ +a4d0d95df5026965c454902ef3d6d84b81f89626 \ No newline at end of file diff --git a/licenses/netty-codec-http2-4.1.94.Final.jar.sha1 b/licenses/netty-codec-http2-4.1.94.Final.jar.sha1 deleted file mode 100644 index e73026b4..00000000 --- a/licenses/netty-codec-http2-4.1.94.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f651595784d6cca4cbca6a8ad74c48fceed6cea8 \ No newline at end of file diff --git a/licenses/netty-codec-http2-4.1.96.Final.jar.sha1 b/licenses/netty-codec-http2-4.1.96.Final.jar.sha1 new file mode 100644 index 00000000..2fc787ee --- /dev/null +++ b/licenses/netty-codec-http2-4.1.96.Final.jar.sha1 @@ -0,0 +1 @@ +cc8baf4ff67c1bcc0cde60bc5c2bb9447d92d9e6 \ No newline at end of file diff --git a/licenses/netty-codec-socks-4.1.94.Final.jar.sha1 b/licenses/netty-codec-socks-4.1.94.Final.jar.sha1 deleted file mode 100644 index de2c4d00..00000000 --- a/licenses/netty-codec-socks-4.1.94.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b9192c7cda295d75f236a13a0b1f5a008f05d516 \ No newline at end of file diff --git a/licenses/netty-codec-socks-4.1.96.Final.jar.sha1 b/licenses/netty-codec-socks-4.1.96.Final.jar.sha1 new file mode 100644 index 00000000..8e959bda --- /dev/null +++ b/licenses/netty-codec-socks-4.1.96.Final.jar.sha1 @@ -0,0 +1 @@ +f53c52dbddaa4a02a51430405792d3f30a89b147 \ No newline at end of file diff --git a/licenses/netty-common-4.1.94.Final.jar.sha1 b/licenses/netty-common-4.1.94.Final.jar.sha1 deleted file mode 100644 index b7873385..00000000 --- a/licenses/netty-common-4.1.94.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ad4ecf779ebc794cd351f57792f56ea01387b868 \ No newline at end of file diff --git a/licenses/netty-common-4.1.96.Final.jar.sha1 b/licenses/netty-common-4.1.96.Final.jar.sha1 new file mode 100644 index 00000000..85b5f527 --- /dev/null +++ b/licenses/netty-common-4.1.96.Final.jar.sha1 @@ -0,0 +1 @@ +d10c167623cbc471753f950846df241d1021655c \ No newline at end of file diff --git a/licenses/netty-handler-4.1.94.Final.jar.sha1 b/licenses/netty-handler-4.1.94.Final.jar.sha1 deleted file mode 100644 index b08e85ba..00000000 --- a/licenses/netty-handler-4.1.94.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cd9121ce24d6d3f2898946d04b0ef3ec548b00b4 \ No newline at end of file diff --git a/licenses/netty-handler-4.1.96.Final.jar.sha1 b/licenses/netty-handler-4.1.96.Final.jar.sha1 new file mode 100644 index 00000000..fe4f48c6 --- /dev/null +++ b/licenses/netty-handler-4.1.96.Final.jar.sha1 @@ -0,0 +1 @@ +7840d7523d709e02961b647546f9d9dde1699306 \ No newline at end of file diff --git a/licenses/netty-handler-proxy-4.1.94.Final.jar.sha1 b/licenses/netty-handler-proxy-4.1.94.Final.jar.sha1 deleted file mode 100644 index a2db8bec..00000000 --- a/licenses/netty-handler-proxy-4.1.94.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -26ba9d30b8f7b095155b9ac63378d6d9386d85c3 \ No newline at end of file diff --git a/licenses/netty-handler-proxy-4.1.96.Final.jar.sha1 b/licenses/netty-handler-proxy-4.1.96.Final.jar.sha1 new file mode 100644 index 00000000..d410208d --- /dev/null +++ b/licenses/netty-handler-proxy-4.1.96.Final.jar.sha1 @@ -0,0 +1 @@ +dcabd63f4aaec2b4cad7588bfdd4cd2c82287e38 \ No newline at end of file diff --git a/licenses/netty-resolver-4.1.94.Final.jar.sha1 b/licenses/netty-resolver-4.1.94.Final.jar.sha1 deleted file mode 100644 index 4c9e4dda..00000000 --- a/licenses/netty-resolver-4.1.94.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e96f649e8e9dcb29a1f8e95328b99c9eb6cf76c2 \ No newline at end of file diff --git a/licenses/netty-resolver-4.1.96.Final.jar.sha1 b/licenses/netty-resolver-4.1.96.Final.jar.sha1 new file mode 100644 index 00000000..9e93f013 --- /dev/null +++ b/licenses/netty-resolver-4.1.96.Final.jar.sha1 @@ -0,0 +1 @@ +0e51db5568a881e0f9b013b35617c597dc32f130 \ No newline at end of file diff --git a/licenses/netty-transport-4.1.94.Final.jar.sha1 b/licenses/netty-transport-4.1.94.Final.jar.sha1 deleted file mode 100644 index ed7760b8..00000000 --- a/licenses/netty-transport-4.1.94.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ec783a737f96991a87b1d5794e2f9eb2024d708a \ No newline at end of file diff --git a/licenses/netty-transport-4.1.96.Final.jar.sha1 b/licenses/netty-transport-4.1.96.Final.jar.sha1 new file mode 100644 index 00000000..707285d3 --- /dev/null +++ b/licenses/netty-transport-4.1.96.Final.jar.sha1 @@ -0,0 +1 @@ +dbd15ca244be28e1a98ed29b9d755edbfa737e02 \ No newline at end of file diff --git a/licenses/netty-transport-native-unix-common-4.1.94.Final.jar.sha1 b/licenses/netty-transport-native-unix-common-4.1.94.Final.jar.sha1 deleted file mode 100644 index 43bc960a..00000000 --- a/licenses/netty-transport-native-unix-common-4.1.94.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3fa5f9d04b6b782d869d6e0657d896eeadca5866 \ No newline at end of file diff --git a/licenses/netty-transport-native-unix-common-4.1.96.Final.jar.sha1 b/licenses/netty-transport-native-unix-common-4.1.96.Final.jar.sha1 new file mode 100644 index 00000000..e911c47d --- /dev/null +++ b/licenses/netty-transport-native-unix-common-4.1.96.Final.jar.sha1 @@ -0,0 +1 @@ +daf8578cade63a01525ee9d70371fa78e6e91094 \ No newline at end of file diff --git a/licenses/performance-analyzer-commons-1.0.0-SNAPSHOT.jar.sha1 b/licenses/performance-analyzer-commons-1.0.0-SNAPSHOT.jar.sha1 index f0bd1dfd..3e2317ed 100644 --- a/licenses/performance-analyzer-commons-1.0.0-SNAPSHOT.jar.sha1 +++ b/licenses/performance-analyzer-commons-1.0.0-SNAPSHOT.jar.sha1 @@ -1 +1 @@ -679c2774d78459d76b1edf492670dfec2e47e54f \ No newline at end of file +50c9a65da3acb24e94c6dbb5e2afda2d7dd536ad \ No newline at end of file diff --git a/src/main/java/org/opensearch/performanceanalyzer/OpenSearchResources.java b/src/main/java/org/opensearch/performanceanalyzer/OpenSearchResources.java index 4267ebb0..d6939b6e 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/OpenSearchResources.java +++ b/src/main/java/org/opensearch/performanceanalyzer/OpenSearchResources.java @@ -9,9 +9,9 @@ import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; +import org.opensearch.core.indices.breaker.CircuitBreakerService; import org.opensearch.env.Environment; import org.opensearch.indices.IndicesService; -import org.opensearch.indices.breaker.CircuitBreakerService; import org.opensearch.threadpool.ThreadPool; public final class OpenSearchResources { diff --git a/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPlugin.java b/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPlugin.java index e87caa8f..76b0a16e 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPlugin.java +++ b/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPlugin.java @@ -19,13 +19,11 @@ import org.apache.logging.log4j.message.ParameterizedMessage; import org.opensearch.SpecialPermission; import org.opensearch.action.ActionRequest; -import org.opensearch.action.ActionResponse; import org.opensearch.action.support.ActionFilter; import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.service.ClusterService; -import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.network.NetworkService; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.IndexScopedSettings; @@ -34,12 +32,14 @@ import org.opensearch.common.settings.SettingsFilter; import org.opensearch.common.util.PageCacheRecycler; import org.opensearch.common.util.concurrent.ThreadContext; +import org.opensearch.core.action.ActionResponse; +import org.opensearch.core.common.io.stream.NamedWriteableRegistry; +import org.opensearch.core.indices.breaker.CircuitBreakerService; import org.opensearch.core.xcontent.NamedXContentRegistry; import org.opensearch.discovery.Discovery; import org.opensearch.env.Environment; import org.opensearch.env.NodeEnvironment; import org.opensearch.index.IndexModule; -import org.opensearch.indices.breaker.CircuitBreakerService; import org.opensearch.performanceanalyzer.action.PerformanceAnalyzerActionFilter; import org.opensearch.performanceanalyzer.collectors.AdmissionControlMetricsCollector; import org.opensearch.performanceanalyzer.collectors.CacheConfigMetricsCollector; diff --git a/src/main/java/org/opensearch/performanceanalyzer/action/PerformanceAnalyzerActionFilter.java b/src/main/java/org/opensearch/performanceanalyzer/action/PerformanceAnalyzerActionFilter.java index 76c306cf..9366041d 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/action/PerformanceAnalyzerActionFilter.java +++ b/src/main/java/org/opensearch/performanceanalyzer/action/PerformanceAnalyzerActionFilter.java @@ -9,14 +9,14 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.action.ActionListener; import org.opensearch.action.ActionRequest; -import org.opensearch.action.ActionResponse; import org.opensearch.action.bulk.BulkRequest; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.support.ActionFilter; import org.opensearch.action.support.ActionFilterChain; import org.opensearch.common.inject.Inject; +import org.opensearch.core.action.ActionListener; +import org.opensearch.core.action.ActionResponse; import org.opensearch.performanceanalyzer.commons.metrics.PerformanceAnalyzerMetrics; import org.opensearch.performanceanalyzer.config.PerformanceAnalyzerController; import org.opensearch.tasks.Task; diff --git a/src/main/java/org/opensearch/performanceanalyzer/action/PerformanceAnalyzerActionListener.java b/src/main/java/org/opensearch/performanceanalyzer/action/PerformanceAnalyzerActionListener.java index edd7ae15..2f78dac2 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/action/PerformanceAnalyzerActionListener.java +++ b/src/main/java/org/opensearch/performanceanalyzer/action/PerformanceAnalyzerActionListener.java @@ -7,9 +7,9 @@ import org.opensearch.OpenSearchException; -import org.opensearch.action.ActionListener; import org.opensearch.action.bulk.BulkResponse; import org.opensearch.action.search.SearchResponse; +import org.opensearch.core.action.ActionListener; import org.opensearch.performanceanalyzer.commons.metrics.AllMetrics.HttpDimension; import org.opensearch.performanceanalyzer.commons.metrics.AllMetrics.HttpMetric; import org.opensearch.performanceanalyzer.commons.metrics.MetricsProcessor; diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/CircuitBreakerCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/CircuitBreakerCollector.java index 6d462828..5f6b0b85 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/collectors/CircuitBreakerCollector.java +++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/CircuitBreakerCollector.java @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.indices.breaker.CircuitBreakerStats; +import org.opensearch.core.indices.breaker.CircuitBreakerStats; import org.opensearch.performanceanalyzer.OpenSearchResources; import org.opensearch.performanceanalyzer.commons.collectors.MetricStatus; import org.opensearch.performanceanalyzer.commons.collectors.PerformanceAnalyzerMetricsCollector; diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/NodeStatsAllShardsMetricsCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/NodeStatsAllShardsMetricsCollector.java index bc4b708a..077d0cf2 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/collectors/NodeStatsAllShardsMetricsCollector.java +++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/NodeStatsAllShardsMetricsCollector.java @@ -19,8 +19,8 @@ import org.opensearch.action.admin.indices.stats.CommonStatsFlags; import org.opensearch.action.admin.indices.stats.IndexShardStats; import org.opensearch.action.admin.indices.stats.ShardStats; +import org.opensearch.core.index.shard.ShardId; import org.opensearch.index.shard.IndexShard; -import org.opensearch.index.shard.ShardId; import org.opensearch.indices.IndicesService; import org.opensearch.indices.NodeIndicesStats; import org.opensearch.performanceanalyzer.OpenSearchResources; diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/NodeStatsFixedShardsMetricsCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/NodeStatsFixedShardsMetricsCollector.java index b8930f94..846eaffb 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/collectors/NodeStatsFixedShardsMetricsCollector.java +++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/NodeStatsFixedShardsMetricsCollector.java @@ -19,8 +19,8 @@ import org.opensearch.action.admin.indices.stats.CommonStatsFlags; import org.opensearch.action.admin.indices.stats.IndexShardStats; import org.opensearch.action.admin.indices.stats.ShardStats; +import org.opensearch.core.index.shard.ShardId; import org.opensearch.index.shard.IndexShard; -import org.opensearch.index.shard.ShardId; import org.opensearch.indices.IndicesService; import org.opensearch.indices.NodeIndicesStats; import org.opensearch.performanceanalyzer.OpenSearchResources; diff --git a/src/main/java/org/opensearch/performanceanalyzer/config/setting/ClusterSettingsManager.java b/src/main/java/org/opensearch/performanceanalyzer/config/setting/ClusterSettingsManager.java index 19b3fdce..44eb1037 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/config/setting/ClusterSettingsManager.java +++ b/src/main/java/org/opensearch/performanceanalyzer/config/setting/ClusterSettingsManager.java @@ -14,7 +14,6 @@ import java.util.Map; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.action.ActionListener; import org.opensearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest; import org.opensearch.action.admin.cluster.state.ClusterStateRequest; import org.opensearch.action.admin.cluster.state.ClusterStateResponse; @@ -23,6 +22,7 @@ import org.opensearch.cluster.ClusterStateListener; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; +import org.opensearch.core.action.ActionListener; import org.opensearch.performanceanalyzer.OpenSearchResources; import org.opensearch.performanceanalyzer.commons.collectors.StatsCollector; diff --git a/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigAction.java b/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigAction.java index 535e4a8c..df7b503c 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigAction.java +++ b/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigAction.java @@ -17,6 +17,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.XContentType; +import org.opensearch.core.rest.RestStatus; import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.performanceanalyzer.commons.config.PluginSettings; import org.opensearch.performanceanalyzer.config.setting.handler.NodeStatsSettingHandler; @@ -25,7 +26,6 @@ import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestController; import org.opensearch.rest.RestRequest; -import org.opensearch.rest.RestStatus; /** * Rest request handler for handling cluster-wide enabling and disabling of performance analyzer diff --git a/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigAction.java b/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigAction.java index 493cd1ca..b4a62f05 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigAction.java +++ b/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigAction.java @@ -16,6 +16,7 @@ import org.opensearch.client.node.NodeClient; import org.opensearch.common.inject.Inject; import org.opensearch.common.xcontent.XContentHelper; +import org.opensearch.core.rest.RestStatus; import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.performanceanalyzer.commons.config.PluginSettings; import org.opensearch.performanceanalyzer.config.PerformanceAnalyzerController; @@ -23,7 +24,6 @@ import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestController; import org.opensearch.rest.RestRequest; -import org.opensearch.rest.RestStatus; @SuppressWarnings("deprecation") public class PerformanceAnalyzerConfigAction extends BaseRestHandler { diff --git a/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerOverridesClusterConfigAction.java b/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerOverridesClusterConfigAction.java index e46beef9..c1ff6e12 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerOverridesClusterConfigAction.java +++ b/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerOverridesClusterConfigAction.java @@ -17,6 +17,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.XContentType; +import org.opensearch.core.rest.RestStatus; import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.performanceanalyzer.commons.config.overrides.ConfigOverrides; import org.opensearch.performanceanalyzer.commons.config.overrides.ConfigOverridesHelper; @@ -26,7 +27,6 @@ import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestController; import org.opensearch.rest.RestRequest; -import org.opensearch.rest.RestStatus; /** Rest request handler for handling config overrides for various performance analyzer features. */ public class PerformanceAnalyzerOverridesClusterConfigAction extends BaseRestHandler { diff --git a/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerResourceProvider.java b/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerResourceProvider.java index 7098120f..5f44cce2 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerResourceProvider.java +++ b/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerResourceProvider.java @@ -30,6 +30,7 @@ import org.opensearch.client.node.NodeClient; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Settings; +import org.opensearch.core.rest.RestStatus; import org.opensearch.performanceanalyzer.commons.config.PluginSettings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.BytesRestResponse; @@ -37,7 +38,6 @@ import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestRequest.Method; import org.opensearch.rest.RestResponse; -import org.opensearch.rest.RestStatus; public class PerformanceAnalyzerResourceProvider extends BaseRestHandler { private static final Logger LOG = diff --git a/src/main/java/org/opensearch/performanceanalyzer/http_action/whoami/TransportWhoAmIAction.java b/src/main/java/org/opensearch/performanceanalyzer/http_action/whoami/TransportWhoAmIAction.java index 0dad87ab..03334a94 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/http_action/whoami/TransportWhoAmIAction.java +++ b/src/main/java/org/opensearch/performanceanalyzer/http_action/whoami/TransportWhoAmIAction.java @@ -6,10 +6,10 @@ package org.opensearch.performanceanalyzer.http_action.whoami; -import org.opensearch.action.ActionListener; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; import org.opensearch.common.inject.Inject; +import org.opensearch.core.action.ActionListener; import org.opensearch.indices.IndicesService; import org.opensearch.performanceanalyzer.OpenSearchResources; import org.opensearch.tasks.Task; diff --git a/src/main/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmIAction.java b/src/main/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmIAction.java index dd33ab16..d5827e62 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmIAction.java +++ b/src/main/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmIAction.java @@ -7,7 +7,7 @@ import org.opensearch.action.ActionType; -import org.opensearch.common.io.stream.Writeable; +import org.opensearch.core.common.io.stream.Writeable; public class WhoAmIAction extends ActionType { diff --git a/src/main/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmIRequest.java b/src/main/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmIRequest.java index 442fb110..2849793d 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmIRequest.java +++ b/src/main/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmIRequest.java @@ -7,7 +7,7 @@ import org.opensearch.action.support.nodes.BaseNodesRequest; -import org.opensearch.common.io.stream.StreamInput; +import org.opensearch.core.common.io.stream.StreamInput; public class WhoAmIRequest extends BaseNodesRequest { diff --git a/src/main/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmIResponse.java b/src/main/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmIResponse.java index 86e4f801..e8254fef 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmIResponse.java +++ b/src/main/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmIResponse.java @@ -7,8 +7,8 @@ import java.io.IOException; -import org.opensearch.action.ActionResponse; -import org.opensearch.common.io.stream.StreamOutput; +import org.opensearch.core.action.ActionResponse; +import org.opensearch.core.common.io.stream.StreamOutput; import org.opensearch.core.xcontent.ToXContent; import org.opensearch.core.xcontent.XContentBuilder; diff --git a/src/main/java/org/opensearch/performanceanalyzer/transport/PerformanceAnalyzerTransportChannel.java b/src/main/java/org/opensearch/performanceanalyzer/transport/PerformanceAnalyzerTransportChannel.java index 8fade05c..cc9f57a8 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/transport/PerformanceAnalyzerTransportChannel.java +++ b/src/main/java/org/opensearch/performanceanalyzer/transport/PerformanceAnalyzerTransportChannel.java @@ -10,13 +10,13 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.opensearch.core.transport.TransportResponse; import org.opensearch.performanceanalyzer.commons.metrics.AllMetrics.ShardBulkDimension; import org.opensearch.performanceanalyzer.commons.metrics.AllMetrics.ShardBulkMetric; import org.opensearch.performanceanalyzer.commons.metrics.MetricsProcessor; import org.opensearch.performanceanalyzer.commons.metrics.PerformanceAnalyzerMetrics; import org.opensearch.performanceanalyzer.commons.util.ThreadIDUtil; import org.opensearch.transport.TransportChannel; -import org.opensearch.transport.TransportResponse; public class PerformanceAnalyzerTransportChannel implements TransportChannel, MetricsProcessor { private static final Logger LOG = diff --git a/src/main/java/org/opensearch/performanceanalyzer/util/Utils.java b/src/main/java/org/opensearch/performanceanalyzer/util/Utils.java index ac705a98..a6a82bc6 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/util/Utils.java +++ b/src/main/java/org/opensearch/performanceanalyzer/util/Utils.java @@ -13,10 +13,10 @@ import org.opensearch.action.admin.indices.stats.CommonStatsFlags; import org.opensearch.action.admin.indices.stats.IndexShardStats; import org.opensearch.action.admin.indices.stats.ShardStats; +import org.opensearch.core.index.shard.ShardId; import org.opensearch.index.IndexService; import org.opensearch.index.shard.IndexShard; import org.opensearch.index.shard.IndexShardState; -import org.opensearch.index.shard.ShardId; import org.opensearch.indices.IndicesService; import org.opensearch.performanceanalyzer.OpenSearchResources; import org.opensearch.performanceanalyzer.collectors.*; diff --git a/src/test/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPluginTests.java b/src/test/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPluginTests.java index 548cb1ed..81bbde05 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPluginTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPluginTests.java @@ -20,18 +20,18 @@ import org.junit.Before; import org.junit.Test; import org.opensearch.action.ActionRequest; -import org.opensearch.action.ActionResponse; import org.opensearch.action.support.ActionFilter; import org.opensearch.client.node.NodeClient; 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.core.action.ActionResponse; +import org.opensearch.core.indices.breaker.CircuitBreakerService; import org.opensearch.env.Environment; import org.opensearch.env.TestEnvironment; import org.opensearch.identity.IdentityService; import org.opensearch.indices.breaker.BreakerSettings; -import org.opensearch.indices.breaker.CircuitBreakerService; import org.opensearch.indices.breaker.HierarchyCircuitBreakerService; import org.opensearch.performanceanalyzer.action.PerformanceAnalyzerActionFilter; import org.opensearch.performanceanalyzer.config.setting.PerformanceAnalyzerClusterSettings; diff --git a/src/test/java/org/opensearch/performanceanalyzer/action/PerformanceAnalyzerActionFilterTests.java b/src/test/java/org/opensearch/performanceanalyzer/action/PerformanceAnalyzerActionFilterTests.java index 7b270d5e..2f73ec2d 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/action/PerformanceAnalyzerActionFilterTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/action/PerformanceAnalyzerActionFilterTests.java @@ -15,12 +15,12 @@ import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.opensearch.action.ActionListener; import org.opensearch.action.ActionRequest; -import org.opensearch.action.ActionResponse; import org.opensearch.action.bulk.BulkRequest; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.support.ActionFilterChain; +import org.opensearch.core.action.ActionListener; +import org.opensearch.core.action.ActionResponse; import org.opensearch.performanceanalyzer.config.PerformanceAnalyzerController; import org.opensearch.tasks.Task; diff --git a/src/test/java/org/opensearch/performanceanalyzer/action/PerformanceAnalyzerActionListenerTests.java b/src/test/java/org/opensearch/performanceanalyzer/action/PerformanceAnalyzerActionListenerTests.java index b122e63b..59655700 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/action/PerformanceAnalyzerActionListenerTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/action/PerformanceAnalyzerActionListenerTests.java @@ -14,15 +14,15 @@ import org.junit.Test; import org.mockito.Mockito; import org.opensearch.OpenSearchException; -import org.opensearch.action.ActionListener; -import org.opensearch.action.ActionResponse; import org.opensearch.action.bulk.BulkResponse; import org.opensearch.action.search.SearchResponse; +import org.opensearch.core.action.ActionListener; +import org.opensearch.core.action.ActionResponse; +import org.opensearch.core.rest.RestStatus; import org.opensearch.performanceanalyzer.commons.config.PluginSettings; import org.opensearch.performanceanalyzer.commons.event_process.Event; import org.opensearch.performanceanalyzer.commons.metrics.PerformanceAnalyzerMetrics; import org.opensearch.performanceanalyzer.util.TestUtil; -import org.opensearch.rest.RestStatus; @SuppressWarnings("unchecked") public class PerformanceAnalyzerActionListenerTests { diff --git a/src/test/java/org/opensearch/performanceanalyzer/collectors/CircuitBreakerCollectorTests.java b/src/test/java/org/opensearch/performanceanalyzer/collectors/CircuitBreakerCollectorTests.java index 0adee06c..c8410488 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/collectors/CircuitBreakerCollectorTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/collectors/CircuitBreakerCollectorTests.java @@ -14,7 +14,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.opensearch.common.breaker.CircuitBreaker; +import org.opensearch.core.common.breaker.CircuitBreaker; import org.opensearch.indices.IndicesService; import org.opensearch.performanceanalyzer.OpenSearchResources; import org.opensearch.performanceanalyzer.commons.config.PluginSettings; diff --git a/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigActionTests.java b/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigActionTests.java index 4d852c40..a6f5dc65 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigActionTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigActionTests.java @@ -18,17 +18,18 @@ import org.junit.Test; import org.mockito.Mock; import org.opensearch.client.node.NodeClient; -import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; +import org.opensearch.core.common.bytes.BytesReference; +import org.opensearch.core.indices.breaker.CircuitBreakerService; +import org.opensearch.core.rest.RestStatus; import org.opensearch.core.xcontent.NamedXContentRegistry; import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.identity.IdentityService; import org.opensearch.indices.breaker.BreakerSettings; -import org.opensearch.indices.breaker.CircuitBreakerService; import org.opensearch.indices.breaker.HierarchyCircuitBreakerService; import org.opensearch.performanceanalyzer.config.PerformanceAnalyzerController; import org.opensearch.performanceanalyzer.config.setting.ClusterSettingsManager; @@ -36,7 +37,6 @@ import org.opensearch.performanceanalyzer.config.setting.handler.PerformanceAnalyzerClusterSettingHandler; import org.opensearch.rest.RestController; import org.opensearch.rest.RestRequest; -import org.opensearch.rest.RestStatus; import org.opensearch.test.rest.FakeRestChannel; import org.opensearch.test.rest.FakeRestRequest; import org.opensearch.threadpool.TestThreadPool; diff --git a/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigActionTests.java b/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigActionTests.java index 26995aad..9138ccea 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigActionTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigActionTests.java @@ -19,22 +19,22 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.opensearch.client.node.NodeClient; -import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; +import org.opensearch.core.common.bytes.BytesReference; +import org.opensearch.core.indices.breaker.CircuitBreakerService; +import org.opensearch.core.rest.RestStatus; import org.opensearch.core.xcontent.NamedXContentRegistry; import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.identity.IdentityService; import org.opensearch.indices.breaker.BreakerSettings; -import org.opensearch.indices.breaker.CircuitBreakerService; import org.opensearch.indices.breaker.HierarchyCircuitBreakerService; import org.opensearch.performanceanalyzer.config.PerformanceAnalyzerController; import org.opensearch.rest.RestController; import org.opensearch.rest.RestRequest; -import org.opensearch.rest.RestStatus; import org.opensearch.test.rest.FakeRestChannel; import org.opensearch.test.rest.FakeRestRequest; import org.opensearch.threadpool.TestThreadPool; diff --git a/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerOverridesClusterConfigActionTests.java b/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerOverridesClusterConfigActionTests.java index c5b35c14..66c0a65a 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerOverridesClusterConfigActionTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerOverridesClusterConfigActionTests.java @@ -19,22 +19,22 @@ import org.junit.Test; import org.mockito.Mock; import org.opensearch.client.node.NodeClient; -import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.common.xcontent.XContentType; +import org.opensearch.core.common.bytes.BytesReference; +import org.opensearch.core.indices.breaker.CircuitBreakerService; +import org.opensearch.core.rest.RestStatus; import org.opensearch.core.xcontent.NamedXContentRegistry; import org.opensearch.identity.IdentityService; import org.opensearch.indices.breaker.BreakerSettings; -import org.opensearch.indices.breaker.CircuitBreakerService; import org.opensearch.indices.breaker.HierarchyCircuitBreakerService; import org.opensearch.performanceanalyzer.commons.config.overrides.ConfigOverridesWrapper; import org.opensearch.performanceanalyzer.config.ConfigOverridesTestHelper; import org.opensearch.performanceanalyzer.config.setting.handler.ConfigOverridesClusterSettingHandler; import org.opensearch.rest.RestController; import org.opensearch.rest.RestRequest.Method; -import org.opensearch.rest.RestStatus; import org.opensearch.test.rest.FakeRestChannel; import org.opensearch.test.rest.FakeRestRequest; import org.opensearch.threadpool.TestThreadPool; diff --git a/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerResourceProviderTests.java b/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerResourceProviderTests.java index dc419329..b5d73c8a 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerResourceProviderTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerResourceProviderTests.java @@ -18,8 +18,8 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; -import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.settings.Settings; +import org.opensearch.core.common.bytes.BytesReference; import org.opensearch.performanceanalyzer.commons.config.PluginSettings; import org.opensearch.rest.RestController; import org.opensearch.rest.RestRequest; diff --git a/src/test/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmITests.java b/src/test/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmITests.java index 5aa5dd0f..d9f1d41c 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmITests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmITests.java @@ -15,10 +15,10 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; -import org.opensearch.action.ActionListener; import org.opensearch.action.support.ActionFilters; -import org.opensearch.common.io.stream.Writeable.Reader; import org.opensearch.common.xcontent.XContentType; +import org.opensearch.core.action.ActionListener; +import org.opensearch.core.common.io.stream.Writeable.Reader; import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.indices.IndicesService; import org.opensearch.performanceanalyzer.OpenSearchResources; diff --git a/src/test/java/org/opensearch/performanceanalyzer/hwnet/CollectMetricsTests.java b/src/test/java/org/opensearch/performanceanalyzer/hwnet/CollectMetricsTests.java index a42319fb..3de35bad 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/hwnet/CollectMetricsTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/hwnet/CollectMetricsTests.java @@ -29,10 +29,10 @@ import org.opensearch.cluster.node.DiscoveryNodeRole; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.service.ClusterService; -import org.opensearch.common.transport.TransportAddress; -import org.opensearch.indices.breaker.AllCircuitBreakerStats; -import org.opensearch.indices.breaker.CircuitBreakerService; -import org.opensearch.indices.breaker.CircuitBreakerStats; +import org.opensearch.core.common.transport.TransportAddress; +import org.opensearch.core.indices.breaker.AllCircuitBreakerStats; +import org.opensearch.core.indices.breaker.CircuitBreakerService; +import org.opensearch.core.indices.breaker.CircuitBreakerStats; import org.opensearch.performanceanalyzer.AbstractTests; import org.opensearch.performanceanalyzer.OpenSearchResources; import org.opensearch.performanceanalyzer.collectors.CircuitBreakerCollector; diff --git a/src/test/java/org/opensearch/performanceanalyzer/listener/PerformanceAnalyzerSearchListenerTests.java b/src/test/java/org/opensearch/performanceanalyzer/listener/PerformanceAnalyzerSearchListenerTests.java index 6118923a..cfa8bf58 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/listener/PerformanceAnalyzerSearchListenerTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/listener/PerformanceAnalyzerSearchListenerTests.java @@ -17,7 +17,7 @@ import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.opensearch.index.shard.ShardId; +import org.opensearch.core.index.shard.ShardId; import org.opensearch.performanceanalyzer.commons.collectors.StatsCollector; import org.opensearch.performanceanalyzer.commons.config.PluginSettings; import org.opensearch.performanceanalyzer.commons.jvm.ThreadList; diff --git a/src/test/java/org/opensearch/performanceanalyzer/transport/PerformanceAnalyzerTransportChannelTests.java b/src/test/java/org/opensearch/performanceanalyzer/transport/PerformanceAnalyzerTransportChannelTests.java index 23bc6ce2..3c15e11d 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/transport/PerformanceAnalyzerTransportChannelTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/transport/PerformanceAnalyzerTransportChannelTests.java @@ -14,9 +14,9 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; +import org.opensearch.core.transport.TransportResponse; import org.opensearch.performanceanalyzer.util.Utils; import org.opensearch.transport.TransportChannel; -import org.opensearch.transport.TransportResponse; public class PerformanceAnalyzerTransportChannelTests { private PerformanceAnalyzerTransportChannel channel; diff --git a/src/test/java/org/opensearch/performanceanalyzer/transport/PerformanceAnalyzerTransportRequestHandlerTests.java b/src/test/java/org/opensearch/performanceanalyzer/transport/PerformanceAnalyzerTransportRequestHandlerTests.java index 56ce489d..56dc289a 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/transport/PerformanceAnalyzerTransportRequestHandlerTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/transport/PerformanceAnalyzerTransportRequestHandlerTests.java @@ -17,7 +17,7 @@ import org.opensearch.action.bulk.BulkItemRequest; import org.opensearch.action.bulk.BulkShardRequest; import org.opensearch.action.support.replication.TransportReplicationAction.ConcreteShardRequest; -import org.opensearch.index.shard.ShardId; +import org.opensearch.core.index.shard.ShardId; import org.opensearch.performanceanalyzer.config.PerformanceAnalyzerController; import org.opensearch.performanceanalyzer.util.Utils; import org.opensearch.tasks.Task;