Backport Refactor changes to 2.x (#1092)

* Open Upgrade gradle version and remove remaining use of ImmutableOpenMap (#814) Signed-off-by: Monu Singh <[email protected]> * Move from common to core.common (#1087) Keep up with core changes opensearch-project/OpenSearch#8157 move from common to core.common Change kotlin.version "1.8.21" as Class 'org.opensearch.commons.utils.OpenForTesting' was compiled with "1.8.21" version of Kotlin. Ref Set following to use 1.6 as 1.8.21 is not available yet. Checked that other OpenSearch plugins are also doing the same. Set kotlinx-coroutines-core to 1.6.0 set kotlinx-coroutines-test to 1.6.0 Added else in when statements as from Kotlin 1.7 version onward exhaustive list is mandatory. 'when' expression must be exhaustive, add necessary 'else' branch --------- Signed-off-by: monusingh-1 <[email protected]> --------- Signed-off-by: Monu Singh <[email protected]> Signed-off-by: monusingh-1 <[email protected]>
opensearch-project · Jul 25, 2023 · 46403eb · 46403eb
1 parent 51cf593
commit 46403eb
Show file tree

Hide file tree

Showing 98 changed files with 250 additions and 252 deletions.
diff --git a/build.gradle b/build.gradle
@@ -36,7 +36,7 @@ import org.opensearch.gradle.test.RestIntegTestTask
 buildscript {
     ext {
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
-        opensearch_version = System.getProperty("opensearch.version", "2.8.0-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "2.10.0-SNAPSHOT")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
         // e.g. 2.0.0-rc1-SNAPSHOT -> 2.0.0.0-rc1-SNAPSHOT
         version_tokens = opensearch_version.tokenize('-')
@@ -54,7 +54,7 @@ buildscript {
         plugin_previous_version = opensearch_previous_version.replaceAll(/(\.\d)([^\d]*)$/, '$1.0$2')
 
         common_utils_version = System.getProperty("common_utils.version", opensearch_build)
-        kotlin_version = System.getProperty("kotlin.version", "1.6.0")
+        kotlin_version = System.getProperty("kotlin.version", "1.8.21")
 
         // For fetching security zip from Maven.
         // https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.1.0/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-security-2.1.0.0.zip
@@ -141,13 +141,13 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}"
     implementation "org.jetbrains:annotations:13.0"
     implementation "com.github.seancfoley:ipaddress:5.3.3"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${kotlin_version}"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0" // Moving away from kotlin_version
     implementation "org.opensearch:common-utils:${common_utils_version}"
 
     testImplementation "org.opensearch.test:framework:${opensearch_version}"
     testImplementation "org.assertj:assertj-core:3.17.2"
     testImplementation "org.opensearch.client:opensearch-rest-high-level-client:${opensearch_version}"
-    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:${kotlin_version}"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0" // Moving away from kotlin_version
     testImplementation "org.jetbrains.kotlin:kotlin-test:${kotlin_version}"
     testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
 }

diff --git a/src/main/kotlin/org/opensearch/replication/ReplicationException.kt b/src/main/kotlin/org/opensearch/replication/ReplicationException.kt
@@ -13,10 +13,10 @@ package org.opensearch.replication
 
 import org.opensearch.OpenSearchException
 import org.opensearch.OpenSearchStatusException
-import org.opensearch.action.ShardOperationFailedException
+import org.opensearch.core.action.ShardOperationFailedException
 import org.opensearch.cluster.metadata.IndexMetadata.INDEX_UUID_NA_VALUE
-import org.opensearch.index.shard.ShardId
-import org.opensearch.rest.RestStatus
+import org.opensearch.core.index.shard.ShardId
+import org.opensearch.core.rest.RestStatus
 
 /**
  * Base class replication exceptions. Note: Replication process may throw exceptions that do not derive from this such as

diff --git a/src/main/kotlin/org/opensearch/replication/ReplicationPlugin.kt b/src/main/kotlin/org/opensearch/replication/ReplicationPlugin.kt
@@ -84,8 +84,8 @@ import org.opensearch.cluster.service.ClusterService
 import org.opensearch.common.CheckedFunction
 import org.opensearch.core.ParseField
 import org.opensearch.common.component.LifecycleComponent
-import org.opensearch.common.io.stream.NamedWriteableRegistry
-import org.opensearch.common.io.stream.Writeable
+import org.opensearch.core.common.io.stream.NamedWriteableRegistry
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.common.settings.ClusterSettings
 import org.opensearch.common.settings.IndexScopedSettings
 import org.opensearch.common.settings.Setting

diff --git a/...otlin/org/opensearch/replication/action/autofollow/AutoFollowClusterManagerNodeRequest.kt b/...otlin/org/opensearch/replication/action/autofollow/AutoFollowClusterManagerNodeRequest.kt
@@ -14,8 +14,8 @@ package org.opensearch.replication.action.autofollow
 import org.opensearch.commons.authuser.User
 import org.opensearch.action.ActionRequestValidationException
 import org.opensearch.action.support.master.MasterNodeRequest
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.ToXContentObject
 import org.opensearch.core.xcontent.XContentBuilder

diff --git a/...g/opensearch/replication/action/autofollow/TransportAutoFollowClusterManagerNodeAction.kt b/...g/opensearch/replication/action/autofollow/TransportAutoFollowClusterManagerNodeAction.kt
@@ -39,7 +39,7 @@ import org.opensearch.cluster.block.ClusterBlockLevel
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver
 import org.opensearch.cluster.service.ClusterService
 import org.opensearch.common.inject.Inject
-import org.opensearch.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.common.settings.IndexScopedSettings
 import org.opensearch.replication.ReplicationException
 import org.opensearch.threadpool.ThreadPool

diff --git a/...ain/kotlin/org/opensearch/replication/action/autofollow/UpdateAutoFollowPatternRequest.kt b/...ain/kotlin/org/opensearch/replication/action/autofollow/UpdateAutoFollowPatternRequest.kt
@@ -17,8 +17,8 @@ import org.opensearch.replication.util.ValidationUtil.validateName
 import org.opensearch.action.ActionRequestValidationException
 import org.opensearch.action.support.master.AcknowledgedRequest
 import org.opensearch.core.ParseField
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.common.settings.Settings
 import org.opensearch.core.xcontent.ObjectParser
 import org.opensearch.core.xcontent.ToXContent

diff --git a/src/main/kotlin/org/opensearch/replication/action/changes/GetChangesRequest.kt b/src/main/kotlin/org/opensearch/replication/action/changes/GetChangesRequest.kt
@@ -14,9 +14,9 @@ package org.opensearch.replication.action.changes
 import org.opensearch.action.ActionRequestValidationException
 import org.opensearch.action.support.single.shard.SingleShardRequest
 import org.opensearch.cluster.node.DiscoveryNode
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.index.shard.ShardId
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.index.shard.ShardId
 import org.opensearch.transport.RemoteClusterAwareRequest
 
 class GetChangesRequest : SingleShardRequest<GetChangesRequest> {

diff --git a/src/main/kotlin/org/opensearch/replication/action/changes/GetChangesResponse.kt b/src/main/kotlin/org/opensearch/replication/action/changes/GetChangesResponse.kt
@@ -12,8 +12,8 @@
 package org.opensearch.replication.action.changes
 
 import org.opensearch.action.ActionResponse
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.index.translog.Translog
 
 class GetChangesResponse(val changes: List<Translog.Operation>,

diff --git a/src/main/kotlin/org/opensearch/replication/action/changes/TransportGetChangesAction.kt b/src/main/kotlin/org/opensearch/replication/action/changes/TransportGetChangesAction.kt
@@ -23,10 +23,10 @@ import org.opensearch.cluster.metadata.IndexNameExpressionResolver
 import org.opensearch.cluster.routing.ShardsIterator
 import org.opensearch.cluster.service.ClusterService
 import org.opensearch.common.inject.Inject
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.Writeable
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.common.unit.TimeValue
-import org.opensearch.index.shard.ShardId
+import org.opensearch.core.index.shard.ShardId
 import org.opensearch.index.translog.Translog
 import org.opensearch.indices.IndicesService
 import org.opensearch.replication.ReplicationPlugin.Companion.REPLICATION_INDEX_TRANSLOG_PRUNING_ENABLED_SETTING

diff --git a/...kotlin/org/opensearch/replication/action/index/ReplicateIndexClusterManagerNodeRequest.kt b/...kotlin/org/opensearch/replication/action/index/ReplicateIndexClusterManagerNodeRequest.kt
@@ -14,8 +14,8 @@ package org.opensearch.replication.action.index
 import org.opensearch.commons.authuser.User
 import org.opensearch.action.ActionRequestValidationException
 import org.opensearch.action.support.master.MasterNodeRequest
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.ToXContentObject
 import org.opensearch.core.xcontent.XContentBuilder

diff --git a/src/main/kotlin/org/opensearch/replication/action/index/ReplicateIndexRequest.kt b/src/main/kotlin/org/opensearch/replication/action/index/ReplicateIndexRequest.kt
@@ -18,8 +18,8 @@ import org.opensearch.action.IndicesRequest
 import org.opensearch.action.support.IndicesOptions
 import org.opensearch.action.support.master.AcknowledgedRequest
 import org.opensearch.core.ParseField
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.common.settings.Settings
 import org.opensearch.core.xcontent.ObjectParser
 import org.opensearch.core.xcontent.ToXContent

diff --git a/src/main/kotlin/org/opensearch/replication/action/index/ReplicateIndexResponse.kt b/src/main/kotlin/org/opensearch/replication/action/index/ReplicateIndexResponse.kt
@@ -12,8 +12,8 @@
 package org.opensearch.replication.action.index
 
 import org.opensearch.action.support.master.AcknowledgedResponse
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 
 class ReplicateIndexResponse(val ack: Boolean) : AcknowledgedResponse(ack) {
     constructor(inp: StreamInput) : this(inp.readBoolean())

diff --git a/...rg/opensearch/replication/action/index/TransportReplicateIndexClusterManagerNodeAction.kt b/...rg/opensearch/replication/action/index/TransportReplicateIndexClusterManagerNodeAction.kt
@@ -40,14 +40,14 @@ import org.opensearch.cluster.metadata.IndexMetadata
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver
 import org.opensearch.cluster.service.ClusterService
 import org.opensearch.common.inject.Inject
-import org.opensearch.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.common.settings.IndexScopedSettings
 import org.opensearch.index.IndexNotFoundException
 import org.opensearch.persistent.PersistentTasksService
 import org.opensearch.replication.ReplicationPlugin
 import org.opensearch.replication.util.stackTraceToString
 import org.opensearch.repositories.RepositoriesService
-import org.opensearch.rest.RestStatus
+import org.opensearch.core.rest.RestStatus
 import org.opensearch.threadpool.ThreadPool
 import org.opensearch.transport.TransportService
 import java.io.IOException

diff --git a/.../kotlin/org/opensearch/replication/action/index/block/TransportUpddateIndexBlockAction.kt b/.../kotlin/org/opensearch/replication/action/index/block/TransportUpddateIndexBlockAction.kt
@@ -31,7 +31,7 @@ import org.opensearch.cluster.block.ClusterBlockLevel
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver
 import org.opensearch.cluster.service.ClusterService
 import org.opensearch.common.inject.Inject
-import org.opensearch.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.threadpool.ThreadPool
 import org.opensearch.transport.TransportService
 import java.io.IOException

diff --git a/src/main/kotlin/org/opensearch/replication/action/index/block/UpdateIndexBlockRequest.kt b/src/main/kotlin/org/opensearch/replication/action/index/block/UpdateIndexBlockRequest.kt
@@ -16,8 +16,8 @@ import org.opensearch.action.IndicesRequest
 import org.opensearch.action.support.IndicesOptions
 import org.opensearch.action.support.master.AcknowledgedRequest
 import org.opensearch.core.ParseField
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ObjectParser
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.ToXContentObject

diff --git a/src/main/kotlin/org/opensearch/replication/action/pause/PauseIndexReplicationRequest.kt b/src/main/kotlin/org/opensearch/replication/action/pause/PauseIndexReplicationRequest.kt
@@ -17,8 +17,8 @@ import org.opensearch.action.IndicesRequest
 import org.opensearch.action.support.IndicesOptions
 import org.opensearch.action.support.master.AcknowledgedRequest
 import org.opensearch.core.ParseField
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ObjectParser
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.ToXContentObject

diff --git a/...in/kotlin/org/opensearch/replication/action/pause/TransportPauseIndexReplicationAction.kt b/...in/kotlin/org/opensearch/replication/action/pause/TransportPauseIndexReplicationAction.kt
@@ -37,7 +37,7 @@ import org.opensearch.cluster.block.ClusterBlockLevel
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver
 import org.opensearch.cluster.service.ClusterService
 import org.opensearch.common.inject.Inject
-import org.opensearch.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.threadpool.ThreadPool
 import org.opensearch.transport.TransportService
 import java.io.IOException

diff --git a/src/main/kotlin/org/opensearch/replication/action/replay/ReplayChangesRequest.kt b/src/main/kotlin/org/opensearch/replication/action/replay/ReplayChangesRequest.kt
@@ -12,9 +12,9 @@
 package org.opensearch.replication.action.replay
 
 import org.opensearch.action.support.replication.ReplicatedWriteRequest
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.index.shard.ShardId
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.index.shard.ShardId
 import org.opensearch.index.translog.Translog
 
 class ReplayChangesRequest : ReplicatedWriteRequest<ReplayChangesRequest> {

diff --git a/src/main/kotlin/org/opensearch/replication/action/replay/ReplayChangesResponse.kt b/src/main/kotlin/org/opensearch/replication/action/replay/ReplayChangesResponse.kt
@@ -13,7 +13,7 @@ package org.opensearch.replication.action.replay
 
 import org.opensearch.action.support.WriteResponse
 import org.opensearch.action.support.replication.ReplicationResponse
-import org.opensearch.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamInput
 
 class ReplayChangesResponse : ReplicationResponse, WriteResponse {
 

diff --git a/src/main/kotlin/org/opensearch/replication/action/replay/TransportReplayChangesAction.kt b/src/main/kotlin/org/opensearch/replication/action/replay/TransportReplayChangesAction.kt
@@ -39,10 +39,10 @@ import org.opensearch.cluster.action.index.MappingUpdatedAction
 import org.opensearch.cluster.action.shard.ShardStateAction
 import org.opensearch.cluster.block.ClusterBlockLevel
 import org.opensearch.cluster.service.ClusterService
-import org.opensearch.common.bytes.BytesReference
+import org.opensearch.core.common.bytes.BytesReference
 import org.opensearch.common.inject.Inject
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.Writeable
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.common.settings.Settings
 import org.opensearch.common.xcontent.XContentType
 import org.opensearch.index.IndexingPressureService

diff --git a/...arch/replication/action/replicationstatedetails/TransportUpdateReplicationStateDetails.kt b/...arch/replication/action/replicationstatedetails/TransportUpdateReplicationStateDetails.kt
@@ -30,7 +30,7 @@ import org.opensearch.cluster.block.ClusterBlockLevel
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver
 import org.opensearch.cluster.service.ClusterService
 import org.opensearch.common.inject.Inject
-import org.opensearch.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.threadpool.ThreadPool
 import org.opensearch.transport.TransportService
 

diff --git a/...search/replication/action/replicationstatedetails/UpdateReplicationStateDetailsRequest.kt b/...search/replication/action/replicationstatedetails/UpdateReplicationStateDetailsRequest.kt
@@ -14,8 +14,8 @@ package org.opensearch.replication.action.replicationstatedetails
 import org.opensearch.replication.metadata.state.ReplicationStateParams
 import org.opensearch.action.ActionRequestValidationException
 import org.opensearch.action.support.master.AcknowledgedRequest
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 
 class UpdateReplicationStateDetailsRequest: AcknowledgedRequest<UpdateReplicationStateDetailsRequest> {
 

diff --git a/src/main/kotlin/org/opensearch/replication/action/repository/GetFileChunkRequest.kt b/src/main/kotlin/org/opensearch/replication/action/repository/GetFileChunkRequest.kt
@@ -13,9 +13,9 @@ package org.opensearch.replication.action.repository
 
 import org.opensearch.action.ActionRequestValidationException
 import org.opensearch.cluster.node.DiscoveryNode
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.index.shard.ShardId
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.index.shard.ShardId
 import org.opensearch.index.store.StoreFileMetadata
 
 class GetFileChunkRequest : RemoteClusterRepositoryRequest<GetFileChunkRequest> {

diff --git a/src/main/kotlin/org/opensearch/replication/action/repository/GetFileChunkResponse.kt b/src/main/kotlin/org/opensearch/replication/action/repository/GetFileChunkResponse.kt
@@ -12,9 +12,9 @@
 package org.opensearch.replication.action.repository
 
 import org.opensearch.action.ActionResponse
-import org.opensearch.common.bytes.BytesReference
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
+import org.opensearch.core.common.bytes.BytesReference
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.index.store.StoreFileMetadata
 
 class GetFileChunkResponse : ActionResponse {

diff --git a/src/main/kotlin/org/opensearch/replication/action/repository/GetStoreMetadataRequest.kt b/src/main/kotlin/org/opensearch/replication/action/repository/GetStoreMetadataRequest.kt
@@ -13,8 +13,8 @@ package org.opensearch.replication.action.repository
 
 import org.opensearch.action.ActionRequestValidationException
 import org.opensearch.cluster.node.DiscoveryNode
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.index.shard.ShardId
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.index.shard.ShardId
 
 class GetStoreMetadataRequest : RemoteClusterRepositoryRequest<GetStoreMetadataRequest> {
 

diff --git a/src/main/kotlin/org/opensearch/replication/action/repository/GetStoreMetadataResponse.kt b/src/main/kotlin/org/opensearch/replication/action/repository/GetStoreMetadataResponse.kt
@@ -12,8 +12,8 @@
 package org.opensearch.replication.action.repository
 
 import org.opensearch.action.ActionResponse
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.index.store.Store
 
 class GetStoreMetadataResponse : ActionResponse {

diff --git a/...main/kotlin/org/opensearch/replication/action/repository/ReleaseLeaderResourcesRequest.kt b/...main/kotlin/org/opensearch/replication/action/repository/ReleaseLeaderResourcesRequest.kt
@@ -13,8 +13,8 @@ package org.opensearch.replication.action.repository
 
 import org.opensearch.action.ActionRequestValidationException
 import org.opensearch.cluster.node.DiscoveryNode
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.index.shard.ShardId
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.index.shard.ShardId
 
 class ReleaseLeaderResourcesRequest: RemoteClusterRepositoryRequest<ReleaseLeaderResourcesRequest> {
 

diff --git a/...ain/kotlin/org/opensearch/replication/action/repository/RemoteClusterRepositoryRequest.kt b/...ain/kotlin/org/opensearch/replication/action/repository/RemoteClusterRepositoryRequest.kt
@@ -13,9 +13,9 @@ package org.opensearch.replication.action.repository
 
 import org.opensearch.action.support.single.shard.SingleShardRequest
 import org.opensearch.cluster.node.DiscoveryNode
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.index.shard.ShardId
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.index.shard.ShardId
 import org.opensearch.transport.RemoteClusterAwareRequest
 
 abstract class RemoteClusterRepositoryRequest<T : SingleShardRequest<T>?>:

diff --git a/src/main/kotlin/org/opensearch/replication/action/repository/TransportGetFileChunkAction.kt b/src/main/kotlin/org/opensearch/replication/action/repository/TransportGetFileChunkAction.kt
@@ -20,11 +20,11 @@ import org.opensearch.cluster.ClusterState
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver
 import org.opensearch.cluster.routing.ShardsIterator
 import org.opensearch.cluster.service.ClusterService
-import org.opensearch.common.bytes.BytesArray
+import org.opensearch.core.common.bytes.BytesArray
 import org.opensearch.common.inject.Inject
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.index.shard.ShardId
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.Writeable
+import org.opensearch.core.index.shard.ShardId
 import org.opensearch.indices.IndicesService
 import org.opensearch.threadpool.ThreadPool
 import org.opensearch.transport.TransportActionProxy

diff --git a/...in/kotlin/org/opensearch/replication/action/repository/TransportGetStoreMetadataAction.kt b/...in/kotlin/org/opensearch/replication/action/repository/TransportGetStoreMetadataAction.kt
@@ -20,9 +20,9 @@ import org.opensearch.cluster.metadata.IndexNameExpressionResolver
 import org.opensearch.cluster.routing.ShardsIterator
 import org.opensearch.cluster.service.ClusterService
 import org.opensearch.common.inject.Inject
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.index.shard.ShardId
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.Writeable
+import org.opensearch.core.index.shard.ShardId
 import org.opensearch.threadpool.ThreadPool
 import org.opensearch.transport.TransportActionProxy
 import org.opensearch.transport.TransportService

diff --git a/...lin/org/opensearch/replication/action/repository/TransportReleaseLeaderResourcesAction.kt b/...lin/org/opensearch/replication/action/repository/TransportReleaseLeaderResourcesAction.kt
@@ -21,9 +21,9 @@ import org.opensearch.cluster.metadata.IndexNameExpressionResolver
 import org.opensearch.cluster.routing.ShardsIterator
 import org.opensearch.cluster.service.ClusterService
 import org.opensearch.common.inject.Inject
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.index.shard.ShardId
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.Writeable
+import org.opensearch.core.index.shard.ShardId
 import org.opensearch.threadpool.ThreadPool
 import org.opensearch.transport.TransportActionProxy
 import org.opensearch.transport.TransportService