Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correctly support registering both default polymorphic serializer & deserializer #1849

Merged
merged 2 commits into from Feb 22, 2022
Merged

Correctly support registering both default polymorphic serializer & deserializer #1849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c2a653
Correctly support registering both default polymorphic serializer & d…
sandwwraith Jan 26, 2022
d88a463
~fix error message
sandwwraith Jan 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions core/commonMain/src/kotlinx/serialization/modules/SerializersModuleBuilders.kt
View file
Open in desktop
Expand Up @@ -153,9 +153,9 @@ public class SerializersModuleBuilder @PublishedApi internal constructor() : Ser
defaultSerializerProvider: (value: Base) -> SerializationStrategy<Base>?,
allowOverwrite: Boolean
) {
val previous = polyBase2DefaultDeserializerProvider[baseClass]
val previous = polyBase2DefaultSerializerProvider[baseClass]
if (previous != null && previous != defaultSerializerProvider && !allowOverwrite) {
throw IllegalArgumentException("Default serializers provider for class $baseClass is already registered: $previous")
throw IllegalArgumentException("Default serializers provider for $baseClass is already registered: $previous")
}
polyBase2DefaultSerializerProvider[baseClass] = defaultSerializerProvider
}
Expand All @@ -168,7 +168,7 @@ public class SerializersModuleBuilder @PublishedApi internal constructor() : Ser
) {
val previous = polyBase2DefaultDeserializerProvider[baseClass]
if (previous != null && previous != defaultDeserializerProvider && !allowOverwrite) {
throw IllegalArgumentException("Default deserializers provider for class $baseClass is already registered: $previous")
throw IllegalArgumentException("Default deserializers provider for $baseClass is already registered: $previous")
}
polyBase2DefaultDeserializerProvider[baseClass] = defaultDeserializerProvider
}
Expand Down
16 changes: 16 additions & 0 deletions core/commonTest/src/kotlinx/serialization/modules/ModuleBuildersTest.kt
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ package kotlinx.serialization.modules
import kotlinx.serialization.*
import kotlinx.serialization.builtins.*
import kotlinx.serialization.descriptors.*
import kotlinx.serialization.encoding.*
import kotlin.reflect.*
import kotlin.test.*

Expand Down Expand Up @@ -305,6 +306,21 @@ class ModuleBuildersTest {
assertEquals<Any?>(Unit.serializer(), m2.getPolymorphic(Any::class, serializedClassName = "foo"))
}

@Test
fun testBothPolymorphicDefaults() {
val anySerializer = object : KSerializer<Any> {
override val descriptor: SerialDescriptor get() = error("descriptor")
override fun serialize(encoder: Encoder, value: Any): Unit = error("serialize")
override fun deserialize(decoder: Decoder): Any = error("deserialize")
}
val module = SerializersModule {
polymorphicDefaultDeserializer(Any::class) { _ -> anySerializer }
polymorphicDefaultSerializer(Any::class) { _ -> anySerializer }
}
assertEquals(anySerializer, module.getPolymorphic(Any::class, 42))
assertEquals(anySerializer, module.getPolymorphic(Any::class, serializedClassName = "42"))
}

@Test
fun testPolymorphicForStandardSubtypesOfAny() {
val serializer = object : KSerializer<Int> by Int.serializer() {}
Expand Down