Skip to content

Correctly serialize Strings in XML #1832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
david-perez merged 3 commits into from
Oct 13, 2022
Merged

Correctly serialize Strings in XML #1832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7533ea4
Correctly serialize `String`s in XML
david-perez Oct 7, 2022
79d31b2
Merge branch 'main' into davidpz/correctly-serialize-strings-in-xml
Oct 10, 2022
d48d29b
Merge branch 'main' into davidpz/correctly-serialize-strings-in-xml
david-perez Oct 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion codegen-client-test/model/rest-xml-extras.smithy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ service RestXmlExtras {
ChecksumRequired,
StringHeader,
CreateFoo,
RequiredMember,
]
}

Expand Down Expand Up @@ -242,5 +243,17 @@ structure StringHeaderOutput {
field: String,

@httpHeader("x-enum")
enumHeader: StringEnum
enumHeader: StringEnum,
}

/// This operation tests that we can serialize `required` members.
@http(uri: "/required-member", method: "GET")
operation RequiredMember {
input: RequiredMemberInputOutput
output: RequiredMemberInputOutput
}

structure RequiredMemberInputOutput {
@required
requiredString: String
}
4 changes: 3 additions & 1 deletion ...in/software/amazon/smithy/rust/codegen/core/smithy/protocols/serialize/ValueExpression.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@

package software.amazon.smithy.rust.codegen.core.smithy.protocols.serialize

import software.amazon.smithy.rust.codegen.core.rustlang.autoDeref

sealed class ValueExpression {
abstract val name: String

data class Reference(override val name: String) : ValueExpression()
data class Value(override val name: String) : ValueExpression()

fun asValue(): String = when (this) {
is Reference -> "*$name"
is Reference -> autoDeref(name)
is Value -> name
}

Expand Down
16 changes: 9 additions & 7 deletions ...smithy/rust/codegen/core/smithy/protocols/serialize/XmlBindingTraitSerializerGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import software.amazon.smithy.model.shapes.StringShape
import software.amazon.smithy.model.shapes.StructureShape
import software.amazon.smithy.model.shapes.TimestampShape
import software.amazon.smithy.model.shapes.UnionShape
import software.amazon.smithy.model.traits.EnumTrait
import software.amazon.smithy.model.traits.TimestampFormatTrait
import software.amazon.smithy.model.traits.XmlFlattenedTrait
import software.amazon.smithy.model.traits.XmlNamespaceTrait
Expand Down Expand Up @@ -285,11 +284,9 @@ class XmlBindingTraitSerializerGenerator(
}

private fun RustWriter.serializeRawMember(member: MemberShape, input: String) {
when (val shape = model.expectShape(member.target)) {
is StringShape -> if (shape.hasTrait<EnumTrait>()) {
when (model.expectShape(member.target)) {
is StringShape -> {
rust("$input.as_str()")
} else {
rust("$input.as_ref()")
}
is BooleanShape, is NumberShape -> {
rust(
Expand Down Expand Up @@ -444,7 +441,7 @@ class XmlBindingTraitSerializerGenerator(
* ```
*
* If [member] is not an optional shape, generate code like:
* `{ .. Block }`
* `{ .. BLOCK }`
*
* [inner] is passed a new `ctx` object to use for code generation which handles the
* potentially new name of the input.
Expand All @@ -462,7 +459,12 @@ class XmlBindingTraitSerializerGenerator(
}
} else {
with(util) {
ignoreZeroValues(member, ValueExpression.Value(autoDeref(ctx.input))) {
val valueExpression = if (ctx.input.startsWith("&")) {
ValueExpression.Reference(ctx.input)
} else {
ValueExpression.Value(ctx.input)
}
ignoreZeroValues(member, valueExpression) {
inner(ctx)
}
}
Expand Down