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 Merge Conflicts after v3 -> v4 merge in petesong/stj branch #3605

Merged
merged 1 commit into from
Jan 14, 2025
Merged

Fix Merge Conflicts after v3 -> v4 merge in petesong/stj branch #3605

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
4 changes: 2 additions & 2 deletions generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCStructureMarshaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1425,7 +1425,7 @@ protected void ProcessStructure(int level, string variableName, Shape structure)

protected void DetermineCustomMarshallerJsonWriteMethod(Member member, string memberProperty, int level)
{
if (String.Equals(member.CustomMarshallerTransformation,"Amazon.Runtime.Internal.Transform.CustomMarshallTransformations.ConvertDateTimeToEpochMilliseconds", StringComparison.OrdinalIgnoreCase))
if (String.Equals(member.CustomMarshallerTransformation,"Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601NoMs", StringComparison.OrdinalIgnoreCase))
{


Expand Down Expand Up @@ -1582,7 +1582,7 @@ protected void DetermineNormalJsonWriteMethod(Shape shape, string memberProperty
#line 240 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCStructureMarshaller.tt"

}
else if (shape.IsDateTime)
else if (shape.IsTimeStamp)
{
if (shape.data[Shape.TimestampFormatKey] != null && !string.Equals(shape.data["timestampFormat"].ToString(),"unixTimestamp"))
{
Expand Down
4 changes: 2 additions & 2 deletions generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCStructureMarshaller.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ namespace <#= this.Config.Namespace #>.Model.Internal.MarshallTransformat
<#+
protected void DetermineCustomMarshallerJsonWriteMethod(Member member, string memberProperty, int level)
{
if (String.Equals(member.CustomMarshallerTransformation,"Amazon.Runtime.Internal.Transform.CustomMarshallTransformations.ConvertDateTimeToEpochMilliseconds", StringComparison.OrdinalIgnoreCase))
if (String.Equals(member.CustomMarshallerTransformation,"Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601NoMs", StringComparison.OrdinalIgnoreCase))
{
#>
<#=new string(' ', level * 4)#> context.Writer.WriteNumberValue(<#=member.CustomMarshallerTransformation#>(<#=memberProperty#>));
Expand Down Expand Up @@ -239,7 +239,7 @@ namespace <#= this.Config.Namespace #>.Model.Internal.MarshallTransformat
<#=new string(' ', level * 4)#> context.Writer.WriteStringValue(<#=memberProperty#>);
<#+
}
else if (shape.IsDateTime)
else if (shape.IsTimeStamp)
{
if (shape.data[Shape.TimestampFormatKey] != null && !string.Equals(shape.data["timestampFormat"].ToString(),"unixTimestamp"))
{
Expand Down
Loading
Loading