More serialization tests

Author: rossdanderson

util/src/main/kotlin/com/caplin/integration/datasourcex/util/serialization/jackson/DataSourceModule.kt

@@ -5,6 +5,8 @@ import com.caplin.integration.datasourcex.util.flow.MapEvent
 import com.caplin.integration.datasourcex.util.flow.SetEvent
 import com.caplin.integration.datasourcex.util.flow.SimpleMapEvent
 import com.caplin.integration.datasourcex.util.flow.ValueOrCompletion
+import com.fasterxml.jackson.databind.JsonDeserializer
+import com.fasterxml.jackson.databind.JsonSerializer
 import com.fasterxml.jackson.databind.Module
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.module.SimpleModule
@@ -31,14 +33,12 @@ object DataSourceModule : SimpleModule() {
     @Suppress("UNCHECKED_CAST")
     addSerializer(
         MapEvent.EntryEvent::class.java,
-        mapEventSerializer
-            as com.fasterxml.jackson.databind.JsonSerializer<MapEvent.EntryEvent<*, *>>,
+        mapEventSerializer as JsonSerializer<MapEvent.EntryEvent<*, *>>,
     )
     @Suppress("UNCHECKED_CAST")
     addDeserializer(
         MapEvent.EntryEvent::class.java,
-        mapEventDeserializer
-            as com.fasterxml.jackson.databind.JsonDeserializer<MapEvent.EntryEvent<*, *>>,
+        mapEventDeserializer as JsonDeserializer<MapEvent.EntryEvent<*, *>>,
     )
 
     val simpleMapEventSerializer = SimpleMapEventSerializer()
@@ -50,14 +50,12 @@ object DataSourceModule : SimpleModule() {
     @Suppress("UNCHECKED_CAST")
     addSerializer(
         SimpleMapEvent.EntryEvent::class.java,
-        simpleMapEventSerializer
-            as com.fasterxml.jackson.databind.JsonSerializer<SimpleMapEvent.EntryEvent<*, *>>,
+        simpleMapEventSerializer as JsonSerializer<SimpleMapEvent.EntryEvent<*, *>>,
     )
     @Suppress("UNCHECKED_CAST")
     addDeserializer(
         SimpleMapEvent.EntryEvent::class.java,
-        simpleMapEventDeserializer
-            as com.fasterxml.jackson.databind.JsonDeserializer<SimpleMapEvent.EntryEvent<*, *>>,
+        simpleMapEventDeserializer as JsonDeserializer<SimpleMapEvent.EntryEvent<*, *>>,
     )
 
     val setEventSerializer = SetEventSerializer()
@@ -69,13 +67,12 @@ object DataSourceModule : SimpleModule() {
     @Suppress("UNCHECKED_CAST")
     addSerializer(
         SetEvent.EntryEvent::class.java,
-        setEventSerializer as com.fasterxml.jackson.databind.JsonSerializer<SetEvent.EntryEvent<*>>,
+        setEventSerializer as JsonSerializer<SetEvent.EntryEvent<*>>,
     )
     @Suppress("UNCHECKED_CAST")
     addDeserializer(
         SetEvent.EntryEvent::class.java,
-        setEventDeserializer
-            as com.fasterxml.jackson.databind.JsonDeserializer<SetEvent.EntryEvent<*>>,
+        setEventDeserializer as JsonDeserializer<SetEvent.EntryEvent<*>>,
     )
 
     val valueOrCompletionSerializer = ValueOrCompletionSerializer()
@@ -87,27 +84,23 @@ object DataSourceModule : SimpleModule() {
     @Suppress("UNCHECKED_CAST")
     addSerializer(
         ValueOrCompletion.Value::class.java,
-        valueOrCompletionSerializer
-            as com.fasterxml.jackson.databind.JsonSerializer<ValueOrCompletion.Value<*>>,
+        valueOrCompletionSerializer as JsonSerializer<ValueOrCompletion.Value<*>>,
     )
     @Suppress("UNCHECKED_CAST")
     addDeserializer(
         ValueOrCompletion.Value::class.java,
-        valueOrCompletionDeserializer
-            as com.fasterxml.jackson.databind.JsonDeserializer<ValueOrCompletion.Value<*>>,
+        valueOrCompletionDeserializer as JsonDeserializer<ValueOrCompletion.Value<*>>,
     )
 
     @Suppress("UNCHECKED_CAST")
     addSerializer(
         ValueOrCompletion.Completion::class.java,
-        valueOrCompletionSerializer
-            as com.fasterxml.jackson.databind.JsonSerializer<ValueOrCompletion.Completion>,
+        valueOrCompletionSerializer as JsonSerializer<ValueOrCompletion.Completion>,
     )
     @Suppress("UNCHECKED_CAST")
     addDeserializer(
         ValueOrCompletion.Completion::class.java,
-        valueOrCompletionDeserializer
-            as com.fasterxml.jackson.databind.JsonDeserializer<ValueOrCompletion.Completion>,
+        valueOrCompletionDeserializer as JsonDeserializer<ValueOrCompletion.Completion>,
     )
   }
 }

util/src/test/kotlin/com/caplin/integration/datasourcex/util/serialization/fory/MapEventSerializationTest.kt

@@ -37,4 +37,20 @@ class MapEventSerializationTest :
         val deserialized = fory.deserialize(bytes)
         deserialized shouldBe event
       }
+
+      context("EntryEvent specifically") {
+        test("Upsert") {
+          val event: MapEvent.EntryEvent<String, String> = Upsert("key", "old", "new")
+          val bytes = fory.serialize(event)
+          val deserialized = fory.deserialize(bytes)
+          deserialized shouldBe event
+        }
+
+        test("Removed") {
+          val event: MapEvent.EntryEvent<String, String> = Removed("key", "old")
+          val bytes = fory.serialize(event)
+          val deserialized = fory.deserialize(bytes)
+          deserialized shouldBe event
+        }
+      }
     })

util/src/test/kotlin/com/caplin/integration/datasourcex/util/serialization/fory/SetEventSerializationTest.kt

@@ -35,4 +35,20 @@ class SetEventSerializationTest :
         val deserialized = fory.deserialize(bytes)
         deserialized shouldBe event
       }
+
+      context("EntryEvent specifically") {
+        test("Insert") {
+          val event: SetEvent.EntryEvent<String> = SetEvent.EntryEvent.Insert("value")
+          val bytes = fory.serialize(event)
+          val deserialized = fory.deserialize(bytes)
+          deserialized shouldBe event
+        }
+
+        test("Removed") {
+          val event: SetEvent.EntryEvent<String> = SetEvent.EntryEvent.Removed("value")
+          val bytes = fory.serialize(event)
+          val deserialized = fory.deserialize(bytes)
+          deserialized shouldBe event
+        }
+      }
     })

util/src/test/kotlin/com/caplin/integration/datasourcex/util/serialization/fory/SimpleMapEventSerializationTest.kt

@@ -35,4 +35,22 @@ class SimpleMapEventSerializationTest :
         val deserialized = fory.deserialize(bytes)
         deserialized shouldBe event
       }
+
+      context("EntryEvent specifically") {
+        test("Upsert") {
+          val event: SimpleMapEvent.EntryEvent<String, String> =
+              SimpleMapEvent.EntryEvent.Upsert("key", "value")
+          val bytes = fory.serialize(event)
+          val deserialized = fory.deserialize(bytes)
+          deserialized shouldBe event
+        }
+
+        test("Removed") {
+          val event: SimpleMapEvent.EntryEvent<String, String> =
+              SimpleMapEvent.EntryEvent.Removed("key")
+          val bytes = fory.serialize(event)
+          val deserialized = fory.deserialize(bytes)
+          deserialized shouldBe event
+        }
+      }
     })

util/src/test/kotlin/com/caplin/integration/datasourcex/util/serialization/fory/ValueOrCompletionSerializationTest.kt

@@ -28,4 +28,20 @@ class ValueOrCompletionSerializationTest :
         val deserialized = fory.deserialize(bytes)
         deserialized shouldBe event
       }
+
+      context("Value and Completion specifically") {
+        test("Value") {
+          val event: ValueOrCompletion.Value<String> = ValueOrCompletion.Value("value")
+          val bytes = fory.serialize(event)
+          val deserialized = fory.deserialize(bytes)
+          deserialized shouldBe event
+        }
+
+        test("Completion") {
+          val event: ValueOrCompletion.Completion = ValueOrCompletion.Completion(null)
+          val bytes = fory.serialize(event)
+          val deserialized = fory.deserialize(bytes)
+          deserialized shouldBe event
+        }
+      }
     })

util/src/test/kotlin/com/caplin/integration/datasourcex/util/serialization/jackson/MapEventSerializationTest.kt

@@ -36,4 +36,28 @@ class MapEventSerializationTest :
             mapper.readValue(json, object : TypeReference<MapEvent<String, String>>() {})
         deserialized shouldBe event
       }
+
+      context("EntryEvent specifically") {
+        test("Upsert") {
+          val event: MapEvent.EntryEvent<String, String> = Upsert("key", "old", "new")
+          val json = mapper.writeValueAsString(event)
+          val deserialized: MapEvent.EntryEvent<String, String> =
+              mapper.readValue(
+                  json,
+                  object : TypeReference<MapEvent.EntryEvent<String, String>>() {},
+              )
+          deserialized shouldBe event
+        }
+
+        test("Removed") {
+          val event: MapEvent.EntryEvent<String, String> = Removed("key", "old")
+          val json = mapper.writeValueAsString(event)
+          val deserialized: MapEvent.EntryEvent<String, String> =
+              mapper.readValue(
+                  json,
+                  object : TypeReference<MapEvent.EntryEvent<String, String>>() {},
+              )
+          deserialized shouldBe event
+        }
+      }
     })

util/src/test/kotlin/com/caplin/integration/datasourcex/util/serialization/jackson/SetEventSerializationTest.kt

@@ -31,4 +31,22 @@ class SetEventSerializationTest :
         val deserialized = mapper.readValue(json, object : TypeReference<SetEvent<String>>() {})
         deserialized shouldBe event
       }
+
+      context("EntryEvent specifically") {
+        test("Insert") {
+          val event: SetEvent.EntryEvent<String> = SetEvent.EntryEvent.Insert("value")
+          val json = mapper.writeValueAsString(event)
+          val deserialized =
+              mapper.readValue(json, object : TypeReference<SetEvent.EntryEvent<String>>() {})
+          deserialized shouldBe event
+        }
+
+        test("Removed") {
+          val event: SetEvent.EntryEvent<String> = SetEvent.EntryEvent.Removed("value")
+          val json = mapper.writeValueAsString(event)
+          val deserialized =
+              mapper.readValue(json, object : TypeReference<SetEvent.EntryEvent<String>>() {})
+          deserialized shouldBe event
+        }
+      }
     })

util/src/test/kotlin/com/caplin/integration/datasourcex/util/serialization/jackson/SimpleMapEventSerializationTest.kt

@@ -34,4 +34,30 @@ class SimpleMapEventSerializationTest :
             mapper.readValue(json, object : TypeReference<SimpleMapEvent<String, String>>() {})
         deserialized shouldBe event
       }
+
+      context("EntryEvent specifically") {
+        test("Upsert") {
+          val event: SimpleMapEvent.EntryEvent<String, String> =
+              SimpleMapEvent.EntryEvent.Upsert("key", "value")
+          val json = mapper.writeValueAsString(event)
+          val deserialized =
+              mapper.readValue(
+                  json,
+                  object : TypeReference<SimpleMapEvent.EntryEvent<String, String>>() {},
+              )
+          deserialized shouldBe event
+        }
+
+        test("Removed") {
+          val event: SimpleMapEvent.EntryEvent<String, String> =
+              SimpleMapEvent.EntryEvent.Removed("key")
+          val json = mapper.writeValueAsString(event)
+          val deserialized =
+              mapper.readValue(
+                  json,
+                  object : TypeReference<SimpleMapEvent.EntryEvent<String, String>>() {},
+              )
+          deserialized shouldBe event
+        }
+      }
     })

util/src/test/kotlin/com/caplin/integration/datasourcex/util/serialization/jackson/ValueOrCompletionSerializationTest.kt

@@ -38,4 +38,33 @@ class ValueOrCompletionSerializationTest :
         deserialized.shouldBeInstanceOf<ValueOrCompletion.Completion>()
         deserialized.throwable?.message shouldBe "error"
       }
+
+      context("Value and Completion specifically") {
+        test("Value") {
+          val event: ValueOrCompletion.Value<String> = ValueOrCompletion.Value("value")
+          val json = mapper.writeValueAsString(event)
+          val deserialized =
+              mapper.readValue(json, object : TypeReference<ValueOrCompletion.Value<String>>() {})
+          deserialized shouldBe event
+        }
+
+        test("Completion (null)") {
+          val event: ValueOrCompletion.Completion = ValueOrCompletion.Completion(null)
+          val json = mapper.writeValueAsString(event)
+          val deserialized =
+              mapper.readValue(json, object : TypeReference<ValueOrCompletion.Completion>() {})
+          deserialized.shouldBeInstanceOf<ValueOrCompletion.Completion>()
+          deserialized.throwable shouldBe null
+        }
+
+        test("Completion (error)") {
+          val event: ValueOrCompletion.Completion =
+              ValueOrCompletion.Completion(RuntimeException("error"))
+          val json = mapper.writeValueAsString(event)
+          val deserialized =
+              mapper.readValue(json, object : TypeReference<ValueOrCompletion.Completion>() {})
+          deserialized.shouldBeInstanceOf<ValueOrCompletion.Completion>()
+          deserialized.throwable?.message shouldBe "error"
+        }
+      }
     })