Delegate sealed class decoding to a new StringMapToObjectDecoder inst…

…ance
sipgate · Apr 2, 2024 · cd19365 · cd19365
1 parent 1453a23
commit cd19365
Showing 1 changed file with 20 additions and 1 deletion.
diff --git a/common/src/main/kotlin/de/sipgate/federmappe/common/StringMapToObjectDecoder.kt b/common/src/main/kotlin/de/sipgate/federmappe/common/StringMapToObjectDecoder.kt
@@ -1,5 +1,6 @@
 package de.sipgate.federmappe.common
 
+import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerializationException
 import kotlinx.serialization.descriptors.PolymorphicKind
@@ -55,6 +56,24 @@ class StringMapToObjectDecoder(
     override fun decodeByte(): Byte = (decodeValue() as Long).toByte()
     override fun decodeFloat(): Float = (decodeValue() as Double).toFloat()
 
+    override fun <T> decodeSerializableElement(
+        descriptor: SerialDescriptor,
+        index: Int,
+        deserializer: DeserializationStrategy<T>,
+        previousValue: T?
+    ): T = if (descriptor.kind is PolymorphicKind) {
+        @Suppress("UNCHECKED_CAST")
+        deserializer.deserialize(
+            StringMapToObjectDecoder(
+                (data[key] as? Map<String, Any?>) ?: data,
+                serializersModule,
+                ignoreUnknownProperties
+            )
+        )
+    } else {
+        decodeSerializableValue(deserializer, previousValue)
+    }
+
     @Suppress("UNCHECKED_CAST")
     override fun beginStructure(descriptor: SerialDescriptor): CompositeDecoder {
         if (key == null) {
@@ -71,7 +90,7 @@ class StringMapToObjectDecoder(
 
         when (valueDescriptor) {
             StructureKind.CLASS -> return StringMapToObjectDecoder(
-                data = (value as? Map<String, Any>) ?: data,
+                data = value as Map<String, Any>,
                 ignoreUnknownProperties = ignoreUnknownProperties,
                 serializersModule = this.serializersModule,
             )