Version bump to opensearch-3.0.0-alpha1 and replaced usage of deprecated classes

build.gradle

@@ -35,8 +35,8 @@ import org.opensearch.gradle.test.RestIntegTestTask
 buildscript {
     ext {
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
-        opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT")
-        buildVersionQualifier = System.getProperty("build.version_qualifier", "")
+        opensearch_version = System.getProperty("opensearch.version", "3.0.0-alpha1-SNAPSHOT")
+        buildVersionQualifier = System.getProperty("build.version_qualifier", "alpha1")
         // e.g. 2.0.0-rc1-SNAPSHOT -> 2.0.0.0-rc1-SNAPSHOT
         version_tokens = opensearch_version.tokenize('-')
         opensearch_build = version_tokens[0] + '.0'

src/main/kotlin/org/opensearch/replication/ReplicationPlugin.kt

@@ -74,7 +74,7 @@ import org.opensearch.replication.task.shard.ShardReplicationState
 import org.opensearch.replication.util.Injectables
 import org.opensearch.action.ActionRequest
 import org.opensearch.core.action.ActionResponse
-import org.opensearch.client.Client
+import org.opensearch.transport.client.Client
 import org.opensearch.cluster.NamedDiff
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver
 import org.opensearch.cluster.metadata.Metadata

src/main/kotlin/org/opensearch/replication/action/autofollow/AutoFollowClusterManagerNodeAction.kt

@@ -12,7 +12,7 @@
 package org.opensearch.replication.action.autofollow
 
 import org.opensearch.action.ActionType
-import org.opensearch.action.support.master.AcknowledgedResponse
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse
 
 class AutoFollowClusterManagerNodeAction: ActionType<AcknowledgedResponse>(NAME, ::AcknowledgedResponse) {
     companion object {

src/main/kotlin/org/opensearch/replication/action/autofollow/AutoFollowClusterManagerNodeRequest.kt

@@ -13,14 +13,14 @@ 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.action.support.clustermanager.ClusterManagerNodeRequest
 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
 
-class AutoFollowClusterManagerNodeRequest: MasterNodeRequest<AutoFollowClusterManagerNodeRequest>, ToXContentObject {
+class AutoFollowClusterManagerNodeRequest: ClusterManagerNodeRequest<AutoFollowClusterManagerNodeRequest>, ToXContentObject {
     var user: User? = null
     var autofollowReq: UpdateAutoFollowPatternRequest
     var withSecurityContext: Boolean = false

src/main/kotlin/org/opensearch/replication/action/autofollow/TransportAutoFollowClusterManagerNodeAction.kt

@@ -30,9 +30,9 @@ import org.opensearch.ResourceAlreadyExistsException
 import org.opensearch.ResourceNotFoundException
 import org.opensearch.core.action.ActionListener
 import org.opensearch.action.support.ActionFilters
-import org.opensearch.action.support.master.AcknowledgedResponse
-import org.opensearch.action.support.master.TransportMasterNodeAction
-import org.opensearch.client.node.NodeClient
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse
+import org.opensearch.action.support.clustermanager.TransportClusterManagerNodeAction
+import org.opensearch.transport.client.node.NodeClient
 import org.opensearch.cluster.ClusterState
 import org.opensearch.cluster.block.ClusterBlockException
 import org.opensearch.cluster.block.ClusterBlockLevel
@@ -49,7 +49,7 @@ class TransportAutoFollowClusterManagerNodeAction @Inject constructor(transportS
                                                               actionFilters: ActionFilters, indexNameExpressionResolver: IndexNameExpressionResolver,
                                                               private val client: NodeClient, private val metadataManager: ReplicationMetadataManager,
                                                               val indexScopedSettings: IndexScopedSettings) :
-        TransportMasterNodeAction<AutoFollowClusterManagerNodeRequest, AcknowledgedResponse>(
+    TransportClusterManagerNodeAction<AutoFollowClusterManagerNodeRequest, AcknowledgedResponse>(
         AutoFollowClusterManagerNodeAction.NAME, true, transportService, clusterService, threadPool, actionFilters,
         ::AutoFollowClusterManagerNodeRequest, indexNameExpressionResolver), CoroutineScope by GlobalScope {
 
@@ -62,7 +62,7 @@ class TransportAutoFollowClusterManagerNodeAction @Inject constructor(transportS
         return state.blocks().globalBlockedException(ClusterBlockLevel.METADATA_WRITE)
     }
 
-    override fun masterOperation(clusterManagerNodeReq: AutoFollowClusterManagerNodeRequest, state: ClusterState, listener: ActionListener<AcknowledgedResponse>) {
+    override fun clusterManagerOperation(clusterManagerNodeReq: AutoFollowClusterManagerNodeRequest, state: ClusterState, listener: ActionListener<AcknowledgedResponse>) {
         val request = clusterManagerNodeReq.autofollowReq
         var user = clusterManagerNodeReq.user
         launch(threadPool.coroutineContext()) {

src/main/kotlin/org/opensearch/replication/action/autofollow/TransportUpdateAutoFollowPatternAction.kt

@@ -27,8 +27,8 @@ import org.apache.logging.log4j.LogManager
 import org.opensearch.core.action.ActionListener
 import org.opensearch.action.support.ActionFilters
 import org.opensearch.action.support.HandledTransportAction
-import org.opensearch.action.support.master.AcknowledgedResponse
-import org.opensearch.client.Client
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse
+import org.opensearch.transport.client.Client
 import org.opensearch.common.inject.Inject
 import org.opensearch.tasks.Task
 import org.opensearch.threadpool.ThreadPool

src/main/kotlin/org/opensearch/replication/action/autofollow/UpdateAutoFollowPatternAction.kt

@@ -12,7 +12,7 @@
 package org.opensearch.replication.action.autofollow
 
 import org.opensearch.action.ActionType
-import org.opensearch.action.support.master.AcknowledgedResponse
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse
 
 class UpdateAutoFollowPatternAction : ActionType<AcknowledgedResponse>(NAME, ::AcknowledgedResponse) {
 

src/main/kotlin/org/opensearch/replication/action/autofollow/UpdateAutoFollowPatternRequest.kt

@@ -16,7 +16,7 @@ import org.opensearch.replication.metadata.store.KEY_SETTINGS
 import org.opensearch.replication.util.ValidationUtil.validateName
 import org.opensearch.replication.util.ValidationUtil.validatePattern
 import org.opensearch.action.ActionRequestValidationException
-import org.opensearch.action.support.master.AcknowledgedRequest
+import org.opensearch.action.support.clustermanager.AcknowledgedRequest
 import org.opensearch.core.ParseField
 import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.core.common.io.stream.StreamOutput

src/main/kotlin/org/opensearch/replication/action/index/ReplicateIndexClusterManagerNodeAction.kt

@@ -12,7 +12,7 @@
 package org.opensearch.replication.action.index
 
 import org.opensearch.action.ActionType
-import org.opensearch.action.support.master.AcknowledgedResponse
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse
 
 class ReplicateIndexClusterManagerNodeAction private constructor(): ActionType<AcknowledgedResponse>(NAME, ::AcknowledgedResponse) {
     companion object {

src/main/kotlin/org/opensearch/replication/action/index/ReplicateIndexClusterManagerNodeRequest.kt

@@ -13,15 +13,15 @@ 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.action.support.clustermanager.ClusterManagerNodeRequest
 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
 
 class ReplicateIndexClusterManagerNodeRequest:
-        MasterNodeRequest<ReplicateIndexClusterManagerNodeRequest>, ToXContentObject {
+    ClusterManagerNodeRequest<ReplicateIndexClusterManagerNodeRequest>, ToXContentObject {
 
     var user: User? = null
     var replicateIndexReq: ReplicateIndexRequest

src/main/kotlin/org/opensearch/replication/action/index/ReplicateIndexRequest.kt

@@ -16,7 +16,7 @@ import org.opensearch.replication.util.ValidationUtil.validateName
 import org.opensearch.action.ActionRequestValidationException
 import org.opensearch.action.IndicesRequest
 import org.opensearch.action.support.IndicesOptions
-import org.opensearch.action.support.master.AcknowledgedRequest
+import org.opensearch.action.support.clustermanager.AcknowledgedRequest
 import org.opensearch.core.ParseField
 import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.core.common.io.stream.StreamOutput

src/main/kotlin/org/opensearch/replication/action/index/ReplicateIndexResponse.kt

@@ -11,7 +11,7 @@
 
 package org.opensearch.replication.action.index
 
-import org.opensearch.action.support.master.AcknowledgedResponse
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse
 import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.core.common.io.stream.StreamOutput
 

src/main/kotlin/org/opensearch/replication/action/index/TransportReplicateIndexAction.kt

@@ -31,7 +31,7 @@ import org.opensearch.action.admin.indices.settings.get.GetSettingsRequest
 import org.opensearch.action.support.ActionFilters
 import org.opensearch.action.support.HandledTransportAction
 import org.opensearch.action.support.IndicesOptions
-import org.opensearch.client.Client
+import org.opensearch.transport.client.Client
 import org.opensearch.cluster.ClusterState
 import org.opensearch.cluster.metadata.MetadataCreateIndexService
 import org.opensearch.common.inject.Inject

src/main/kotlin/org/opensearch/replication/action/index/TransportReplicateIndexClusterManagerNodeAction.kt

@@ -30,9 +30,9 @@ import org.opensearch.OpenSearchStatusException
 import org.opensearch.core.action.ActionListener
 import org.opensearch.action.support.ActionFilters
 import org.opensearch.action.support.IndicesOptions
-import org.opensearch.action.support.master.AcknowledgedResponse
-import org.opensearch.action.support.master.TransportMasterNodeAction
-import org.opensearch.client.node.NodeClient
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse
+import org.opensearch.action.support.clustermanager.TransportClusterManagerNodeAction
+import org.opensearch.transport.client.node.NodeClient
 import org.opensearch.cluster.ClusterState
 import org.opensearch.cluster.block.ClusterBlockException
 import org.opensearch.cluster.block.ClusterBlockLevel
@@ -62,7 +62,7 @@ class TransportReplicateIndexClusterManagerNodeAction @Inject constructor(transp
                                                                           private val nodeClient : NodeClient,
                                                                           private val repositoryService: RepositoriesService,
                                                                           private val replicationMetadataManager: ReplicationMetadataManager) :
-        TransportMasterNodeAction<ReplicateIndexClusterManagerNodeRequest, AcknowledgedResponse>(ReplicateIndexClusterManagerNodeAction.NAME,
+    TransportClusterManagerNodeAction<ReplicateIndexClusterManagerNodeRequest, AcknowledgedResponse>(ReplicateIndexClusterManagerNodeAction.NAME,
                 transportService, clusterService, threadPool, actionFilters, ::ReplicateIndexClusterManagerNodeRequest, indexNameExpressionResolver),
         CoroutineScope by GlobalScope {
 
@@ -80,7 +80,7 @@ class TransportReplicateIndexClusterManagerNodeAction @Inject constructor(transp
     }
 
     @Throws(Exception::class)
-    override fun masterOperation(request: ReplicateIndexClusterManagerNodeRequest, state: ClusterState,
+    override fun clusterManagerOperation(request: ReplicateIndexClusterManagerNodeRequest, state: ClusterState,
                                  listener: ActionListener<AcknowledgedResponse>) {
         val replicateIndexReq = request.replicateIndexReq
         val user = request.user

src/main/kotlin/org/opensearch/replication/action/index/block/TransportUpddateIndexBlockAction.kt

@@ -22,9 +22,9 @@ import org.apache.logging.log4j.LogManager
 import org.opensearch.OpenSearchException
 import org.opensearch.core.action.ActionListener
 import org.opensearch.action.support.ActionFilters
-import org.opensearch.action.support.master.AcknowledgedResponse
-import org.opensearch.action.support.master.TransportMasterNodeAction
-import org.opensearch.client.Client
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse
+import org.opensearch.action.support.clustermanager.TransportClusterManagerNodeAction
+import org.opensearch.transport.client.Client
 import org.opensearch.cluster.ClusterState
 import org.opensearch.cluster.block.ClusterBlockException
 import org.opensearch.cluster.block.ClusterBlockLevel
@@ -44,7 +44,7 @@ class TransportUpddateIndexBlockAction @Inject constructor(transportService: Tra
                                                            indexNameExpressionResolver:
                                                            IndexNameExpressionResolver,
                                                            val client: Client) :
-        TransportMasterNodeAction<UpdateIndexBlockRequest, AcknowledgedResponse>(UpdateIndexBlockAction.NAME,
+    TransportClusterManagerNodeAction<UpdateIndexBlockRequest, AcknowledgedResponse>(UpdateIndexBlockAction.NAME,
                 transportService, clusterService, threadPool, actionFilters, ::UpdateIndexBlockRequest,
                 indexNameExpressionResolver), CoroutineScope by GlobalScope {
 
@@ -57,7 +57,7 @@ class TransportUpddateIndexBlockAction @Inject constructor(transportService: Tra
     }
 
     @Throws(Exception::class)
-    override fun masterOperation(request: UpdateIndexBlockRequest?, state: ClusterState?, listener: ActionListener<AcknowledgedResponse>) {
+    override fun clusterManagerOperation(request: UpdateIndexBlockRequest?, state: ClusterState?, listener: ActionListener<AcknowledgedResponse>) {
         val followerIndexName = request!!.indexName
         log.debug("Adding index block for $followerIndexName")
         launch(threadPool.coroutineContext(ThreadPool.Names.MANAGEMENT)) {

src/main/kotlin/org/opensearch/replication/action/index/block/UpdateIndexBlockAction.kt

@@ -12,7 +12,7 @@
 package org.opensearch.replication.action.index.block
 
 import org.opensearch.action.ActionType
-import org.opensearch.action.support.master.AcknowledgedResponse
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse
 
 class UpdateIndexBlockAction private constructor(): ActionType<AcknowledgedResponse>(NAME, ::AcknowledgedResponse) {
     companion object {

src/main/kotlin/org/opensearch/replication/action/index/block/UpdateIndexBlockRequest.kt

@@ -14,7 +14,7 @@ package org.opensearch.replication.action.index.block
 import org.opensearch.action.ActionRequestValidationException
 import org.opensearch.action.IndicesRequest
 import org.opensearch.action.support.IndicesOptions
-import org.opensearch.action.support.master.AcknowledgedRequest
+import org.opensearch.action.support.clustermanager.AcknowledgedRequest
 import org.opensearch.core.ParseField
 import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.core.common.io.stream.StreamOutput

src/main/kotlin/org/opensearch/replication/action/pause/PauseIndexReplicationAction.kt

@@ -12,7 +12,7 @@
 package org.opensearch.replication.action.pause
 
 import org.opensearch.action.ActionType
-import org.opensearch.action.support.master.AcknowledgedResponse
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse
 
 class PauseIndexReplicationAction private constructor(): ActionType<AcknowledgedResponse>(NAME, ::AcknowledgedResponse) {
     companion object {

src/main/kotlin/org/opensearch/replication/action/pause/PauseIndexReplicationRequest.kt

@@ -15,7 +15,7 @@ import org.opensearch.replication.metadata.ReplicationMetadataManager
 import org.opensearch.action.ActionRequestValidationException
 import org.opensearch.action.IndicesRequest
 import org.opensearch.action.support.IndicesOptions
-import org.opensearch.action.support.master.AcknowledgedRequest
+import org.opensearch.action.support.clustermanager.AcknowledgedRequest
 import org.opensearch.core.ParseField
 import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.core.common.io.stream.StreamOutput

src/main/kotlin/org/opensearch/replication/action/pause/TransportPauseIndexReplicationAction.kt

@@ -24,10 +24,9 @@ import org.opensearch.OpenSearchException
 import org.opensearch.ResourceAlreadyExistsException
 import org.opensearch.core.action.ActionListener
 import org.opensearch.action.support.ActionFilters
-import org.opensearch.action.support.master.AcknowledgedRequest
-import org.opensearch.action.support.master.AcknowledgedResponse
-import org.opensearch.action.support.master.TransportMasterNodeAction
-import org.opensearch.client.Client
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse
+import org.opensearch.action.support.clustermanager.TransportClusterManagerNodeAction
+import org.opensearch.transport.client.Client
 import org.opensearch.cluster.AckedClusterStateUpdateTask
 import org.opensearch.cluster.ClusterState
 import org.opensearch.cluster.ClusterStateTaskExecutor
@@ -50,7 +49,7 @@ class TransportPauseIndexReplicationAction @Inject constructor(transportService:
                                                                IndexNameExpressionResolver,
                                                                val client: Client,
                                                                val replicationMetadataManager: ReplicationMetadataManager) :
-    TransportMasterNodeAction<PauseIndexReplicationRequest, AcknowledgedResponse> (PauseIndexReplicationAction.NAME,
+    TransportClusterManagerNodeAction<PauseIndexReplicationRequest, AcknowledgedResponse> (PauseIndexReplicationAction.NAME,
             transportService, clusterService, threadPool, actionFilters, ::PauseIndexReplicationRequest,
             indexNameExpressionResolver), CoroutineScope by GlobalScope {
 
@@ -63,7 +62,7 @@ class TransportPauseIndexReplicationAction @Inject constructor(transportService:
     }
 
     @Throws(Exception::class)
-    override fun masterOperation(request: PauseIndexReplicationRequest, state: ClusterState,
+    override fun clusterManagerOperation(request: PauseIndexReplicationRequest, state: ClusterState,
                                  listener: ActionListener<AcknowledgedResponse>) {
         launch(Dispatchers.Unconfined + threadPool.coroutineContext()) {
             listener.completeWith {

src/main/kotlin/org/opensearch/replication/action/replay/TransportReplayChangesAction.kt

@@ -33,7 +33,7 @@ import org.opensearch.action.resync.TransportResyncReplicationAction
 import org.opensearch.action.support.ActionFilters
 import org.opensearch.action.support.IndicesOptions
 import org.opensearch.action.support.replication.TransportWriteAction
-import org.opensearch.client.Client
+import org.opensearch.transport.client.Client
 import org.opensearch.cluster.ClusterStateObserver
 import org.opensearch.cluster.action.index.MappingUpdatedAction
 import org.opensearch.cluster.action.shard.ShardStateAction

src/main/kotlin/org/opensearch/replication/action/replicationstatedetails/TransportUpdateReplicationStateDetails.kt

@@ -20,9 +20,9 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import org.opensearch.core.action.ActionListener
 import org.opensearch.action.support.ActionFilters
-import org.opensearch.action.support.master.AcknowledgedRequest
-import org.opensearch.action.support.master.AcknowledgedResponse
-import org.opensearch.action.support.master.TransportMasterNodeAction
+import org.opensearch.action.support.clustermanager.AcknowledgedRequest
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse
+import org.opensearch.action.support.clustermanager.TransportClusterManagerNodeAction
 import org.opensearch.cluster.ClusterState
 import org.opensearch.cluster.ClusterStateTaskExecutor
 import org.opensearch.cluster.block.ClusterBlockException
@@ -39,15 +39,15 @@ class TransportUpdateReplicationStateDetails @Inject constructor(transportServic
                                                                  threadPool: ThreadPool,
                                                                  actionFilters: ActionFilters,
                                                                  indexNameExpressionResolver: IndexNameExpressionResolver) :
-        TransportMasterNodeAction<UpdateReplicationStateDetailsRequest, AcknowledgedResponse>(UpdateReplicationStateAction.NAME,
+    TransportClusterManagerNodeAction<UpdateReplicationStateDetailsRequest, AcknowledgedResponse>(UpdateReplicationStateAction.NAME,
                 transportService, clusterService, threadPool, actionFilters, ::UpdateReplicationStateDetailsRequest, indexNameExpressionResolver),
         CoroutineScope by GlobalScope {
 
     override fun checkBlock(request: UpdateReplicationStateDetailsRequest, state: ClusterState): ClusterBlockException? {
         return state.blocks.globalBlockedException(ClusterBlockLevel.METADATA_WRITE)
     }
 
-    override fun masterOperation(request: UpdateReplicationStateDetailsRequest, state: ClusterState,
+    override fun clusterManagerOperation(request: UpdateReplicationStateDetailsRequest, state: ClusterState,
                                  listener: ActionListener<AcknowledgedResponse>) {
 
         launch(threadPool.coroutineContext(ThreadPool.Names.MANAGEMENT)) {