Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions generator/.DevConfigs/3d12779c-4e5d-4021-9592-7e0060b2fa80.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"services": [
{
"serviceName": "S3",
"type": "patch",
"changeLogMessages": [
"Generate RenameObject, PutBucketOwnershipControls, PutBucketTagging, and CopyObject",
"[Breaking Change] SourceIfUnmodifiedSince, DestinationIfUnmodifiedSince, DestinationIfModifiedSince and SourceIfModifiedSince in Amazon.S3.Model.RenameObjectRequest has been changed to nullable to be consistent with the nullability changes in V4."
]
}
]
}

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,19 @@ using Amazon.Runtime.Internal.Util;
{
if (structure != null && this.Config.ServiceModel.Customizations.ShapeModifiers.TryGetValue(structure.Name, out var modifier) && modifier.ExcludedMarshallingProperties.Contains(member.ModeledName))
continue;
bool skipXmlIsSet = this.Config.ServiceModel.Customizations.TryGetPropertyModifier(member.OwningShape.Name, member.ModeledName, out var propModifier) && propModifier.SkipXmlIsSet;
if (!skipXmlIsSet)
{
#>
if (<#=variableName#>.IsSet<#=member.PropertyName#>())
{
<#+
if (member.CustomMarshallerTransformation != null)
}
if(this.Config.ServiceModel.Customizations.TryGetPropertyModifier(member.OwningShape.Name, member.ModeledName, out var injectPropModifier ) && injectPropModifier.InjectXmlMarshallCode.Count > 0)
{
WriteInjectXmlCode(injectPropModifier.InjectXmlMarshallCode, 4);
}
else if (member.CustomMarshallerTransformation != null)
{
#>
request.Headers["<#=member.MarshallLocationName#>"] = <#=member.CustomMarshallerTransformation#>(<#=variableName#>.<#=member.PropertyName#>);
Expand Down Expand Up @@ -118,9 +126,12 @@ using Amazon.Runtime.Internal.Util;
<#+
}
}
if (!skipXmlIsSet)
{
#>
}
<#+
}
}
}
protected void ProcessHeaderMembers(string variableName, IEnumerable<Member> members)
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,16 @@ using Amazon.Runtime.Internal.Util;
{
if (this.Config.ServiceModel.Customizations.ShapeModifiers.TryGetValue(member.OwningShape.Name, out var modifier) && modifier.ExcludedUnmarshallingProperties.Contains(member.ModeledName))
continue;
if (this.Config.ServiceModel.Customizations.TryGetPropertyModifier(member.OwningShape.Name, member.ModeledName, out var propertyModifier) && propertyModifier.InjectXmlUnmarshallCode.Count > 0)
{
foreach (var code in propertyModifier.InjectXmlUnmarshallCode)
{
#>
<#=code#>
<#+
}
continue;
}
if (member.Shape.IsMap)
{
#>
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -151,12 +151,7 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations
<#+
if (this.Config.ServiceModel.Customizations.ShapeModifiers.TryGetValue(operation.RequestStructure.Name, out var shapeModifier) && shapeModifier.InjectXmlMarshallCodeInPayload.Count > 0)
{
foreach (var codeSnippet in shapeModifier.InjectXmlMarshallCodeInPayload)
{
#>
<#=codeSnippet#>
<#+
}
WriteInjectXmlCode(shapeModifier.InjectXmlMarshallCodeInPayload, 4);
}
if(operation.RequestPayloadMember==null)
{
Expand Down Expand Up @@ -214,14 +209,7 @@ WriteXmlAttributeString(level, member, variableName, isPayload: false);
{
if (this.Config.ServiceModel.Customizations.TryGetPropertyModifier(operation.RequestPayloadMember.OwningShape.Name, operation.RequestPayloadMember.ModeledName, out var propertyModifier) && propertyModifier.InjectXmlMarshallCode.Count > 0)
{
foreach (var codeSnippet in propertyModifier.InjectXmlMarshallCode)
{
#>
<#=codeSnippet#>
<#+
}
#>
<#+
WriteInjectXmlCode(propertyModifier.InjectXmlMarshallCode, 5);
}
else
{
Expand Down Expand Up @@ -406,12 +394,7 @@ WriteXmlAttributeString(level + 1, member, variableName, isPayload: true, operat
}
else if(this.Config.ServiceModel.Customizations.TryGetPropertyModifier(member.OwningShape.Name, member.ModeledName, out var injectPropModifier ) && injectPropModifier.InjectXmlMarshallCode.Count > 0)
{
foreach (var codeSnippet in injectPropModifier.InjectXmlMarshallCode)
{
#>
<#=new string(' ', (level) * 4)#> <#=codeSnippet#>
<#+
}
WriteInjectXmlCode(injectPropModifier.InjectXmlMarshallCode, 3);
continue;
}
else if (this.Config.ServiceModel.Customizations.TryGetPropertyModifier(member.OwningShape.Name, member.ModeledName, out var propModifier2) && propModifier2.SkipXmlIsSet)
Expand Down
Loading