Fix core XcontentType refactor (opensearch-project#873)

Signed-off-by: Hailong Cui <ihailong@amazon.com> (cherry picked from commit d4cafd6)
Hailong-am · Aug 7, 2023 · d8a3ac6 · d8a3ac6
1 parent fbfc896
commit d8a3ac6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/...in/org/opensearch/indexmanagement/indexstatemanagement/resthandler/RestAddPolicyAction.kt b/...in/org/opensearch/indexmanagement/indexstatemanagement/resthandler/RestAddPolicyAction.kt
@@ -55,7 +55,7 @@ class RestAddPolicyAction : BaseRestHandler() {
         }
 
         val body = if (request.hasContent()) {
-            XContentHelper.convertToMap(request.requiredContent(), false, request.xContentType as (MediaType)).v2()
+            XContentHelper.convertToMap(request.requiredContent(), false, request.mediaType).v2()
         } else {
             mapOf()
         }

diff --git a/...rch/indexmanagement/indexstatemanagement/resthandler/RestRetryFailedManagedIndexAction.kt b/...rch/indexmanagement/indexstatemanagement/resthandler/RestRetryFailedManagedIndexAction.kt
@@ -55,7 +55,7 @@ class RestRetryFailedManagedIndexAction : BaseRestHandler() {
             throw IllegalArgumentException("Missing indices")
         }
         val body = if (request.hasContent()) {
-            XContentHelper.convertToMap(request.requiredContent(), false, request.xContentType as (MediaType)).v2()
+            XContentHelper.convertToMap(request.requiredContent(), false, request.mediaType).v2()
         } else {
             mapOf()
         }

diff --git a/src/main/kotlin/org/opensearch/indexmanagement/opensearchapi/OpenSearchExtensions.kt b/src/main/kotlin/org/opensearch/indexmanagement/opensearchapi/OpenSearchExtensions.kt
@@ -73,7 +73,7 @@ fun contentParser(bytesReference: BytesReference): XContentParser {
 
 /** Convert an object to maps and lists representation */
 fun ToXContent.convertToMap(): Map<String, Any> {
-    val bytesReference = XContentHelper.toXContent(this, XContentType.JSON, false)
+    val bytesReference = XContentHelper.toXContent(this, MediaType.fromMediaType(XContentType.JSON.mediaType()), ToXContent.EMPTY_PARAMS, false)
     return XContentHelper.convertToMap(bytesReference, false, XContentType.JSON as (MediaType)).v2()
 }
 

diff --git a/src/test/kotlin/org/opensearch/indexmanagement/IndexManagementRestTestCase.kt b/src/test/kotlin/org/opensearch/indexmanagement/IndexManagementRestTestCase.kt
@@ -24,7 +24,8 @@ import org.opensearch.core.xcontent.DeprecationHandler
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.common.xcontent.XContentType
 import org.opensearch.indexmanagement.indexstatemanagement.util.INDEX_HIDDEN
-import org.opensearch.rest.RestStatus
+import org.opensearch.core.rest.RestStatus
+import org.opensearch.core.xcontent.MediaType
 import java.io.IOException
 import java.nio.file.Files
 import java.util.*
@@ -194,7 +195,11 @@ abstract class IndexManagementRestTestCase : ODFERestTestCase() {
             }
 
             val response = client.performRequest(Request("GET", "/_cat/indices?format=json&expand_wildcards=all"))
+<<<<<<< HEAD
             val xContentType = XContentType.fromMediaType(response.entity.contentType.value)
+=======
+            val xContentType = MediaType.fromMediaType(response.entity.contentType)
+>>>>>>> d4cafd60 (Fix core XcontentType refactor (#873))
             xContentType.xContent().createParser(
                 NamedXContentRegistry.EMPTY, DeprecationHandler.THROW_UNSUPPORTED_OPERATION,
                 response.entity.content
@@ -263,7 +268,11 @@ abstract class IndexManagementRestTestCase : ODFERestTestCase() {
         protected fun waitForThreadPools(client: RestClient) {
             val response = client.performRequest(Request("GET", "/_cat/thread_pool?format=json"))
 
+<<<<<<< HEAD
             val xContentType = XContentType.fromMediaType(response.entity.contentType.value)
+=======
+            val xContentType = MediaType.fromMediaType(response.entity.contentType)
+>>>>>>> d4cafd60 (Fix core XcontentType refactor (#873))
             xContentType.xContent().createParser(
                 NamedXContentRegistry.EMPTY, DeprecationHandler.THROW_UNSUPPORTED_OPERATION,
                 response.entity.content