Fix beginStructure in JsonTreeDecoder when inner structre descriptor is same as outer #2346
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sandwwraith
requested changes
Jun 27, 2023
...ests/commonTest/src/kotlinx/serialization/json/polymorphic/JsonTreeDecoderPolymorphicTest.kt
Outdated
Show resolved
Hide resolved
sandwwraith
reviewed
Jun 28, 2023
...ests/commonTest/src/kotlinx/serialization/json/polymorphic/JsonTreeDecoderPolymorphicTest.kt
Outdated
Show resolved
Hide resolved
…stance of decoder when the polyDescriptor is same returns a new instance with the same polyDiscriminaton. Fixes Kotlin#2343
|
I also squashed the commits. |
sandwwraith
approved these changes
Jun 29, 2023
|
Great job, thanks! |
JesusMcCloud
pushed a commit
to a-sit-plus/kotlinx.serialization
that referenced
this pull request
Jul 5, 2023
… is same as outer (Kotlin#2346) Instead of returning the same instance of decoder (with invalid position) a new instance is created, and polyDiscriminator and polyDescriptor are passed to the new instance. This way check for unknown keys in endStructure can properly filter out polymorphic discriminator (by default "type) from potential unknown keys. Fixes Kotlin#2343
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Attempt 2 (previous pull request and discussion here #2344) at solving #2343. This time instead of returning the same instance of decoder (with invalid position) a new instance is created, and
polyDiscriminatorandpolyDescriptorare passed to the new instance.This way check for unknown keys in
endStructurecan properly filter out polymorphic discriminator (by default "type) from potential unknown keys.Added a simple test that fails with the original code and passes with the fix, but I'm not sure what to call it or if it's in the right place.