From 40637ea68ac8c7fa88a19660ee481131cca37258 Mon Sep 17 00:00:00 2001 From: Muhammad Othman Date: Fri, 19 Dec 2025 15:59:24 -0500 Subject: [PATCH 1/2] Improve AWS Query compatible error handling in unmarshallers --- .../78714232-60db-41f4-8696-7764cc7bd5c9.json | 20 + .../Marshallers/BaseResponseUnmarshaller.cs | 439 +++++++++--------- .../Marshallers/BaseResponseUnmarshaller.tt | 27 +- .../JsonRPCExceptionUnmarshaller.cs | 89 +--- .../JsonRPCExceptionUnmarshaller.tt | 15 - .../JsonRPCResponseUnmarshaller.cs | 91 ++-- .../JsonRPCResponseUnmarshaller.tt | 31 +- 7 files changed, 324 insertions(+), 388 deletions(-) create mode 100644 generator/.DevConfigs/78714232-60db-41f4-8696-7764cc7bd5c9.json diff --git a/generator/.DevConfigs/78714232-60db-41f4-8696-7764cc7bd5c9.json b/generator/.DevConfigs/78714232-60db-41f4-8696-7764cc7bd5c9.json new file mode 100644 index 000000000000..dd50793aa4b6 --- /dev/null +++ b/generator/.DevConfigs/78714232-60db-41f4-8696-7764cc7bd5c9.json @@ -0,0 +1,20 @@ + + +{ + "services": [ + { + "serviceName": "CloudWatch", + "type": "patch", + "changeLogMessages": [ + "Improve AWS Query compatible error handling in unmarshallers." + ] + }, + { + "serviceName": "SQS", + "type": "patch", + "changeLogMessages": [ + "Improve AWS Query compatible error handling in unmarshallers." + ] + } + ] +} \ No newline at end of file diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.cs b/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.cs index 6fb5aa54a470..0b880fcc12f3 100644 --- a/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.cs +++ b/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.cs @@ -19,7 +19,7 @@ namespace ServiceClientGenerator.Generators.Marshallers /// Class to produce the template output /// - #line 1 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 1 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")] public partial class BaseResponseUnmarshaller : Generators.BaseGenerator { @@ -33,7 +33,7 @@ public override string TransformText() return this.GenerationEnvironment.ToString(); } - #line 8 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 8 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" protected void GenerateAWSQueryCompatibleBlock() { @@ -42,34 +42,33 @@ protected void GenerateAWSQueryCompatibleBlock() #line default #line hidden - #line 11 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" -this.Write(@" var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains("";"")) + #line 11 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" +this.Write(@" var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains("";"")) { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } } } } - } "); #line default #line hidden - #line 32 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 31 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } @@ -77,7 +76,7 @@ protected void GenerateAWSQueryCompatibleBlock() #line default #line hidden - #line 36 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 35 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" protected void AddCommonUsingStatements() { @@ -86,7 +85,7 @@ protected void AddCommonUsingStatements() #line default #line hidden - #line 39 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 38 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("using System;\r\nusing System.Collections.Generic;\r\nusing System.Globalization;\r\nus" + "ing System.IO;\r\nusing System.Net;\r\nusing System.Text;\r\nusing System.Xml.Serializ" + "ation;\r\n\r\nusing "); @@ -95,14 +94,14 @@ protected void AddCommonUsingStatements() #line default #line hidden - #line 48 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 47 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.Namespace)); #line default #line hidden - #line 48 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 47 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(".Model;\r\nusing Amazon.Runtime;\r\nusing Amazon.Runtime.Internal;\r\nusing Amazon.Runt" + "ime.Internal.Transform;\r\nusing Amazon.Runtime.Internal.Util;\r\n"); @@ -110,7 +109,7 @@ protected void AddCommonUsingStatements() #line default #line hidden - #line 53 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 52 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } @@ -167,49 +166,49 @@ protected void AddResponseSingletonMethod() #line default #line hidden - #line 104 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 103 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" private static "); #line default #line hidden - #line 105 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 104 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName)); #line default #line hidden - #line 105 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 104 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("ResponseUnmarshaller _instance = new "); #line default #line hidden - #line 105 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 104 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName)); #line default #line hidden - #line 105 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 104 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("ResponseUnmarshaller(); \r\n\r\n\t\tinternal static "); #line default #line hidden - #line 107 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 106 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName)); #line default #line hidden - #line 107 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 106 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("ResponseUnmarshaller GetInstance()\r\n\t\t{\r\n\t\t\treturn _instance;\r\n\t\t}\r\n\r\n ///" + " \r\n /// Gets the singleton.\r\n /// \r\n\t\tpublic " + "static "); @@ -218,14 +217,14 @@ protected void AddResponseSingletonMethod() #line default #line hidden - #line 115 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 114 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName)); #line default #line hidden - #line 115 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 114 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("ResponseUnmarshaller Instance\r\n\t\t{\r\n\t\t\tget\r\n\t\t\t{\r\n\t\t\t\treturn _instance;\r\n\t\t\t}\r\n\t\t" + "}\r\n\r\n"); @@ -233,7 +232,7 @@ protected void AddResponseSingletonMethod() #line default #line hidden - #line 123 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 122 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } @@ -244,35 +243,35 @@ protected void AddStructureSingletonMethod() #line default #line hidden - #line 128 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 127 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" private static "); #line default #line hidden - #line 129 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 128 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName)); #line default #line hidden - #line 129 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 128 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("Unmarshaller _instance = new "); #line default #line hidden - #line 129 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 128 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName)); #line default #line hidden - #line 129 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 128 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("Unmarshaller(); \r\n\r\n /// \r\n /// Gets the singleton." + "\r\n /// \r\n\t\tpublic static "); @@ -280,21 +279,21 @@ protected void AddStructureSingletonMethod() #line default #line hidden - #line 134 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 133 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName)); #line default #line hidden - #line 134 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 133 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("Unmarshaller Instance\r\n\t\t{\r\n\t\t\tget\r\n\t\t\t{\r\n\t\t\t\treturn _instance;\r\n\t\t\t}\r\n\t\t}\r\n"); #line default #line hidden - #line 141 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 140 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } @@ -313,28 +312,28 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 154 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 153 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\t//Map of headers with prefix \""); #line default #line hidden - #line 155 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 154 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 155 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 154 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\".\r\n"); #line default #line hidden - #line 156 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 155 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" // Dictionary if (member.ModelShape.ValueShape.IsString) @@ -344,182 +343,182 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 160 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 159 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" var headersFor"); #line default #line hidden - #line 161 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 160 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 161 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 160 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = new Dictionary();\r\n\t\t\tforeach (var name"); #line default #line hidden - #line 162 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 161 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 162 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 161 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" in context.ResponseData.GetHeaderNames())\r\n\t\t\t{\r\n\t\t\t\tvar keyToUse = name"); #line default #line hidden - #line 164 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 163 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 164 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 163 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(";\r\n\t\t\t\tif(\""); #line default #line hidden - #line 165 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 164 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 165 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 164 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\".Length > 0 && keyToUse.StartsWith(\""); #line default #line hidden - #line 165 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 164 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 165 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 164 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\")) {\r\n\t\t\t\t\tkeyToUse = keyToUse.Substring(\""); #line default #line hidden - #line 166 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 165 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 166 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 165 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\".Length);\r\n\t\t\t\t}\r\n\r\n\t\t\t\tif (context.ResponseData.IsHeaderPresent($\""); #line default #line hidden - #line 169 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 168 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 169 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 168 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("{keyToUse}\"))\r\n\t\t\t\t{\r\n\t\t\t\t\theadersFor"); #line default #line hidden - #line 171 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 170 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 171 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 170 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(".Add(\r\n\t\t\t\t\t\tkeyToUse,\r\n\t\t\t\t\t\tcontext.ResponseData.GetHeaderValue($\""); #line default #line hidden - #line 173 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 172 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 173 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 172 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("{keyToUse}\")\r\n\t\t\t\t\t);\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\tif(headersFor"); #line default #line hidden - #line 177 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 176 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 177 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 176 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(".Count > 0)\r\n\t\t\t\tresponse."); #line default #line hidden - #line 178 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 177 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 178 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 177 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = headersFor"); #line default #line hidden - #line 178 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 177 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 178 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 177 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(";\r\n"); #line default #line hidden - #line 179 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 178 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } // Dictionary> @@ -530,182 +529,182 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 184 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 183 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\t var headersFor"); #line default #line hidden - #line 185 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 184 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 185 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 184 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = new Dictionary>();\r\n\t\t\tforeach (var name"); #line default #line hidden - #line 186 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 185 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 186 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 185 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" in context.ResponseData.GetHeaderNames())\r\n\t\t\t{\r\n\t\t\t\tvar keyToUse = name"); #line default #line hidden - #line 188 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 187 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 188 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 187 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(";\r\n\t\t\t\tif(\""); #line default #line hidden - #line 189 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 188 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 189 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 188 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\".Length > 0 && keyToUse.StartsWith(\""); #line default #line hidden - #line 189 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 188 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 189 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 188 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\")) {\r\n\t\t\t\t\tkeyToUse = keyToUse.Substring(\""); #line default #line hidden - #line 190 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 189 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 190 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 189 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\".Length);\r\n\t\t\t\t}\r\n\r\n\t\t\t\tif (context.ResponseData.IsHeaderPresent($\""); #line default #line hidden - #line 193 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 192 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 193 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 192 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("{keyToUse}\"))\r\n\t\t\t\t{\r\n\t\t\t\t\theadersFor"); #line default #line hidden - #line 195 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 194 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 195 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 194 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(".Add(\r\n\t\t\t\t\t\tkeyToUse,\r\n\t\t\t\t\t\tcontext.ResponseData.GetHeaderValue($\""); #line default #line hidden - #line 197 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 196 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 197 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 196 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("{keyToUse}\").Split(\',\').ToList()\r\n\t\t\t\t\t);\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\tif(headersFor"); #line default #line hidden - #line 201 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 200 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 201 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 200 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(".Count > 0)\r\n\t\t\t\tresponse."); #line default #line hidden - #line 202 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 201 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 202 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 201 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = headersFor"); #line default #line hidden - #line 202 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 201 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 202 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 201 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(";\r\n"); #line default #line hidden - #line 203 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 202 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } else @@ -717,7 +716,7 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 210 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 209 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" continue; } @@ -726,28 +725,28 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 213 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 212 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\tif (context.ResponseData.IsHeaderPresent(\""); #line default #line hidden - #line 214 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 213 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 214 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 213 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\"))\r\n"); #line default #line hidden - #line 215 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 214 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" if (member.Shape.IsString) { @@ -758,7 +757,7 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 220 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 219 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\t{\r\n\t\t\t\tvar headerBytes = Convert.FromBase64String(context.ResponseData.GetHead" + "erValue(\""); @@ -766,35 +765,35 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 222 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 221 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 222 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 221 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\"));\r\n\t\t\t\tresponse."); #line default #line hidden - #line 223 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 222 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 223 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 222 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = Encoding.UTF8.GetString(headerBytes, 0, headerBytes.Length);\r\n\t\t\t}\r\n"); #line default #line hidden - #line 225 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 224 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } else @@ -804,42 +803,42 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 229 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 228 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\t\tresponse."); #line default #line hidden - #line 230 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 229 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 230 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 229 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = context.ResponseData.GetHeaderValue(\""); #line default #line hidden - #line 230 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 229 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 230 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 229 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 231 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 230 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } } @@ -850,28 +849,28 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 236 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 235 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\t//Map of headers with prefix \""); #line default #line hidden - #line 237 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 236 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 237 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 236 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\".\r\n\r\n"); #line default #line hidden - #line 239 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 238 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" // Dictionary if (member.ModelShape.ValueShape.IsString) @@ -881,182 +880,182 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 243 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 242 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" var headersFor"); #line default #line hidden - #line 244 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 243 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 244 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 243 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = new Dictionary();\r\n\t\t\tforeach (var name"); #line default #line hidden - #line 245 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 244 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 245 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 244 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" in context.ResponseData.GetHeaderNames())\r\n\t\t\t{\r\n\t\t\t\tvar keyToUse = name"); #line default #line hidden - #line 247 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 246 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.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\BaseResponseUnmarshaller.tt" + #line 246 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(";\r\n\t\t\t\tif(\""); #line default #line hidden - #line 248 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 247 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 248 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 247 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\".Length > 0 && keyToUse.StartsWith(\""); #line default #line hidden - #line 248 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 247 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 248 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 247 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\")) {\r\n\t\t\t\t\tkeyToUse = keyToUse.Substring(\""); #line default #line hidden - #line 249 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 248 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 249 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 248 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\".Length);\r\n\t\t\t\t}\r\n\r\n\t\t\t\tif (context.ResponseData.IsHeaderPresent($\""); #line default #line hidden - #line 252 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 251 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 252 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 251 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("{keyToUse}\"))\r\n\t\t\t\t{\r\n\t\t\t\t\theadersFor"); #line default #line hidden - #line 254 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 253 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 254 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 253 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(".Add(\r\n\t\t\t\t\t\tkeyToUse,\r\n\t\t\t\t\t\tcontext.ResponseData.GetHeaderValue($\""); #line default #line hidden - #line 256 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 255 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 256 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 255 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("{keyToUse}\")\r\n\t\t\t\t\t);\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\tif(headersFor"); #line default #line hidden - #line 260 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 259 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 260 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 259 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(".Count > 0)\r\n\t\t\t\tresponse."); #line default #line hidden - #line 261 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 260 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 261 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 260 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = headersFor"); #line default #line hidden - #line 261 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 260 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 261 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 260 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(";\r\n"); #line default #line hidden - #line 262 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 261 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } // Dictionary> @@ -1067,182 +1066,182 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 267 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 266 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\t var headersFor"); #line default #line hidden - #line 268 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 267 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 268 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 267 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = new Dictionary>();\r\n\t\t\tforeach (var name"); #line default #line hidden - #line 269 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 268 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 269 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 268 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" in context.ResponseData.GetHeaderNames())\r\n\t\t\t{\r\n\t\t\t\tvar keyToUse = name"); #line default #line hidden - #line 271 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 270 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 271 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 270 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(";\r\n\t\t\t\tif(\""); #line default #line hidden - #line 272 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 271 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 272 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 271 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\".Length > 0 && keyToUse.StartsWith(\""); #line default #line hidden - #line 272 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 271 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 272 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 271 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\")) {\r\n\t\t\t\t\tkeyToUse = keyToUse.Substring(\""); #line default #line hidden - #line 273 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 272 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 273 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 272 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\".Length);\r\n\t\t\t\t}\r\n\r\n\t\t\t\tif (context.ResponseData.IsHeaderPresent($\""); #line default #line hidden - #line 276 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 275 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 276 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 275 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("{keyToUse}\"))\r\n\t\t\t\t{\r\n\t\t\t\t\theadersFor"); #line default #line hidden - #line 278 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 277 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 278 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 277 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(".Add(\r\n\t\t\t\t\t\tkeyToUse,\r\n\t\t\t\t\t\tcontext.ResponseData.GetHeaderValue($\""); #line default #line hidden - #line 280 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 279 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 280 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 279 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("{keyToUse}\").Split(\',\').ToList()\r\n\t\t\t\t\t);\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\tif(headersFor"); #line default #line hidden - #line 284 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 283 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 284 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 283 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(".Count > 0)\r\n\t\t\t\tresponse."); #line default #line hidden - #line 285 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 284 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 285 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 284 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = headersFor"); #line default #line hidden - #line 285 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 284 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 285 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 284 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(";\r\n"); #line default #line hidden - #line 286 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 285 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } else @@ -1254,7 +1253,7 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 294 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 293 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } else if (member.Shape.IsList) @@ -1270,42 +1269,42 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 304 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 303 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\t\tresponse."); #line default #line hidden - #line 305 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 304 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 305 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 304 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = MultiValueHeaderParser.ToStringList(context.ResponseData.GetHeaderValue(\""); #line default #line hidden - #line 305 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 304 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 305 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 304 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\"));\r\n"); #line default #line hidden - #line 306 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 305 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } else if(member.Shape.ListShape.IsDateTime) @@ -1318,56 +1317,56 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 313 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 312 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\t\tresponse."); #line default #line hidden - #line 314 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 313 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 314 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 313 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = MultiValueHeaderParser.ToDateTimeList(context.ResponseData.GetHeaderValue(\""); #line default #line hidden - #line 314 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 313 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 314 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 313 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\"), \""); #line default #line hidden - #line 314 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 313 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(timestampFormat)); #line default #line hidden - #line 314 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 313 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 315 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 314 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } else @@ -1383,56 +1382,56 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 325 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 324 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\t\tresponse."); #line default #line hidden - #line 326 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 325 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 326 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 325 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = MultiValueHeaderParser.ToValueTypeList<"); #line default #line hidden - #line 326 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 325 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ListShape.GetPrimitiveType().ToLower())); #line default #line hidden - #line 326 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 325 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(">(context.ResponseData.GetHeaderValue(\""); #line default #line hidden - #line 326 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 325 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 326 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 325 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\"));\r\n"); #line default #line hidden - #line 327 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 326 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } else @@ -1450,42 +1449,42 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 339 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 338 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\t\tresponse."); #line default #line hidden - #line 340 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 339 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 340 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 339 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = DateTime.Parse(context.ResponseData.GetHeaderValue(\""); #line default #line hidden - #line 340 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 339 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 340 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 339 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\"), CultureInfo.InvariantCulture);\r\n"); #line default #line hidden - #line 341 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 340 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } else if(member.TimestampFormat == TimestampFormat.UnixTimestamp) @@ -1495,21 +1494,21 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 345 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 344 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\t\tresponse."); #line default #line hidden - #line 346 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 345 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 346 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 345 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = Amazon.Util.AWSSDKUtils.ConvertFromUnixEpochSeconds(int.Parse(context.Response" + "Data.GetHeaderValue(\""); @@ -1517,21 +1516,21 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 346 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 345 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 346 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 345 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\"), CultureInfo.InvariantCulture));\r\n"); #line default #line hidden - #line 347 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 346 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } else @@ -1546,70 +1545,70 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 356 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 355 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\t\tresponse."); #line default #line hidden - #line 357 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 356 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 357 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 356 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = "); #line default #line hidden - #line 357 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 356 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.GetPrimitiveType().ToLower())); #line default #line hidden - #line 357 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 356 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(".Parse(context.ResponseData.GetHeaderValue(\""); #line default #line hidden - #line 357 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 356 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 357 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 356 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\")"); #line default #line hidden - #line 357 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 356 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture((member.Shape.IsBoolean)?"":", CultureInfo.InvariantCulture")); #line default #line hidden - #line 357 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 356 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(");\r\n"); #line default #line hidden - #line 358 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 357 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } else @@ -1630,28 +1629,28 @@ protected void ProcessStatusCode() #line default #line hidden - #line 373 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 372 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\tresponse."); #line default #line hidden - #line 374 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 373 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.ResponseStatusCodeMember.PropertyName)); #line default #line hidden - #line 374 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 373 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = (int)context.ResponseData.StatusCode;\r\n"); #line default #line hidden - #line 375 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 374 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } } @@ -1660,7 +1659,7 @@ protected void ProcessStatusCode() #line default #line hidden - #line 379 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 378 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" /* The rules for determining the marshallName for xml-based services is different than json services. Xml based services are defined as any service which marshalls/unmarshalls an xml document. This includes AWSQueryResponse, diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.tt b/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.tt index c7c8ed58aec4..77e032a7de32 100644 --- a/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.tt +++ b/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.tt @@ -9,26 +9,25 @@ protected void GenerateAWSQueryCompatibleBlock() { #> - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } } } } - } <#+ } #> diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCExceptionUnmarshaller.cs b/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCExceptionUnmarshaller.cs index cfb8e819b070..9802d6faa18e 100644 --- a/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCExceptionUnmarshaller.cs +++ b/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCExceptionUnmarshaller.cs @@ -18,7 +18,7 @@ namespace ServiceClientGenerator.Generators.Marshallers /// Class to produce the template output /// - #line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" + #line 1 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")] public partial class JsonRPCExceptionUnmarshaller : BaseResponseUnmarshaller { @@ -29,7 +29,7 @@ public partial class JsonRPCExceptionUnmarshaller : BaseResponseUnmarshaller public override string TransformText() { - #line 6 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" + #line 6 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" AddLicenseHeader(); @@ -41,7 +41,7 @@ public override string TransformText() this.Write("using ThirdParty.Json.LitJson;\r\n\r\n#pragma warning disable CS0612,CS0618\r\nnamespac" + "e "); - #line 14 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" + #line 14 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.Namespace)); #line default @@ -49,21 +49,21 @@ public override string TransformText() this.Write(".Model.Internal.MarshallTransformations\r\n{\r\n /// \r\n /// Response U" + "nmarshaller for "); - #line 17 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" + #line 17 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName)); #line default #line hidden this.Write(" Object\r\n /// \r\n public class "); - #line 19 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" + #line 19 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName)); #line default #line hidden this.Write("Unmarshaller : IErrorResponseUnmarshaller<"); - #line 19 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" + #line 19 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName)); #line default @@ -73,7 +73,7 @@ public override string TransformText() "\r\n /// \r\n /// \r\n " + " public "); - #line 26 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" + #line 26 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName)); #line default @@ -91,78 +91,35 @@ public override string TransformText() /// public "); - #line 37 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" + #line 37 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName)); #line default #line hidden this.Write(" Unmarshall(JsonUnmarshallerContext context, Amazon.Runtime.Internal.ErrorRespons" + - "e errorResponse)\r\n {\r\n context.Read();\r\n\r\n"); + "e errorResponse)\r\n {\r\n context.Read();\r\n\r\n "); - #line 41 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" - - if (this.Config.ServiceModel.IsAwsQueryCompatible) - { - GenerateAWSQueryCompatibleBlock(); - - - #line default - #line hidden - this.Write(" "); - - #line 46 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" + #line 41 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName)); #line default #line hidden this.Write(" unmarshalledObject = new "); - #line 46 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" + #line 41 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName)); #line default #line hidden - this.Write("(errorResponse.Message, errorResponse.InnerException,\r\n errorType," + - " errorCode, errorResponse.RequestId, errorResponse.StatusCode);\r\n"); - - #line 48 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" - - } - else + this.Write(@"(errorResponse.Message, errorResponse.InnerException, + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); + + int targetDepth = context.CurrentDepth; + while (context.ReadAtDepth(targetDepth)) { - - - #line default - #line hidden - this.Write(" "); - - #line 53 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName)); - - #line default - #line hidden - this.Write(" unmarshalledObject = new "); - - #line 53 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName)); - - #line default - #line hidden - this.Write("(errorResponse.Message, errorResponse.InnerException,\r\n errorRespo" + - "nse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode)" + - ";\r\n"); - - #line 55 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" - - } - - - #line default - #line hidden - this.Write(" \r\n int targetDepth = context.CurrentDepth;\r\n while " + - "(context.ReadAtDepth(targetDepth))\r\n {\r\n"); +"); - #line 62 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" + #line 47 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" if(this.Structure != null) { @@ -174,21 +131,21 @@ public override string TransformText() #line hidden this.Write(" if (context.TestExpression(\""); - #line 68 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" + #line 53 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName)); #line default #line hidden this.Write("\", targetDepth))\r\n {\r\n var unmarshaller = "); - #line 70 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" + #line 55 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.DetermineTypeUnmarshallerInstantiate())); #line default #line hidden this.Write(";\r\n unmarshalledObject."); - #line 71 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" + #line 56 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default @@ -196,7 +153,7 @@ public override string TransformText() this.Write(" = unmarshaller.Unmarshall(context);\r\n continue;\r\n " + " }\r\n"); - #line 74 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" + #line 59 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" } } @@ -206,7 +163,7 @@ public override string TransformText() #line hidden this.Write(" }\r\n \r\n return unmarshalledObject;\r\n }\r\n\r\n"); - #line 83 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" + #line 68 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCExceptionUnmarshaller.tt" this.AddStructureSingletonMethod(); diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCExceptionUnmarshaller.tt b/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCExceptionUnmarshaller.tt index 97ebdf03a760..cb7c6e9b7b07 100644 --- a/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCExceptionUnmarshaller.tt +++ b/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCExceptionUnmarshaller.tt @@ -38,23 +38,8 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations { context.Read(); -<# - if (this.Config.ServiceModel.IsAwsQueryCompatible) - { - GenerateAWSQueryCompatibleBlock(); -#> - <#=this.UnmarshallerBaseName #> unmarshalledObject = new <#=this.UnmarshallerBaseName #>(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); -<# - } - else - { -#> <#=this.UnmarshallerBaseName #> unmarshalledObject = new <#=this.UnmarshallerBaseName #>(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); -<# - } -#> int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCResponseUnmarshaller.cs b/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCResponseUnmarshaller.cs index f80c673b5e9b..85ce463faf01 100644 --- a/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCResponseUnmarshaller.cs +++ b/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCResponseUnmarshaller.cs @@ -346,48 +346,28 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte #line default #line hidden - this.Write("\r\n using (var contextCopy = new JsonUnmarshallerContext(streamCopy, tr" + - "ue, context.ResponseData))\r\n"); + this.Write(" using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true" + + ", context.ResponseData))\r\n {\r\n"); #line 158 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCResponseUnmarshaller.tt" - } - else - { - - - #line default - #line hidden - this.Write(" using (var contextCopy = new JsonUnmarshallerContext(streamCopy, fals" + - "e, null))\r\n"); - - #line 164 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCResponseUnmarshaller.tt" - - } - - - #line default - #line hidden - this.Write(" {\r\n"); - - #line 168 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCResponseUnmarshaller.tt" - + GenerateAWSQueryCompatibleBlock(); foreach (var exception in this.Operation.Exceptions) { #line default #line hidden - this.Write(" if (errorResponse.Code != null && errorResponse.Code.Equals(\""); + this.Write(" if (errorTypeName != null && errorTypeName.Equals(\""); - #line 172 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCResponseUnmarshaller.tt" + #line 163 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(exception.ShapeOriginalName)); #line default #line hidden this.Write("\"))\r\n {\r\n return "); - #line 174 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCResponseUnmarshaller.tt" + #line 165 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(exception.Name)); #line default @@ -395,64 +375,65 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte this.Write("Unmarshaller.Instance.Unmarshall(contextCopy, errorResponse);\r\n }\r" + "\n"); - #line 176 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCResponseUnmarshaller.tt" + #line 167 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCResponseUnmarshaller.tt" } + } + else + { #line default #line hidden - this.Write(" }\r\n"); + this.Write(" using (var contextCopy = new JsonUnmarshallerContext(streamCopy, fals" + + "e, null))\r\n {\r\n"); - #line 180 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCResponseUnmarshaller.tt" + #line 175 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCResponseUnmarshaller.tt" - if (this.Config.ServiceModel.IsAwsQueryCompatible) - { - GenerateAWSQueryCompatibleBlock(); + foreach (var exception in this.Operation.Exceptions) + { #line default #line hidden - this.Write(" return new "); + this.Write(" if (errorResponse.Code != null && errorResponse.Code.Equals(\""); - #line 185 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCResponseUnmarshaller.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(this.BaseException)); + #line 179 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCResponseUnmarshaller.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(exception.Code)); #line default #line hidden - this.Write("(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, error" + - "Response.RequestId, errorResponse.StatusCode);\r\n"); + this.Write("\"))\r\n {\r\n return "); - #line 186 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCResponseUnmarshaller.tt" + #line 181 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCResponseUnmarshaller.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(exception.Name)); + + #line default + #line hidden + this.Write("Unmarshaller.Instance.Unmarshall(contextCopy, errorResponse);\r\n }\r" + + "\n"); + + #line 183 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCResponseUnmarshaller.tt" + } } - else - { + #line default #line hidden - this.Write(" return new "); + this.Write(" }\r\n return new "); - #line 191 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCResponseUnmarshaller.tt" + #line 189 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.BaseException)); #line default #line hidden this.Write("(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorRe" + - "sponse.Code, errorResponse.RequestId, errorResponse.StatusCode);\r\n"); + "sponse.Code, errorResponse.RequestId, errorResponse.StatusCode);\r\n }\r\n\r\n"); #line 192 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCResponseUnmarshaller.tt" - } - - - #line default - #line hidden - this.Write(" }\r\n\r\n"); - - #line 197 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCResponseUnmarshaller.tt" - if (payload != null && payload.Shape.IsStreaming) { @@ -472,7 +453,7 @@ public override bool HasStreamingProperty "); - #line 212 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCResponseUnmarshaller.tt" + #line 207 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCResponseUnmarshaller.tt" } this.AddResponseSingletonMethod(); @@ -481,7 +462,7 @@ public override bool HasStreamingProperty #line default #line hidden - #line 216 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCResponseUnmarshaller.tt" + #line 211 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCResponseUnmarshaller.tt" if(isEventStreamOutput) { @@ -505,7 +486,7 @@ protected override bool ShouldReadEntireResponse(IWebResponseData response, bool public override bool HasStreamingProperty => true; "); - #line 234 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCResponseUnmarshaller.tt" + #line 229 "C:\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCResponseUnmarshaller.tt" } diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCResponseUnmarshaller.tt b/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCResponseUnmarshaller.tt index 74c8d77c550d..49ffb785d7d5 100644 --- a/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCResponseUnmarshaller.tt +++ b/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCResponseUnmarshaller.tt @@ -153,45 +153,40 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations { #> <# // Create a copy of context with headers in the response #> - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) + { +<# + GenerateAWSQueryCompatibleBlock(); + foreach (var exception in this.Operation.Exceptions) + { +#> + if (errorTypeName != null && errorTypeName.Equals("<#=exception.ShapeOriginalName #>")) + { + return <#=exception.Name#>Unmarshaller.Instance.Unmarshall(contextCopy, errorResponse); + } <# + } } else { #> using (var contextCopy = new JsonUnmarshallerContext(streamCopy, false, null)) -<# - } -#> { <# foreach (var exception in this.Operation.Exceptions) { #> - if (errorResponse.Code != null && errorResponse.Code.Equals("<#=exception.ShapeOriginalName #>")) + if (errorResponse.Code != null && errorResponse.Code.Equals("<#=exception.Code #>")) { return <#=exception.Name#>Unmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } <# } -#> } -<# - if (this.Config.ServiceModel.IsAwsQueryCompatible) - { - GenerateAWSQueryCompatibleBlock(); + #> - return new <#=this.BaseException#>(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); -<# } - else - { -#> return new <#=this.BaseException#>(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); -<# - } -#> } <# From 537ea496845b3149357664aa9bc90c47ceb223e5 Mon Sep 17 00:00:00 2001 From: Muhammad Othman Date: Fri, 19 Dec 2025 16:00:05 -0500 Subject: [PATCH 2/2] Generate SQS & CloudWatch with improved AWS Query compatible error handling in unmarshallers --- ...urrentModificationExceptionUnmarshaller.cs | 22 +----- .../ConflictExceptionUnmarshaller.cs | 22 +----- ...dInvalidInputErrorExceptionUnmarshaller.cs | 22 +----- ...boardNotFoundErrorExceptionUnmarshaller.cs | 22 +----- .../DeleteAlarmsResponseUnmarshaller.cs | 38 +++++----- ...leteAnomalyDetectorResponseUnmarshaller.cs | 52 ++++++------- .../DeleteDashboardsResponseUnmarshaller.cs | 50 ++++++------ .../DeleteInsightRulesResponseUnmarshaller.cs | 46 ++++++----- .../DeleteMetricStreamResponseUnmarshaller.cs | 48 ++++++------ ...beAlarmContributorsResponseUnmarshaller.cs | 46 ++++++----- ...escribeAlarmHistoryResponseUnmarshaller.cs | 38 +++++----- ...ribeAlarmsForMetricResponseUnmarshaller.cs | 30 ++++---- .../DescribeAlarmsResponseUnmarshaller.cs | 38 +++++----- ...ibeAnomalyDetectorsResponseUnmarshaller.cs | 50 ++++++------ ...escribeInsightRulesResponseUnmarshaller.cs | 38 +++++----- ...DisableAlarmActionsResponseUnmarshaller.cs | 30 ++++---- ...DisableInsightRulesResponseUnmarshaller.cs | 46 ++++++----- .../EnableAlarmActionsResponseUnmarshaller.cs | 30 ++++---- .../EnableInsightRulesResponseUnmarshaller.cs | 48 ++++++------ .../GetDashboardResponseUnmarshaller.cs | 48 ++++++------ ...etInsightRuleReportResponseUnmarshaller.cs | 48 ++++++------ .../GetMetricDataResponseUnmarshaller.cs | 38 +++++----- ...GetMetricStatisticsResponseUnmarshaller.cs | 50 ++++++------ .../GetMetricStreamResponseUnmarshaller.cs | 52 ++++++------- ...etMetricWidgetImageResponseUnmarshaller.cs | 30 ++++---- .../InternalServiceExceptionUnmarshaller.cs | 22 +----- .../InvalidFormatExceptionUnmarshaller.cs | 22 +----- .../InvalidNextTokenExceptionUnmarshaller.cs | 22 +----- ...rameterCombinationExceptionUnmarshaller.cs | 22 +----- ...alidParameterValueExceptionUnmarshaller.cs | 22 +----- .../LimitExceededExceptionUnmarshaller.cs | 22 +----- .../ListDashboardsResponseUnmarshaller.cs | 46 ++++++----- ...ManagedInsightRulesResponseUnmarshaller.cs | 48 ++++++------ .../ListMetricStreamsResponseUnmarshaller.cs | 50 ++++++------ .../ListMetricsResponseUnmarshaller.cs | 46 ++++++----- ...ListTagsForResourceResponseUnmarshaller.cs | 48 ++++++------ ...gRequiredParameterExceptionUnmarshaller.cs | 22 +----- .../PutAnomalyDetectorResponseUnmarshaller.cs | 52 ++++++------- .../PutCompositeAlarmResponseUnmarshaller.cs | 38 +++++----- .../PutDashboardResponseUnmarshaller.cs | 48 ++++++------ .../PutInsightRuleResponseUnmarshaller.cs | 48 ++++++------ ...ManagedInsightRulesResponseUnmarshaller.cs | 46 ++++++----- .../PutMetricAlarmResponseUnmarshaller.cs | 38 +++++----- .../PutMetricDataResponseUnmarshaller.cs | 50 ++++++------ .../PutMetricStreamResponseUnmarshaller.cs | 52 ++++++------- .../ResourceNotFoundExceptionUnmarshaller.cs | 22 +----- .../SetAlarmStateResponseUnmarshaller.cs | 46 ++++++----- .../StartMetricStreamsResponseUnmarshaller.cs | 48 ++++++------ .../StopMetricStreamsResponseUnmarshaller.cs | 48 ++++++------ .../TagResourceResponseUnmarshaller.cs | 52 ++++++------- .../UntagResourceResponseUnmarshaller.cs | 52 ++++++------- .../AddPermissionResponseUnmarshaller.cs | 54 +++++++------ ...ntryIdsNotDistinctExceptionUnmarshaller.cs | 22 +----- ...atchRequestTooLongExceptionUnmarshaller.cs | 22 +----- ...ncelMessageMoveTaskResponseUnmarshaller.cs | 52 ++++++------- ...sageVisibilityBatchResponseUnmarshaller.cs | 60 +++++++-------- ...geMessageVisibilityResponseUnmarshaller.cs | 56 +++++++------- .../CreateQueueResponseUnmarshaller.cs | 58 +++++++------- .../DeleteMessageBatchResponseUnmarshaller.cs | 60 +++++++-------- .../DeleteMessageResponseUnmarshaller.cs | 56 +++++++------- .../DeleteQueueResponseUnmarshaller.cs | 52 ++++++------- .../EmptyBatchRequestExceptionUnmarshaller.cs | 22 +----- .../GetQueueAttributesResponseUnmarshaller.cs | 54 +++++++------ .../GetQueueUrlResponseUnmarshaller.cs | 52 ++++++------- .../InvalidAddressExceptionUnmarshaller.cs | 22 +----- ...validAttributeNameExceptionUnmarshaller.cs | 22 +----- ...alidAttributeValueExceptionUnmarshaller.cs | 22 +----- ...nvalidBatchEntryIdExceptionUnmarshaller.cs | 22 +----- .../InvalidIdFormatExceptionUnmarshaller.cs | 22 +----- ...lidMessageContentsExceptionUnmarshaller.cs | 22 +----- .../InvalidSecurityExceptionUnmarshaller.cs | 22 +----- .../KmsAccessDeniedExceptionUnmarshaller.cs | 22 +----- .../KmsDisabledExceptionUnmarshaller.cs | 22 +----- ...KmsInvalidKeyUsageExceptionUnmarshaller.cs | 22 +----- .../KmsInvalidStateExceptionUnmarshaller.cs | 22 +----- .../KmsNotFoundExceptionUnmarshaller.cs | 22 +----- .../KmsOptInRequiredExceptionUnmarshaller.cs | 22 +----- .../KmsThrottledExceptionUnmarshaller.cs | 22 +----- ...dLetterSourceQueuesResponseUnmarshaller.cs | 52 ++++++------- ...istMessageMoveTasksResponseUnmarshaller.cs | 52 ++++++------- .../ListQueueTagsResponseUnmarshaller.cs | 52 ++++++------- .../ListQueuesResponseUnmarshaller.cs | 50 ++++++------ ...MessageNotInflightExceptionUnmarshaller.cs | 22 +----- .../OverLimitExceptionUnmarshaller.cs | 22 +----- ...rgeQueueInProgressExceptionUnmarshaller.cs | 22 +----- .../PurgeQueueResponseUnmarshaller.cs | 54 +++++++------ ...eueDeletedRecentlyExceptionUnmarshaller.cs | 22 +----- .../QueueDoesNotExistExceptionUnmarshaller.cs | 22 +----- .../QueueNameExistsExceptionUnmarshaller.cs | 22 +----- ...iptHandleIsInvalidExceptionUnmarshaller.cs | 22 +----- .../ReceiveMessageResponseUnmarshaller.cs | 68 ++++++++--------- .../RemovePermissionResponseUnmarshaller.cs | 52 ++++++------- .../RequestThrottledExceptionUnmarshaller.cs | 22 +----- .../ResourceNotFoundExceptionUnmarshaller.cs | 22 +----- .../SendMessageBatchResponseUnmarshaller.cs | 76 +++++++++---------- .../SendMessageResponseUnmarshaller.cs | 68 ++++++++--------- .../SetQueueAttributesResponseUnmarshaller.cs | 58 +++++++------- ...tartMessageMoveTaskResponseUnmarshaller.cs | 52 ++++++------- .../TagQueueResponseUnmarshaller.cs | 52 ++++++------- ...riesInBatchRequestExceptionUnmarshaller.cs | 22 +----- ...supportedOperationExceptionUnmarshaller.cs | 22 +----- .../UntagQueueResponseUnmarshaller.cs | 52 ++++++------- .../CreateQueueResponseUnmarshaller.cs | 46 ++++++----- .../MemberRefOpResponseUnmarshaller.cs | 30 ++++---- ...eueDeletedRecentlyExceptionUnmarshaller.cs | 22 +----- .../QueueNameExistsExceptionUnmarshaller.cs | 22 +----- .../StaticOpResponseUnmarshaller.cs | 30 ++++---- .../CustomCodeErrorExceptionUnmarshaller.cs | 22 +----- .../NoCustomCodeErrorExceptionUnmarshaller.cs | 22 +----- ...CompatibleOperationResponseUnmarshaller.cs | 46 ++++++----- 110 files changed, 1575 insertions(+), 2587 deletions(-) diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ConcurrentModificationExceptionUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ConcurrentModificationExceptionUnmarshaller.cs index 97069ce297c7..899e8ad213a5 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ConcurrentModificationExceptionUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ConcurrentModificationExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public ConcurrentModificationException Unmarshall(JsonUnmarshallerContext contex { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } ConcurrentModificationException unmarshalledObject = new ConcurrentModificationException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ConflictExceptionUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ConflictExceptionUnmarshaller.cs index e8680eb575e9..c3856bdabef1 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ConflictExceptionUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ConflictExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public ConflictException Unmarshall(JsonUnmarshallerContext context, Amazon.Runt { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } ConflictException unmarshalledObject = new ConflictException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DashboardInvalidInputErrorExceptionUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DashboardInvalidInputErrorExceptionUnmarshaller.cs index 771ca87bc8da..5f9bafb4a8f0 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DashboardInvalidInputErrorExceptionUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DashboardInvalidInputErrorExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public DashboardInvalidInputErrorException Unmarshall(JsonUnmarshallerContext co { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } DashboardInvalidInputErrorException unmarshalledObject = new DashboardInvalidInputErrorException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DashboardNotFoundErrorExceptionUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DashboardNotFoundErrorExceptionUnmarshaller.cs index ca84963398e5..ab19ebd19e6c 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DashboardNotFoundErrorExceptionUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DashboardNotFoundErrorExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public DashboardNotFoundErrorException Unmarshall(JsonUnmarshallerContext contex { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } DashboardNotFoundErrorException unmarshalledObject = new DashboardNotFoundErrorException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DeleteAlarmsResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DeleteAlarmsResponseUnmarshaller.cs index 6a2c75d2c172..c74f23535aa0 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DeleteAlarmsResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DeleteAlarmsResponseUnmarshaller.cs @@ -68,35 +68,33 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("ResourceNotFound")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) { - return ResourceNotFoundExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); - } - } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } } } } + if (errorTypeName != null && errorTypeName.Equals("ResourceNotFound")) + { + return ResourceNotFoundExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); + } } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static DeleteAlarmsResponseUnmarshaller _instance = new DeleteAlarmsResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DeleteAnomalyDetectorResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DeleteAnomalyDetectorResponseUnmarshaller.cs index 5dba1b368c3b..03aa8b60dc75 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DeleteAnomalyDetectorResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DeleteAnomalyDetectorResponseUnmarshaller.cs @@ -68,51 +68,49 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InternalServiceFault")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InternalServiceFault")) { return InternalServiceExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterCombinationException")) + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterCombinationException")) { return InvalidParameterCombinationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException")) + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException")) { return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("MissingRequiredParameterException")) + if (errorTypeName != null && errorTypeName.Equals("MissingRequiredParameterException")) { return MissingRequiredParameterExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("ResourceNotFoundException")) + if (errorTypeName != null && errorTypeName.Equals("ResourceNotFoundException")) { return ResourceNotFoundExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static DeleteAnomalyDetectorResponseUnmarshaller _instance = new DeleteAnomalyDetectorResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DeleteDashboardsResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DeleteDashboardsResponseUnmarshaller.cs index d60cc95dc6b9..3d95911bf059 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DeleteDashboardsResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DeleteDashboardsResponseUnmarshaller.cs @@ -68,47 +68,45 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("ConflictException")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("ConflictException")) { return ConflictExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("DashboardNotFoundError")) + if (errorTypeName != null && errorTypeName.Equals("DashboardNotFoundError")) { return DashboardNotFoundErrorExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InternalServiceFault")) + if (errorTypeName != null && errorTypeName.Equals("InternalServiceFault")) { return InternalServiceExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException")) + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException")) { return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static DeleteDashboardsResponseUnmarshaller _instance = new DeleteDashboardsResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DeleteInsightRulesResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DeleteInsightRulesResponseUnmarshaller.cs index d83263a83751..a489160ea81a 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DeleteInsightRulesResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DeleteInsightRulesResponseUnmarshaller.cs @@ -79,39 +79,37 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException")) - { - return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); - } - if (errorResponse.Code != null && errorResponse.Code.Equals("MissingRequiredParameterException")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) { - return MissingRequiredParameterExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); - } - } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } } } } + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException")) + { + return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); + } + if (errorTypeName != null && errorTypeName.Equals("MissingRequiredParameterException")) + { + return MissingRequiredParameterExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); + } } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static DeleteInsightRulesResponseUnmarshaller _instance = new DeleteInsightRulesResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DeleteMetricStreamResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DeleteMetricStreamResponseUnmarshaller.cs index ea65f2f13da2..af1a36e4b1ec 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DeleteMetricStreamResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DeleteMetricStreamResponseUnmarshaller.cs @@ -68,43 +68,41 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InternalServiceFault")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InternalServiceFault")) { return InternalServiceExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException")) + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException")) { return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("MissingRequiredParameterException")) + if (errorTypeName != null && errorTypeName.Equals("MissingRequiredParameterException")) { return MissingRequiredParameterExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static DeleteMetricStreamResponseUnmarshaller _instance = new DeleteMetricStreamResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeAlarmContributorsResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeAlarmContributorsResponseUnmarshaller.cs index 028c86676cde..2d4c73b6c2f1 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeAlarmContributorsResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeAlarmContributorsResponseUnmarshaller.cs @@ -85,39 +85,37 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidNextToken")) - { - return InvalidNextTokenExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); - } - if (errorResponse.Code != null && errorResponse.Code.Equals("ResourceNotFoundException")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) { - return ResourceNotFoundExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); - } - } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } } } } + if (errorTypeName != null && errorTypeName.Equals("InvalidNextToken")) + { + return InvalidNextTokenExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); + } + if (errorTypeName != null && errorTypeName.Equals("ResourceNotFoundException")) + { + return ResourceNotFoundExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); + } } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static DescribeAlarmContributorsResponseUnmarshaller _instance = new DescribeAlarmContributorsResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeAlarmHistoryResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeAlarmHistoryResponseUnmarshaller.cs index a7048c8b4547..1536c34d27ac 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeAlarmHistoryResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeAlarmHistoryResponseUnmarshaller.cs @@ -85,35 +85,33 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidNextToken")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) { - return InvalidNextTokenExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); - } - } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } } } } + if (errorTypeName != null && errorTypeName.Equals("InvalidNextToken")) + { + return InvalidNextTokenExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); + } } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static DescribeAlarmHistoryResponseUnmarshaller _instance = new DescribeAlarmHistoryResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeAlarmsForMetricResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeAlarmsForMetricResponseUnmarshaller.cs index a5e9d6d59e87..9478b3b21979 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeAlarmsForMetricResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeAlarmsForMetricResponseUnmarshaller.cs @@ -79,31 +79,29 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } } } } } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static DescribeAlarmsForMetricResponseUnmarshaller _instance = new DescribeAlarmsForMetricResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeAlarmsResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeAlarmsResponseUnmarshaller.cs index 0eda268e804c..3ef0ccd53952 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeAlarmsResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeAlarmsResponseUnmarshaller.cs @@ -91,35 +91,33 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidNextToken")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) { - return InvalidNextTokenExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); - } - } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } } } } + if (errorTypeName != null && errorTypeName.Equals("InvalidNextToken")) + { + return InvalidNextTokenExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); + } } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static DescribeAlarmsResponseUnmarshaller _instance = new DescribeAlarmsResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeAnomalyDetectorsResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeAnomalyDetectorsResponseUnmarshaller.cs index 8063bff21d54..6fbfd7764264 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeAnomalyDetectorsResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeAnomalyDetectorsResponseUnmarshaller.cs @@ -85,47 +85,45 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InternalServiceFault")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InternalServiceFault")) { return InternalServiceExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidNextToken")) + if (errorTypeName != null && errorTypeName.Equals("InvalidNextToken")) { return InvalidNextTokenExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterCombinationException")) + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterCombinationException")) { return InvalidParameterCombinationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException")) + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException")) { return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static DescribeAnomalyDetectorsResponseUnmarshaller _instance = new DescribeAnomalyDetectorsResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeInsightRulesResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeInsightRulesResponseUnmarshaller.cs index 039354e237ea..2dac9e16db06 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeInsightRulesResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeInsightRulesResponseUnmarshaller.cs @@ -85,35 +85,33 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidNextToken")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) { - return InvalidNextTokenExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); - } - } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } } } } + if (errorTypeName != null && errorTypeName.Equals("InvalidNextToken")) + { + return InvalidNextTokenExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); + } } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static DescribeInsightRulesResponseUnmarshaller _instance = new DescribeInsightRulesResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DisableAlarmActionsResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DisableAlarmActionsResponseUnmarshaller.cs index 1db3fb7f0810..da50c803000d 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DisableAlarmActionsResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DisableAlarmActionsResponseUnmarshaller.cs @@ -68,31 +68,29 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } } } } } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static DisableAlarmActionsResponseUnmarshaller _instance = new DisableAlarmActionsResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DisableInsightRulesResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DisableInsightRulesResponseUnmarshaller.cs index 9e5bf1f7278e..1882f049ad71 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DisableInsightRulesResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DisableInsightRulesResponseUnmarshaller.cs @@ -79,39 +79,37 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException")) - { - return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); - } - if (errorResponse.Code != null && errorResponse.Code.Equals("MissingRequiredParameterException")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) { - return MissingRequiredParameterExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); - } - } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } } } } + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException")) + { + return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); + } + if (errorTypeName != null && errorTypeName.Equals("MissingRequiredParameterException")) + { + return MissingRequiredParameterExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); + } } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static DisableInsightRulesResponseUnmarshaller _instance = new DisableInsightRulesResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/EnableAlarmActionsResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/EnableAlarmActionsResponseUnmarshaller.cs index 8f6aba27b765..19fb8c6636e2 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/EnableAlarmActionsResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/EnableAlarmActionsResponseUnmarshaller.cs @@ -68,31 +68,29 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } } } } } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static EnableAlarmActionsResponseUnmarshaller _instance = new EnableAlarmActionsResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/EnableInsightRulesResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/EnableInsightRulesResponseUnmarshaller.cs index 80aada9d1989..40dc54245a88 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/EnableInsightRulesResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/EnableInsightRulesResponseUnmarshaller.cs @@ -79,43 +79,41 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException")) { return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("LimitExceededException")) + if (errorTypeName != null && errorTypeName.Equals("LimitExceededException")) { return LimitExceededExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("MissingRequiredParameterException")) + if (errorTypeName != null && errorTypeName.Equals("MissingRequiredParameterException")) { return MissingRequiredParameterExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static EnableInsightRulesResponseUnmarshaller _instance = new EnableInsightRulesResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetDashboardResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetDashboardResponseUnmarshaller.cs index 5c51689fcc8c..fb5d09176e98 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetDashboardResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetDashboardResponseUnmarshaller.cs @@ -91,43 +91,41 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("DashboardNotFoundError")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("DashboardNotFoundError")) { return DashboardNotFoundErrorExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InternalServiceFault")) + if (errorTypeName != null && errorTypeName.Equals("InternalServiceFault")) { return InternalServiceExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException")) + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException")) { return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static GetDashboardResponseUnmarshaller _instance = new GetDashboardResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetInsightRuleReportResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetInsightRuleReportResponseUnmarshaller.cs index 677de18b62a4..b0d5dc19be81 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetInsightRuleReportResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetInsightRuleReportResponseUnmarshaller.cs @@ -109,43 +109,41 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException")) { return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("MissingRequiredParameterException")) + if (errorTypeName != null && errorTypeName.Equals("MissingRequiredParameterException")) { return MissingRequiredParameterExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("ResourceNotFoundException")) + if (errorTypeName != null && errorTypeName.Equals("ResourceNotFoundException")) { return ResourceNotFoundExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static GetInsightRuleReportResponseUnmarshaller _instance = new GetInsightRuleReportResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetMetricDataResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetMetricDataResponseUnmarshaller.cs index ae368518c446..e40643dbfb7e 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetMetricDataResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetMetricDataResponseUnmarshaller.cs @@ -91,35 +91,33 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidNextToken")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) { - return InvalidNextTokenExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); - } - } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } } } } + if (errorTypeName != null && errorTypeName.Equals("InvalidNextToken")) + { + return InvalidNextTokenExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); + } } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static GetMetricDataResponseUnmarshaller _instance = new GetMetricDataResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetMetricStatisticsResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetMetricStatisticsResponseUnmarshaller.cs index 3f5bcb12cfd8..37a68c9fa791 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetMetricStatisticsResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetMetricStatisticsResponseUnmarshaller.cs @@ -85,47 +85,45 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InternalServiceFault")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InternalServiceFault")) { return InternalServiceExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterCombinationException")) + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterCombinationException")) { return InvalidParameterCombinationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException")) + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException")) { return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("MissingRequiredParameterException")) + if (errorTypeName != null && errorTypeName.Equals("MissingRequiredParameterException")) { return MissingRequiredParameterExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static GetMetricStatisticsResponseUnmarshaller _instance = new GetMetricStatisticsResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetMetricStreamResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetMetricStreamResponseUnmarshaller.cs index 0d023ca97323..634e1fe2c086 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetMetricStreamResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetMetricStreamResponseUnmarshaller.cs @@ -145,51 +145,49 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InternalServiceFault")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InternalServiceFault")) { return InternalServiceExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterCombinationException")) + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterCombinationException")) { return InvalidParameterCombinationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException")) + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException")) { return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("MissingRequiredParameterException")) + if (errorTypeName != null && errorTypeName.Equals("MissingRequiredParameterException")) { return MissingRequiredParameterExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("ResourceNotFoundException")) + if (errorTypeName != null && errorTypeName.Equals("ResourceNotFoundException")) { return ResourceNotFoundExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static GetMetricStreamResponseUnmarshaller _instance = new GetMetricStreamResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetMetricWidgetImageResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetMetricWidgetImageResponseUnmarshaller.cs index 9785391b2886..e3e7a2641bdc 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetMetricWidgetImageResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetMetricWidgetImageResponseUnmarshaller.cs @@ -79,31 +79,29 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } } } } } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static GetMetricWidgetImageResponseUnmarshaller _instance = new GetMetricWidgetImageResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/InternalServiceExceptionUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/InternalServiceExceptionUnmarshaller.cs index ec7685117d55..13ebcaa6bc0c 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/InternalServiceExceptionUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/InternalServiceExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public InternalServiceException Unmarshall(JsonUnmarshallerContext context, Amaz { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } InternalServiceException unmarshalledObject = new InternalServiceException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/InvalidFormatExceptionUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/InvalidFormatExceptionUnmarshaller.cs index 1ae9e24c4872..6dfbb927b39d 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/InvalidFormatExceptionUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/InvalidFormatExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public InvalidFormatException Unmarshall(JsonUnmarshallerContext context, Amazon { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } InvalidFormatException unmarshalledObject = new InvalidFormatException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/InvalidNextTokenExceptionUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/InvalidNextTokenExceptionUnmarshaller.cs index cb6f2310defe..458383533f08 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/InvalidNextTokenExceptionUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/InvalidNextTokenExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public InvalidNextTokenException Unmarshall(JsonUnmarshallerContext context, Ama { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } InvalidNextTokenException unmarshalledObject = new InvalidNextTokenException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/InvalidParameterCombinationExceptionUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/InvalidParameterCombinationExceptionUnmarshaller.cs index 1cb69c42fbd3..bccf7d862423 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/InvalidParameterCombinationExceptionUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/InvalidParameterCombinationExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public InvalidParameterCombinationException Unmarshall(JsonUnmarshallerContext c { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } InvalidParameterCombinationException unmarshalledObject = new InvalidParameterCombinationException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/InvalidParameterValueExceptionUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/InvalidParameterValueExceptionUnmarshaller.cs index d87610905d02..43a63d7b7ad4 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/InvalidParameterValueExceptionUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/InvalidParameterValueExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public InvalidParameterValueException Unmarshall(JsonUnmarshallerContext context { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } InvalidParameterValueException unmarshalledObject = new InvalidParameterValueException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/LimitExceededExceptionUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/LimitExceededExceptionUnmarshaller.cs index 9060beecda7a..57e94a80ec36 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/LimitExceededExceptionUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/LimitExceededExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public LimitExceededException Unmarshall(JsonUnmarshallerContext context, Amazon { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } LimitExceededException unmarshalledObject = new LimitExceededException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ListDashboardsResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ListDashboardsResponseUnmarshaller.cs index e262f3b6058d..4afd798f121a 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ListDashboardsResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ListDashboardsResponseUnmarshaller.cs @@ -85,39 +85,37 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InternalServiceFault")) - { - return InternalServiceExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); - } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) { - return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); - } - } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } } } } + if (errorTypeName != null && errorTypeName.Equals("InternalServiceFault")) + { + return InternalServiceExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); + } + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException")) + { + return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); + } } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static ListDashboardsResponseUnmarshaller _instance = new ListDashboardsResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ListManagedInsightRulesResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ListManagedInsightRulesResponseUnmarshaller.cs index d0b189a69706..686cc3dc2f2f 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ListManagedInsightRulesResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ListManagedInsightRulesResponseUnmarshaller.cs @@ -85,43 +85,41 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidNextToken")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InvalidNextToken")) { return InvalidNextTokenExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException")) + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException")) { return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("MissingRequiredParameterException")) + if (errorTypeName != null && errorTypeName.Equals("MissingRequiredParameterException")) { return MissingRequiredParameterExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static ListManagedInsightRulesResponseUnmarshaller _instance = new ListManagedInsightRulesResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ListMetricStreamsResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ListMetricStreamsResponseUnmarshaller.cs index fe1d869cd59e..dde24be7a214 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ListMetricStreamsResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ListMetricStreamsResponseUnmarshaller.cs @@ -85,47 +85,45 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InternalServiceFault")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InternalServiceFault")) { return InternalServiceExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidNextToken")) + if (errorTypeName != null && errorTypeName.Equals("InvalidNextToken")) { return InvalidNextTokenExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException")) + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException")) { return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("MissingRequiredParameterException")) + if (errorTypeName != null && errorTypeName.Equals("MissingRequiredParameterException")) { return MissingRequiredParameterExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static ListMetricStreamsResponseUnmarshaller _instance = new ListMetricStreamsResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ListMetricsResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ListMetricsResponseUnmarshaller.cs index 5539d9cfde34..069356dde4e2 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ListMetricsResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ListMetricsResponseUnmarshaller.cs @@ -91,39 +91,37 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InternalServiceFault")) - { - return InternalServiceExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); - } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) { - return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); - } - } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } } } } + if (errorTypeName != null && errorTypeName.Equals("InternalServiceFault")) + { + return InternalServiceExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); + } + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException")) + { + return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); + } } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static ListMetricsResponseUnmarshaller _instance = new ListMetricsResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ListTagsForResourceResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ListTagsForResourceResponseUnmarshaller.cs index 58eaf84a7bcb..a994704dc3ee 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ListTagsForResourceResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ListTagsForResourceResponseUnmarshaller.cs @@ -79,43 +79,41 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InternalServiceFault")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InternalServiceFault")) { return InternalServiceExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException")) + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException")) { return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("ResourceNotFoundException")) + if (errorTypeName != null && errorTypeName.Equals("ResourceNotFoundException")) { return ResourceNotFoundExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static ListTagsForResourceResponseUnmarshaller _instance = new ListTagsForResourceResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/MissingRequiredParameterExceptionUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/MissingRequiredParameterExceptionUnmarshaller.cs index b2762f028e63..e476a0eea92b 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/MissingRequiredParameterExceptionUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/MissingRequiredParameterExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public MissingRequiredParameterException Unmarshall(JsonUnmarshallerContext cont { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } MissingRequiredParameterException unmarshalledObject = new MissingRequiredParameterException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutAnomalyDetectorResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutAnomalyDetectorResponseUnmarshaller.cs index e7421a3d3eb5..466da9273072 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutAnomalyDetectorResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutAnomalyDetectorResponseUnmarshaller.cs @@ -68,51 +68,49 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InternalServiceFault")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InternalServiceFault")) { return InternalServiceExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterCombinationException")) + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterCombinationException")) { return InvalidParameterCombinationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException")) + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException")) { return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("LimitExceededException")) + if (errorTypeName != null && errorTypeName.Equals("LimitExceededException")) { return LimitExceededExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("MissingRequiredParameterException")) + if (errorTypeName != null && errorTypeName.Equals("MissingRequiredParameterException")) { return MissingRequiredParameterExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static PutAnomalyDetectorResponseUnmarshaller _instance = new PutAnomalyDetectorResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutCompositeAlarmResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutCompositeAlarmResponseUnmarshaller.cs index 3538baf2d2fe..59c86cac719b 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutCompositeAlarmResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutCompositeAlarmResponseUnmarshaller.cs @@ -68,35 +68,33 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("LimitExceededFault")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) { - return LimitExceededExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); - } - } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } } } } + if (errorTypeName != null && errorTypeName.Equals("LimitExceededFault")) + { + return LimitExceededExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); + } } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static PutCompositeAlarmResponseUnmarshaller _instance = new PutCompositeAlarmResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutDashboardResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutDashboardResponseUnmarshaller.cs index 87d9ec63eb50..b16fea862dbb 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutDashboardResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutDashboardResponseUnmarshaller.cs @@ -79,43 +79,41 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("ConflictException")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("ConflictException")) { return ConflictExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("DashboardInvalidInputError")) + if (errorTypeName != null && errorTypeName.Equals("DashboardInvalidInputError")) { return DashboardInvalidInputErrorExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InternalServiceFault")) + if (errorTypeName != null && errorTypeName.Equals("InternalServiceFault")) { return InternalServiceExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static PutDashboardResponseUnmarshaller _instance = new PutDashboardResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutInsightRuleResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutInsightRuleResponseUnmarshaller.cs index 33b98adf4ac7..ae4e09303af0 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutInsightRuleResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutInsightRuleResponseUnmarshaller.cs @@ -68,43 +68,41 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException")) { return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("LimitExceededException")) + if (errorTypeName != null && errorTypeName.Equals("LimitExceededException")) { return LimitExceededExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("MissingRequiredParameterException")) + if (errorTypeName != null && errorTypeName.Equals("MissingRequiredParameterException")) { return MissingRequiredParameterExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static PutInsightRuleResponseUnmarshaller _instance = new PutInsightRuleResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutManagedInsightRulesResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutManagedInsightRulesResponseUnmarshaller.cs index 6eb8a4728d00..b44ff91dda4a 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutManagedInsightRulesResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutManagedInsightRulesResponseUnmarshaller.cs @@ -79,39 +79,37 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException")) - { - return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); - } - if (errorResponse.Code != null && errorResponse.Code.Equals("MissingRequiredParameterException")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) { - return MissingRequiredParameterExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); - } - } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } } } } + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException")) + { + return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); + } + if (errorTypeName != null && errorTypeName.Equals("MissingRequiredParameterException")) + { + return MissingRequiredParameterExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); + } } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static PutManagedInsightRulesResponseUnmarshaller _instance = new PutManagedInsightRulesResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutMetricAlarmResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutMetricAlarmResponseUnmarshaller.cs index 6258f548c1df..18b52a3d490e 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutMetricAlarmResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutMetricAlarmResponseUnmarshaller.cs @@ -68,35 +68,33 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("LimitExceededFault")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) { - return LimitExceededExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); - } - } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } } } } + if (errorTypeName != null && errorTypeName.Equals("LimitExceededFault")) + { + return LimitExceededExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); + } } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static PutMetricAlarmResponseUnmarshaller _instance = new PutMetricAlarmResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutMetricDataResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutMetricDataResponseUnmarshaller.cs index 4558445e56d1..ed9a4f553e73 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutMetricDataResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutMetricDataResponseUnmarshaller.cs @@ -68,47 +68,45 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InternalServiceFault")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InternalServiceFault")) { return InternalServiceExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterCombinationException")) + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterCombinationException")) { return InvalidParameterCombinationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException")) + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException")) { return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("MissingRequiredParameterException")) + if (errorTypeName != null && errorTypeName.Equals("MissingRequiredParameterException")) { return MissingRequiredParameterExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static PutMetricDataResponseUnmarshaller _instance = new PutMetricDataResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutMetricStreamResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutMetricStreamResponseUnmarshaller.cs index 97b014755ca0..920d7e52fd51 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutMetricStreamResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutMetricStreamResponseUnmarshaller.cs @@ -79,51 +79,49 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("ConcurrentModificationException")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("ConcurrentModificationException")) { return ConcurrentModificationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InternalServiceFault")) + if (errorTypeName != null && errorTypeName.Equals("InternalServiceFault")) { return InternalServiceExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterCombinationException")) + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterCombinationException")) { return InvalidParameterCombinationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException")) + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException")) { return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("MissingRequiredParameterException")) + if (errorTypeName != null && errorTypeName.Equals("MissingRequiredParameterException")) { return MissingRequiredParameterExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static PutMetricStreamResponseUnmarshaller _instance = new PutMetricStreamResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ResourceNotFoundExceptionUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ResourceNotFoundExceptionUnmarshaller.cs index 300c5d98f057..46f57ee20147 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ResourceNotFoundExceptionUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ResourceNotFoundExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public ResourceNotFoundException Unmarshall(JsonUnmarshallerContext context, Ama { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } ResourceNotFoundException unmarshalledObject = new ResourceNotFoundException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/SetAlarmStateResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/SetAlarmStateResponseUnmarshaller.cs index da9b271f8d5b..902be962f0a6 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/SetAlarmStateResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/SetAlarmStateResponseUnmarshaller.cs @@ -68,39 +68,37 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidFormatFault")) - { - return InvalidFormatExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); - } - if (errorResponse.Code != null && errorResponse.Code.Equals("ResourceNotFound")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) { - return ResourceNotFoundExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); - } - } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } } } } + if (errorTypeName != null && errorTypeName.Equals("InvalidFormatFault")) + { + return InvalidFormatExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); + } + if (errorTypeName != null && errorTypeName.Equals("ResourceNotFound")) + { + return ResourceNotFoundExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); + } } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static SetAlarmStateResponseUnmarshaller _instance = new SetAlarmStateResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/StartMetricStreamsResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/StartMetricStreamsResponseUnmarshaller.cs index 5bb0e420f659..bccc2386be30 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/StartMetricStreamsResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/StartMetricStreamsResponseUnmarshaller.cs @@ -68,43 +68,41 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InternalServiceFault")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InternalServiceFault")) { return InternalServiceExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException")) + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException")) { return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("MissingRequiredParameterException")) + if (errorTypeName != null && errorTypeName.Equals("MissingRequiredParameterException")) { return MissingRequiredParameterExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static StartMetricStreamsResponseUnmarshaller _instance = new StartMetricStreamsResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/StopMetricStreamsResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/StopMetricStreamsResponseUnmarshaller.cs index 9c9a7724db65..1363b8c1e479 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/StopMetricStreamsResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/StopMetricStreamsResponseUnmarshaller.cs @@ -68,43 +68,41 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InternalServiceFault")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InternalServiceFault")) { return InternalServiceExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException")) + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException")) { return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("MissingRequiredParameterException")) + if (errorTypeName != null && errorTypeName.Equals("MissingRequiredParameterException")) { return MissingRequiredParameterExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static StopMetricStreamsResponseUnmarshaller _instance = new StopMetricStreamsResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/TagResourceResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/TagResourceResponseUnmarshaller.cs index 904f88179632..bf048c22a7b6 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/TagResourceResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/TagResourceResponseUnmarshaller.cs @@ -68,51 +68,49 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("ConcurrentModificationException")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("ConcurrentModificationException")) { return ConcurrentModificationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("ConflictException")) + if (errorTypeName != null && errorTypeName.Equals("ConflictException")) { return ConflictExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InternalServiceFault")) + if (errorTypeName != null && errorTypeName.Equals("InternalServiceFault")) { return InternalServiceExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException")) + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException")) { return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("ResourceNotFoundException")) + if (errorTypeName != null && errorTypeName.Equals("ResourceNotFoundException")) { return ResourceNotFoundExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static TagResourceResponseUnmarshaller _instance = new TagResourceResponseUnmarshaller(); diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/UntagResourceResponseUnmarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/UntagResourceResponseUnmarshaller.cs index 63da52f02467..58183bf3ed52 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/UntagResourceResponseUnmarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/UntagResourceResponseUnmarshaller.cs @@ -68,51 +68,49 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("ConcurrentModificationException")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("ConcurrentModificationException")) { return ConcurrentModificationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("ConflictException")) + if (errorTypeName != null && errorTypeName.Equals("ConflictException")) { return ConflictExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InternalServiceFault")) + if (errorTypeName != null && errorTypeName.Equals("InternalServiceFault")) { return InternalServiceExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException")) + if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException")) { return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("ResourceNotFoundException")) + if (errorTypeName != null && errorTypeName.Equals("ResourceNotFoundException")) { return ResourceNotFoundExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static UntagResourceResponseUnmarshaller _instance = new UntagResourceResponseUnmarshaller(); diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/AddPermissionResponseUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/AddPermissionResponseUnmarshaller.cs index 364f7a428451..069e87fb72dc 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/AddPermissionResponseUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/AddPermissionResponseUnmarshaller.cs @@ -68,55 +68,53 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAddress")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InvalidAddress")) { return InvalidAddressExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidSecurity")) + if (errorTypeName != null && errorTypeName.Equals("InvalidSecurity")) { return InvalidSecurityExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("OverLimit")) + if (errorTypeName != null && errorTypeName.Equals("OverLimit")) { return OverLimitExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("QueueDoesNotExist")) + if (errorTypeName != null && errorTypeName.Equals("QueueDoesNotExist")) { return QueueDoesNotExistExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("RequestThrottled")) + if (errorTypeName != null && errorTypeName.Equals("RequestThrottled")) { return RequestThrottledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("UnsupportedOperation")) + if (errorTypeName != null && errorTypeName.Equals("UnsupportedOperation")) { return UnsupportedOperationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static AddPermissionResponseUnmarshaller _instance = new AddPermissionResponseUnmarshaller(); diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/BatchEntryIdsNotDistinctExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/BatchEntryIdsNotDistinctExceptionUnmarshaller.cs index 8d7fd3f10303..a98a3ca0c8bb 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/BatchEntryIdsNotDistinctExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/BatchEntryIdsNotDistinctExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public BatchEntryIdsNotDistinctException Unmarshall(JsonUnmarshallerContext cont { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } BatchEntryIdsNotDistinctException unmarshalledObject = new BatchEntryIdsNotDistinctException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/BatchRequestTooLongExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/BatchRequestTooLongExceptionUnmarshaller.cs index f0f3bfac78d3..0412e461c87c 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/BatchRequestTooLongExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/BatchRequestTooLongExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public BatchRequestTooLongException Unmarshall(JsonUnmarshallerContext context, { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } BatchRequestTooLongException unmarshalledObject = new BatchRequestTooLongException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/CancelMessageMoveTaskResponseUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/CancelMessageMoveTaskResponseUnmarshaller.cs index b5c14f0c4eb5..7d9770dac419 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/CancelMessageMoveTaskResponseUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/CancelMessageMoveTaskResponseUnmarshaller.cs @@ -79,51 +79,49 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAddress")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InvalidAddress")) { return InvalidAddressExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidSecurity")) + if (errorTypeName != null && errorTypeName.Equals("InvalidSecurity")) { return InvalidSecurityExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("RequestThrottled")) + if (errorTypeName != null && errorTypeName.Equals("RequestThrottled")) { return RequestThrottledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("ResourceNotFoundException")) + if (errorTypeName != null && errorTypeName.Equals("ResourceNotFoundException")) { return ResourceNotFoundExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("UnsupportedOperation")) + if (errorTypeName != null && errorTypeName.Equals("UnsupportedOperation")) { return UnsupportedOperationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static CancelMessageMoveTaskResponseUnmarshaller _instance = new CancelMessageMoveTaskResponseUnmarshaller(); diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ChangeMessageVisibilityBatchResponseUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ChangeMessageVisibilityBatchResponseUnmarshaller.cs index 0f24bbb030ce..99e0474a3ee3 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ChangeMessageVisibilityBatchResponseUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ChangeMessageVisibilityBatchResponseUnmarshaller.cs @@ -85,67 +85,65 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("BatchEntryIdsNotDistinct")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("BatchEntryIdsNotDistinct")) { return BatchEntryIdsNotDistinctExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("EmptyBatchRequest")) + if (errorTypeName != null && errorTypeName.Equals("EmptyBatchRequest")) { return EmptyBatchRequestExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAddress")) + if (errorTypeName != null && errorTypeName.Equals("InvalidAddress")) { return InvalidAddressExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidBatchEntryId")) + if (errorTypeName != null && errorTypeName.Equals("InvalidBatchEntryId")) { return InvalidBatchEntryIdExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidSecurity")) + if (errorTypeName != null && errorTypeName.Equals("InvalidSecurity")) { return InvalidSecurityExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("QueueDoesNotExist")) + if (errorTypeName != null && errorTypeName.Equals("QueueDoesNotExist")) { return QueueDoesNotExistExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("RequestThrottled")) + if (errorTypeName != null && errorTypeName.Equals("RequestThrottled")) { return RequestThrottledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("TooManyEntriesInBatchRequest")) + if (errorTypeName != null && errorTypeName.Equals("TooManyEntriesInBatchRequest")) { return TooManyEntriesInBatchRequestExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("UnsupportedOperation")) + if (errorTypeName != null && errorTypeName.Equals("UnsupportedOperation")) { return UnsupportedOperationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static ChangeMessageVisibilityBatchResponseUnmarshaller _instance = new ChangeMessageVisibilityBatchResponseUnmarshaller(); diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ChangeMessageVisibilityResponseUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ChangeMessageVisibilityResponseUnmarshaller.cs index 2d7008d8d2fe..09a22a9797f4 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ChangeMessageVisibilityResponseUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ChangeMessageVisibilityResponseUnmarshaller.cs @@ -68,59 +68,57 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAddress")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InvalidAddress")) { return InvalidAddressExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidSecurity")) + if (errorTypeName != null && errorTypeName.Equals("InvalidSecurity")) { return InvalidSecurityExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("MessageNotInflight")) + if (errorTypeName != null && errorTypeName.Equals("MessageNotInflight")) { return MessageNotInflightExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("QueueDoesNotExist")) + if (errorTypeName != null && errorTypeName.Equals("QueueDoesNotExist")) { return QueueDoesNotExistExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("ReceiptHandleIsInvalid")) + if (errorTypeName != null && errorTypeName.Equals("ReceiptHandleIsInvalid")) { return ReceiptHandleIsInvalidExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("RequestThrottled")) + if (errorTypeName != null && errorTypeName.Equals("RequestThrottled")) { return RequestThrottledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("UnsupportedOperation")) + if (errorTypeName != null && errorTypeName.Equals("UnsupportedOperation")) { return UnsupportedOperationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static ChangeMessageVisibilityResponseUnmarshaller _instance = new ChangeMessageVisibilityResponseUnmarshaller(); diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/CreateQueueResponseUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/CreateQueueResponseUnmarshaller.cs index aa2d7225ec0b..2a645aad61b0 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/CreateQueueResponseUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/CreateQueueResponseUnmarshaller.cs @@ -79,63 +79,61 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAddress")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InvalidAddress")) { return InvalidAddressExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAttributeName")) + if (errorTypeName != null && errorTypeName.Equals("InvalidAttributeName")) { return InvalidAttributeNameExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAttributeValue")) + if (errorTypeName != null && errorTypeName.Equals("InvalidAttributeValue")) { return InvalidAttributeValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidSecurity")) + if (errorTypeName != null && errorTypeName.Equals("InvalidSecurity")) { return InvalidSecurityExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("QueueDeletedRecently")) + if (errorTypeName != null && errorTypeName.Equals("QueueDeletedRecently")) { return QueueDeletedRecentlyExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("QueueNameExists")) + if (errorTypeName != null && errorTypeName.Equals("QueueNameExists")) { return QueueNameExistsExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("RequestThrottled")) + if (errorTypeName != null && errorTypeName.Equals("RequestThrottled")) { return RequestThrottledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("UnsupportedOperation")) + if (errorTypeName != null && errorTypeName.Equals("UnsupportedOperation")) { return UnsupportedOperationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static CreateQueueResponseUnmarshaller _instance = new CreateQueueResponseUnmarshaller(); diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/DeleteMessageBatchResponseUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/DeleteMessageBatchResponseUnmarshaller.cs index 8348a02b3e54..262a7d445e6f 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/DeleteMessageBatchResponseUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/DeleteMessageBatchResponseUnmarshaller.cs @@ -85,67 +85,65 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("BatchEntryIdsNotDistinct")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("BatchEntryIdsNotDistinct")) { return BatchEntryIdsNotDistinctExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("EmptyBatchRequest")) + if (errorTypeName != null && errorTypeName.Equals("EmptyBatchRequest")) { return EmptyBatchRequestExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAddress")) + if (errorTypeName != null && errorTypeName.Equals("InvalidAddress")) { return InvalidAddressExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidBatchEntryId")) + if (errorTypeName != null && errorTypeName.Equals("InvalidBatchEntryId")) { return InvalidBatchEntryIdExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidSecurity")) + if (errorTypeName != null && errorTypeName.Equals("InvalidSecurity")) { return InvalidSecurityExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("QueueDoesNotExist")) + if (errorTypeName != null && errorTypeName.Equals("QueueDoesNotExist")) { return QueueDoesNotExistExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("RequestThrottled")) + if (errorTypeName != null && errorTypeName.Equals("RequestThrottled")) { return RequestThrottledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("TooManyEntriesInBatchRequest")) + if (errorTypeName != null && errorTypeName.Equals("TooManyEntriesInBatchRequest")) { return TooManyEntriesInBatchRequestExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("UnsupportedOperation")) + if (errorTypeName != null && errorTypeName.Equals("UnsupportedOperation")) { return UnsupportedOperationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static DeleteMessageBatchResponseUnmarshaller _instance = new DeleteMessageBatchResponseUnmarshaller(); diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/DeleteMessageResponseUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/DeleteMessageResponseUnmarshaller.cs index 91741167dfcd..e8e06d95407e 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/DeleteMessageResponseUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/DeleteMessageResponseUnmarshaller.cs @@ -68,59 +68,57 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAddress")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InvalidAddress")) { return InvalidAddressExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidIdFormat")) + if (errorTypeName != null && errorTypeName.Equals("InvalidIdFormat")) { return InvalidIdFormatExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidSecurity")) + if (errorTypeName != null && errorTypeName.Equals("InvalidSecurity")) { return InvalidSecurityExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("QueueDoesNotExist")) + if (errorTypeName != null && errorTypeName.Equals("QueueDoesNotExist")) { return QueueDoesNotExistExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("ReceiptHandleIsInvalid")) + if (errorTypeName != null && errorTypeName.Equals("ReceiptHandleIsInvalid")) { return ReceiptHandleIsInvalidExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("RequestThrottled")) + if (errorTypeName != null && errorTypeName.Equals("RequestThrottled")) { return RequestThrottledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("UnsupportedOperation")) + if (errorTypeName != null && errorTypeName.Equals("UnsupportedOperation")) { return UnsupportedOperationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static DeleteMessageResponseUnmarshaller _instance = new DeleteMessageResponseUnmarshaller(); diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/DeleteQueueResponseUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/DeleteQueueResponseUnmarshaller.cs index c69ab6f69883..6f13a67bef96 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/DeleteQueueResponseUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/DeleteQueueResponseUnmarshaller.cs @@ -68,51 +68,49 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAddress")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InvalidAddress")) { return InvalidAddressExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidSecurity")) + if (errorTypeName != null && errorTypeName.Equals("InvalidSecurity")) { return InvalidSecurityExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("QueueDoesNotExist")) + if (errorTypeName != null && errorTypeName.Equals("QueueDoesNotExist")) { return QueueDoesNotExistExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("RequestThrottled")) + if (errorTypeName != null && errorTypeName.Equals("RequestThrottled")) { return RequestThrottledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("UnsupportedOperation")) + if (errorTypeName != null && errorTypeName.Equals("UnsupportedOperation")) { return UnsupportedOperationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static DeleteQueueResponseUnmarshaller _instance = new DeleteQueueResponseUnmarshaller(); diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/EmptyBatchRequestExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/EmptyBatchRequestExceptionUnmarshaller.cs index 1ebcdac5e771..fe271cb04fec 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/EmptyBatchRequestExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/EmptyBatchRequestExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public EmptyBatchRequestException Unmarshall(JsonUnmarshallerContext context, Am { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } EmptyBatchRequestException unmarshalledObject = new EmptyBatchRequestException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/GetQueueAttributesResponseUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/GetQueueAttributesResponseUnmarshaller.cs index 95ce3c798e46..dfb8d68bc8ab 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/GetQueueAttributesResponseUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/GetQueueAttributesResponseUnmarshaller.cs @@ -79,55 +79,53 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAddress")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InvalidAddress")) { return InvalidAddressExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAttributeName")) + if (errorTypeName != null && errorTypeName.Equals("InvalidAttributeName")) { return InvalidAttributeNameExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidSecurity")) + if (errorTypeName != null && errorTypeName.Equals("InvalidSecurity")) { return InvalidSecurityExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("QueueDoesNotExist")) + if (errorTypeName != null && errorTypeName.Equals("QueueDoesNotExist")) { return QueueDoesNotExistExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("RequestThrottled")) + if (errorTypeName != null && errorTypeName.Equals("RequestThrottled")) { return RequestThrottledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("UnsupportedOperation")) + if (errorTypeName != null && errorTypeName.Equals("UnsupportedOperation")) { return UnsupportedOperationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static GetQueueAttributesResponseUnmarshaller _instance = new GetQueueAttributesResponseUnmarshaller(); diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/GetQueueUrlResponseUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/GetQueueUrlResponseUnmarshaller.cs index a6570571cdcb..cecab070c9e9 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/GetQueueUrlResponseUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/GetQueueUrlResponseUnmarshaller.cs @@ -79,51 +79,49 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAddress")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InvalidAddress")) { return InvalidAddressExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidSecurity")) + if (errorTypeName != null && errorTypeName.Equals("InvalidSecurity")) { return InvalidSecurityExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("QueueDoesNotExist")) + if (errorTypeName != null && errorTypeName.Equals("QueueDoesNotExist")) { return QueueDoesNotExistExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("RequestThrottled")) + if (errorTypeName != null && errorTypeName.Equals("RequestThrottled")) { return RequestThrottledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("UnsupportedOperation")) + if (errorTypeName != null && errorTypeName.Equals("UnsupportedOperation")) { return UnsupportedOperationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static GetQueueUrlResponseUnmarshaller _instance = new GetQueueUrlResponseUnmarshaller(); diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidAddressExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidAddressExceptionUnmarshaller.cs index c643c83a34d4..a8df39d47e39 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidAddressExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidAddressExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public InvalidAddressException Unmarshall(JsonUnmarshallerContext context, Amazo { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } InvalidAddressException unmarshalledObject = new InvalidAddressException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidAttributeNameExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidAttributeNameExceptionUnmarshaller.cs index 8a70e796e1f9..df2d2ccb7fe1 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidAttributeNameExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidAttributeNameExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public InvalidAttributeNameException Unmarshall(JsonUnmarshallerContext context, { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } InvalidAttributeNameException unmarshalledObject = new InvalidAttributeNameException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidAttributeValueExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidAttributeValueExceptionUnmarshaller.cs index 361999d1e68e..0a05c8f62628 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidAttributeValueExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidAttributeValueExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public InvalidAttributeValueException Unmarshall(JsonUnmarshallerContext context { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } InvalidAttributeValueException unmarshalledObject = new InvalidAttributeValueException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidBatchEntryIdExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidBatchEntryIdExceptionUnmarshaller.cs index 5a86b03c32e5..1d57a1e99fff 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidBatchEntryIdExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidBatchEntryIdExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public InvalidBatchEntryIdException Unmarshall(JsonUnmarshallerContext context, { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } InvalidBatchEntryIdException unmarshalledObject = new InvalidBatchEntryIdException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidIdFormatExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidIdFormatExceptionUnmarshaller.cs index e52cf848f712..c96bb79ad1b0 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidIdFormatExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidIdFormatExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public InvalidIdFormatException Unmarshall(JsonUnmarshallerContext context, Amaz { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } InvalidIdFormatException unmarshalledObject = new InvalidIdFormatException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidMessageContentsExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidMessageContentsExceptionUnmarshaller.cs index 9d06dac5719e..74a48a44403e 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidMessageContentsExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidMessageContentsExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public InvalidMessageContentsException Unmarshall(JsonUnmarshallerContext contex { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } InvalidMessageContentsException unmarshalledObject = new InvalidMessageContentsException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidSecurityExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidSecurityExceptionUnmarshaller.cs index ce7d598ce5cb..839fa20247a7 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidSecurityExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/InvalidSecurityExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public InvalidSecurityException Unmarshall(JsonUnmarshallerContext context, Amaz { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } InvalidSecurityException unmarshalledObject = new InvalidSecurityException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsAccessDeniedExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsAccessDeniedExceptionUnmarshaller.cs index 3c9ebef153b2..f249a650f6c2 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsAccessDeniedExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsAccessDeniedExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public KmsAccessDeniedException Unmarshall(JsonUnmarshallerContext context, Amaz { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } KmsAccessDeniedException unmarshalledObject = new KmsAccessDeniedException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsDisabledExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsDisabledExceptionUnmarshaller.cs index d1da584c32fb..e1d7458cf0df 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsDisabledExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsDisabledExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public KmsDisabledException Unmarshall(JsonUnmarshallerContext context, Amazon.R { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } KmsDisabledException unmarshalledObject = new KmsDisabledException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsInvalidKeyUsageExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsInvalidKeyUsageExceptionUnmarshaller.cs index 3921ae476e8a..676378a4eb17 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsInvalidKeyUsageExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsInvalidKeyUsageExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public KmsInvalidKeyUsageException Unmarshall(JsonUnmarshallerContext context, A { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } KmsInvalidKeyUsageException unmarshalledObject = new KmsInvalidKeyUsageException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsInvalidStateExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsInvalidStateExceptionUnmarshaller.cs index ad892962535f..5b0ce7d31b43 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsInvalidStateExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsInvalidStateExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public KmsInvalidStateException Unmarshall(JsonUnmarshallerContext context, Amaz { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } KmsInvalidStateException unmarshalledObject = new KmsInvalidStateException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsNotFoundExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsNotFoundExceptionUnmarshaller.cs index 18a5eb421cfa..e59e86ac6131 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsNotFoundExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsNotFoundExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public KmsNotFoundException Unmarshall(JsonUnmarshallerContext context, Amazon.R { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } KmsNotFoundException unmarshalledObject = new KmsNotFoundException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsOptInRequiredExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsOptInRequiredExceptionUnmarshaller.cs index 7bbe2870f832..75cba22bee28 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsOptInRequiredExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsOptInRequiredExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public KmsOptInRequiredException Unmarshall(JsonUnmarshallerContext context, Ama { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } KmsOptInRequiredException unmarshalledObject = new KmsOptInRequiredException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsThrottledExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsThrottledExceptionUnmarshaller.cs index ede516629f1d..ed121e6f1c52 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsThrottledExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/KmsThrottledExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public KmsThrottledException Unmarshall(JsonUnmarshallerContext context, Amazon. { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } KmsThrottledException unmarshalledObject = new KmsThrottledException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ListDeadLetterSourceQueuesResponseUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ListDeadLetterSourceQueuesResponseUnmarshaller.cs index 70c23b749112..6e3f32795838 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ListDeadLetterSourceQueuesResponseUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ListDeadLetterSourceQueuesResponseUnmarshaller.cs @@ -85,51 +85,49 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAddress")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InvalidAddress")) { return InvalidAddressExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidSecurity")) + if (errorTypeName != null && errorTypeName.Equals("InvalidSecurity")) { return InvalidSecurityExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("QueueDoesNotExist")) + if (errorTypeName != null && errorTypeName.Equals("QueueDoesNotExist")) { return QueueDoesNotExistExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("RequestThrottled")) + if (errorTypeName != null && errorTypeName.Equals("RequestThrottled")) { return RequestThrottledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("UnsupportedOperation")) + if (errorTypeName != null && errorTypeName.Equals("UnsupportedOperation")) { return UnsupportedOperationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static ListDeadLetterSourceQueuesResponseUnmarshaller _instance = new ListDeadLetterSourceQueuesResponseUnmarshaller(); diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ListMessageMoveTasksResponseUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ListMessageMoveTasksResponseUnmarshaller.cs index 645cb79da5b1..361e74d856b9 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ListMessageMoveTasksResponseUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ListMessageMoveTasksResponseUnmarshaller.cs @@ -79,51 +79,49 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAddress")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InvalidAddress")) { return InvalidAddressExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidSecurity")) + if (errorTypeName != null && errorTypeName.Equals("InvalidSecurity")) { return InvalidSecurityExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("RequestThrottled")) + if (errorTypeName != null && errorTypeName.Equals("RequestThrottled")) { return RequestThrottledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("ResourceNotFoundException")) + if (errorTypeName != null && errorTypeName.Equals("ResourceNotFoundException")) { return ResourceNotFoundExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("UnsupportedOperation")) + if (errorTypeName != null && errorTypeName.Equals("UnsupportedOperation")) { return UnsupportedOperationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static ListMessageMoveTasksResponseUnmarshaller _instance = new ListMessageMoveTasksResponseUnmarshaller(); diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ListQueueTagsResponseUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ListQueueTagsResponseUnmarshaller.cs index ce70e6a20671..48b2f0ef36e3 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ListQueueTagsResponseUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ListQueueTagsResponseUnmarshaller.cs @@ -79,51 +79,49 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAddress")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InvalidAddress")) { return InvalidAddressExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidSecurity")) + if (errorTypeName != null && errorTypeName.Equals("InvalidSecurity")) { return InvalidSecurityExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("QueueDoesNotExist")) + if (errorTypeName != null && errorTypeName.Equals("QueueDoesNotExist")) { return QueueDoesNotExistExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("RequestThrottled")) + if (errorTypeName != null && errorTypeName.Equals("RequestThrottled")) { return RequestThrottledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("UnsupportedOperation")) + if (errorTypeName != null && errorTypeName.Equals("UnsupportedOperation")) { return UnsupportedOperationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static ListQueueTagsResponseUnmarshaller _instance = new ListQueueTagsResponseUnmarshaller(); diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ListQueuesResponseUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ListQueuesResponseUnmarshaller.cs index efc62b1ee04b..7b7de78f1675 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ListQueuesResponseUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ListQueuesResponseUnmarshaller.cs @@ -85,47 +85,45 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAddress")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InvalidAddress")) { return InvalidAddressExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidSecurity")) + if (errorTypeName != null && errorTypeName.Equals("InvalidSecurity")) { return InvalidSecurityExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("RequestThrottled")) + if (errorTypeName != null && errorTypeName.Equals("RequestThrottled")) { return RequestThrottledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("UnsupportedOperation")) + if (errorTypeName != null && errorTypeName.Equals("UnsupportedOperation")) { return UnsupportedOperationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static ListQueuesResponseUnmarshaller _instance = new ListQueuesResponseUnmarshaller(); diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/MessageNotInflightExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/MessageNotInflightExceptionUnmarshaller.cs index 4a92a4ddd638..4bb356db7f12 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/MessageNotInflightExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/MessageNotInflightExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public MessageNotInflightException Unmarshall(JsonUnmarshallerContext context, A { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } MessageNotInflightException unmarshalledObject = new MessageNotInflightException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/OverLimitExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/OverLimitExceptionUnmarshaller.cs index cd436b109ed3..5b15667524fd 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/OverLimitExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/OverLimitExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public OverLimitException Unmarshall(JsonUnmarshallerContext context, Amazon.Run { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } OverLimitException unmarshalledObject = new OverLimitException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/PurgeQueueInProgressExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/PurgeQueueInProgressExceptionUnmarshaller.cs index 3b31336060a9..2d1444a320b5 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/PurgeQueueInProgressExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/PurgeQueueInProgressExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public PurgeQueueInProgressException Unmarshall(JsonUnmarshallerContext context, { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } PurgeQueueInProgressException unmarshalledObject = new PurgeQueueInProgressException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/PurgeQueueResponseUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/PurgeQueueResponseUnmarshaller.cs index 6e8e282ca9ad..90b62fcd6e2c 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/PurgeQueueResponseUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/PurgeQueueResponseUnmarshaller.cs @@ -68,55 +68,53 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAddress")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InvalidAddress")) { return InvalidAddressExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidSecurity")) + if (errorTypeName != null && errorTypeName.Equals("InvalidSecurity")) { return InvalidSecurityExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("PurgeQueueInProgress")) + if (errorTypeName != null && errorTypeName.Equals("PurgeQueueInProgress")) { return PurgeQueueInProgressExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("QueueDoesNotExist")) + if (errorTypeName != null && errorTypeName.Equals("QueueDoesNotExist")) { return QueueDoesNotExistExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("RequestThrottled")) + if (errorTypeName != null && errorTypeName.Equals("RequestThrottled")) { return RequestThrottledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("UnsupportedOperation")) + if (errorTypeName != null && errorTypeName.Equals("UnsupportedOperation")) { return UnsupportedOperationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static PurgeQueueResponseUnmarshaller _instance = new PurgeQueueResponseUnmarshaller(); diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/QueueDeletedRecentlyExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/QueueDeletedRecentlyExceptionUnmarshaller.cs index c700acfc8974..ca226c4faf6f 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/QueueDeletedRecentlyExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/QueueDeletedRecentlyExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public QueueDeletedRecentlyException Unmarshall(JsonUnmarshallerContext context, { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } QueueDeletedRecentlyException unmarshalledObject = new QueueDeletedRecentlyException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/QueueDoesNotExistExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/QueueDoesNotExistExceptionUnmarshaller.cs index b0c3e7b763dd..42d6c9185c0d 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/QueueDoesNotExistExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/QueueDoesNotExistExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public QueueDoesNotExistException Unmarshall(JsonUnmarshallerContext context, Am { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } QueueDoesNotExistException unmarshalledObject = new QueueDoesNotExistException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/QueueNameExistsExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/QueueNameExistsExceptionUnmarshaller.cs index 73496be2b31c..2540f3b56ff1 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/QueueNameExistsExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/QueueNameExistsExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public QueueNameExistsException Unmarshall(JsonUnmarshallerContext context, Amaz { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } QueueNameExistsException unmarshalledObject = new QueueNameExistsException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ReceiptHandleIsInvalidExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ReceiptHandleIsInvalidExceptionUnmarshaller.cs index 6a03c2e54a8e..ccda70b80ebd 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ReceiptHandleIsInvalidExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ReceiptHandleIsInvalidExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public ReceiptHandleIsInvalidException Unmarshall(JsonUnmarshallerContext contex { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } ReceiptHandleIsInvalidException unmarshalledObject = new ReceiptHandleIsInvalidException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ReceiveMessageResponseUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ReceiveMessageResponseUnmarshaller.cs index 28c29a16eea6..1bd03ce515d3 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ReceiveMessageResponseUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ReceiveMessageResponseUnmarshaller.cs @@ -79,83 +79,81 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAddress")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InvalidAddress")) { return InvalidAddressExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidSecurity")) + if (errorTypeName != null && errorTypeName.Equals("InvalidSecurity")) { return InvalidSecurityExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("KmsAccessDenied")) + if (errorTypeName != null && errorTypeName.Equals("KmsAccessDenied")) { return KmsAccessDeniedExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("KmsDisabled")) + if (errorTypeName != null && errorTypeName.Equals("KmsDisabled")) { return KmsDisabledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("KmsInvalidKeyUsage")) + if (errorTypeName != null && errorTypeName.Equals("KmsInvalidKeyUsage")) { return KmsInvalidKeyUsageExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("KmsInvalidState")) + if (errorTypeName != null && errorTypeName.Equals("KmsInvalidState")) { return KmsInvalidStateExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("KmsNotFound")) + if (errorTypeName != null && errorTypeName.Equals("KmsNotFound")) { return KmsNotFoundExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("KmsOptInRequired")) + if (errorTypeName != null && errorTypeName.Equals("KmsOptInRequired")) { return KmsOptInRequiredExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("KmsThrottled")) + if (errorTypeName != null && errorTypeName.Equals("KmsThrottled")) { return KmsThrottledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("OverLimit")) + if (errorTypeName != null && errorTypeName.Equals("OverLimit")) { return OverLimitExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("QueueDoesNotExist")) + if (errorTypeName != null && errorTypeName.Equals("QueueDoesNotExist")) { return QueueDoesNotExistExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("RequestThrottled")) + if (errorTypeName != null && errorTypeName.Equals("RequestThrottled")) { return RequestThrottledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("UnsupportedOperation")) + if (errorTypeName != null && errorTypeName.Equals("UnsupportedOperation")) { return UnsupportedOperationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static ReceiveMessageResponseUnmarshaller _instance = new ReceiveMessageResponseUnmarshaller(); diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/RemovePermissionResponseUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/RemovePermissionResponseUnmarshaller.cs index b4403f002e57..f85356f6d7d0 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/RemovePermissionResponseUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/RemovePermissionResponseUnmarshaller.cs @@ -68,51 +68,49 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAddress")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InvalidAddress")) { return InvalidAddressExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidSecurity")) + if (errorTypeName != null && errorTypeName.Equals("InvalidSecurity")) { return InvalidSecurityExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("QueueDoesNotExist")) + if (errorTypeName != null && errorTypeName.Equals("QueueDoesNotExist")) { return QueueDoesNotExistExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("RequestThrottled")) + if (errorTypeName != null && errorTypeName.Equals("RequestThrottled")) { return RequestThrottledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("UnsupportedOperation")) + if (errorTypeName != null && errorTypeName.Equals("UnsupportedOperation")) { return UnsupportedOperationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static RemovePermissionResponseUnmarshaller _instance = new RemovePermissionResponseUnmarshaller(); diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/RequestThrottledExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/RequestThrottledExceptionUnmarshaller.cs index 1e461e36fcd8..e99a087e4a1d 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/RequestThrottledExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/RequestThrottledExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public RequestThrottledException Unmarshall(JsonUnmarshallerContext context, Ama { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } RequestThrottledException unmarshalledObject = new RequestThrottledException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ResourceNotFoundExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ResourceNotFoundExceptionUnmarshaller.cs index 51796912e7b1..c56d67f105ab 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ResourceNotFoundExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/ResourceNotFoundExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public ResourceNotFoundException Unmarshall(JsonUnmarshallerContext context, Ama { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } ResourceNotFoundException unmarshalledObject = new ResourceNotFoundException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/SendMessageBatchResponseUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/SendMessageBatchResponseUnmarshaller.cs index 40a8f5635c00..024bfaa983b7 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/SendMessageBatchResponseUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/SendMessageBatchResponseUnmarshaller.cs @@ -85,99 +85,97 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("BatchEntryIdsNotDistinct")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("BatchEntryIdsNotDistinct")) { return BatchEntryIdsNotDistinctExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("BatchRequestTooLong")) + if (errorTypeName != null && errorTypeName.Equals("BatchRequestTooLong")) { return BatchRequestTooLongExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("EmptyBatchRequest")) + if (errorTypeName != null && errorTypeName.Equals("EmptyBatchRequest")) { return EmptyBatchRequestExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAddress")) + if (errorTypeName != null && errorTypeName.Equals("InvalidAddress")) { return InvalidAddressExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidBatchEntryId")) + if (errorTypeName != null && errorTypeName.Equals("InvalidBatchEntryId")) { return InvalidBatchEntryIdExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidSecurity")) + if (errorTypeName != null && errorTypeName.Equals("InvalidSecurity")) { return InvalidSecurityExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("KmsAccessDenied")) + if (errorTypeName != null && errorTypeName.Equals("KmsAccessDenied")) { return KmsAccessDeniedExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("KmsDisabled")) + if (errorTypeName != null && errorTypeName.Equals("KmsDisabled")) { return KmsDisabledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("KmsInvalidKeyUsage")) + if (errorTypeName != null && errorTypeName.Equals("KmsInvalidKeyUsage")) { return KmsInvalidKeyUsageExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("KmsInvalidState")) + if (errorTypeName != null && errorTypeName.Equals("KmsInvalidState")) { return KmsInvalidStateExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("KmsNotFound")) + if (errorTypeName != null && errorTypeName.Equals("KmsNotFound")) { return KmsNotFoundExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("KmsOptInRequired")) + if (errorTypeName != null && errorTypeName.Equals("KmsOptInRequired")) { return KmsOptInRequiredExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("KmsThrottled")) + if (errorTypeName != null && errorTypeName.Equals("KmsThrottled")) { return KmsThrottledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("QueueDoesNotExist")) + if (errorTypeName != null && errorTypeName.Equals("QueueDoesNotExist")) { return QueueDoesNotExistExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("RequestThrottled")) + if (errorTypeName != null && errorTypeName.Equals("RequestThrottled")) { return RequestThrottledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("TooManyEntriesInBatchRequest")) + if (errorTypeName != null && errorTypeName.Equals("TooManyEntriesInBatchRequest")) { return TooManyEntriesInBatchRequestExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("UnsupportedOperation")) + if (errorTypeName != null && errorTypeName.Equals("UnsupportedOperation")) { return UnsupportedOperationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static SendMessageBatchResponseUnmarshaller _instance = new SendMessageBatchResponseUnmarshaller(); diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/SendMessageResponseUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/SendMessageResponseUnmarshaller.cs index 4dda0cdc07f7..f8aefdefd6b8 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/SendMessageResponseUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/SendMessageResponseUnmarshaller.cs @@ -103,83 +103,81 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAddress")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InvalidAddress")) { return InvalidAddressExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidMessageContents")) + if (errorTypeName != null && errorTypeName.Equals("InvalidMessageContents")) { return InvalidMessageContentsExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidSecurity")) + if (errorTypeName != null && errorTypeName.Equals("InvalidSecurity")) { return InvalidSecurityExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("KmsAccessDenied")) + if (errorTypeName != null && errorTypeName.Equals("KmsAccessDenied")) { return KmsAccessDeniedExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("KmsDisabled")) + if (errorTypeName != null && errorTypeName.Equals("KmsDisabled")) { return KmsDisabledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("KmsInvalidKeyUsage")) + if (errorTypeName != null && errorTypeName.Equals("KmsInvalidKeyUsage")) { return KmsInvalidKeyUsageExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("KmsInvalidState")) + if (errorTypeName != null && errorTypeName.Equals("KmsInvalidState")) { return KmsInvalidStateExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("KmsNotFound")) + if (errorTypeName != null && errorTypeName.Equals("KmsNotFound")) { return KmsNotFoundExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("KmsOptInRequired")) + if (errorTypeName != null && errorTypeName.Equals("KmsOptInRequired")) { return KmsOptInRequiredExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("KmsThrottled")) + if (errorTypeName != null && errorTypeName.Equals("KmsThrottled")) { return KmsThrottledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("QueueDoesNotExist")) + if (errorTypeName != null && errorTypeName.Equals("QueueDoesNotExist")) { return QueueDoesNotExistExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("RequestThrottled")) + if (errorTypeName != null && errorTypeName.Equals("RequestThrottled")) { return RequestThrottledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("UnsupportedOperation")) + if (errorTypeName != null && errorTypeName.Equals("UnsupportedOperation")) { return UnsupportedOperationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static SendMessageResponseUnmarshaller _instance = new SendMessageResponseUnmarshaller(); diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/SetQueueAttributesResponseUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/SetQueueAttributesResponseUnmarshaller.cs index 98ea16704018..d6d73efe05ec 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/SetQueueAttributesResponseUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/SetQueueAttributesResponseUnmarshaller.cs @@ -68,63 +68,61 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAddress")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InvalidAddress")) { return InvalidAddressExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAttributeName")) + if (errorTypeName != null && errorTypeName.Equals("InvalidAttributeName")) { return InvalidAttributeNameExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAttributeValue")) + if (errorTypeName != null && errorTypeName.Equals("InvalidAttributeValue")) { return InvalidAttributeValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidSecurity")) + if (errorTypeName != null && errorTypeName.Equals("InvalidSecurity")) { return InvalidSecurityExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("OverLimit")) + if (errorTypeName != null && errorTypeName.Equals("OverLimit")) { return OverLimitExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("QueueDoesNotExist")) + if (errorTypeName != null && errorTypeName.Equals("QueueDoesNotExist")) { return QueueDoesNotExistExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("RequestThrottled")) + if (errorTypeName != null && errorTypeName.Equals("RequestThrottled")) { return RequestThrottledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("UnsupportedOperation")) + if (errorTypeName != null && errorTypeName.Equals("UnsupportedOperation")) { return UnsupportedOperationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static SetQueueAttributesResponseUnmarshaller _instance = new SetQueueAttributesResponseUnmarshaller(); diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/StartMessageMoveTaskResponseUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/StartMessageMoveTaskResponseUnmarshaller.cs index c5a45a66b65a..fbf80268677a 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/StartMessageMoveTaskResponseUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/StartMessageMoveTaskResponseUnmarshaller.cs @@ -79,51 +79,49 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAddress")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InvalidAddress")) { return InvalidAddressExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidSecurity")) + if (errorTypeName != null && errorTypeName.Equals("InvalidSecurity")) { return InvalidSecurityExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("RequestThrottled")) + if (errorTypeName != null && errorTypeName.Equals("RequestThrottled")) { return RequestThrottledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("ResourceNotFoundException")) + if (errorTypeName != null && errorTypeName.Equals("ResourceNotFoundException")) { return ResourceNotFoundExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("UnsupportedOperation")) + if (errorTypeName != null && errorTypeName.Equals("UnsupportedOperation")) { return UnsupportedOperationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static StartMessageMoveTaskResponseUnmarshaller _instance = new StartMessageMoveTaskResponseUnmarshaller(); diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/TagQueueResponseUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/TagQueueResponseUnmarshaller.cs index 00f08fdbdb6d..02b0af7e7dad 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/TagQueueResponseUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/TagQueueResponseUnmarshaller.cs @@ -68,51 +68,49 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAddress")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InvalidAddress")) { return InvalidAddressExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidSecurity")) + if (errorTypeName != null && errorTypeName.Equals("InvalidSecurity")) { return InvalidSecurityExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("QueueDoesNotExist")) + if (errorTypeName != null && errorTypeName.Equals("QueueDoesNotExist")) { return QueueDoesNotExistExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("RequestThrottled")) + if (errorTypeName != null && errorTypeName.Equals("RequestThrottled")) { return RequestThrottledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("UnsupportedOperation")) + if (errorTypeName != null && errorTypeName.Equals("UnsupportedOperation")) { return UnsupportedOperationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static TagQueueResponseUnmarshaller _instance = new TagQueueResponseUnmarshaller(); diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/TooManyEntriesInBatchRequestExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/TooManyEntriesInBatchRequestExceptionUnmarshaller.cs index 2691ebff7a98..507f66cd4bc2 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/TooManyEntriesInBatchRequestExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/TooManyEntriesInBatchRequestExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public TooManyEntriesInBatchRequestException Unmarshall(JsonUnmarshallerContext { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } TooManyEntriesInBatchRequestException unmarshalledObject = new TooManyEntriesInBatchRequestException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/UnsupportedOperationExceptionUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/UnsupportedOperationExceptionUnmarshaller.cs index 709b969cbaa4..b1e1070e1722 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/UnsupportedOperationExceptionUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/UnsupportedOperationExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public UnsupportedOperationException Unmarshall(JsonUnmarshallerContext context, { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } UnsupportedOperationException unmarshalledObject = new UnsupportedOperationException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/UntagQueueResponseUnmarshaller.cs b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/UntagQueueResponseUnmarshaller.cs index 6e0faa253a7e..818621d1299a 100644 --- a/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/UntagQueueResponseUnmarshaller.cs +++ b/sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/UntagQueueResponseUnmarshaller.cs @@ -68,51 +68,49 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidAddress")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) + { + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + { + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) + { + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } + } + } + } + if (errorTypeName != null && errorTypeName.Equals("InvalidAddress")) { return InvalidAddressExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidSecurity")) + if (errorTypeName != null && errorTypeName.Equals("InvalidSecurity")) { return InvalidSecurityExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("QueueDoesNotExist")) + if (errorTypeName != null && errorTypeName.Equals("QueueDoesNotExist")) { return QueueDoesNotExistExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("RequestThrottled")) + if (errorTypeName != null && errorTypeName.Equals("RequestThrottled")) { return RequestThrottledExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } - if (errorResponse.Code != null && errorResponse.Code.Equals("UnsupportedOperation")) + if (errorTypeName != null && errorTypeName.Equals("UnsupportedOperation")) { return UnsupportedOperationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); } } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } - return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonSQSException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static UntagQueueResponseUnmarshaller _instance = new UntagQueueResponseUnmarshaller(); diff --git a/sdk/test/Services/QueryCompatible/Generated/Model/Internal/MarshallTransformations/CreateQueueResponseUnmarshaller.cs b/sdk/test/Services/QueryCompatible/Generated/Model/Internal/MarshallTransformations/CreateQueueResponseUnmarshaller.cs index c050415f9802..f18f27381705 100644 --- a/sdk/test/Services/QueryCompatible/Generated/Model/Internal/MarshallTransformations/CreateQueueResponseUnmarshaller.cs +++ b/sdk/test/Services/QueryCompatible/Generated/Model/Internal/MarshallTransformations/CreateQueueResponseUnmarshaller.cs @@ -79,39 +79,37 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("QueueDeletedRecently")) - { - return QueueDeletedRecentlyExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); - } - if (errorResponse.Code != null && errorResponse.Code.Equals("QueueNameExists")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) { - return QueueNameExistsExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); - } - } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } } } } + if (errorTypeName != null && errorTypeName.Equals("QueueDeletedRecently")) + { + return QueueDeletedRecentlyExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); + } + if (errorTypeName != null && errorTypeName.Equals("QueueNameExists")) + { + return QueueNameExistsExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); + } } - return new AmazonQueryCompatibleException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonQueryCompatibleException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static CreateQueueResponseUnmarshaller _instance = new CreateQueueResponseUnmarshaller(); diff --git a/sdk/test/Services/QueryCompatible/Generated/Model/Internal/MarshallTransformations/MemberRefOpResponseUnmarshaller.cs b/sdk/test/Services/QueryCompatible/Generated/Model/Internal/MarshallTransformations/MemberRefOpResponseUnmarshaller.cs index 4f172ee9f745..e87de5ccfc66 100644 --- a/sdk/test/Services/QueryCompatible/Generated/Model/Internal/MarshallTransformations/MemberRefOpResponseUnmarshaller.cs +++ b/sdk/test/Services/QueryCompatible/Generated/Model/Internal/MarshallTransformations/MemberRefOpResponseUnmarshaller.cs @@ -68,31 +68,29 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } } } } } - return new AmazonQueryCompatibleException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonQueryCompatibleException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static MemberRefOpResponseUnmarshaller _instance = new MemberRefOpResponseUnmarshaller(); diff --git a/sdk/test/Services/QueryCompatible/Generated/Model/Internal/MarshallTransformations/QueueDeletedRecentlyExceptionUnmarshaller.cs b/sdk/test/Services/QueryCompatible/Generated/Model/Internal/MarshallTransformations/QueueDeletedRecentlyExceptionUnmarshaller.cs index de352495e27a..b209f7199aaa 100644 --- a/sdk/test/Services/QueryCompatible/Generated/Model/Internal/MarshallTransformations/QueueDeletedRecentlyExceptionUnmarshaller.cs +++ b/sdk/test/Services/QueryCompatible/Generated/Model/Internal/MarshallTransformations/QueueDeletedRecentlyExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public QueueDeletedRecentlyException Unmarshall(JsonUnmarshallerContext context, { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } QueueDeletedRecentlyException unmarshalledObject = new QueueDeletedRecentlyException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/test/Services/QueryCompatible/Generated/Model/Internal/MarshallTransformations/QueueNameExistsExceptionUnmarshaller.cs b/sdk/test/Services/QueryCompatible/Generated/Model/Internal/MarshallTransformations/QueueNameExistsExceptionUnmarshaller.cs index 5a3ce52925be..3d55da29903c 100644 --- a/sdk/test/Services/QueryCompatible/Generated/Model/Internal/MarshallTransformations/QueueNameExistsExceptionUnmarshaller.cs +++ b/sdk/test/Services/QueryCompatible/Generated/Model/Internal/MarshallTransformations/QueueNameExistsExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public QueueNameExistsException Unmarshall(JsonUnmarshallerContext context, Amaz { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } QueueNameExistsException unmarshalledObject = new QueueNameExistsException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/test/Services/QueryCompatible/Generated/Model/Internal/MarshallTransformations/StaticOpResponseUnmarshaller.cs b/sdk/test/Services/QueryCompatible/Generated/Model/Internal/MarshallTransformations/StaticOpResponseUnmarshaller.cs index 0ca74df72bfa..1c27bc695062 100644 --- a/sdk/test/Services/QueryCompatible/Generated/Model/Internal/MarshallTransformations/StaticOpResponseUnmarshaller.cs +++ b/sdk/test/Services/QueryCompatible/Generated/Model/Internal/MarshallTransformations/StaticOpResponseUnmarshaller.cs @@ -68,31 +68,29 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } } } } } - return new AmazonQueryCompatibleException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonQueryCompatibleException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static StaticOpResponseUnmarshaller _instance = new StaticOpResponseUnmarshaller(); diff --git a/sdk/test/Services/QueryCompatibleJSONRPC10/Generated/Model/Internal/MarshallTransformations/CustomCodeErrorExceptionUnmarshaller.cs b/sdk/test/Services/QueryCompatibleJSONRPC10/Generated/Model/Internal/MarshallTransformations/CustomCodeErrorExceptionUnmarshaller.cs index ebfd4d955082..4c38442660c3 100644 --- a/sdk/test/Services/QueryCompatibleJSONRPC10/Generated/Model/Internal/MarshallTransformations/CustomCodeErrorExceptionUnmarshaller.cs +++ b/sdk/test/Services/QueryCompatibleJSONRPC10/Generated/Model/Internal/MarshallTransformations/CustomCodeErrorExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public CustomCodeErrorException Unmarshall(JsonUnmarshallerContext context, Amaz { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } CustomCodeErrorException unmarshalledObject = new CustomCodeErrorException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/test/Services/QueryCompatibleJSONRPC10/Generated/Model/Internal/MarshallTransformations/NoCustomCodeErrorExceptionUnmarshaller.cs b/sdk/test/Services/QueryCompatibleJSONRPC10/Generated/Model/Internal/MarshallTransformations/NoCustomCodeErrorExceptionUnmarshaller.cs index 7b334ec49095..66903c8f2c1d 100644 --- a/sdk/test/Services/QueryCompatibleJSONRPC10/Generated/Model/Internal/MarshallTransformations/NoCustomCodeErrorExceptionUnmarshaller.cs +++ b/sdk/test/Services/QueryCompatibleJSONRPC10/Generated/Model/Internal/MarshallTransformations/NoCustomCodeErrorExceptionUnmarshaller.cs @@ -59,28 +59,8 @@ public NoCustomCodeErrorException Unmarshall(JsonUnmarshallerContext context, Am { context.Read(); - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) - { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) - { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); - } - } - } - } NoCustomCodeErrorException unmarshalledObject = new NoCustomCodeErrorException(errorResponse.Message, errorResponse.InnerException, - errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); int targetDepth = context.CurrentDepth; while (context.ReadAtDepth(targetDepth)) diff --git a/sdk/test/Services/QueryCompatibleJSONRPC10/Generated/Model/Internal/MarshallTransformations/QueryCompatibleOperationResponseUnmarshaller.cs b/sdk/test/Services/QueryCompatibleJSONRPC10/Generated/Model/Internal/MarshallTransformations/QueryCompatibleOperationResponseUnmarshaller.cs index 5466ef9da1da..2b7e6d39059e 100644 --- a/sdk/test/Services/QueryCompatibleJSONRPC10/Generated/Model/Internal/MarshallTransformations/QueryCompatibleOperationResponseUnmarshaller.cs +++ b/sdk/test/Services/QueryCompatibleJSONRPC10/Generated/Model/Internal/MarshallTransformations/QueryCompatibleOperationResponseUnmarshaller.cs @@ -68,39 +68,37 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte var responseBodyBytes = context.GetResponseBodyBytes(); using (var streamCopy = new MemoryStream(responseBodyBytes)) - using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData)) { - if (errorResponse.Code != null && errorResponse.Code.Equals("CustomCodeError")) - { - return CustomCodeErrorExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); - } - if (errorResponse.Code != null && errorResponse.Code.Equals("NoCustomCodeError")) + var errorTypeName = errorResponse.Code; + var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; + if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) { - return NoCustomCodeErrorExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); - } - } - var errorCode = errorResponse.Code; - var errorType = errorResponse.Type; - var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; - if (context.ResponseData.IsHeaderPresent(queryHeaderKey)) - { - var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); - if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) - { - var queryErrorParts = queryError.Split(';'); - if (queryErrorParts.Length == 2) + var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey); + if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";")) { - errorCode = queryErrorParts[0]; - var errorTypeString = queryErrorParts[1]; - if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + var queryErrorParts = queryError.Split(';'); + if (queryErrorParts.Length == 2) { - errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + errorResponse.Code = queryErrorParts[0]; + var errorTypeString = queryErrorParts[1]; + if (Enum.IsDefined(typeof(ErrorType), errorTypeString)) + { + errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString); + } } } } + if (errorTypeName != null && errorTypeName.Equals("CustomCodeError")) + { + return CustomCodeErrorExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); + } + if (errorTypeName != null && errorTypeName.Equals("NoCustomCodeError")) + { + return NoCustomCodeErrorExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse); + } } - return new AmazonQueryCompatibleJSONRPC10Exception(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode); + return new AmazonQueryCompatibleJSONRPC10Exception(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode); } private static QueryCompatibleOperationResponseUnmarshaller _instance = new QueryCompatibleOperationResponseUnmarshaller();