Merge pull request #739 from derek-ho/fix-2.x

update import from upstream breaking changes
opensearch-project · Aug 2, 2023 · 07c4494 · 07c4494
2 parents 79a6aff + 1290ca6
commit 07c4494
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/test/kotlin/org/opensearch/integTest/PluginRestTestCase.kt b/src/test/kotlin/org/opensearch/integTest/PluginRestTestCase.kt
@@ -19,10 +19,10 @@ import org.opensearch.client.WarningFailureException
 import org.opensearch.client.WarningsHandler
 import org.opensearch.common.io.PathUtils
 import org.opensearch.common.settings.Settings
-import org.opensearch.common.xcontent.XContentType
 import org.opensearch.commons.ConfigConstants
 import org.opensearch.commons.rest.SecureRestClientBuilder
 import org.opensearch.core.xcontent.DeprecationHandler
+import org.opensearch.core.xcontent.MediaType
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.test.rest.OpenSearchRestTestCase
 import java.io.BufferedReader
@@ -61,7 +61,7 @@ abstract class PluginRestTestCase : OpenSearchRestTestCase() {
     open fun wipeAllODFEIndices() {
         if (preserveODFEIndicesAfterTest()) return
         val response = client().performRequest(Request("GET", "/_cat/indices?format=json&expand_wildcards=all"))
-        val xContentType = XContentType.fromMediaType(response.entity.contentType.value)
+        val xContentType = MediaType.fromMediaType(response.entity.contentType.value)
         xContentType.xContent().createParser(
             NamedXContentRegistry.EMPTY, DeprecationHandler.THROW_UNSUPPORTED_OPERATION,
             response.entity.content