Fixing xcontent imports (#410)

* Fixing xcontent imports Signed-off-by: Khushboo Rajput <[email protected]> --------- Signed-off-by: Khushboo Rajput <[email protected]>
opensearch-project · Mar 29, 2023 · f89e7e8 · f89e7e8
1 parent b03c2ca
commit f89e7e8
Show file tree

Hide file tree

Showing 33 changed files with 32 additions and 26 deletions.
diff --git a/licenses/netty-buffer-4.1.86.Final.jar.sha1 b/licenses/netty-buffer-4.1.86.Final.jar.sha1
diff --git a/licenses/netty-buffer-4.1.90.Final.jar.sha1 b/licenses/netty-buffer-4.1.90.Final.jar.sha1
@@ -0,0 +1 @@
+937eb60c19c5f5c1326b96123c9ec3d33238d4d5
diff --git a/licenses/netty-codec-4.1.86.Final.jar.sha1 b/licenses/netty-codec-4.1.86.Final.jar.sha1
diff --git a/licenses/netty-codec-4.1.90.Final.jar.sha1 b/licenses/netty-codec-4.1.90.Final.jar.sha1
@@ -0,0 +1 @@
+9992a22c82e18b8fd4f34989535f3e504e55aa37
diff --git a/licenses/netty-codec-http-4.1.86.Final.jar.sha1 b/licenses/netty-codec-http-4.1.86.Final.jar.sha1
diff --git a/licenses/netty-codec-http-4.1.90.Final.jar.sha1 b/licenses/netty-codec-http-4.1.90.Final.jar.sha1
@@ -0,0 +1 @@
+19bbcd46f8ee0d118486f98eff22fe665b9689e5
diff --git a/licenses/netty-codec-http2-4.1.86.Final.jar.sha1 b/licenses/netty-codec-http2-4.1.86.Final.jar.sha1
diff --git a/licenses/netty-codec-http2-4.1.90.Final.jar.sha1 b/licenses/netty-codec-http2-4.1.90.Final.jar.sha1
@@ -0,0 +1 @@
+ea3be877ea976b3d71e1a872958d32854b24db66
diff --git a/licenses/netty-codec-socks-4.1.86.Final.jar.sha1 b/licenses/netty-codec-socks-4.1.86.Final.jar.sha1
diff --git a/licenses/netty-codec-socks-4.1.90.Final.jar.sha1 b/licenses/netty-codec-socks-4.1.90.Final.jar.sha1
@@ -0,0 +1 @@
+7397535a4e03d2f74c71aa2282eb7a2760ffc37b
diff --git a/licenses/netty-common-4.1.86.Final.jar.sha1 b/licenses/netty-common-4.1.86.Final.jar.sha1
diff --git a/licenses/netty-common-4.1.90.Final.jar.sha1 b/licenses/netty-common-4.1.90.Final.jar.sha1
@@ -0,0 +1 @@
+43597a09382c6ae2bef469a9b3a41e8a17850638
diff --git a/licenses/netty-handler-4.1.86.Final.jar.sha1 b/licenses/netty-handler-4.1.86.Final.jar.sha1
diff --git a/licenses/netty-handler-4.1.90.Final.jar.sha1 b/licenses/netty-handler-4.1.90.Final.jar.sha1
@@ -0,0 +1 @@
+64f6946ce4d9189cec5341d3f5f86ac5653099b5
diff --git a/licenses/netty-handler-proxy-4.1.86.Final.jar.sha1 b/licenses/netty-handler-proxy-4.1.86.Final.jar.sha1
diff --git a/licenses/netty-handler-proxy-4.1.90.Final.jar.sha1 b/licenses/netty-handler-proxy-4.1.90.Final.jar.sha1
@@ -0,0 +1 @@
+6ab526a43a14f7796434fa6a705c34201603235f
diff --git a/licenses/netty-resolver-4.1.86.Final.jar.sha1 b/licenses/netty-resolver-4.1.86.Final.jar.sha1
diff --git a/licenses/netty-resolver-4.1.90.Final.jar.sha1 b/licenses/netty-resolver-4.1.90.Final.jar.sha1
@@ -0,0 +1 @@
+47c415d8c83f08b820ba00e6497a6cf19dd0155f
diff --git a/licenses/netty-transport-4.1.86.Final.jar.sha1 b/licenses/netty-transport-4.1.86.Final.jar.sha1
diff --git a/licenses/netty-transport-4.1.90.Final.jar.sha1 b/licenses/netty-transport-4.1.90.Final.jar.sha1
@@ -0,0 +1 @@
+82d68da212f62b076c763f5efa9b072d2abc018f
diff --git a/licenses/netty-transport-native-unix-common-4.1.86.Final.jar.sha1 b/licenses/netty-transport-native-unix-common-4.1.86.Final.jar.sha1
diff --git a/licenses/netty-transport-native-unix-common-4.1.90.Final.jar.sha1 b/licenses/netty-transport-native-unix-common-4.1.90.Final.jar.sha1
@@ -0,0 +1 @@
+e42282002cf22105e7e993651aead231246d0220
diff --git a/licenses/performanceanalyzer-rca-2.5.0.0-SNAPSHOT.jar.sha1 b/licenses/performanceanalyzer-rca-2.5.0.0-SNAPSHOT.jar.sha1
diff --git a/licenses/performanceanalyzer-rca-2.7.0.0-SNAPSHOT.jar.sha1 b/licenses/performanceanalyzer-rca-2.7.0.0-SNAPSHOT.jar.sha1
@@ -0,0 +1 @@
+5b6981ded955c77a09b5f241cbbefe68e5663c24
diff --git a/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPlugin.java b/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPlugin.java
@@ -39,7 +39,7 @@
 import org.opensearch.common.settings.SettingsFilter;
 import org.opensearch.common.util.PageCacheRecycler;
 import org.opensearch.common.util.concurrent.ThreadContext;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.discovery.Discovery;
 import org.opensearch.env.Environment;
 import org.opensearch.env.NodeEnvironment;

diff --git a/...search/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigAction.java b/...search/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigAction.java
@@ -15,9 +15,9 @@
 import org.apache.logging.log4j.Logger;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.common.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentHelper;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.performanceanalyzer.config.PluginSettings;
 import org.opensearch.performanceanalyzer.config.setting.handler.NodeStatsSettingHandler;
 import org.opensearch.performanceanalyzer.config.setting.handler.PerformanceAnalyzerClusterSettingHandler;

diff --git a/...rg/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigAction.java b/...rg/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigAction.java
@@ -15,8 +15,8 @@
 import org.apache.logging.log4j.Logger;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.common.inject.Inject;
-import org.opensearch.common.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentHelper;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.performanceanalyzer.config.PerformanceAnalyzerController;
 import org.opensearch.performanceanalyzer.config.PluginSettings;
 import org.opensearch.rest.BaseRestHandler;

diff --git a/...rformanceanalyzer/http_action/config/PerformanceAnalyzerOverridesClusterConfigAction.java b/...rformanceanalyzer/http_action/config/PerformanceAnalyzerOverridesClusterConfigAction.java
@@ -15,9 +15,9 @@
 import org.apache.logging.log4j.Logger;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.common.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentHelper;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.performanceanalyzer.config.overrides.ConfigOverrides;
 import org.opensearch.performanceanalyzer.config.overrides.ConfigOverridesHelper;
 import org.opensearch.performanceanalyzer.config.overrides.ConfigOverridesWrapper;

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
@@ -9,8 +9,8 @@
 import java.io.IOException;
 import org.opensearch.action.ActionResponse;
 import org.opensearch.common.io.stream.StreamOutput;
-import org.opensearch.common.xcontent.ToXContent;
-import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
 
 public class WhoAmIResponse extends ActionResponse implements ToXContent {
     @Override

diff --git a/...h/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigActionTests.java b/...h/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigActionTests.java
@@ -21,9 +21,10 @@
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.util.concurrent.ThreadContext;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
-import org.opensearch.common.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.indices.breaker.BreakerSettings;
 import org.opensearch.indices.breaker.CircuitBreakerService;
 import org.opensearch.indices.breaker.HierarchyCircuitBreakerService;
@@ -178,7 +179,9 @@ private FakeRestRequest buildRequest(String requestPath) throws IOException {
         return new FakeRestRequest.Builder(NamedXContentRegistry.EMPTY)
                 .withMethod(RestRequest.Method.POST)
                 .withPath(requestPath)
-                .withContent(BytesReference.bytes(builder), builder.contentType())
+                .withContent(
+                        BytesReference.bytes(builder),
+                        XContentType.fromMediaType(builder.contentType()))
                 .build();
     }
 }
diff --git a/...ensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigActionTests.java b/...ensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigActionTests.java
@@ -22,9 +22,10 @@
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.util.concurrent.ThreadContext;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
-import org.opensearch.common.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.indices.breaker.BreakerSettings;
 import org.opensearch.indices.breaker.CircuitBreakerService;
 import org.opensearch.indices.breaker.HierarchyCircuitBreakerService;
@@ -310,7 +311,9 @@ private FakeRestRequest buildRequest(String requestPath, boolean shouldEnable)
         return new FakeRestRequest.Builder(NamedXContentRegistry.EMPTY)
                 .withMethod(RestRequest.Method.POST)
                 .withPath(requestPath)
-                .withContent(BytesReference.bytes(builder), builder.contentType())
+                .withContent(
+                        BytesReference.bytes(builder),
+                        XContentType.fromMediaType(builder.contentType()))
                 .build();
     }
 }
diff --git a/...anceanalyzer/http_action/config/PerformanceAnalyzerOverridesClusterConfigActionTests.java b/...anceanalyzer/http_action/config/PerformanceAnalyzerOverridesClusterConfigActionTests.java
@@ -22,8 +22,8 @@
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.util.concurrent.ThreadContext;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.indices.breaker.BreakerSettings;
 import org.opensearch.indices.breaker.CircuitBreakerService;
 import org.opensearch.indices.breaker.HierarchyCircuitBreakerService;

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
@@ -18,8 +18,8 @@
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.common.io.stream.Writeable.Reader;
-import org.opensearch.common.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.indices.IndicesService;
 import org.opensearch.performanceanalyzer.OpenSearchResources;
 import org.opensearch.tasks.Task;