Fixing xcontent imports in Tests

Signed-off-by: Khushboo Rajput <[email protected]>
opensearch-project · Mar 29, 2023 · b70c9d7 · b70c9d7
1 parent 5347875
commit b70c9d7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
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.XContentFactory;
+import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.core.xcontent.XContentBuilder;
-import org.opensearch.core.xcontent.XContentFactory;
 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.XContentFactory;
+import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.core.xcontent.XContentBuilder;
-import org.opensearch.core.xcontent.XContentFactory;
 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.XContentType;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
-import org.opensearch.core.xcontent.XContentType;
 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.XContentType;
 import org.opensearch.core.xcontent.XContentBuilder;
-import org.opensearch.core.xcontent.XContentType;
 import org.opensearch.indices.IndicesService;
 import org.opensearch.performanceanalyzer.OpenSearchResources;
 import org.opensearch.tasks.Task;