Skip to content
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

fix: Allow empty lists to be serialized for Aws queries and Ec2 queries #666

Merged
merged 3 commits into from
Nov 2, 2022
Merged

fix: Allow empty lists to be serialized for Aws queries and Ec2 queries #666

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
5d73fc9
Allow empty lists to be serialized for Aws queries and Ec2 queries
epau Nov 2, 2022
5ec9ba8
Updates tests
epau Nov 2, 2022
905c4b4
Updates tests
epau Nov 2, 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
4 changes: 4 additions & 0 deletions .../software/amazon/smithy/aws/swift/codegen/awsquery/AwsQueryFormURLEncodeCustomizations.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,8 @@ class AwsQueryFormURLEncodeCustomizations : FormURLEncodeCustomizable {
override fun customNameTraitGenerator(memberShape: Shape, defaultName: String): String {
return XMLNameTraitGenerator.construct(memberShape, defaultName).toString()
}

override fun shouldSerializeEmptyLists(): Boolean {
return true
}
}
3 changes: 3 additions & 0 deletions .../software/amazon/smithy/aws/swift/codegen/ec2query/Ec2QueryFormURLEncodeCustomizations.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,7 @@ class Ec2QueryFormURLEncodeCustomizations : FormURLEncodeCustomizable {
override fun customNameTraitGenerator(memberShape: Shape, defaultName: String): String {
return Ec2QueryNameTraitGenerator.construct(memberShape, defaultName).toString()
}
override fun shouldSerializeEmptyLists(): Boolean {
return true
}
}
16 changes: 13 additions & 3 deletions ...test/kotlin/software/amazon/smithy/aws/swift/codegen/awsquery/BlobEncodeGeneratorTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,15 @@ class BlobEncodeGeneratorTests {
public func encode(to encoder: Swift.Encoder) throws {
var container = encoder.container(keyedBy: ClientRuntime.Key.self)
if let blobList = blobList {
var blobListContainer = container.nestedContainer(keyedBy: ClientRuntime.Key.self, forKey: ClientRuntime.Key("BlobList"))
for (index0, blob0) in blobList.enumerated() {
try blobListContainer.encode(blob0.base64EncodedString(), forKey: ClientRuntime.Key("member.\(index0.advanced(by: 1))"))
if !blobList.isEmpty {
var blobListContainer = container.nestedContainer(keyedBy: ClientRuntime.Key.self, forKey: ClientRuntime.Key("BlobList"))
for (index0, blob0) in blobList.enumerated() {
try blobListContainer.encode(blob0.base64EncodedString(), forKey: ClientRuntime.Key("member.\(index0.advanced(by: 1))"))
}
}
else {
var blobListContainer = container.nestedContainer(keyedBy: ClientRuntime.Key.self, forKey: ClientRuntime.Key("BlobList"))
try blobListContainer.encode("", forKey: ClientRuntime.Key(""))
}
}
if let blobListFlattened = blobListFlattened {
Expand All @@ -36,6 +42,10 @@ class BlobEncodeGeneratorTests {
try container.encode(blob0.base64EncodedString(), forKey: ClientRuntime.Key("BlobListFlattened.\(index0.advanced(by: 1))"))
}
}
else {
var blobListFlattenedContainer = container.nestedContainer(keyedBy: ClientRuntime.Key.self, forKey: ClientRuntime.Key("BlobListFlattened"))
try blobListFlattenedContainer.encode("", forKey: ClientRuntime.Key(""))
}
}
if let blobMap = blobMap {
var blobMapContainer = container.nestedContainer(keyedBy: ClientRuntime.Key.self, forKey: ClientRuntime.Key("BlobMap"))
Expand Down
60 changes: 48 additions & 12 deletions ...tlin/software/amazon/smithy/aws/swift/codegen/awsquery/ListEncodeFormURLGeneratorTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,15 @@ class ListEncodeFormURLGeneratorTests {
public func encode(to encoder: Swift.Encoder) throws {
var container = encoder.container(keyedBy: ClientRuntime.Key.self)
if let complexListArg = complexListArg {
var complexListArgContainer = container.nestedContainer(keyedBy: ClientRuntime.Key.self, forKey: ClientRuntime.Key("ComplexListArg"))
for (index0, greetingstruct0) in complexListArg.enumerated() {
try complexListArgContainer.encode(greetingstruct0, forKey: ClientRuntime.Key("member.\(index0.advanced(by: 1))"))
if !complexListArg.isEmpty {
var complexListArgContainer = container.nestedContainer(keyedBy: ClientRuntime.Key.self, forKey: ClientRuntime.Key("ComplexListArg"))
for (index0, greetingstruct0) in complexListArg.enumerated() {
try complexListArgContainer.encode(greetingstruct0, forKey: ClientRuntime.Key("member.\(index0.advanced(by: 1))"))
}
}
else {
var complexListArgContainer = container.nestedContainer(keyedBy: ClientRuntime.Key.self, forKey: ClientRuntime.Key("ComplexListArg"))
try complexListArgContainer.encode("", forKey: ClientRuntime.Key(""))
}
}
if let flattenedListArg = flattenedListArg {
Expand All @@ -37,6 +43,10 @@ class ListEncodeFormURLGeneratorTests {
try flattenedListArgContainer0.encode(string0, forKey: ClientRuntime.Key(""))
}
}
else {
var flattenedListArgContainer = container.nestedContainer(keyedBy: ClientRuntime.Key.self, forKey: ClientRuntime.Key("FlattenedListArg"))
try flattenedListArgContainer.encode("", forKey: ClientRuntime.Key(""))
}
}
if let flattenedListArgWithXmlName = flattenedListArgWithXmlName {
if !flattenedListArgWithXmlName.isEmpty {
Expand All @@ -45,17 +55,33 @@ class ListEncodeFormURLGeneratorTests {
try flattenedListArgWithXmlNameContainer0.encode(string0, forKey: ClientRuntime.Key(""))
}
}
else {
var flattenedListArgWithXmlNameContainer = container.nestedContainer(keyedBy: ClientRuntime.Key.self, forKey: ClientRuntime.Key("Hi"))
try flattenedListArgWithXmlNameContainer.encode("", forKey: ClientRuntime.Key(""))
}
}
if let listArg = listArg {
var listArgContainer = container.nestedContainer(keyedBy: ClientRuntime.Key.self, forKey: ClientRuntime.Key("ListArg"))
for (index0, string0) in listArg.enumerated() {
try listArgContainer.encode(string0, forKey: ClientRuntime.Key("member.\(index0.advanced(by: 1))"))
if !listArg.isEmpty {
var listArgContainer = container.nestedContainer(keyedBy: ClientRuntime.Key.self, forKey: ClientRuntime.Key("ListArg"))
for (index0, string0) in listArg.enumerated() {
try listArgContainer.encode(string0, forKey: ClientRuntime.Key("member.\(index0.advanced(by: 1))"))
}
}
else {
var listArgContainer = container.nestedContainer(keyedBy: ClientRuntime.Key.self, forKey: ClientRuntime.Key("ListArg"))
try listArgContainer.encode("", forKey: ClientRuntime.Key(""))
}
}
if let listArgWithXmlNameMember = listArgWithXmlNameMember {
var listArgWithXmlNameMemberContainer = container.nestedContainer(keyedBy: ClientRuntime.Key.self, forKey: ClientRuntime.Key("ListArgWithXmlNameMember"))
for (index0, string0) in listArgWithXmlNameMember.enumerated() {
try listArgWithXmlNameMemberContainer.encode(string0, forKey: ClientRuntime.Key("item.\(index0.advanced(by: 1))"))
if !listArgWithXmlNameMember.isEmpty {
var listArgWithXmlNameMemberContainer = container.nestedContainer(keyedBy: ClientRuntime.Key.self, forKey: ClientRuntime.Key("ListArgWithXmlNameMember"))
for (index0, string0) in listArgWithXmlNameMember.enumerated() {
try listArgWithXmlNameMemberContainer.encode(string0, forKey: ClientRuntime.Key("item.\(index0.advanced(by: 1))"))
}
}
else {
var listArgWithXmlNameMemberContainer = container.nestedContainer(keyedBy: ClientRuntime.Key.self, forKey: ClientRuntime.Key("ListArgWithXmlNameMember"))
try listArgWithXmlNameMemberContainer.encode("", forKey: ClientRuntime.Key(""))
}
}
if let flatTsList = flatTsList {
Expand All @@ -65,11 +91,21 @@ class ListEncodeFormURLGeneratorTests {
try flatTsListContainer0.encode(TimestampWrapper(timestamp0, format: .epochSeconds), forKey: ClientRuntime.Key(""))
}
}
else {
var flatTsListContainer = container.nestedContainer(keyedBy: ClientRuntime.Key.self, forKey: ClientRuntime.Key("flatTsList"))
try flatTsListContainer.encode("", forKey: ClientRuntime.Key(""))
}
}
if let tsList = tsList {
var tsListContainer = container.nestedContainer(keyedBy: ClientRuntime.Key.self, forKey: ClientRuntime.Key("tsList"))
for (index0, timestamp0) in tsList.enumerated() {
try tsListContainer.encode(TimestampWrapper(timestamp0, format: .epochSeconds), forKey: ClientRuntime.Key("member.\(index0.advanced(by: 1))"))
if !tsList.isEmpty {
var tsListContainer = container.nestedContainer(keyedBy: ClientRuntime.Key.self, forKey: ClientRuntime.Key("tsList"))
for (index0, timestamp0) in tsList.enumerated() {
try tsListContainer.encode(TimestampWrapper(timestamp0, format: .epochSeconds), forKey: ClientRuntime.Key("member.\(index0.advanced(by: 1))"))
}
}
else {
var tsListContainer = container.nestedContainer(keyedBy: ClientRuntime.Key.self, forKey: ClientRuntime.Key("tsList"))
try tsListContainer.encode("", forKey: ClientRuntime.Key(""))
}
}
try container.encode("QueryLists", forKey:ClientRuntime.Key("Action"))
Expand Down