Support discriminators not being the first field when decoding #1324
Conversation
| @@ -75,6 +79,41 @@ class KotlinSerializerCodecProviderTest { | |||
| assertEquals(DataClassWithSimpleValues::class.java, codec.encoderClass) | |||
| } | |||
|
|
|||
| @Test | |||
| fun testDataClassWithSimpleValuesFieldOrdering() { | |||
There was a problem hiding this comment.
This functionality was already supported but added a regression test.
| val actual = | ||
| codec.decode( | ||
| JsonReader( | ||
| """{"name": "string", "_id": {$oid: "${objectId.toHexString()}"}, |
There was a problem hiding this comment.
Here all the fields are out of order and this confirms it does support the scenario where the discriminator isn't the first field.
| @@ -213,13 +213,37 @@ private class PolymorphicDecoder( | |||
| configuration: BsonConfiguration | |||
| ) : DefaultBsonDecoder(reader, serializersModule, configuration) { | |||
| private var index = 0 | |||
| private var mark: BsonReaderMark? = reader.mark | |||
There was a problem hiding this comment.
Here a mark is set allowing the PolymorphicDecoder to iterate to the discriminator field instead of expecting it to be the first field.
| override fun <T> decodeSerializableValue(deserializer: DeserializationStrategy<T>): T = | ||
| deserializer.deserialize(DefaultBsonDecoder(reader, serializersModule, configuration)) | ||
| override fun <T> decodeSerializableValue(deserializer: DeserializationStrategy<T>): T { | ||
| mark?.let { |
There was a problem hiding this comment.
clears the mark on the first decoding of values.
|
@rozza this seems a solution for the polymorphic serializer on root level (with _id field), but this is only part of the fix. Currently the polymorphic serializer is not called while inserting a document to Mongo, so without that also having a fix, this won't do much. In driver-core in the Operations class we see that during insert of a document that the function documentToBsonDocument is called. It fetches the Codec for the class that is inserted (data class), but it should fetch the Codec of collection (basically the getCodec function). This is causing the wrong serializer to be used. |
|
Hi @robbamberg - thanks for the follow up, that is a slightly different issue to the one being fixed here. I've added #1327 for that fix. |
bson-kotlinx/src/main/kotlin/org/bson/codecs/kotlinx/BsonDecoder.kt
Outdated
Show resolved
Hide resolved
bson-kotlinx/src/main/kotlin/org/bson/codecs/kotlinx/BsonDecoder.kt
Outdated
Show resolved
Hide resolved
JAVA-5304