json: Use @SerialName of inline polymorphic children #2601
Merged
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
tadfisher
force-pushed
the
tad/sealed-inline-serialname
branch
from
2eab64f
to
ca6d783
Compare
pdvrieze
reviewed
Mar 14, 2024
formats/json/commonMain/src/kotlinx/serialization/json/internal/StreamingJsonEncoder.kt
Outdated
Show resolved
Hide resolved
| @@ -35,7 +35,8 @@ internal fun <T> Json.readPolymorphicJson( | |||
|
|
|||
| private sealed class AbstractJsonTreeDecoder( | |||
| override val json: Json, | |||
| open val value: JsonElement | |||
| open val value: JsonElement, | |||
| protected val polyDiscriminator: String? = null | |||
There was a problem hiding this comment.
Be consistent in naming, in other places it is called polymorphicDiscriminator
There was a problem hiding this comment.
Would you like me to rename polyDescriptor (the following parameter in JsonTreeDecoder) as well? I was trying to be consistent with that.
There was a problem hiding this comment.
Full name (polymorphicDiscriminator) is better
tadfisher
force-pushed
the
tad/sealed-inline-serialname
branch
from
ca6d783
to
edcf14e
Compare
sandwwraith
reviewed
Mar 21, 2024
tadfisher
force-pushed
the
tad/sealed-inline-serialname
branch
from
edcf14e
to
a3f54a7
Compare
tadfisher
force-pushed
the
tad/sealed-inline-serialname
branch
from
a3f54a7
to
9854e11
Compare
|
@sandwwraith Done! |
|
Note to self: it doesn't fix related problems with custom serializers (e.g. #2596), as they have different code path, so further investigation is required |
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.
Fixes #2288
Currently, the
serialNameof value class children of sealed classes is ignored for encoding. Fix this in by storing the child'sserialNameinencodeInline, and consuming it inbeginStructure. A small fix was needed to support decoding these types inJsonTreeDecoder.