Generated changes for issue 24

aws · Apr 3, 2024 · 980e91d · 980e91d
1 parent a9c3a40
commit 980e91d
Show file tree

Hide file tree

Showing 14 changed files with 236 additions and 112 deletions.
diff --git a/...APIGateway/Generated/Model/Internal/MarshallTransformations/GetExportRequestMarshaller.cs b/...APIGateway/Generated/Model/Internal/MarshallTransformations/GetExportRequestMarshaller.cs
@@ -67,11 +67,12 @@ public IRequest Marshall(GetExportRequest publicRequest)
             if (!publicRequest.IsSetStageName())
                 throw new AmazonAPIGatewayException("Request object does not have required field StageName set");
             request.AddPathResource("{stage_name}", StringUtils.FromString(publicRequest.StageName));
-
             if (publicRequest.IsSetParameters())
             {
                 foreach(var kvp in publicRequest.Parameters)
                 {
+                    if(request.Parameters.ContainsKey(kvp.Key))
+                       request.Parameters.Remove(kvp.Key);
                     request.Parameters.Add(kvp.Key, StringUtils.FromString(kvp.Value));
                 }
             }

diff --git a/...es/APIGateway/Generated/Model/Internal/MarshallTransformations/GetSdkRequestMarshaller.cs b/...es/APIGateway/Generated/Model/Internal/MarshallTransformations/GetSdkRequestMarshaller.cs
@@ -67,11 +67,12 @@ public IRequest Marshall(GetSdkRequest publicRequest)
             if (!publicRequest.IsSetStageName())
                 throw new AmazonAPIGatewayException("Request object does not have required field StageName set");
             request.AddPathResource("{stage_name}", StringUtils.FromString(publicRequest.StageName));
-
             if (publicRequest.IsSetParameters())
             {
                 foreach(var kvp in publicRequest.Parameters)
                 {
+                    if(request.Parameters.ContainsKey(kvp.Key))
+                       request.Parameters.Remove(kvp.Key);
                     request.Parameters.Add(kvp.Key, StringUtils.FromString(kvp.Value));
                 }
             }

diff --git a/...ateway/Generated/Model/Internal/MarshallTransformations/ImportRestApiRequestMarshaller.cs b/...ateway/Generated/Model/Internal/MarshallTransformations/ImportRestApiRequestMarshaller.cs
@@ -60,14 +60,17 @@ public IRequest Marshall(ImportRestApiRequest publicRequest)
             request.HttpMethod = "POST";
 
             request.AddSubResource("mode", "import");
-
             if (publicRequest.IsSetFailOnWarnings())
-                request.Parameters.Add("failonwarnings", StringUtils.FromBool(publicRequest.FailOnWarnings));
-
+            {
+                if(!request.Parameters.ContainsKey("failonwarnings"))
+                   request.Parameters.Add("failonwarnings", StringUtils.FromBool(publicRequest.FailOnWarnings));
+            }
             if (publicRequest.IsSetParameters())
             {
                 foreach(var kvp in publicRequest.Parameters)
                 {
+                    if(request.Parameters.ContainsKey(kvp.Key))
+                       request.Parameters.Remove(kvp.Key);
                     request.Parameters.Add(kvp.Key, StringUtils.FromString(kvp.Value));
                 }
             }

diff --git a/...PIGateway/Generated/Model/Internal/MarshallTransformations/PutRestApiRequestMarshaller.cs b/...PIGateway/Generated/Model/Internal/MarshallTransformations/PutRestApiRequestMarshaller.cs
@@ -62,17 +62,22 @@ public IRequest Marshall(PutRestApiRequest publicRequest)
             if (!publicRequest.IsSetRestApiId())
                 throw new AmazonAPIGatewayException("Request object does not have required field RestApiId set");
             request.AddPathResource("{restapi_id}", StringUtils.FromString(publicRequest.RestApiId));
-
             if (publicRequest.IsSetFailOnWarnings())
-                request.Parameters.Add("failonwarnings", StringUtils.FromBool(publicRequest.FailOnWarnings));
-
+            {
+                if(!request.Parameters.ContainsKey("failonwarnings"))
+                   request.Parameters.Add("failonwarnings", StringUtils.FromBool(publicRequest.FailOnWarnings));
+            }
             if (publicRequest.IsSetMode())
-                request.Parameters.Add("mode", StringUtils.FromString(publicRequest.Mode));
-
+            {
+                if(!request.Parameters.ContainsKey("mode"))
+                   request.Parameters.Add("mode", StringUtils.FromString(publicRequest.Mode));
+            }
             if (publicRequest.IsSetParameters())
             {
                 foreach(var kvp in publicRequest.Parameters)
                 {
+                    if(request.Parameters.ContainsKey(kvp.Key))
+                       request.Parameters.Remove(kvp.Key);
                     request.Parameters.Add(kvp.Key, StringUtils.FromString(kvp.Value));
                 }
             }

diff --git a/...xchange/Generated/Model/Internal/MarshallTransformations/SendApiAssetRequestMarshaller.cs b/...xchange/Generated/Model/Internal/MarshallTransformations/SendApiAssetRequestMarshaller.cs
@@ -59,11 +59,12 @@ public IRequest Marshall(SendApiAssetRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2017-07-25";
             request.HttpMethod = "POST";
 
-
             if (publicRequest.IsSetQueryStringParameters())
             {
                 foreach(var kvp in publicRequest.QueryStringParameters)
                 {
+                    if(request.Parameters.ContainsKey(kvp.Key))
+                       request.Parameters.Remove(kvp.Key);
                     request.Parameters.Add(kvp.Key, StringUtils.FromString(kvp.Value));
                 }
             }

diff --git a/...Service/Generated/Model/Internal/MarshallTransformations/ListScrapersRequestMarshaller.cs b/...Service/Generated/Model/Internal/MarshallTransformations/ListScrapersRequestMarshaller.cs
@@ -58,20 +58,25 @@ public IRequest Marshall(ListScrapersRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2020-08-01";
             request.HttpMethod = "GET";
 
-
             if (publicRequest.IsSetFilters())
             {
                 foreach(var kvp in publicRequest.Filters)
                 {
+                    if(request.ParameterCollection.ContainsKey(kvp.Key))
+                       request.ParameterCollection.Remove(kvp.Key);
                     request.ParameterCollection.Add(kvp.Key, kvp.Value);
                 }
             }
-
             if (publicRequest.IsSetMaxResults())
-                request.Parameters.Add("maxResults", StringUtils.FromInt(publicRequest.MaxResults));
-
+            {
+                if(!request.Parameters.ContainsKey("maxResults"))
+                   request.Parameters.Add("maxResults", StringUtils.FromInt(publicRequest.MaxResults));
+            }
             if (publicRequest.IsSetNextToken())
-                request.Parameters.Add("nextToken", StringUtils.FromString(publicRequest.NextToken));
+            {
+                if(!request.Parameters.ContainsKey("nextToken"))
+                   request.Parameters.Add("nextToken", StringUtils.FromString(publicRequest.NextToken));
+            }
             request.ResourcePath = "/scrapers";
             request.UseQueryString = true;
 

diff --git a/.../Generated/Model/Internal/MarshallTransformations/AllQueryStringTypesRequestMarshaller.cs b/.../Generated/Model/Internal/MarshallTransformations/AllQueryStringTypesRequestMarshaller.cs
@@ -58,74 +58,121 @@ public IRequest Marshall(AllQueryStringTypesRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2019-12-16";
             request.HttpMethod = "GET";
 
-
             if (publicRequest.IsSetQueryBoolean())
-                request.Parameters.Add("Boolean", StringUtils.FromBool(publicRequest.QueryBoolean));
-
+            {
+                if(!request.Parameters.ContainsKey("Boolean"))
+                   request.Parameters.Add("Boolean", StringUtils.FromBool(publicRequest.QueryBoolean));
+            }
             if (publicRequest.IsSetQueryBooleanList())
-                request.ParameterCollection.Add("BooleanList", publicRequest.QueryBooleanList.ConvertAll<string>(item => StringUtils.FromBool(item)));
-
+            {
+                if(!request.ParameterCollection.ContainsKey("BooleanList"))
+                   request.ParameterCollection.Add("BooleanList", publicRequest.QueryBooleanList.ConvertAll<string>(item => StringUtils.FromBool(item)));
+
+            }
             if (publicRequest.IsSetQueryByte())
-                request.Parameters.Add("Byte", StringUtils.FromInt(publicRequest.QueryByte));
-
+            {
+                if(!request.Parameters.ContainsKey("Byte"))
+                   request.Parameters.Add("Byte", StringUtils.FromInt(publicRequest.QueryByte));
+            }
             if (publicRequest.IsSetQueryDouble())
-                request.Parameters.Add("Double", StringUtils.FromDouble(publicRequest.QueryDouble));
-
+            {
+                if(!request.Parameters.ContainsKey("Double"))
+                   request.Parameters.Add("Double", StringUtils.FromDouble(publicRequest.QueryDouble));
+            }
             if (publicRequest.IsSetQueryDoubleList())
-                request.ParameterCollection.Add("DoubleList", publicRequest.QueryDoubleList.ConvertAll<string>(item => StringUtils.FromDouble(item)));
-
+            {
+                if(!request.ParameterCollection.ContainsKey("DoubleList"))
+                   request.ParameterCollection.Add("DoubleList", publicRequest.QueryDoubleList.ConvertAll<string>(item => StringUtils.FromDouble(item)));
+
+            }
             if (publicRequest.IsSetQueryEnum())
-                request.Parameters.Add("Enum", StringUtils.FromString(publicRequest.QueryEnum));
-
+            {
+                if(!request.Parameters.ContainsKey("Enum"))
+                   request.Parameters.Add("Enum", StringUtils.FromString(publicRequest.QueryEnum));
+            }
             if (publicRequest.IsSetQueryEnumList())
-                request.ParameterCollection.Add("EnumList", publicRequest.QueryEnumList);
-
+            {
+                if(!request.ParameterCollection.ContainsKey("EnumList"))
+                   request.ParameterCollection.Add("EnumList", publicRequest.QueryEnumList);
+            }
             if (publicRequest.IsSetQueryFloat())
-                request.Parameters.Add("Float", StringUtils.FromFloat(publicRequest.QueryFloat));
-
+            {
+                if(!request.Parameters.ContainsKey("Float"))
+                   request.Parameters.Add("Float", StringUtils.FromFloat(publicRequest.QueryFloat));
+            }
             if (publicRequest.IsSetQueryInteger())
-                request.Parameters.Add("Integer", StringUtils.FromInt(publicRequest.QueryInteger));
-
+            {
+                if(!request.Parameters.ContainsKey("Integer"))
+                   request.Parameters.Add("Integer", StringUtils.FromInt(publicRequest.QueryInteger));
+            }
             if (publicRequest.IsSetQueryIntegerEnum())
-                request.Parameters.Add("IntegerEnum", StringUtils.FromInt(publicRequest.QueryIntegerEnum));
-
+            {
+                if(!request.Parameters.ContainsKey("IntegerEnum"))
+                   request.Parameters.Add("IntegerEnum", StringUtils.FromInt(publicRequest.QueryIntegerEnum));
+            }
             if (publicRequest.IsSetQueryIntegerEnumList())
-                request.ParameterCollection.Add("IntegerEnumList", publicRequest.QueryIntegerEnumList.ConvertAll<string>(item => StringUtils.FromInt(item)));
-
+            {
+                if(!request.ParameterCollection.ContainsKey("IntegerEnumList"))
+                   request.ParameterCollection.Add("IntegerEnumList", publicRequest.QueryIntegerEnumList.ConvertAll<string>(item => StringUtils.FromInt(item)));
+
+            }
             if (publicRequest.IsSetQueryIntegerList())
-                request.ParameterCollection.Add("IntegerList", publicRequest.QueryIntegerList.ConvertAll<string>(item => StringUtils.FromInt(item)));
-
+            {
+                if(!request.ParameterCollection.ContainsKey("IntegerList"))
+                   request.ParameterCollection.Add("IntegerList", publicRequest.QueryIntegerList.ConvertAll<string>(item => StringUtils.FromInt(item)));
+
+            }
             if (publicRequest.IsSetQueryIntegerSet())
-                request.ParameterCollection.Add("IntegerSet", publicRequest.QueryIntegerSet.ConvertAll<string>(item => StringUtils.FromInt(item)));
-
+            {
+                if(!request.ParameterCollection.ContainsKey("IntegerSet"))
+                   request.ParameterCollection.Add("IntegerSet", publicRequest.QueryIntegerSet.ConvertAll<string>(item => StringUtils.FromInt(item)));
+
+            }
             if (publicRequest.IsSetQueryLong())
-                request.Parameters.Add("Long", StringUtils.FromLong(publicRequest.QueryLong));
-
+            {
+                if(!request.Parameters.ContainsKey("Long"))
+                   request.Parameters.Add("Long", StringUtils.FromLong(publicRequest.QueryLong));
+            }
             if (publicRequest.IsSetQueryParamsMapOfStringList())
             {
                 foreach(var kvp in publicRequest.QueryParamsMapOfStringList)
                 {
+                    if(request.ParameterCollection.ContainsKey(kvp.Key))
+                       request.ParameterCollection.Remove(kvp.Key);
                     request.ParameterCollection.Add(kvp.Key, kvp.Value);
                 }
             }
-
             if (publicRequest.IsSetQueryShort())
-                request.Parameters.Add("Short", StringUtils.FromInt(publicRequest.QueryShort));
-
+            {
+                if(!request.Parameters.ContainsKey("Short"))
+                   request.Parameters.Add("Short", StringUtils.FromInt(publicRequest.QueryShort));
+            }
             if (publicRequest.IsSetQueryString())
-                request.Parameters.Add("String", StringUtils.FromString(publicRequest.QueryString));
-
+            {
+                if(!request.Parameters.ContainsKey("String"))
+                   request.Parameters.Add("String", StringUtils.FromString(publicRequest.QueryString));
+            }
             if (publicRequest.IsSetQueryStringList())
-                request.ParameterCollection.Add("StringList", publicRequest.QueryStringList);
-
+            {
+                if(!request.ParameterCollection.ContainsKey("StringList"))
+                   request.ParameterCollection.Add("StringList", publicRequest.QueryStringList);
+            }
             if (publicRequest.IsSetQueryStringSet())
-                request.ParameterCollection.Add("StringSet", publicRequest.QueryStringSet);
-
+            {
+                if(!request.ParameterCollection.ContainsKey("StringSet"))
+                   request.ParameterCollection.Add("StringSet", publicRequest.QueryStringSet);
+            }
             if (publicRequest.IsSetQueryTimestamp())
-                request.Parameters.Add("Timestamp", StringUtils.FromDateTimeToISO8601(publicRequest.QueryTimestamp));
-
+            {
+                if(!request.Parameters.ContainsKey("Timestamp"))
+                   request.Parameters.Add("Timestamp", StringUtils.FromDateTimeToISO8601(publicRequest.QueryTimestamp));
+            }
             if (publicRequest.IsSetQueryTimestampList())
-                request.ParameterCollection.Add("TimestampList", publicRequest.QueryTimestampList.ConvertAll<string>(item => StringUtils.FromDateTimeToISO8601WithOptionalMs(item)));
+            {
+                if(!request.ParameterCollection.ContainsKey("TimestampList"))
+                   request.ParameterCollection.Add("TimestampList", publicRequest.QueryTimestampList.ConvertAll<string>(item => StringUtils.FromDateTimeToISO8601WithOptionalMs(item)));
+
+            }
             request.ResourcePath = "/AllQueryStringTypesInput";
             request.UseQueryString = true;
 

diff --git a/...ted/Model/Internal/MarshallTransformations/QueryParamsAsStringListMapRequestMarshaller.cs b/...ted/Model/Internal/MarshallTransformations/QueryParamsAsStringListMapRequestMarshaller.cs
@@ -58,17 +58,20 @@ public IRequest Marshall(QueryParamsAsStringListMapRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2019-12-16";
             request.HttpMethod = "POST";
 
-
             if (publicRequest.IsSetFoo())
             {
                 foreach(var kvp in publicRequest.Foo)
                 {
+                    if(request.ParameterCollection.ContainsKey(kvp.Key))
+                       request.ParameterCollection.Remove(kvp.Key);
                     request.ParameterCollection.Add(kvp.Key, kvp.Value);
                 }
             }
-
             if (publicRequest.IsSetQux())
-                request.Parameters.Add("corge", StringUtils.FromString(publicRequest.Qux));
+            {
+                if(!request.Parameters.ContainsKey("corge"))
+                   request.Parameters.Add("corge", StringUtils.FromString(publicRequest.Qux));
+            }
             request.ResourcePath = "/StringListMap";
             request.UseQueryString = true;
 

diff --git a/...ocol/Generated/Model/Internal/MarshallTransformations/QueryPrecedenceRequestMarshaller.cs b/...ocol/Generated/Model/Internal/MarshallTransformations/QueryPrecedenceRequestMarshaller.cs
@@ -58,17 +58,20 @@ public IRequest Marshall(QueryPrecedenceRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2019-12-16";
             request.HttpMethod = "POST";
 
-
             if (publicRequest.IsSetBaz())
             {
                 foreach(var kvp in publicRequest.Baz)
                 {
+                    if(request.Parameters.ContainsKey(kvp.Key))
+                       request.Parameters.Remove(kvp.Key);
                     request.Parameters.Add(kvp.Key, StringUtils.FromString(kvp.Value));
                 }
             }
-
             if (publicRequest.IsSetFoo())
-                request.Parameters.Add("bar", StringUtils.FromString(publicRequest.Foo));
+            {
+                if(!request.Parameters.ContainsKey("bar"))
+                   request.Parameters.Add("bar", StringUtils.FromString(publicRequest.Foo));
+            }
             request.ResourcePath = "/Precedence";
             request.UseQueryString = true;
 

diff --git a/.../Generated/Model/Internal/MarshallTransformations/QueryIntegerListMapRequestMarshaller.cs b/.../Generated/Model/Internal/MarshallTransformations/QueryIntegerListMapRequestMarshaller.cs
@@ -58,11 +58,12 @@ public IRequest Marshall(QueryIntegerListMapRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2021-05-13";
             request.HttpMethod = "GET";
 
-
             if (publicRequest.IsSetQueryParamsMapOfIntegerList())
             {
                 foreach(var kvp in publicRequest.QueryParamsMapOfIntegerList)
                 {
+                    if(request.ParameterCollection.ContainsKey(kvp.Key))
+                       request.ParameterCollection.Remove(kvp.Key);
                     request.ParameterCollection.Add(kvp.Key, kvp.Value.ConvertAll<string>(item => StringUtils.FromInt(item)));
                 }
             }

diff --git a/...t/Generated/Model/Internal/MarshallTransformations/QueryStringListMapRequestMarshaller.cs b/...t/Generated/Model/Internal/MarshallTransformations/QueryStringListMapRequestMarshaller.cs
@@ -58,11 +58,12 @@ public IRequest Marshall(QueryStringListMapRequest publicRequest)
             request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2021-05-13";
             request.HttpMethod = "GET";
 
-
             if (publicRequest.IsSetQueryParamsMapOfStringList())
             {
                 foreach(var kvp in publicRequest.QueryParamsMapOfStringList)
                 {
+                    if(request.ParameterCollection.ContainsKey(kvp.Key))
+                       request.ParameterCollection.Remove(kvp.Key);
                     request.ParameterCollection.Add(kvp.Key, kvp.Value);
                 }
             }