Refactor to core.common.Strings and MediaType

Signed-off-by: monusingh-1 <[email protected]>
opensearch-project · Aug 7, 2023 · 71802c6 · 71802c6
1 parent b09e223
commit 71802c6
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 11 deletions.
diff --git a/src/main/kotlin/org/opensearch/replication/action/stats/FollowerStatsResponse.kt b/src/main/kotlin/org/opensearch/replication/action/stats/FollowerStatsResponse.kt
@@ -16,7 +16,6 @@ import org.apache.logging.log4j.LogManager
 import org.opensearch.action.FailedNodeException
 import org.opensearch.action.support.nodes.BaseNodesResponse
 import org.opensearch.cluster.ClusterName
-import org.opensearch.common.Strings
 import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ToXContent.EMPTY_PARAMS
@@ -117,7 +116,7 @@ class FollowerStatsResponse : BaseNodesResponse<FollowerNodeStatsResponse?>, ToX
     override fun toString(): String {
         val builder: XContentBuilder = XContentFactory.jsonBuilder().prettyPrint()
         toXContent(builder, EMPTY_PARAMS)
-        return Strings.toString(builder)
+        return builder.toString()
     }
 }
 
diff --git a/src/main/kotlin/org/opensearch/replication/action/stats/LeaderStatsResponse.kt b/src/main/kotlin/org/opensearch/replication/action/stats/LeaderStatsResponse.kt
@@ -16,7 +16,6 @@ import org.apache.logging.log4j.LogManager
 import org.opensearch.action.FailedNodeException
 import org.opensearch.action.support.nodes.BaseNodesResponse
 import org.opensearch.cluster.ClusterName
-import org.opensearch.common.Strings
 import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ToXContent.EMPTY_PARAMS
@@ -76,7 +75,7 @@ class LeaderStatsResponse : BaseNodesResponse<LeaderNodeStatsResponse?>, ToXCont
     override fun toString(): String {
         val builder: XContentBuilder = XContentFactory.jsonBuilder().prettyPrint()
         toXContent(builder, EMPTY_PARAMS)
-        return Strings.toString(builder)
+        return builder.toString()
     }
 }
 
diff --git a/src/main/kotlin/org/opensearch/replication/task/index/IndexReplicationParams.kt b/src/main/kotlin/org/opensearch/replication/task/index/IndexReplicationParams.kt
@@ -13,7 +13,7 @@ package org.opensearch.replication.task.index
 
 import org.opensearch.Version
 import org.opensearch.core.ParseField
-import org.opensearch.common.Strings
+import org.opensearch.core.common.Strings
 import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ObjectParser

diff --git a/src/main/kotlin/org/opensearch/replication/task/shard/ShardReplicationParams.kt b/src/main/kotlin/org/opensearch/replication/task/shard/ShardReplicationParams.kt
@@ -13,7 +13,7 @@ package org.opensearch.replication.task.shard
 
 import org.opensearch.Version
 import org.opensearch.core.ParseField
-import org.opensearch.common.Strings
+import org.opensearch.core.common.Strings
 import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ObjectParser

diff --git a/src/main/kotlin/org/opensearch/replication/util/ValidationUtil.kt b/src/main/kotlin/org/opensearch/replication/util/ValidationUtil.kt
@@ -17,7 +17,7 @@ import org.opensearch.Version
 import org.opensearch.cluster.ClusterState
 import org.opensearch.cluster.metadata.IndexMetadata
 import org.opensearch.cluster.metadata.MetadataCreateIndexService
-import org.opensearch.common.Strings
+import org.opensearch.core.common.Strings
 import org.opensearch.common.ValidationException
 import org.opensearch.common.settings.Settings
 import org.opensearch.env.Environment

diff --git a/src/test/kotlin/org/opensearch/replication/MultiClusterRestTestCase.kt b/src/test/kotlin/org/opensearch/replication/MultiClusterRestTestCase.kt
@@ -37,7 +37,6 @@ import org.opensearch.client.ResponseException
 import org.opensearch.client.RestClient
 import org.opensearch.client.RestClientBuilder
 import org.opensearch.client.RestHighLevelClient
-import org.opensearch.common.Strings
 import org.opensearch.common.io.PathUtils
 import org.opensearch.common.settings.Settings
 import org.opensearch.common.unit.TimeValue
@@ -416,7 +415,7 @@ abstract class MultiClusterRestTestCase : OpenSearchTestCase() {
         clearCommand.endObject()
         if (mustClear) {
             val request = Request("PUT", "/_cluster/settings")
-            request.setJsonEntity(Strings.toString(clearCommand))
+            request.setJsonEntity(clearCommand.toString())
             testCluster.lowLevelClient.performRequest(request)
         }
     }

diff --git a/src/test/kotlin/org/opensearch/replication/ReplicationHelpers.kt b/src/test/kotlin/org/opensearch/replication/ReplicationHelpers.kt
@@ -25,7 +25,7 @@ import org.opensearch.common.settings.Settings
 import org.opensearch.common.unit.TimeValue
 import org.opensearch.core.xcontent.DeprecationHandler
 import org.opensearch.core.xcontent.NamedXContentRegistry
-import org.opensearch.common.xcontent.XContentType
+import org.opensearch.core.xcontent.MediaType
 import org.opensearch.test.OpenSearchTestCase.assertBusy
 import org.opensearch.test.rest.OpenSearchRestTestCase
 import org.junit.Assert
@@ -96,7 +96,7 @@ fun RestHighLevelClient.startReplication(request: StartReplicationRequest,
         waitForNoInitializingShards()
 }
 fun getAckResponse(lowLevelResponse: Response): AcknowledgedResponse {
-    val xContentType = XContentType.fromMediaType(lowLevelResponse.entity.contentType.value)
+    val xContentType = MediaType.fromMediaType(lowLevelResponse.entity.contentType.value)
     val xcp = xContentType.xContent().createParser(NamedXContentRegistry.EMPTY, DeprecationHandler.IGNORE_DEPRECATIONS,
             lowLevelResponse.entity.content)
     return AcknowledgedResponse.fromXContent(xcp)