Skip to content

Commit

Permalink
Refactor XContentType to mediaType (#721)
Browse files Browse the repository at this point in the history
Signed-off-by: Hailong Cui <[email protected]>
  • Loading branch information
Hailong-am authored Jul 26, 2023
1 parent b5f454c commit d0a322c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion notifications/notifications/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ testClusters.integTest {
}

// Always be minimumCompatibilityVersion of current opensearch version(3.0.0)
def bwcVersionShort = "2.9.0"
def bwcVersionShort = "2.10.0"
def bwcVersion = bwcVersionShort + ".0"
def bwcOpenSearchVesion= bwcVersionShort + "-SNAPSHOT"
def bwcPluginVersion = bwcVersion + "-SNAPSHOT"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
val xContentType = MediaType.fromMediaType(response.entity.contentType)
xContentType.xContent().createParser(
NamedXContentRegistry.EMPTY,
DeprecationHandler.THROW_UNSUPPORTED_OPERATION,
Expand Down

0 comments on commit d0a322c

Please sign in to comment.