Skip to content

chore: update form url encoder code generation #275

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
merged 1 commit into from
Jun 30, 2021
Merged

chore: update form url encoder code generation #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 13 deletions ...mazon/smithy/swift/codegen/integration/serde/formurl/MemberShapeEncodeFormURLGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,20 +312,9 @@ abstract class MemberShapeEncodeFormURLGenerator(
level: Int,
nextRenderer: (String) -> Unit
) {
val isBoxed = ctx.symbolProvider.toSymbol(valueTargetShape).isBoxed()
val nextContainer = "valueContainer${level + 1}"
if (isBoxed && !(valueTargetShape is SetShape)) {
writer.openBlock("if let ${nestedKeyValueName.second} = ${nestedKeyValueName.second} {", "}") {
writer.write("var $nextContainer = $entryContainerName.nestedContainer(keyedBy: Key.self, forKey: Key(\"${resolvedCodingKeys.second}\"))")
nextRenderer(nextContainer)
}
} else {
// Todo: Write a unit test for this
writer.openBlock("if let ${nestedKeyValueName.second} = ${nestedKeyValueName.second} {", "}") {
writer.write("var $nextContainer = $entryContainerName.nestedContainer(keyedBy: Key.self, forKey: Key(\"${resolvedCodingKeys.second}\"))")
nextRenderer(nextContainer)
}
}
writer.write("var $nextContainer = $entryContainerName.nestedContainer(keyedBy: Key.self, forKey: Key(\"${resolvedCodingKeys.second}\"))")
nextRenderer(nextContainer)
}

fun renderTimestampMember(member: MemberShape, memberTarget: TimestampShape, containerName: String) {
Expand Down
8 changes: 3 additions & 5 deletions smithy-swift-codegen/src/test/kotlin/serde/formurl/MapEncodeFormURLGeneratorTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,9 @@ class MapEncodeFormURLGeneratorTests {
var entryContainer0 = mapOfListsContainer.nestedContainer(keyedBy: Key.self, forKey: Key("entry.\(index0.advanced(by: 1))"))
var keyContainer0 = entryContainer0.nestedContainer(keyedBy: Key.self, forKey: Key("key"))
try keyContainer0.encode(stringKey0, forKey: Key(""))
if let stringlistValue0 = stringlistValue0 {
var valueContainer1 = entryContainer0.nestedContainer(keyedBy: Key.self, forKey: Key("value"))
for (index1, string1) in stringlistValue0.enumerated() {
try valueContainer1.encode(string1, forKey: Key("member.\(index1.advanced(by: 1))"))
}
var valueContainer1 = entryContainer0.nestedContainer(keyedBy: Key.self, forKey: Key("value"))
for (index1, string1) in stringlistValue0.enumerated() {
try valueContainer1.encode(string1, forKey: Key("member.\(index1.advanced(by: 1))"))
}
}
}
Expand Down