From d5ff229671da82e65d98cd748aaccf17bb85d14e Mon Sep 17 00:00:00 2001
From: Ankit Kala <ankikala@amazon.com>
Date: Tue, 23 May 2023 16:02:34 +0530
Subject: [PATCH] Handle serialization issues with
 UpdateReplicationStateDetailsRequest (#866)

Signed-off-by: Ankit Kala <ankikala@amazon.com>
(cherry picked from commit 3e3787dddaa99a4085153024f064566730881fb9)
---
 .../UpdateReplicationStateDetailsRequest.kt   |  3 +-
 ...dateReplicationStateDetailsRequestTests.kt | 42 +++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 src/test/kotlin/org/opensearch/replication/action/replicationstatedetails/UpdateReplicationStateDetailsRequestTests.kt

diff --git a/src/main/kotlin/org/opensearch/replication/action/replicationstatedetails/UpdateReplicationStateDetailsRequest.kt b/src/main/kotlin/org/opensearch/replication/action/replicationstatedetails/UpdateReplicationStateDetailsRequest.kt
index bddcd528..04fedd0a 100644
--- a/src/main/kotlin/org/opensearch/replication/action/replicationstatedetails/UpdateReplicationStateDetailsRequest.kt
+++ b/src/main/kotlin/org/opensearch/replication/action/replicationstatedetails/UpdateReplicationStateDetailsRequest.kt
@@ -48,6 +48,7 @@ class UpdateReplicationStateDetailsRequest: AcknowledgedRequest<UpdateReplicatio
     override fun writeTo(out: StreamOutput) {
         super.writeTo(out)
         out.writeString(followIndexName)
-        out.writeMap(replicationStateParams)
+        out.writeMap(replicationStateParams, StreamOutput::writeString, StreamOutput::writeString)
+        out.writeEnum(updateType)
     }
 }
\ No newline at end of file
diff --git a/src/test/kotlin/org/opensearch/replication/action/replicationstatedetails/UpdateReplicationStateDetailsRequestTests.kt b/src/test/kotlin/org/opensearch/replication/action/replicationstatedetails/UpdateReplicationStateDetailsRequestTests.kt
new file mode 100644
index 00000000..e013c238
--- /dev/null
+++ b/src/test/kotlin/org/opensearch/replication/action/replicationstatedetails/UpdateReplicationStateDetailsRequestTests.kt
@@ -0,0 +1,42 @@
+package org.opensearch.replication.action.replicationstatedetails
+
+import org.assertj.core.api.Assertions
+import org.opensearch.common.io.stream.BytesStreamOutput
+import org.opensearch.test.OpenSearchTestCase
+
+class UpdateReplicationStateDetailsRequestTests: OpenSearchTestCase() {
+    companion object {
+        const val INDEX = "index"
+    }
+
+    fun `test serialization update type add`() {
+        val state = mapOf(Pair("k1", "v1"), Pair("k2", "v2"))
+        val request = UpdateReplicationStateDetailsRequest(INDEX, state, UpdateReplicationStateDetailsRequest.UpdateType.ADD)
+        val output = BytesStreamOutput()
+        request.writeTo(output)
+        val deserialized = UpdateReplicationStateDetailsRequest(output.bytes().streamInput())
+
+        assertEquals(UpdateReplicationStateDetailsRequest.UpdateType.ADD, deserialized.updateType)
+        assertEquals(INDEX, deserialized.followIndexName)
+        Assertions.assertThat(deserialized.replicationStateParams.containsKey("k1"))
+        Assertions.assertThat(deserialized.replicationStateParams.containsKey("k2"))
+        Assertions.assertThat("v1".equals(deserialized.replicationStateParams["k1"]))
+        Assertions.assertThat("v2".equals(deserialized.replicationStateParams["k2"]))
+    }
+
+    fun `test serialization update type delete`() {
+        val state = mapOf(Pair("k1", "v1"), Pair("k2", "v2"))
+        val request = UpdateReplicationStateDetailsRequest(INDEX, state, UpdateReplicationStateDetailsRequest.UpdateType.REMOVE)
+        val output = BytesStreamOutput()
+        request.writeTo(output)
+
+        val deserialized = UpdateReplicationStateDetailsRequest(output.bytes().streamInput())
+
+        assertEquals(UpdateReplicationStateDetailsRequest.UpdateType.REMOVE, deserialized.updateType)
+        assertEquals(INDEX, deserialized.followIndexName)
+        Assertions.assertThat(deserialized.replicationStateParams.containsKey("k1"))
+        Assertions.assertThat(deserialized.replicationStateParams.containsKey("k2"))
+        Assertions.assertThat("v1".equals(deserialized.replicationStateParams["k1"]))
+        Assertions.assertThat("v2".equals(deserialized.replicationStateParams["k2"]))
+    }
+}
\ No newline at end of file