fix: correctly deserialize consecutive XML flat maps #879
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
lauzadis
force-pushed
the
fix-xml-flatmap-deserializer
branch
from
04ab28e to
0cc29b1
Compare
ianbotsf
approved these changes
Jun 30, 2023
Comment on lines
107
to
114
| val compareTo = when (descriptor.hasTrait<Flattened>()) { | ||
| // Prefer seeking to XmlSerialName if the trait exists | ||
| true -> when (descriptor.hasTrait<XmlSerialName>()) { | ||
| true -> descriptor.expectTrait<XmlSerialName>().name | ||
| false -> mapTrait.key | ||
| } | ||
| false -> mapTrait.entry | ||
| } |
There was a problem hiding this comment.
Style: I generally find when/true/false to be less readable than if/else or null-coalescing. In this case, when (descriptor.hasTrait<XmlSerialName>()) { ... } can be replaced with:
descriptor.findTrait<XmlSerialName>()?.name ?: mapTrait.key
Thankfully JSON doesn't have this problem because it only has one way to represent a map |
|
SonarCloud Quality Gate failed.
|
aajtodd
approved these changes
Jun 30, 2023
aajtodd
added a commit
that referenced
this pull request
Mar 11, 2024
* feat: identity API upstream changes (#864) * track upstream codegen changes (#879) * track upstream IdentityProvider and Attributes changes (#881) * add base class for credentials config (#883) BREAKING CHANGE: `CredentialsProvider` method name and signature changed. `signer` property removed from service client config in favor of `authSchemes` override.
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.
This PR fixes a bug in the XML deserializer which fails to process consecutive flat maps properly. Before this change, the deserializer would seek forward until it found a matching map key. Consecutive flat maps sharing the same key names would be lumped together unintentionally.
The fix is to seek using
XmlSerialNameas a comparator since this is the only thing distinguishing different flat maps. A new deserialize methodpeekSeekis added which seeks forward and only consumes tokens if they are a match.Issue #
awslabs/aws-sdk-kotlin#962
Description of changes
This fixes a bug when deserializing consecutive flat maps. See the new "consecutive flat maps" test case for an example of an XML tree for which parsing previously failed.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.