[Backport 2.x] Fix core XcontentFactory refactor (#734)

* Fix core XcontentFactory refactor (#732) Signed-off-by: Hailong Cui <[email protected]> (cherry picked from commit 216dfcb) * Refactor XContentType to mediaType (#721) Signed-off-by: Hailong Cui <[email protected]> (cherry picked from commit d0a322c)
opensearch-project · Aug 7, 2023 · b67c5bd · b67c5bd
1 parent 74de360
commit b67c5bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...ns/core/src/main/kotlin/org/opensearch/notifications/core/client/DestinationHttpClient.kt b/...ns/core/src/main/kotlin/org/opensearch/notifications/core/client/DestinationHttpClient.kt
@@ -20,9 +20,9 @@ import org.apache.http.impl.client.DefaultHttpRequestRetryHandler
 import org.apache.http.impl.client.HttpClientBuilder
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager
 import org.apache.http.util.EntityUtils
-import org.opensearch.common.xcontent.XContentFactory
 import org.opensearch.common.xcontent.XContentType
 import org.opensearch.core.rest.RestStatus
+import org.opensearch.core.xcontent.MediaTypeRegistry
 import org.opensearch.notifications.core.setting.PluginSettings
 import org.opensearch.notifications.core.utils.OpenForTesting
 import org.opensearch.notifications.core.utils.logger
@@ -155,7 +155,7 @@ class DestinationHttpClient {
     }
 
     fun buildRequestBody(destination: WebhookDestination, message: MessageContent): String {
-        val builder = XContentFactory.contentBuilder(XContentType.JSON)
+        val builder = MediaTypeRegistry.contentBuilder(XContentType.JSON)
         val keyName = when (destination) {
             // Slack webhook request body has required "text" as key name https://api.slack.com/messaging/webhooks
             // Chime webhook request body has required "Content" as key name

diff --git a/notifications/notifications/src/test/kotlin/org/opensearch/integtest/PluginRestTestCase.kt b/notifications/notifications/src/test/kotlin/org/opensearch/integtest/PluginRestTestCase.kt
@@ -17,12 +17,12 @@ import org.opensearch.client.RestClient
 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.notifications.model.ConfigType
 import org.opensearch.commons.rest.SecureRestClientBuilder
 import org.opensearch.core.rest.RestStatus
 import org.opensearch.core.xcontent.DeprecationHandler
+import org.opensearch.core.xcontent.MediaType
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.notifications.NotificationPlugin
 import org.opensearch.rest.RestRequest
@@ -67,7 +67,7 @@ abstract class PluginRestTestCase : OpenSearchRestTestCase() {
 
         val pluginIndices = listOf(".opensearch-notifications-config")
         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,