Upgrade Smithy to 1.49 #3662
Merged
Upgrade Smithy to 1.49 #3662
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
|
A new generated diff is ready to view.
A new doc preview is ready to view. |
Velfi
reviewed
May 24, 2024
Comment on lines
285
to
319
| private fun RustWriter.serializeCollection( | ||
| protected open fun RustWriter.serializeCollection( | ||
| memberContext: MemberContext, | ||
| context: Context<CollectionShape>, | ||
| ) { | ||
| serializeCollectionInner(memberContext, context, this) | ||
| } | ||
|
|
||
| protected fun serializeCollectionInner( | ||
| memberContext: MemberContext, | ||
| context: Context<CollectionShape>, | ||
| writer: RustWriter, | ||
| ) { | ||
| val flat = memberContext.shape.isFlattened() | ||
| val memberOverride = | ||
| when (val override = context.shape.member.getTrait<XmlNameTrait>()?.value) { | ||
| null -> "None" | ||
| else -> "Some(${override.dq()})" | ||
| } | ||
| val itemName = safeName("item") | ||
| safeName("list").also { listName -> | ||
| rust("let mut $listName = ${context.writerExpression}.start_list($flat, $memberOverride);") | ||
| rustBlock("for $itemName in ${context.valueExpression.asRef()}") { | ||
| val itemName = writer.safeName("item") | ||
| writer.safeName("list").also { listName -> | ||
| writer.rust("let mut $listName = ${context.writerExpression}.start_list($flat, $memberOverride);") | ||
| writer.rustBlock("for $itemName in ${context.valueExpression.asRef()}") { | ||
| val entryName = safeName("entry") | ||
| Attribute.AllowUnusedMut.render(this) | ||
| rust("let mut $entryName = $listName.entry();") | ||
| writer.rust("let mut $entryName = $listName.entry();") | ||
| val targetShape = model.expectShape(context.shape.member.target) | ||
| serializeMemberValue( | ||
| writer.serializeMemberValue( | ||
| MemberContext(entryName, ValueExpression.Reference(itemName), context.shape.member), | ||
| targetShape, | ||
| ) | ||
| } | ||
| rust("$listName.finish();") | ||
| writer.rust("$listName.finish();") | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
This looks to be doing the same thing. Why update it?
There was a problem hiding this comment.
This is working around Kotlin's limitation that an extension method cannot be overridden. Ec2QuerySerializerGenerator, a subclass of QuerySerializerGenerator, needs to override RustWriter.serializeCollection so that it should only call it if an input list is NOT empty (otherwise &ListArg= would be rendered which ec2 query protocol doesn't like in Smithy 1.49). However, we currently couldn't do this in Kotlin if it were not for serializeCollectionInner:
override fun RustWriter.serializeCollection(
memberContext: MemberContext,
context: Context<CollectionShape>,
) {
rustBlock("if !${context.valueExpression.asRef()}.is_empty()") {
super.serializeCollection(memberContext, context) // cannot call super class's extension method like this
}
drganjoo
reviewed
May 24, 2024
...tware/amazon/smithy/rust/codegen/core/smithy/protocols/serialize/QuerySerializerGenerator.kt
Outdated
Show resolved
Hide resolved
This commit addresses #3662 (comment)
drganjoo
approved these changes
May 24, 2024
|
A new generated diff is ready to view.
A new doc preview is ready to view. |
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.
Motivation and Context
Upgrades Smithy to 1.49.0
Description
As part of the upgrade, it updates the serializer for EC2 query protocol to handle empty lists in response to this (otherwise a protocol test
ec2_empty_query_lists_requestwould fail).Testing
Existing tests in CI
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.