Skip to content

Commit b448db5

Browse files
peterrsonggpeterrsongg
authored
Update RestXml request marshallers to use IsSet methods (#4247)
* generator updates for rest-xml request marshallers to use IsSet methods * All generated service changes
1 parent c2dfdac commit b448db5

File tree

85 files changed

+1170
-1061
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1170
-1061
lines changed

‎generator/.DevConfigs/ab9c4930-eb59-4c81-adb4-6ee0c8659522.json‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"services": [
3+
{
4+
"serviceName": "CloudFront",
5+
"type": "patch",
6+
"changeLogMessages": [
7+
"Update request marshallers to use IsSet methods"
8+
]
9+
},
10+
{
11+
"serviceName": "Route53",
12+
"type": "patch",
13+
"changeLogMessages": [
14+
"Update request marshallers to use IsSet methods."
15+
]
16+
},
17+
{
18+
"serviceName": "S3",
19+
"type": "patch",
20+
"changeLogMessages": [
21+
"Update request marshallers to use IsSet methods."
22+
]
23+
},
24+
{
25+
"serviceName": "S3Control",
26+
"type": "patch",
27+
"changeLogMessages": [
28+
"Update request marshallers to use IsSet methods."
29+
]
30+
}
31+
]
32+
}

‎generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.cs‎

Lines changed: 483 additions & 415 deletions
Large diffs are not rendered by default.

‎generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.tt‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -490,16 +490,24 @@ WriteXmlAttributeString(level + 1, member, variableName, isPayload: true, operat
490490
void ProcessStructure(int level, string variableName, Member member)
491491
{
492492
var shape = member.Shape.IsList ? member.Shape.ListShape : member.Shape ;
493-
variableName = member.Shape.IsList ? variableName : variableName + "." + member.PropertyName;
494-
495493
// Use shape's ListMarshallName if the structure is a list.
496494
var marshallName = member.Shape.IsList ? member.Shape.ListMarshallName ?? "member" : member.MarshallName;
497495
if(member.Shape.IsFlattened || member.IsFlattened)
498496
marshallName = member.LocationName ?? member.ModeledName;
497+
if (member.Shape.IsList)
498+
{
499499
#>
500500
<#=new string(' ', level * 4)#> if (<#=variableName#> != null)
501501
<#=new string(' ', level * 4)#> {
502502
<#+
503+
}
504+
else
505+
{
506+
#>
507+
<#=new string(' ', level * 4)#> if (<#=variableName#>.IsSet<#=member.PropertyName#>())
508+
<#=new string(' ', level * 4)#> {
509+
<#+
510+
}
503511
if (!string.IsNullOrEmpty(member.Shape.XmlNamespace))
504512
{
505513
if (!string.IsNullOrEmpty(member.Shape.XmlNamespacePrefix))
@@ -521,6 +529,7 @@ WriteXmlAttributeString(level + 1, member, variableName, isPayload: true, operat
521529
<#=new string(' ', level * 4)#> xmlWriter.WriteStartElement("<#=marshallName#>");
522530
<#+
523531
}
532+
variableName = member.Shape.IsList ? variableName : variableName + "." + member.PropertyName;
524533
ProcessMembers(level + 1, variableName, shape.Members);
525534
#>
526535
<#=new string(' ', level * 4)#> xmlWriter.WriteEndElement();
@@ -533,7 +542,7 @@ WriteXmlAttributeString(level + 1, member, variableName, isPayload: true, operat
533542
var listItemVariable = (variableName + member.PropertyName).Replace(".",string.Empty) + "Value";
534543
#>
535544
<#=new string(' ', level * 4)#> var <#=listVariable#> = <#=variableName#>.<#=member.PropertyName#>;
536-
<#=new string(' ', level * 4)#> if (<#=listVariable#> != null && (<#=listVariable#>.Count > 0 || !AWSConfigs.InitializeCollections))
545+
<#=new string(' ', level * 4)#> if (<#=variableName#>.IsSet<#=member.PropertyName#>())
537546
<#=new string(' ', level * 4)#> {
538547
<#+
539548
if (!member.IsFlattened && !member.Shape.IsFlattened)

‎sdk/src/Services/CloudFront/Generated/Model/Internal/MarshallTransformations/CreateAnycastIpListRequestMarshaller.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public IRequest Marshall(CreateAnycastIpListRequest publicRequest)
6868
xmlWriter.WriteElementString("IpAddressType", StringUtils.FromString(publicRequest.IpAddressType));
6969

7070
var publicRequestIpamCidrConfigs = publicRequest.IpamCidrConfigs;
71-
if (publicRequestIpamCidrConfigs != null && (publicRequestIpamCidrConfigs.Count > 0 || !AWSConfigs.InitializeCollections))
71+
if (publicRequest.IsSetIpamCidrConfigs())
7272
{
7373
xmlWriter.WriteStartElement("IpamCidrConfigs");
7474
foreach (var publicRequestIpamCidrConfigsValue in publicRequestIpamCidrConfigs)
@@ -95,11 +95,11 @@ public IRequest Marshall(CreateAnycastIpListRequest publicRequest)
9595
if(publicRequest.IsSetName())
9696
xmlWriter.WriteElementString("Name", StringUtils.FromString(publicRequest.Name));
9797

98-
if (publicRequest.Tags != null)
98+
if (publicRequest.IsSetTags())
9999
{
100100
xmlWriter.WriteStartElement("Tags");
101101
var publicRequestTagsItems = publicRequest.Tags.Items;
102-
if (publicRequestTagsItems != null && (publicRequestTagsItems.Count > 0 || !AWSConfigs.InitializeCollections))
102+
if (publicRequest.Tags.IsSetItems())
103103
{
104104
xmlWriter.WriteStartElement("Items");
105105
foreach (var publicRequestTagsItemsValue in publicRequestTagsItems)

‎sdk/src/Services/CloudFront/Generated/Model/Internal/MarshallTransformations/CreateCachePolicyRequestMarshaller.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -81,19 +81,19 @@ public IRequest Marshall(CreateCachePolicyRequest publicRequest)
8181
if(publicRequest.CachePolicyConfig.IsSetName())
8282
xmlWriter.WriteElementString("Name", StringUtils.FromString(publicRequest.CachePolicyConfig.Name));
8383

84-
if (publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin != null)
84+
if (publicRequest.CachePolicyConfig.IsSetParametersInCacheKeyAndForwardedToOrigin())
8585
{
8686
xmlWriter.WriteStartElement("ParametersInCacheKeyAndForwardedToOrigin");
87-
if (publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.CookiesConfig != null)
87+
if (publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.IsSetCookiesConfig())
8888
{
8989
xmlWriter.WriteStartElement("CookiesConfig");
9090
if(publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.CookiesConfig.IsSetCookieBehavior())
9191
xmlWriter.WriteElementString("CookieBehavior", StringUtils.FromString(publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.CookiesConfig.CookieBehavior));
92-
if (publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.CookiesConfig.Cookies != null)
92+
if (publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.CookiesConfig.IsSetCookies())
9393
{
9494
xmlWriter.WriteStartElement("Cookies");
9595
var publicRequestCachePolicyConfigParametersInCacheKeyAndForwardedToOriginCookiesConfigCookiesItems = publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.CookiesConfig.Cookies.Items;
96-
if (publicRequestCachePolicyConfigParametersInCacheKeyAndForwardedToOriginCookiesConfigCookiesItems != null && (publicRequestCachePolicyConfigParametersInCacheKeyAndForwardedToOriginCookiesConfigCookiesItems.Count > 0 || !AWSConfigs.InitializeCollections))
96+
if (publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.CookiesConfig.Cookies.IsSetItems())
9797
{
9898
xmlWriter.WriteStartElement("Items");
9999
foreach (var publicRequestCachePolicyConfigParametersInCacheKeyAndForwardedToOriginCookiesConfigCookiesItemsValue in publicRequestCachePolicyConfigParametersInCacheKeyAndForwardedToOriginCookiesConfigCookiesItems)
@@ -114,16 +114,16 @@ public IRequest Marshall(CreateCachePolicyRequest publicRequest)
114114
xmlWriter.WriteElementString("EnableAcceptEncodingBrotli", StringUtils.FromBool(publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.EnableAcceptEncodingBrotli.Value));
115115
if(publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.IsSetEnableAcceptEncodingGzip())
116116
xmlWriter.WriteElementString("EnableAcceptEncodingGzip", StringUtils.FromBool(publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.EnableAcceptEncodingGzip.Value));
117-
if (publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.HeadersConfig != null)
117+
if (publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.IsSetHeadersConfig())
118118
{
119119
xmlWriter.WriteStartElement("HeadersConfig");
120120
if(publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.HeadersConfig.IsSetHeaderBehavior())
121121
xmlWriter.WriteElementString("HeaderBehavior", StringUtils.FromString(publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.HeadersConfig.HeaderBehavior));
122-
if (publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.HeadersConfig.Headers != null)
122+
if (publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.HeadersConfig.IsSetHeaders())
123123
{
124124
xmlWriter.WriteStartElement("Headers");
125125
var publicRequestCachePolicyConfigParametersInCacheKeyAndForwardedToOriginHeadersConfigHeadersItems = publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.HeadersConfig.Headers.Items;
126-
if (publicRequestCachePolicyConfigParametersInCacheKeyAndForwardedToOriginHeadersConfigHeadersItems != null && (publicRequestCachePolicyConfigParametersInCacheKeyAndForwardedToOriginHeadersConfigHeadersItems.Count > 0 || !AWSConfigs.InitializeCollections))
126+
if (publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.HeadersConfig.Headers.IsSetItems())
127127
{
128128
xmlWriter.WriteStartElement("Items");
129129
foreach (var publicRequestCachePolicyConfigParametersInCacheKeyAndForwardedToOriginHeadersConfigHeadersItemsValue in publicRequestCachePolicyConfigParametersInCacheKeyAndForwardedToOriginHeadersConfigHeadersItems)
@@ -140,16 +140,16 @@ public IRequest Marshall(CreateCachePolicyRequest publicRequest)
140140
}
141141
xmlWriter.WriteEndElement();
142142
}
143-
if (publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.QueryStringsConfig != null)
143+
if (publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.IsSetQueryStringsConfig())
144144
{
145145
xmlWriter.WriteStartElement("QueryStringsConfig");
146146
if(publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.QueryStringsConfig.IsSetQueryStringBehavior())
147147
xmlWriter.WriteElementString("QueryStringBehavior", StringUtils.FromString(publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.QueryStringsConfig.QueryStringBehavior));
148-
if (publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.QueryStringsConfig.QueryStrings != null)
148+
if (publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.QueryStringsConfig.IsSetQueryStrings())
149149
{
150150
xmlWriter.WriteStartElement("QueryStrings");
151151
var publicRequestCachePolicyConfigParametersInCacheKeyAndForwardedToOriginQueryStringsConfigQueryStringsItems = publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.QueryStringsConfig.QueryStrings.Items;
152-
if (publicRequestCachePolicyConfigParametersInCacheKeyAndForwardedToOriginQueryStringsConfigQueryStringsItems != null && (publicRequestCachePolicyConfigParametersInCacheKeyAndForwardedToOriginQueryStringsConfigQueryStringsItems.Count > 0 || !AWSConfigs.InitializeCollections))
152+
if (publicRequest.CachePolicyConfig.ParametersInCacheKeyAndForwardedToOrigin.QueryStringsConfig.QueryStrings.IsSetItems())
153153
{
154154
xmlWriter.WriteStartElement("Items");
155155
foreach (var publicRequestCachePolicyConfigParametersInCacheKeyAndForwardedToOriginQueryStringsConfigQueryStringsItemsValue in publicRequestCachePolicyConfigParametersInCacheKeyAndForwardedToOriginQueryStringsConfigQueryStringsItems)

‎sdk/src/Services/CloudFront/Generated/Model/Internal/MarshallTransformations/CreateConnectionFunctionRequestMarshaller.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,16 @@ public IRequest Marshall(CreateConnectionFunctionRequest publicRequest)
6767
if(publicRequest.IsSetConnectionFunctionCode())
6868
xmlWriter.WriteElementString("ConnectionFunctionCode", StringUtils.FromMemoryStream(publicRequest.ConnectionFunctionCode));
6969

70-
if (publicRequest.ConnectionFunctionConfig != null)
70+
if (publicRequest.IsSetConnectionFunctionConfig())
7171
{
7272
xmlWriter.WriteStartElement("ConnectionFunctionConfig");
7373
if(publicRequest.ConnectionFunctionConfig.IsSetComment())
7474
xmlWriter.WriteElementString("Comment", StringUtils.FromString(publicRequest.ConnectionFunctionConfig.Comment));
75-
if (publicRequest.ConnectionFunctionConfig.KeyValueStoreAssociations != null)
75+
if (publicRequest.ConnectionFunctionConfig.IsSetKeyValueStoreAssociations())
7676
{
7777
xmlWriter.WriteStartElement("KeyValueStoreAssociations");
7878
var publicRequestConnectionFunctionConfigKeyValueStoreAssociationsItems = publicRequest.ConnectionFunctionConfig.KeyValueStoreAssociations.Items;
79-
if (publicRequestConnectionFunctionConfigKeyValueStoreAssociationsItems != null && (publicRequestConnectionFunctionConfigKeyValueStoreAssociationsItems.Count > 0 || !AWSConfigs.InitializeCollections))
79+
if (publicRequest.ConnectionFunctionConfig.KeyValueStoreAssociations.IsSetItems())
8080
{
8181
xmlWriter.WriteStartElement("Items");
8282
foreach (var publicRequestConnectionFunctionConfigKeyValueStoreAssociationsItemsValue in publicRequestConnectionFunctionConfigKeyValueStoreAssociationsItems)
@@ -102,11 +102,11 @@ public IRequest Marshall(CreateConnectionFunctionRequest publicRequest)
102102
if(publicRequest.IsSetName())
103103
xmlWriter.WriteElementString("Name", StringUtils.FromString(publicRequest.Name));
104104

105-
if (publicRequest.Tags != null)
105+
if (publicRequest.IsSetTags())
106106
{
107107
xmlWriter.WriteStartElement("Tags");
108108
var publicRequestTagsItems = publicRequest.Tags.Items;
109-
if (publicRequestTagsItems != null && (publicRequestTagsItems.Count > 0 || !AWSConfigs.InitializeCollections))
109+
if (publicRequest.Tags.IsSetItems())
110110
{
111111
xmlWriter.WriteStartElement("Items");
112112
foreach (var publicRequestTagsItemsValue in publicRequestTagsItems)

‎sdk/src/Services/CloudFront/Generated/Model/Internal/MarshallTransformations/CreateConnectionGroupRequestMarshaller.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ public IRequest Marshall(CreateConnectionGroupRequest publicRequest)
7676
if(publicRequest.IsSetName())
7777
xmlWriter.WriteElementString("Name", StringUtils.FromString(publicRequest.Name));
7878

79-
if (publicRequest.Tags != null)
79+
if (publicRequest.IsSetTags())
8080
{
8181
xmlWriter.WriteStartElement("Tags");
8282
var publicRequestTagsItems = publicRequest.Tags.Items;
83-
if (publicRequestTagsItems != null && (publicRequestTagsItems.Count > 0 || !AWSConfigs.InitializeCollections))
83+
if (publicRequest.Tags.IsSetItems())
8484
{
8585
xmlWriter.WriteStartElement("Items");
8686
foreach (var publicRequestTagsItemsValue in publicRequestTagsItems)

‎sdk/src/Services/CloudFront/Generated/Model/Internal/MarshallTransformations/CreateContinuousDeploymentPolicyRequestMarshaller.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ public IRequest Marshall(CreateContinuousDeploymentPolicyRequest publicRequest)
6969
if(publicRequest.ContinuousDeploymentPolicyConfig.IsSetEnabled())
7070
xmlWriter.WriteElementString("Enabled", StringUtils.FromBool(publicRequest.ContinuousDeploymentPolicyConfig.Enabled.Value));
7171

72-
if (publicRequest.ContinuousDeploymentPolicyConfig.StagingDistributionDnsNames != null)
72+
if (publicRequest.ContinuousDeploymentPolicyConfig.IsSetStagingDistributionDnsNames())
7373
{
7474
xmlWriter.WriteStartElement("StagingDistributionDnsNames");
7575
var publicRequestContinuousDeploymentPolicyConfigStagingDistributionDnsNamesItems = publicRequest.ContinuousDeploymentPolicyConfig.StagingDistributionDnsNames.Items;
76-
if (publicRequestContinuousDeploymentPolicyConfigStagingDistributionDnsNamesItems != null && (publicRequestContinuousDeploymentPolicyConfigStagingDistributionDnsNamesItems.Count > 0 || !AWSConfigs.InitializeCollections))
76+
if (publicRequest.ContinuousDeploymentPolicyConfig.StagingDistributionDnsNames.IsSetItems())
7777
{
7878
xmlWriter.WriteStartElement("Items");
7979
foreach (var publicRequestContinuousDeploymentPolicyConfigStagingDistributionDnsNamesItemsValue in publicRequestContinuousDeploymentPolicyConfigStagingDistributionDnsNamesItems)
@@ -88,10 +88,10 @@ public IRequest Marshall(CreateContinuousDeploymentPolicyRequest publicRequest)
8888
xmlWriter.WriteElementString("Quantity", StringUtils.FromInt(publicRequest.ContinuousDeploymentPolicyConfig.StagingDistributionDnsNames.Quantity.Value));
8989
xmlWriter.WriteEndElement();
9090
}
91-
if (publicRequest.ContinuousDeploymentPolicyConfig.TrafficConfig != null)
91+
if (publicRequest.ContinuousDeploymentPolicyConfig.IsSetTrafficConfig())
9292
{
9393
xmlWriter.WriteStartElement("TrafficConfig");
94-
if (publicRequest.ContinuousDeploymentPolicyConfig.TrafficConfig.SingleHeaderConfig != null)
94+
if (publicRequest.ContinuousDeploymentPolicyConfig.TrafficConfig.IsSetSingleHeaderConfig())
9595
{
9696
xmlWriter.WriteStartElement("SingleHeaderConfig");
9797
if(publicRequest.ContinuousDeploymentPolicyConfig.TrafficConfig.SingleHeaderConfig.IsSetHeader())
@@ -100,10 +100,10 @@ public IRequest Marshall(CreateContinuousDeploymentPolicyRequest publicRequest)
100100
xmlWriter.WriteElementString("Value", StringUtils.FromString(publicRequest.ContinuousDeploymentPolicyConfig.TrafficConfig.SingleHeaderConfig.Value));
101101
xmlWriter.WriteEndElement();
102102
}
103-
if (publicRequest.ContinuousDeploymentPolicyConfig.TrafficConfig.SingleWeightConfig != null)
103+
if (publicRequest.ContinuousDeploymentPolicyConfig.TrafficConfig.IsSetSingleWeightConfig())
104104
{
105105
xmlWriter.WriteStartElement("SingleWeightConfig");
106-
if (publicRequest.ContinuousDeploymentPolicyConfig.TrafficConfig.SingleWeightConfig.SessionStickinessConfig != null)
106+
if (publicRequest.ContinuousDeploymentPolicyConfig.TrafficConfig.SingleWeightConfig.IsSetSessionStickinessConfig())
107107
{
108108
xmlWriter.WriteStartElement("SessionStickinessConfig");
109109
if(publicRequest.ContinuousDeploymentPolicyConfig.TrafficConfig.SingleWeightConfig.SessionStickinessConfig.IsSetIdleTTL())

0 commit comments

Comments
 (0)