Fix Merge Conflicts (#3605)

aws · Jan 14, 2025 · 277a6f5 · 277a6f5
1 parent cf7977b
commit 277a6f5
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 359 deletions.
diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCStructureMarshaller.cs b/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCStructureMarshaller.cs
@@ -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))
 		{
 
 
@@ -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"))
 			{

diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCStructureMarshaller.tt b/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCStructureMarshaller.tt
@@ -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#>));
@@ -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"))
 			{