Skip to content

Fix Spacing in RestXml Request Marshallers #4256

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
peterrsongg merged 2 commits into from
Dec 23, 2025
Merged

Fix Spacing in RestXml Request Marshallers #4256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4d98d2
generator and devconfig changes
peterrsongg Dec 23, 2025
ca22ed3
Generated Service Changes
peterrsongg Dec 23, 2025
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
32 changes: 32 additions & 0 deletions generator/.DevConfigs/3d84a553-7110-4d85-9b5d-a72528575e89.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"services": [
{
"serviceName": "S3",
"type": "patch",
"changeLogMessages": [
"Fix spacing in request marshallers."
]
},
{
"serviceName": "CloudFront",
"type": "patch",
"changeLogMessages": [
"Fix spacing in request marshallers."
]
},
{
"serviceName": "S3Control",
"type": "patch",
"changeLogMessages": [
"Fix spacing in request marshallers."
]
},
{
"serviceName": "Route53",
"type": "patch",
"changeLogMessages": [
"Fix spacing in request marshallers."
]
}
]
}
1,369 changes: 685 additions & 684 deletions generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.cs
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,7 @@ WriteXmlAttributeString(level + 1, member, variableName, isPayload: true, operat
marshallName = member.LocationName ?? member.ModeledName;
if (member.Shape.IsList)
{
level++;
#>
<#=new string(' ', level * 4)#> if (<#=variableName#> != null)
<#=new string(' ', level * 4)#> {
Expand Down
44 changes: 22 additions & 22 deletions .../Generated/Model/Internal/MarshallTransformations/CreateAnycastIpListRequestMarshaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,19 +73,19 @@ public IRequest Marshall(CreateAnycastIpListRequest publicRequest)
xmlWriter.WriteStartElement("IpamCidrConfigs");
foreach (var publicRequestIpamCidrConfigsValue in publicRequestIpamCidrConfigs)
{
if (publicRequestIpamCidrConfigsValue != null)
{
xmlWriter.WriteStartElement("IpamCidrConfig");
if(publicRequestIpamCidrConfigsValue.IsSetAnycastIp())
xmlWriter.WriteElementString("AnycastIp", StringUtils.FromString(publicRequestIpamCidrConfigsValue.AnycastIp));
if(publicRequestIpamCidrConfigsValue.IsSetCidr())
xmlWriter.WriteElementString("Cidr", StringUtils.FromString(publicRequestIpamCidrConfigsValue.Cidr));
if(publicRequestIpamCidrConfigsValue.IsSetIpamPoolArn())
xmlWriter.WriteElementString("IpamPoolArn", StringUtils.FromString(publicRequestIpamCidrConfigsValue.IpamPoolArn));
if(publicRequestIpamCidrConfigsValue.IsSetStatus())
xmlWriter.WriteElementString("Status", StringUtils.FromString(publicRequestIpamCidrConfigsValue.Status));
xmlWriter.WriteEndElement();
}
if (publicRequestIpamCidrConfigsValue != null)
{
xmlWriter.WriteStartElement("IpamCidrConfig");
if(publicRequestIpamCidrConfigsValue.IsSetAnycastIp())
xmlWriter.WriteElementString("AnycastIp", StringUtils.FromString(publicRequestIpamCidrConfigsValue.AnycastIp));
if(publicRequestIpamCidrConfigsValue.IsSetCidr())
xmlWriter.WriteElementString("Cidr", StringUtils.FromString(publicRequestIpamCidrConfigsValue.Cidr));
if(publicRequestIpamCidrConfigsValue.IsSetIpamPoolArn())
xmlWriter.WriteElementString("IpamPoolArn", StringUtils.FromString(publicRequestIpamCidrConfigsValue.IpamPoolArn));
if(publicRequestIpamCidrConfigsValue.IsSetStatus())
xmlWriter.WriteElementString("Status", StringUtils.FromString(publicRequestIpamCidrConfigsValue.Status));
xmlWriter.WriteEndElement();
}
}
xmlWriter.WriteEndElement();
}
Expand All @@ -104,15 +104,15 @@ public IRequest Marshall(CreateAnycastIpListRequest publicRequest)
xmlWriter.WriteStartElement("Items");
foreach (var publicRequestTagsItemsValue in publicRequestTagsItems)
{
if (publicRequestTagsItemsValue != null)
{
xmlWriter.WriteStartElement("Tag");
if(publicRequestTagsItemsValue.IsSetKey())
xmlWriter.WriteElementString("Key", StringUtils.FromString(publicRequestTagsItemsValue.Key));
if(publicRequestTagsItemsValue.IsSetValue())
xmlWriter.WriteElementString("Value", StringUtils.FromString(publicRequestTagsItemsValue.Value));
xmlWriter.WriteEndElement();
}
if (publicRequestTagsItemsValue != null)
{
xmlWriter.WriteStartElement("Tag");
if(publicRequestTagsItemsValue.IsSetKey())
xmlWriter.WriteElementString("Key", StringUtils.FromString(publicRequestTagsItemsValue.Key));
if(publicRequestTagsItemsValue.IsSetValue())
xmlWriter.WriteElementString("Value", StringUtils.FromString(publicRequestTagsItemsValue.Value));
xmlWriter.WriteEndElement();
}
}
xmlWriter.WriteEndElement();
}
Expand Down
32 changes: 16 additions & 16 deletions ...rated/Model/Internal/MarshallTransformations/CreateConnectionFunctionRequestMarshaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ public IRequest Marshall(CreateConnectionFunctionRequest publicRequest)
xmlWriter.WriteStartElement("Items");
foreach (var publicRequestConnectionFunctionConfigKeyValueStoreAssociationsItemsValue in publicRequestConnectionFunctionConfigKeyValueStoreAssociationsItems)
{
if (publicRequestConnectionFunctionConfigKeyValueStoreAssociationsItemsValue != null)
{
xmlWriter.WriteStartElement("KeyValueStoreAssociation");
if(publicRequestConnectionFunctionConfigKeyValueStoreAssociationsItemsValue.IsSetKeyValueStoreARN())
xmlWriter.WriteElementString("KeyValueStoreARN", StringUtils.FromString(publicRequestConnectionFunctionConfigKeyValueStoreAssociationsItemsValue.KeyValueStoreARN));
xmlWriter.WriteEndElement();
}
if (publicRequestConnectionFunctionConfigKeyValueStoreAssociationsItemsValue != null)
{
xmlWriter.WriteStartElement("KeyValueStoreAssociation");
if(publicRequestConnectionFunctionConfigKeyValueStoreAssociationsItemsValue.IsSetKeyValueStoreARN())
xmlWriter.WriteElementString("KeyValueStoreARN", StringUtils.FromString(publicRequestConnectionFunctionConfigKeyValueStoreAssociationsItemsValue.KeyValueStoreARN));
xmlWriter.WriteEndElement();
}
}
xmlWriter.WriteEndElement();
}
Expand All @@ -111,15 +111,15 @@ public IRequest Marshall(CreateConnectionFunctionRequest publicRequest)
xmlWriter.WriteStartElement("Items");
foreach (var publicRequestTagsItemsValue in publicRequestTagsItems)
{
if (publicRequestTagsItemsValue != null)
{
xmlWriter.WriteStartElement("Tag");
if(publicRequestTagsItemsValue.IsSetKey())
xmlWriter.WriteElementString("Key", StringUtils.FromString(publicRequestTagsItemsValue.Key));
if(publicRequestTagsItemsValue.IsSetValue())
xmlWriter.WriteElementString("Value", StringUtils.FromString(publicRequestTagsItemsValue.Value));
xmlWriter.WriteEndElement();
}
if (publicRequestTagsItemsValue != null)
{
xmlWriter.WriteStartElement("Tag");
if(publicRequestTagsItemsValue.IsSetKey())
xmlWriter.WriteElementString("Key", StringUtils.FromString(publicRequestTagsItemsValue.Key));
if(publicRequestTagsItemsValue.IsSetValue())
xmlWriter.WriteElementString("Value", StringUtils.FromString(publicRequestTagsItemsValue.Value));
xmlWriter.WriteEndElement();
}
}
xmlWriter.WriteEndElement();
}
Expand Down
18 changes: 9 additions & 9 deletions ...enerated/Model/Internal/MarshallTransformations/CreateConnectionGroupRequestMarshaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@ public IRequest Marshall(CreateConnectionGroupRequest publicRequest)
xmlWriter.WriteStartElement("Items");
foreach (var publicRequestTagsItemsValue in publicRequestTagsItems)
{
if (publicRequestTagsItemsValue != null)
{
xmlWriter.WriteStartElement("Tag");
if(publicRequestTagsItemsValue.IsSetKey())
xmlWriter.WriteElementString("Key", StringUtils.FromString(publicRequestTagsItemsValue.Key));
if(publicRequestTagsItemsValue.IsSetValue())
xmlWriter.WriteElementString("Value", StringUtils.FromString(publicRequestTagsItemsValue.Value));
xmlWriter.WriteEndElement();
}
if (publicRequestTagsItemsValue != null)
{
xmlWriter.WriteStartElement("Tag");
if(publicRequestTagsItemsValue.IsSetKey())
xmlWriter.WriteElementString("Key", StringUtils.FromString(publicRequestTagsItemsValue.Key));
if(publicRequestTagsItemsValue.IsSetValue())
xmlWriter.WriteElementString("Value", StringUtils.FromString(publicRequestTagsItemsValue.Value));
xmlWriter.WriteEndElement();
}
}
xmlWriter.WriteEndElement();
}
Expand Down
Loading
Loading