From b7a1e1583d9890728b12ffda001daa62406862ed Mon Sep 17 00:00:00 2001 From: Peter Song Date: Thu, 28 Mar 2024 17:01:56 -0700 Subject: [PATCH 1/2] Fixes for issue 29 --- .../Marshallers/RestXmlRequestMarshaller.cs | 809 ++++++++++++------ .../Marshallers/RestXmlRequestMarshaller.tt | 56 +- 2 files changed, 613 insertions(+), 252 deletions(-) diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.cs b/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.cs index 715a61593bae..0c44cbba6e86 100644 --- a/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.cs +++ b/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.cs @@ -871,7 +871,7 @@ void ProcessRequestBodyMembers(string variableName, Operation operation) } - void ProcessMembers(int level, string variableName, IEnumerable members) + void ProcessMembers(int level, string variableName, IEnumerable members, bool insideMap = false) { foreach(var member in members) { @@ -885,7 +885,144 @@ void ProcessMembers(int level, string variableName, IEnumerable members) } else if(member.IsMap) { - ProcessMap(level, variableName, member); + if(member.IsFlattened) + { + ProcessFlattenedMap(level,variableName,member); + } + else + { + ProcessMap(level, variableName, member); + } + } + // we're processing members of a structure as a map's value + else if(insideMap) + { + + + #line default + #line hidden + + #line 247 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); + + + #line default + #line hidden + + #line 247 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write("\t\t\t\tif("); + + + #line default + #line hidden + + #line 247 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); + + + #line default + #line hidden + + #line 247 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write(".IsSet"); + + + #line default + #line hidden + + #line 247 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); + + + #line default + #line hidden + + #line 247 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write("())\r\n"); + + + #line default + #line hidden + + #line 248 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); + + + #line default + #line hidden + + #line 248 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write("\t\t\t\t\txmlWriter.WriteElementString(\""); + + + #line default + #line hidden + + #line 248 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write(this.ToStringHelper.ToStringWithCulture(member.ModeledName)); + + + #line default + #line hidden + + #line 248 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write("\", "); + + + #line default + #line hidden + + #line 248 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write(this.ToStringHelper.ToStringWithCulture(member.PrimitiveMarshaller)); + + + #line default + #line hidden + + #line 248 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write("("); + + + #line default + #line hidden + + #line 248 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); + + + #line default + #line hidden + + #line 248 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write("."); + + + #line default + #line hidden + + #line 248 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); + + + #line default + #line hidden + + #line 248 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write(this.ToStringHelper.ToStringWithCulture((member.UseNullable ? ".Value" : string.Empty))); + + + #line default + #line hidden + + #line 248 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write("));\t\t\t\t \r\n"); + + + #line default + #line hidden + + #line 249 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + } else { @@ -894,126 +1031,126 @@ void ProcessMembers(int level, string variableName, IEnumerable members) #line default #line hidden - #line 239 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 254 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 239 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 254 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\tif("); #line default #line hidden - #line 239 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 254 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 239 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 254 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(".IsSet"); #line default #line hidden - #line 239 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 254 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 239 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 254 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("())\r\n"); #line default #line hidden - #line 240 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 255 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 240 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 255 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteElementString(\""); #line default #line hidden - #line 240 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 255 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName)); #line default #line hidden - #line 240 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 255 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\", "); #line default #line hidden - #line 240 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 255 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PrimitiveMarshaller)); #line default #line hidden - #line 240 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 255 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("("); #line default #line hidden - #line 240 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 255 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 240 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 255 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("."); #line default #line hidden - #line 240 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 255 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 240 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 255 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture((member.UseNullable ? ".Value" : string.Empty))); #line default #line hidden - #line 240 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 255 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("));\t\t\t\t \r\n\r\n"); #line default #line hidden - #line 242 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 257 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } } @@ -1028,84 +1165,84 @@ void ProcessStructure(int level, string variableName, Shape shape) #line default #line hidden - #line 251 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 266 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\r\n"); #line default #line hidden - #line 252 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 267 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 252 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 267 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\tif ("); #line default #line hidden - #line 252 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 267 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 252 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 267 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(" != null) \r\n"); #line default #line hidden - #line 253 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 268 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 253 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 268 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t{\r\n"); #line default #line hidden - #line 254 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 269 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 254 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 269 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 254 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 269 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(marshallName)); #line default #line hidden - #line 254 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 269 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\t\t\t\r\n"); #line default #line hidden - #line 255 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 270 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" ProcessMembers(level + 1, variableName, shape.Members); @@ -1113,35 +1250,35 @@ void ProcessStructure(int level, string variableName, Shape shape) #line default #line hidden - #line 258 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 273 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 258 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 273 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteEndElement();\r\n"); #line default #line hidden - #line 259 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 274 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 259 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 274 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t}\r\n"); #line default #line hidden - #line 260 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 275 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } @@ -1157,84 +1294,84 @@ void ProcessStructure(int level, string variableName, Member member) #line default #line hidden - #line 270 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 285 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\r\n"); #line default #line hidden - #line 271 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 286 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 271 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 286 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\tif ("); #line default #line hidden - #line 271 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 286 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 271 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 286 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(" != null) \r\n"); #line default #line hidden - #line 272 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 287 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 272 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 287 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t{\r\n"); #line default #line hidden - #line 273 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 288 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 273 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 288 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 273 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 288 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(marshallName)); #line default #line hidden - #line 273 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 288 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\t\t\t\r\n"); #line default #line hidden - #line 274 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 289 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" ProcessMembers(level + 1, variableName, shape.Members); @@ -1242,35 +1379,35 @@ void ProcessStructure(int level, string variableName, Member member) #line default #line hidden - #line 277 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 292 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 277 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 292 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteEndElement();\r\n"); #line default #line hidden - #line 278 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 293 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 278 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 293 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t}\r\n"); #line default #line hidden - #line 279 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 294 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } @@ -1283,203 +1420,203 @@ void ProcessList(int level, string variableName, Member member) #line default #line hidden - #line 287 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 302 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 287 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 302 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\tvar "); #line default #line hidden - #line 287 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 302 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(listVariable)); #line default #line hidden - #line 287 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 302 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(" = "); #line default #line hidden - #line 287 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 302 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 287 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 302 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("."); #line default #line hidden - #line 287 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 302 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 287 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 302 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(";\r\n"); #line default #line hidden - #line 288 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 303 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 288 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 303 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\tif ("); #line default #line hidden - #line 288 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 303 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(listVariable)); #line default #line hidden - #line 288 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 303 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(" != null && "); #line default #line hidden - #line 288 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 303 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(listVariable)); #line default #line hidden - #line 288 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 303 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(".Count > 0) \r\n"); #line default #line hidden - #line 289 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 304 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 289 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 304 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t{\t\t\t\t\t\t\r\n"); #line default #line hidden - #line 290 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 305 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 290 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 305 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 290 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 305 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName)); #line default #line hidden - #line 290 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 305 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 291 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 306 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 291 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 306 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\tforeach (var "); #line default #line hidden - #line 291 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 306 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(listItemVariable)); #line default #line hidden - #line 291 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 306 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(" in "); #line default #line hidden - #line 291 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 306 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(listVariable)); #line default #line hidden - #line 291 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 306 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(") \r\n"); #line default #line hidden - #line 292 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 307 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 292 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 307 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t{\r\n"); #line default #line hidden - #line 293 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 308 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" if(member.Shape.ListShape.IsStructure) { @@ -1496,91 +1633,91 @@ void ProcessList(int level, string variableName, Member member) #line default #line hidden - #line 305 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 320 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 305 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 320 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 305 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 320 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(listMarshallName)); #line default #line hidden - #line 305 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 320 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 306 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 321 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 306 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 321 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteValue("); #line default #line hidden - #line 306 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 321 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ListShape.PrimitiveMarshaller(MarshallLocation.Body))); #line default #line hidden - #line 306 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 321 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("("); #line default #line hidden - #line 306 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 321 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(listItemVariable)); #line default #line hidden - #line 306 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 321 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("));\r\n"); #line default #line hidden - #line 307 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 322 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 307 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 322 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteEndElement();\r\n"); #line default #line hidden - #line 308 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 323 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } @@ -1592,77 +1729,77 @@ void ProcessList(int level, string variableName, Member member) #line default #line hidden - #line 315 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 330 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 315 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 330 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 315 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 330 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(listMarshallName)); #line default #line hidden - #line 315 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 330 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 316 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 331 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 316 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 331 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteValue("); #line default #line hidden - #line 316 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 331 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(listItemVariable)); #line default #line hidden - #line 316 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 331 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(");\r\n"); #line default #line hidden - #line 317 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 332 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 317 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 332 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteEndElement();\r\n"); #line default #line hidden - #line 318 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 333 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } } @@ -1671,172 +1808,186 @@ void ProcessList(int level, string variableName, Member member) #line default #line hidden - #line 322 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 337 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 322 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 337 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t}\t\t\t\r\n"); #line default #line hidden - #line 323 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 338 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 323 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 338 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteEndElement();\t\t\t\r\n"); #line default #line hidden - #line 324 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 339 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 324 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 339 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t}\r\n"); #line default #line hidden - #line 325 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 340 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } void ProcessMap(int level, string variableName, Member member) - { + { #line default #line hidden - #line 331 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 346 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 331 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 346 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 331 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 346 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName)); #line default #line hidden - #line 331 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 346 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 332 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 347 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 332 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 347 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\tforeach (var kvp in "); #line default #line hidden - #line 332 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 347 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 332 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 347 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("."); #line default #line hidden - #line 332 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 347 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 332 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 347 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(") \r\n"); #line default #line hidden - #line 333 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 348 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 333 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 348 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t{\r\n"); #line default #line hidden - #line 334 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 349 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 334 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 349 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\"entry\");\r\n"); #line default #line hidden - #line 335 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 350 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 335 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" -this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\"key\", kvp.Key);\r\n"); + #line 350 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\""); #line default #line hidden - #line 336 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 350 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.KeyMarshallName)); + + + #line default + #line hidden + + #line 350 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write("\", kvp.Key);\r\n"); + + + #line default + #line hidden + + #line 351 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" if(member.Shape.ValueShape.IsMap) { @@ -1849,43 +2000,57 @@ void ProcessMap(int level, string variableName, Member member) #line default #line hidden - #line 344 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 359 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 344 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" -this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\"value\");\r\n"); + #line 359 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\""); + + + #line default + #line hidden + + #line 359 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueMarshallName)); + + + #line default + #line hidden + + #line 359 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write("\");\r\n\r\n"); #line default #line hidden - #line 345 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 361 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" - ProcessStructure(level + 2, "kvp.Value", member.Shape.ValueShape); + ProcessStructureAsMapValue(level + 2, "kvp.Value", member.Shape.ValueShape); #line default #line hidden - #line 348 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 364 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 348 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 364 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteEndElement();\r\n"); #line default #line hidden - #line 349 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 365 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else @@ -1895,35 +2060,49 @@ void ProcessMap(int level, string variableName, Member member) #line default #line hidden - #line 354 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 370 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 354 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" -this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\"value\", kvp.Value"); + #line 370 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\""); + + + #line default + #line hidden + + #line 370 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueMarshallName)); #line default #line hidden - #line 354 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 370 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write("\", kvp.Value"); + + + #line default + #line hidden + + #line 370 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueShape.IsString ? "" : ".ToString()")); #line default #line hidden - #line 354 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 370 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(");\r\n"); #line default #line hidden - #line 355 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 371 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } @@ -1931,49 +2110,49 @@ void ProcessMap(int level, string variableName, Member member) #line default #line hidden - #line 358 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 374 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 358 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 374 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteEndElement();\r\n"); #line default #line hidden - #line 359 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 375 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 359 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 375 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t}\r\n"); #line default #line hidden - #line 360 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 376 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 360 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 376 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteEndElement();\r\n"); #line default #line hidden - #line 361 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 377 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } @@ -1981,7 +2160,7 @@ void ProcessMap(int level, string variableName, Member member) #line default #line hidden - #line 364 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 380 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" // Separating the processing of a flattened map and a regular map for maintability void ProcessFlattenedMap(int level, string variableName, Member member) @@ -1991,105 +2170,119 @@ void ProcessFlattenedMap(int level, string variableName, Member member) #line default #line hidden - #line 369 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 385 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 369 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 385 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\tforeach (var kvp in "); #line default #line hidden - #line 369 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 385 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 369 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 385 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("."); #line default #line hidden - #line 369 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 385 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 369 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 385 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(")\r\n"); #line default #line hidden - #line 370 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 386 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 370 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 386 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t{\r\n"); #line default #line hidden - #line 371 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 387 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 371 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 387 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 371 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 387 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName)); #line default #line hidden - #line 371 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 387 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 372 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 388 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 372 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" -this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\"key\", kvp.Key);\r\n"); + #line 388 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\""); + + + #line default + #line hidden + + #line 388 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.KeyMarshallName)); #line default #line hidden - #line 373 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 388 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write("\", kvp.Key);\r\n"); + + + #line default + #line hidden + + #line 389 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" if(member.Shape.ValueShape.IsMap) { @@ -2102,43 +2295,57 @@ void ProcessFlattenedMap(int level, string variableName, Member member) #line default #line hidden - #line 381 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 397 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 381 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" -this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\"value\");\r\n"); + #line 397 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\""); + + + #line default + #line hidden + + #line 397 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueMarshallName)); #line default #line hidden - #line 382 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 397 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write("\");\r\n"); - ProcessStructure(level + 2, "kvp.Value", member.Shape.ValueShape); + + #line default + #line hidden + + #line 398 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + + ProcessStructureAsMapValue(level + 2, "kvp.Value", member.Shape.ValueShape); #line default #line hidden - #line 385 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 401 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 385 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 401 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteEndElement();\r\n"); #line default #line hidden - #line 386 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 402 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else @@ -2148,49 +2355,63 @@ void ProcessFlattenedMap(int level, string variableName, Member member) #line default #line hidden - #line 391 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 407 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 391 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" -this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\"value\", kvp.Value"); + #line 407 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\""); + + + #line default + #line hidden + + #line 407 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueMarshallName)); + + + #line default + #line hidden + + #line 407 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write("\", kvp.Value"); #line default #line hidden - #line 391 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 407 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueShape.IsString ? "" : ".ToString()")); #line default #line hidden - #line 391 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 407 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(");\r\n"); #line default #line hidden - #line 392 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 408 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 392 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 408 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteEndElement();\r\n"); #line default #line hidden - #line 393 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 409 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } @@ -2198,21 +2419,21 @@ void ProcessFlattenedMap(int level, string variableName, Member member) #line default #line hidden - #line 396 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 412 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 396 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 412 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t}\t\r\n"); #line default #line hidden - #line 397 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 413 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } @@ -2220,7 +2441,7 @@ void ProcessFlattenedMap(int level, string variableName, Member member) #line default #line hidden - #line 400 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 416 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" void ProcessSubMap(int level, Shape shape, string parentVariableName) { @@ -2229,119 +2450,133 @@ void ProcessSubMap(int level, Shape shape, string parentVariableName) #line default #line hidden - #line 404 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 420 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 404 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 420 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteStartElement(\"value\");\r\n"); #line default #line hidden - #line 405 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 421 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 405 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 421 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\tforeach (var kvp"); #line default #line hidden - #line 405 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 421 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(level)); #line default #line hidden - #line 405 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 421 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(" in "); #line default #line hidden - #line 405 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 421 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parentVariableName)); #line default #line hidden - #line 405 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 421 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(".Value) \r\n"); #line default #line hidden - #line 406 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 422 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 406 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 422 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t{\r\n"); #line default #line hidden - #line 407 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 423 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 407 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 423 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\"entry\");\r\n"); #line default #line hidden - #line 408 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 424 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 408 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" -this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\"key\", kvp"); + #line 424 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\""); #line default #line hidden - #line 408 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 424 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write(this.ToStringHelper.ToStringWithCulture(shape.KeyMarshallName)); + + + #line default + #line hidden + + #line 424 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write("\", kvp"); + + + #line default + #line hidden + + #line 424 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(level)); #line default #line hidden - #line 408 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 424 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(".Key);\r\n"); #line default #line hidden - #line 409 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 425 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" if(shape.ValueShape.IsMap) { @@ -2354,35 +2589,49 @@ void ProcessSubMap(int level, Shape shape, string parentVariableName) #line default #line hidden - #line 417 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 433 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 417 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" -this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\"value\", kvp"); + #line 433 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\""); + + + #line default + #line hidden + + #line 433 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write(this.ToStringHelper.ToStringWithCulture(shape.ValueMarshallName)); #line default #line hidden - #line 417 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 433 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write("\", kvp"); + + + #line default + #line hidden + + #line 433 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(level)); #line default #line hidden - #line 417 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 433 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(".Value);\r\n"); #line default #line hidden - #line 418 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 434 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } @@ -2390,49 +2639,49 @@ void ProcessSubMap(int level, Shape shape, string parentVariableName) #line default #line hidden - #line 421 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 437 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 421 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 437 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteEndElement();\r\n"); #line default #line hidden - #line 422 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 438 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 422 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 438 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t}\t\t\t\r\n"); #line default #line hidden - #line 423 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 439 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 423 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 439 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteEndElement();\t\t\t\t\r\n"); #line default #line hidden - #line 424 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 440 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } @@ -2440,7 +2689,7 @@ void ProcessSubMap(int level, Shape shape, string parentVariableName) #line default #line hidden - #line 427 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 443 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" protected void ProcessNonStructurePayload(Member payload, int level) { @@ -2451,63 +2700,63 @@ protected void ProcessNonStructurePayload(Member payload, int level) #line default #line hidden - #line 434 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 450 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 434 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 450 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("request.Content = Encoding.UTF8.GetBytes("); #line default #line hidden - #line 434 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 450 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.RequestPayloadMember.PrimitiveMarshaller)); #line default #line hidden - #line 434 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 450 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("(publicRequest."); #line default #line hidden - #line 434 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 450 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.RequestPayloadMember.PropertyName)); #line default #line hidden - #line 434 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 450 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("));\r\n"); #line default #line hidden - #line 435 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 451 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 435 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 451 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("request.Headers[\"Content-Type\"] = \"text/plain\";\r\n"); #line default #line hidden - #line 436 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 452 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else if(payload.Shape.IsMemoryStream) @@ -2517,54 +2766,136 @@ protected void ProcessNonStructurePayload(Member payload, int level) #line default #line hidden - #line 441 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 457 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 441 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 457 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("request.ContentStream = publicRequest."); #line default #line hidden - #line 441 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 457 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.RequestPayloadMember.PropertyName)); #line default #line hidden - #line 441 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 457 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(";\r\n"); #line default #line hidden - #line 442 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 458 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 442 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 458 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("request.Headers[\"Content-Type\"] = \"application/octet-stream\";\r\n"); #line default #line hidden - #line 443 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 459 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } } + #line default + #line hidden + + #line 463 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + + protected void ProcessStructureAsMapValue(int level, string variableName, Shape shape) + { + // Use shape's ListMarshallName if the structure is a list. + + + #line default + #line hidden + + #line 468 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); + + + #line default + #line hidden + + #line 468 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write("\t\t\t\tif ("); + + + #line default + #line hidden + + #line 468 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); + + + #line default + #line hidden + + #line 468 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write(" != null) \r\n"); + + + #line default + #line hidden + + #line 469 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); + + + #line default + #line hidden + + #line 469 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write("\t\t\t\t{\r\n"); + + + #line default + #line hidden + + #line 470 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + + ProcessMembers(level + 1, variableName, shape.Members, insideMap: true); + + + #line default + #line hidden + + #line 473 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); + + + #line default + #line hidden + + #line 473 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" +this.Write("\t\t\t\t}\r\n"); + + + #line default + #line hidden + + #line 474 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + + } + + #line default #line hidden } diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.tt b/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.tt index 3d8171d269fa..e7cfad794784 100644 --- a/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.tt +++ b/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.tt @@ -217,7 +217,7 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations <#+ } - void ProcessMembers(int level, string variableName, IEnumerable members) + void ProcessMembers(int level, string variableName, IEnumerable members, bool insideMap = false) { foreach(var member in members) { @@ -231,7 +231,22 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations } else if(member.IsMap) { - ProcessMap(level, variableName, member); + if(member.IsFlattened) + { + ProcessFlattenedMap(level,variableName,member); + } + else + { + ProcessMap(level, variableName, member); + } + } + // we're processing members of a structure as a map's value + else if(insideMap) + { +#> +<#=new string(' ', level * 4)#> if(<#=variableName#>.IsSet<#=member.PropertyName#>()) +<#=new string(' ', level * 4)#> xmlWriter.WriteElementString("<#=member.ModeledName#>", <#=member.PrimitiveMarshaller#>(<#=variableName#>.<#=member.PropertyName#><#=(member.UseNullable ? ".Value" : string.Empty)#>)); +<#+ } else { @@ -326,13 +341,13 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations } void ProcessMap(int level, string variableName, Member member) - { + { #> <#=new string(' ', level * 4)#> xmlWriter.WriteStartElement("<#=member.MarshallName#>"); <#=new string(' ', level * 4)#> foreach (var kvp in <#=variableName#>.<#=member.PropertyName#>) <#=new string(' ', level * 4)#> { <#=new string(' ', level * 4)#> xmlWriter.WriteStartElement("entry"); -<#=new string(' ', level * 4)#> xmlWriter.WriteElementString("key", kvp.Key); +<#=new string(' ', level * 4)#> xmlWriter.WriteElementString("<#=member.Shape.KeyMarshallName#>", kvp.Key); <#+ if(member.Shape.ValueShape.IsMap) { @@ -341,9 +356,10 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations else if(member.Shape.ValueShape.IsStructure) { #> -<#=new string(' ', level * 4)#> xmlWriter.WriteStartElement("value"); +<#=new string(' ', level * 4)#> xmlWriter.WriteStartElement("<#=member.Shape.ValueMarshallName#>"); + <#+ - ProcessStructure(level + 2, "kvp.Value", member.Shape.ValueShape); + ProcessStructureAsMapValue(level + 2, "kvp.Value", member.Shape.ValueShape); #> <#=new string(' ', level * 4)#> xmlWriter.WriteEndElement(); <#+ @@ -351,7 +367,7 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations else { #> -<#=new string(' ', level * 4)#> xmlWriter.WriteElementString("value", kvp.Value<#=member.Shape.ValueShape.IsString ? "" : ".ToString()"#>); +<#=new string(' ', level * 4)#> xmlWriter.WriteElementString("<#=member.Shape.ValueMarshallName#>", kvp.Value<#=member.Shape.ValueShape.IsString ? "" : ".ToString()"#>); <#+ } #> @@ -369,7 +385,7 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations <#=new string(' ', level * 4)#> foreach (var kvp in <#=variableName#>.<#=member.PropertyName#>) <#=new string(' ', level * 4)#> { <#=new string(' ', level * 4)#> xmlWriter.WriteStartElement("<#=member.MarshallName#>"); -<#=new string(' ', level * 4)#> xmlWriter.WriteElementString("key", kvp.Key); +<#=new string(' ', level * 4)#> xmlWriter.WriteElementString("<#=member.Shape.KeyMarshallName#>", kvp.Key); <#+ if(member.Shape.ValueShape.IsMap) { @@ -378,9 +394,9 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations else if(member.Shape.ValueShape.IsStructure) { #> -<#=new string(' ', level * 4)#> xmlWriter.WriteStartElement("value"); +<#=new string(' ', level * 4)#> xmlWriter.WriteStartElement("<#=member.Shape.ValueMarshallName#>"); <#+ - ProcessStructure(level + 2, "kvp.Value", member.Shape.ValueShape); + ProcessStructureAsMapValue(level + 2, "kvp.Value", member.Shape.ValueShape); #> <#=new string(' ', level * 4)#> xmlWriter.WriteEndElement(); <#+ @@ -388,7 +404,7 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations else { #> -<#=new string(' ', level * 4)#> xmlWriter.WriteElementString("value", kvp.Value<#=member.Shape.ValueShape.IsString ? "" : ".ToString()"#>); +<#=new string(' ', level * 4)#> xmlWriter.WriteElementString("<#=member.Shape.ValueMarshallName#>", kvp.Value<#=member.Shape.ValueShape.IsString ? "" : ".ToString()"#>); <#=new string(' ', level * 4)#> xmlWriter.WriteEndElement(); <#+ } @@ -405,7 +421,7 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations <#=new string(' ', level * 4)#> foreach (var kvp<#=level#> in <#=parentVariableName#>.Value) <#=new string(' ', level * 4)#> { <#=new string(' ', level * 4)#> xmlWriter.WriteStartElement("entry"); -<#=new string(' ', level * 4)#> xmlWriter.WriteElementString("key", kvp<#=level#>.Key); +<#=new string(' ', level * 4)#> xmlWriter.WriteElementString("<#=shape.KeyMarshallName#>", kvp<#=level#>.Key); <#+ if(shape.ValueShape.IsMap) { @@ -414,7 +430,7 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations else { #> -<#=new string(' ', level * 4)#> xmlWriter.WriteElementString("value", kvp<#=level#>.Value); +<#=new string(' ', level * 4)#> xmlWriter.WriteElementString("<#=shape.ValueMarshallName#>", kvp<#=level#>.Value); <#+ } #> @@ -442,4 +458,18 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations <#+ } } +#> +<#+ + protected void ProcessStructureAsMapValue(int level, string variableName, Shape shape) + { + // Use shape's ListMarshallName if the structure is a list. +#> +<#=new string(' ', level * 4)#> if (<#=variableName#> != null) +<#=new string(' ', level * 4)#> { +<#+ + ProcessMembers(level + 1, variableName, shape.Members, insideMap: true); +#> +<#=new string(' ', level * 4)#> } +<#+ + } #> \ No newline at end of file From f4f40f5c72d60b181dc8bf0d7515c37bbe93d129 Mon Sep 17 00:00:00 2001 From: Peter Song Date: Thu, 4 Apr 2024 16:35:41 -0700 Subject: [PATCH 2/2] Generated changes for issue 29 --- .../Marshallers/RestXmlRequestMarshaller.cs | 54 +++++++++---------- .../FlattenedXmlMapRequestMarshaller.cs | 4 +- ...tenedXmlMapWithXmlNameRequestMarshaller.cs | 10 ++-- .../NestedXmlMapsRequestMarshaller.cs | 8 ++- .../XmlEmptyMapsRequestMarshaller.cs | 6 +-- .../XmlEnumsRequestMarshaller.cs | 1 - .../XmlIntEnumsRequestMarshaller.cs | 1 - ...XmlMapWithXmlNamespaceRequestMarshaller.cs | 5 +- .../XmlMapsRequestMarshaller.cs | 6 +-- .../XmlMapsXmlNameRequestMarshaller.cs | 10 ++-- 10 files changed, 44 insertions(+), 61 deletions(-) diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.cs b/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.cs index 0c44cbba6e86..720236a450ed 100644 --- a/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.cs +++ b/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.cs @@ -2700,63 +2700,63 @@ protected void ProcessNonStructurePayload(Member payload, int level) #line default #line hidden - #line 450 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 449 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 450 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 449 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("request.Content = Encoding.UTF8.GetBytes("); #line default #line hidden - #line 450 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 449 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.RequestPayloadMember.PrimitiveMarshaller)); #line default #line hidden - #line 450 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 449 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("(publicRequest."); #line default #line hidden - #line 450 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 449 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.RequestPayloadMember.PropertyName)); #line default #line hidden - #line 450 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 449 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("));\r\n"); #line default #line hidden - #line 451 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 450 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 451 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 450 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("request.Headers[\"Content-Type\"] = \"text/plain\";\r\n"); #line default #line hidden - #line 452 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 451 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else if(payload.Shape.IsMemoryStream) @@ -2766,49 +2766,49 @@ protected void ProcessNonStructurePayload(Member payload, int level) #line default #line hidden - #line 457 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 456 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 457 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 456 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("request.ContentStream = publicRequest."); #line default #line hidden - #line 457 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 456 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.RequestPayloadMember.PropertyName)); #line default #line hidden - #line 457 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 456 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(";\r\n"); #line default #line hidden - #line 458 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 457 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 458 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 457 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("request.Headers[\"Content-Type\"] = \"application/octet-stream\";\r\n"); #line default #line hidden - #line 459 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 458 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } } @@ -2817,7 +2817,7 @@ protected void ProcessNonStructurePayload(Member payload, int level) #line default #line hidden - #line 463 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 462 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" protected void ProcessStructureAsMapValue(int level, string variableName, Shape shape) { @@ -2827,49 +2827,49 @@ protected void ProcessStructureAsMapValue(int level, string variableName, Shape #line default #line hidden - #line 468 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 467 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 468 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 467 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\tif ("); #line default #line hidden - #line 468 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 467 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 468 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 467 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(" != null) \r\n"); #line default #line hidden - #line 469 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 468 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 469 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 468 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t{\r\n"); #line default #line hidden - #line 470 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 469 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" ProcessMembers(level + 1, variableName, shape.Members, insideMap: true); @@ -2877,21 +2877,21 @@ protected void ProcessStructureAsMapValue(int level, string variableName, Shape #line default #line hidden - #line 473 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 472 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 473 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 472 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t}\r\n"); #line default #line hidden - #line 474 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 473 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/FlattenedXmlMapRequestMarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/FlattenedXmlMapRequestMarshaller.cs index d69406f45f8a..a6fe55a52615 100644 --- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/FlattenedXmlMapRequestMarshaller.cs +++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/FlattenedXmlMapRequestMarshaller.cs @@ -70,8 +70,8 @@ public IRequest Marshall(FlattenedXmlMapRequest publicRequest) xmlWriter.WriteElementString("key", kvp.Key); xmlWriter.WriteElementString("value", kvp.Value); xmlWriter.WriteEndElement(); - } - } + } + xmlWriter.WriteEndElement(); xmlWriter.WriteEndElement(); } diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/FlattenedXmlMapWithXmlNameRequestMarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/FlattenedXmlMapWithXmlNameRequestMarshaller.cs index 845e2a464f0b..762ed4091117 100644 --- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/FlattenedXmlMapWithXmlNameRequestMarshaller.cs +++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/FlattenedXmlMapWithXmlNameRequestMarshaller.cs @@ -66,12 +66,12 @@ public IRequest Marshall(FlattenedXmlMapWithXmlNameRequest publicRequest) { foreach (var kvp in publicRequest.MyMap) { - xmlWriter.WriteStartElement("KVP"); - xmlWriter.WriteElementString("key", kvp.Key); - xmlWriter.WriteElementString("value", kvp.Value); + xmlWriter.WriteStartElement("entry"); + xmlWriter.WriteElementString("K", kvp.Key); + xmlWriter.WriteElementString("V", kvp.Value); xmlWriter.WriteEndElement(); - } - } + } + xmlWriter.WriteEndElement(); xmlWriter.WriteEndElement(); } diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/NestedXmlMapsRequestMarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/NestedXmlMapsRequestMarshaller.cs index 12a0e2f05047..3a57fcf65f17 100644 --- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/NestedXmlMapsRequestMarshaller.cs +++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/NestedXmlMapsRequestMarshaller.cs @@ -77,10 +77,9 @@ public IRequest Marshall(NestedXmlMapsRequest publicRequest) xmlWriter.WriteEndElement(); } xmlWriter.WriteEndElement(); - } - } - if(publicRequest.IsSetNestedMap()) - { + xmlWriter.WriteEndElement(); + } + xmlWriter.WriteEndElement(); xmlWriter.WriteStartElement("nestedMap"); foreach (var kvp in publicRequest.NestedMap) { @@ -98,7 +97,6 @@ public IRequest Marshall(NestedXmlMapsRequest publicRequest) xmlWriter.WriteEndElement(); } xmlWriter.WriteEndElement(); - } xmlWriter.WriteEndElement(); } diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlEmptyMapsRequestMarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlEmptyMapsRequestMarshaller.cs index 7258713f1d54..7b19d4bf7149 100644 --- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlEmptyMapsRequestMarshaller.cs +++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlEmptyMapsRequestMarshaller.cs @@ -70,20 +70,16 @@ public IRequest Marshall(XmlEmptyMapsRequest publicRequest) xmlWriter.WriteStartElement("entry"); xmlWriter.WriteElementString("key", kvp.Key); xmlWriter.WriteStartElement("value"); - + if (kvp.Value != null) { - xmlWriter.WriteStartElement("GreetingStruct"); if(kvp.Value.IsSetHi()) xmlWriter.WriteElementString("hi", StringUtils.FromString(kvp.Value.Hi)); - - xmlWriter.WriteEndElement(); } xmlWriter.WriteEndElement(); xmlWriter.WriteEndElement(); } xmlWriter.WriteEndElement(); - } xmlWriter.WriteEndElement(); } diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlEnumsRequestMarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlEnumsRequestMarshaller.cs index 6537f4e6ef64..02b62591240f 100644 --- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlEnumsRequestMarshaller.cs +++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlEnumsRequestMarshaller.cs @@ -94,7 +94,6 @@ public IRequest Marshall(XmlEnumsRequest publicRequest) xmlWriter.WriteEndElement(); } xmlWriter.WriteEndElement(); - } var publicRequestFooEnumSet = publicRequest.FooEnumSet; if (publicRequestFooEnumSet != null && publicRequestFooEnumSet.Count > 0) { diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlIntEnumsRequestMarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlIntEnumsRequestMarshaller.cs index 948607d8db1a..9f28370580d4 100644 --- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlIntEnumsRequestMarshaller.cs +++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlIntEnumsRequestMarshaller.cs @@ -94,7 +94,6 @@ public IRequest Marshall(XmlIntEnumsRequest publicRequest) xmlWriter.WriteEndElement(); } xmlWriter.WriteEndElement(); - } var publicRequestIntEnumSet = publicRequest.IntEnumSet; if (publicRequestIntEnumSet != null && publicRequestIntEnumSet.Count > 0) { diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlMapWithXmlNamespaceRequestMarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlMapWithXmlNamespaceRequestMarshaller.cs index 932355270901..18324b4dcbda 100644 --- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlMapWithXmlNamespaceRequestMarshaller.cs +++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlMapWithXmlNamespaceRequestMarshaller.cs @@ -68,12 +68,11 @@ public IRequest Marshall(XmlMapWithXmlNamespaceRequest publicRequest) foreach (var kvp in publicRequest.MyMap) { xmlWriter.WriteStartElement("entry"); - xmlWriter.WriteElementString("key", kvp.Key); - xmlWriter.WriteElementString("value", kvp.Value); + xmlWriter.WriteElementString("K", kvp.Key); + xmlWriter.WriteElementString("V", kvp.Value); xmlWriter.WriteEndElement(); } xmlWriter.WriteEndElement(); - } xmlWriter.WriteEndElement(); } diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlMapsRequestMarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlMapsRequestMarshaller.cs index 1c2b8eb0c47b..c47388e3aa62 100644 --- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlMapsRequestMarshaller.cs +++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlMapsRequestMarshaller.cs @@ -70,20 +70,16 @@ public IRequest Marshall(XmlMapsRequest publicRequest) xmlWriter.WriteStartElement("entry"); xmlWriter.WriteElementString("key", kvp.Key); xmlWriter.WriteStartElement("value"); - + if (kvp.Value != null) { - xmlWriter.WriteStartElement("GreetingStruct"); if(kvp.Value.IsSetHi()) xmlWriter.WriteElementString("hi", StringUtils.FromString(kvp.Value.Hi)); - - xmlWriter.WriteEndElement(); } xmlWriter.WriteEndElement(); xmlWriter.WriteEndElement(); } xmlWriter.WriteEndElement(); - } xmlWriter.WriteEndElement(); } diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlMapsXmlNameRequestMarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlMapsXmlNameRequestMarshaller.cs index 42a11a4e4caf..39d1a6aa2c4e 100644 --- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlMapsXmlNameRequestMarshaller.cs +++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlMapsXmlNameRequestMarshaller.cs @@ -68,22 +68,18 @@ public IRequest Marshall(XmlMapsXmlNameRequest publicRequest) foreach (var kvp in publicRequest.MyMap) { xmlWriter.WriteStartElement("entry"); - xmlWriter.WriteElementString("key", kvp.Key); - xmlWriter.WriteStartElement("value"); - + xmlWriter.WriteElementString("Attribute", kvp.Key); + xmlWriter.WriteStartElement("Setting"); + if (kvp.Value != null) { - xmlWriter.WriteStartElement("GreetingStruct"); if(kvp.Value.IsSetHi()) xmlWriter.WriteElementString("hi", StringUtils.FromString(kvp.Value.Hi)); - - xmlWriter.WriteEndElement(); } xmlWriter.WriteEndElement(); xmlWriter.WriteEndElement(); } xmlWriter.WriteEndElement(); - } xmlWriter.WriteEndElement(); }