Fix launch exception

DRSchlaubi · Dec 28, 2023 · 478bc36 · 478bc36
1 parent 3a7d33e
commit 478bc36
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 allprojects {
     group = "dev.schlaubi.tonbrett"
-    version = "1.18.5"
+    version = "1.18.6"
 
     repositories {
         mavenCentral()

diff --git a/common/src/jvmMain/kotlin/dev/schlaubi/tonbrett/common/Id.kt b/common/src/jvmMain/kotlin/dev/schlaubi/tonbrett/common/Id.kt
@@ -9,6 +9,8 @@ import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.JsonDecoder
+import kotlinx.serialization.json.JsonEncoder
 import org.bson.types.ObjectId
 import org.litote.kmongo.id.toId
 import org.litote.kmongo.toId
@@ -34,15 +36,15 @@ public object IdSerializer : KSerializer<Id<*>> {
         PrimitiveSerialDescriptor("MongoID", PrimitiveKind.STRING)
 
     override fun deserialize(decoder: Decoder): Id<*> {
-        return if (decoder is BsonFlexibleDecoder) {
+        return if (decoder !is JsonDecoder && decoder is BsonFlexibleDecoder) {
             WrappedId<Any>(decoder.reader.readObjectId().toId())
         } else {
             WrappedId<Any>(decoder.decodeString().toId())
         }
     }
 
     override fun serialize(encoder: Encoder, value: Id<*>): Unit =
-        if (encoder is BsonEncoder) {
+        if (encoder !is JsonEncoder && encoder is BsonEncoder) {
             val objectId = ObjectId(value.toString())
             encoder.encodeObjectId(objectId)
         } else {