Make ActionRequests that extend UpdateRequest to extend more generic …

…ActionRequest Signed-off-by: Craig Perkins <[email protected]>
opensearch-project · Nov 26, 2024 · ae9fa1b · ae9fa1b
1 parent 5aaf114
commit ae9fa1b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/src/main/kotlin/org/opensearch/indexmanagement/transform/action/stop/StopTransformRequest.kt b/src/main/kotlin/org/opensearch/indexmanagement/transform/action/stop/StopTransformRequest.kt
@@ -5,24 +5,30 @@
 
 package org.opensearch.indexmanagement.transform.action.stop
 
+import org.opensearch.action.ActionRequest
 import org.opensearch.action.ActionRequestValidationException
 import org.opensearch.action.ValidateActions.addValidationError
-import org.opensearch.action.update.UpdateRequest
 import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.core.common.io.stream.StreamOutput
 import java.io.IOException
 
-class StopTransformRequest : UpdateRequest {
+class StopTransformRequest : ActionRequest {
+
+    val id: String
+        get() = field
+
     @Throws(IOException::class)
-    constructor(sin: StreamInput) : super(sin)
+    constructor(sin: StreamInput) : super(sin) {
+        this.id = sin.readString()
+    }
 
     constructor(id: String) {
-        super.id(id)
+        this.id = id
     }
 
     override fun validate(): ActionRequestValidationException? {
         var validationException: ActionRequestValidationException? = null
-        if (super.id().isEmpty()) {
+        if (this.id.isEmpty()) {
             validationException = addValidationError("id is missing", validationException)
         }
         return validationException

diff --git a/...tlin/org/opensearch/indexmanagement/transform/action/stop/TransportStopTransformAction.kt b/...tlin/org/opensearch/indexmanagement/transform/action/stop/TransportStopTransformAction.kt
@@ -76,13 +76,13 @@ constructor(
     private val log = LogManager.getLogger(javaClass)
 
     override fun doExecute(task: Task, request: StopTransformRequest, actionListener: ActionListener<AcknowledgedResponse>) {
-        log.debug("Executing StopTransformAction on ${request.id()}")
+        log.debug("Executing StopTransformAction on ${request.id}")
         log.debug(
             "User and roles string from thread context: ${client.threadPool().threadContext.getTransient<String>(
                 ConfigConstants.OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT,
             )}",
         )
-        val getRequest = GetRequest(INDEX_MANAGEMENT_INDEX, request.id())
+        val getRequest = GetRequest(INDEX_MANAGEMENT_INDEX, request.id)
         val user = buildUser(client.threadPool().threadContext)
         client.threadPool().threadContext.stashContext().use {
             client.get(
@@ -212,7 +212,8 @@ constructor(
 
     private fun updateTransformJob(transform: Transform, request: StopTransformRequest, actionListener: ActionListener<AcknowledgedResponse>) {
         val now = Instant.now().toEpochMilli()
-        request.index(IndexManagementPlugin.INDEX_MANAGEMENT_INDEX).setIfSeqNo(transform.seqNo).setIfPrimaryTerm(transform.primaryTerm)
+        val updateReq = UpdateRequest(IndexManagementPlugin.INDEX_MANAGEMENT_INDEX, request.id)
+        updateReq.setIfSeqNo(transform.seqNo).setIfPrimaryTerm(transform.primaryTerm)
             .doc(
                 mapOf(
                     Transform.TRANSFORM_TYPE to
@@ -223,7 +224,7 @@ constructor(
                 ),
             )
         client.update(
-            request,
+            updateReq,
             object : ActionListener<UpdateResponse> {
                 override fun onResponse(response: UpdateResponse) {
                     actionListener.onResponse(AcknowledgedResponse(response.result == DocWriteResponse.Result.UPDATED))

diff --git a/src/test/kotlin/org/opensearch/indexmanagement/transform/action/RequestTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/transform/action/RequestTests.kt
@@ -7,6 +7,7 @@ package org.opensearch.indexmanagement.transform.action
 
 import org.opensearch.action.DocWriteRequest
 import org.opensearch.action.support.WriteRequest
+import org.opensearch.action.update.UpdateRequest
 import org.opensearch.common.io.stream.BytesStreamOutput
 import org.opensearch.index.seqno.SequenceNumbers
 import org.opensearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_MANAGEMENT_INDEX
@@ -161,11 +162,11 @@ class RequestTests : OpenSearchTestCase() {
 
     fun `test stop transform request`() {
         val id = "some_id"
-        val req = StopTransformRequest(id).index(INDEX_MANAGEMENT_INDEX)
+        val req = UpdateRequest(INDEX_MANAGEMENT_INDEX, id)
 
         val out = BytesStreamOutput().apply { req.writeTo(this) }
         val streamedReq = StopTransformRequest(buildStreamInputForTransforms(out))
 
-        assertEquals(id, streamedReq.id())
+        assertEquals(id, streamedReq.id)
     }
 }