diff --git a/sdk/src/Services/APIGateway/Generated/Model/Internal/MarshallTransformations/GetExportRequestMarshaller.cs b/sdk/src/Services/APIGateway/Generated/Model/Internal/MarshallTransformations/GetExportRequestMarshaller.cs index 8ae968f69301..33e2f7a7421c 100644 --- a/sdk/src/Services/APIGateway/Generated/Model/Internal/MarshallTransformations/GetExportRequestMarshaller.cs +++ b/sdk/src/Services/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/sdk/src/Services/APIGateway/Generated/Model/Internal/MarshallTransformations/GetSdkRequestMarshaller.cs b/sdk/src/Services/APIGateway/Generated/Model/Internal/MarshallTransformations/GetSdkRequestMarshaller.cs index 4e76779f5a3d..a235797d0011 100644 --- a/sdk/src/Services/APIGateway/Generated/Model/Internal/MarshallTransformations/GetSdkRequestMarshaller.cs +++ b/sdk/src/Services/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/sdk/src/Services/APIGateway/Generated/Model/Internal/MarshallTransformations/ImportRestApiRequestMarshaller.cs b/sdk/src/Services/APIGateway/Generated/Model/Internal/MarshallTransformations/ImportRestApiRequestMarshaller.cs index e147dcc1771f..a5bcd4952d86 100644 --- a/sdk/src/Services/APIGateway/Generated/Model/Internal/MarshallTransformations/ImportRestApiRequestMarshaller.cs +++ b/sdk/src/Services/APIGateway/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/sdk/src/Services/APIGateway/Generated/Model/Internal/MarshallTransformations/PutRestApiRequestMarshaller.cs b/sdk/src/Services/APIGateway/Generated/Model/Internal/MarshallTransformations/PutRestApiRequestMarshaller.cs index 58971af930d0..e4911bdd3188 100644 --- a/sdk/src/Services/APIGateway/Generated/Model/Internal/MarshallTransformations/PutRestApiRequestMarshaller.cs +++ b/sdk/src/Services/APIGateway/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/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/SendApiAssetRequestMarshaller.cs b/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/SendApiAssetRequestMarshaller.cs index 6c571690d311..f06972d6f816 100644 --- a/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/SendApiAssetRequestMarshaller.cs +++ b/sdk/src/Services/DataExchange/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/sdk/src/Services/PrometheusService/Generated/Model/Internal/MarshallTransformations/ListScrapersRequestMarshaller.cs b/sdk/src/Services/PrometheusService/Generated/Model/Internal/MarshallTransformations/ListScrapersRequestMarshaller.cs index 8938e7341c5e..cfefd4f499e9 100644 --- a/sdk/src/Services/PrometheusService/Generated/Model/Internal/MarshallTransformations/ListScrapersRequestMarshaller.cs +++ b/sdk/src/Services/PrometheusService/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/sdk/test/Services/RestJsonProtocol/Generated/Model/Internal/MarshallTransformations/AllQueryStringTypesRequestMarshaller.cs b/sdk/test/Services/RestJsonProtocol/Generated/Model/Internal/MarshallTransformations/AllQueryStringTypesRequestMarshaller.cs index 32cd2e72d635..4e6c74601ba1 100644 --- a/sdk/test/Services/RestJsonProtocol/Generated/Model/Internal/MarshallTransformations/AllQueryStringTypesRequestMarshaller.cs +++ b/sdk/test/Services/RestJsonProtocol/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(item => StringUtils.FromBool(item))); - + { + if(!request.ParameterCollection.ContainsKey("BooleanList")) + request.ParameterCollection.Add("BooleanList", publicRequest.QueryBooleanList.ConvertAll(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(item => StringUtils.FromDouble(item))); - + { + if(!request.ParameterCollection.ContainsKey("DoubleList")) + request.ParameterCollection.Add("DoubleList", publicRequest.QueryDoubleList.ConvertAll(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(item => StringUtils.FromInt(item))); - + { + if(!request.ParameterCollection.ContainsKey("IntegerEnumList")) + request.ParameterCollection.Add("IntegerEnumList", publicRequest.QueryIntegerEnumList.ConvertAll(item => StringUtils.FromInt(item))); + + } if (publicRequest.IsSetQueryIntegerList()) - request.ParameterCollection.Add("IntegerList", publicRequest.QueryIntegerList.ConvertAll(item => StringUtils.FromInt(item))); - + { + if(!request.ParameterCollection.ContainsKey("IntegerList")) + request.ParameterCollection.Add("IntegerList", publicRequest.QueryIntegerList.ConvertAll(item => StringUtils.FromInt(item))); + + } if (publicRequest.IsSetQueryIntegerSet()) - request.ParameterCollection.Add("IntegerSet", publicRequest.QueryIntegerSet.ConvertAll(item => StringUtils.FromInt(item))); - + { + if(!request.ParameterCollection.ContainsKey("IntegerSet")) + request.ParameterCollection.Add("IntegerSet", publicRequest.QueryIntegerSet.ConvertAll(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(item => StringUtils.FromDateTimeToISO8601WithOptionalMs(item))); + { + if(!request.ParameterCollection.ContainsKey("TimestampList")) + request.ParameterCollection.Add("TimestampList", publicRequest.QueryTimestampList.ConvertAll(item => StringUtils.FromDateTimeToISO8601WithOptionalMs(item))); + + } request.ResourcePath = "/AllQueryStringTypesInput"; request.UseQueryString = true; diff --git a/sdk/test/Services/RestJsonProtocol/Generated/Model/Internal/MarshallTransformations/QueryParamsAsStringListMapRequestMarshaller.cs b/sdk/test/Services/RestJsonProtocol/Generated/Model/Internal/MarshallTransformations/QueryParamsAsStringListMapRequestMarshaller.cs index 1cf6f8e18347..49b76d7b9881 100644 --- a/sdk/test/Services/RestJsonProtocol/Generated/Model/Internal/MarshallTransformations/QueryParamsAsStringListMapRequestMarshaller.cs +++ b/sdk/test/Services/RestJsonProtocol/Generated/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/sdk/test/Services/RestJsonProtocol/Generated/Model/Internal/MarshallTransformations/QueryPrecedenceRequestMarshaller.cs b/sdk/test/Services/RestJsonProtocol/Generated/Model/Internal/MarshallTransformations/QueryPrecedenceRequestMarshaller.cs index 0e6c891153fc..50b964b36671 100644 --- a/sdk/test/Services/RestJsonProtocol/Generated/Model/Internal/MarshallTransformations/QueryPrecedenceRequestMarshaller.cs +++ b/sdk/test/Services/RestJsonProtocol/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/sdk/test/Services/RestJsonTest/Generated/Model/Internal/MarshallTransformations/QueryIntegerListMapRequestMarshaller.cs b/sdk/test/Services/RestJsonTest/Generated/Model/Internal/MarshallTransformations/QueryIntegerListMapRequestMarshaller.cs index f92c90510314..25bfa72ca44e 100644 --- a/sdk/test/Services/RestJsonTest/Generated/Model/Internal/MarshallTransformations/QueryIntegerListMapRequestMarshaller.cs +++ b/sdk/test/Services/RestJsonTest/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(item => StringUtils.FromInt(item))); } } diff --git a/sdk/test/Services/RestJsonTest/Generated/Model/Internal/MarshallTransformations/QueryStringListMapRequestMarshaller.cs b/sdk/test/Services/RestJsonTest/Generated/Model/Internal/MarshallTransformations/QueryStringListMapRequestMarshaller.cs index d5c153350b0c..2528042830ff 100644 --- a/sdk/test/Services/RestJsonTest/Generated/Model/Internal/MarshallTransformations/QueryStringListMapRequestMarshaller.cs +++ b/sdk/test/Services/RestJsonTest/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); } } diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/AllQueryStringTypesRequestMarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/AllQueryStringTypesRequestMarshaller.cs index 8936008d1cde..7ceb4e35389c 100644 --- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/AllQueryStringTypesRequestMarshaller.cs +++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/AllQueryStringTypesRequestMarshaller.cs @@ -56,74 +56,121 @@ public IRequest Marshall(AllQueryStringTypesRequest publicRequest) { var request = new DefaultRequest(publicRequest, "Amazon.RestXmlProtocol"); 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(item => StringUtils.FromBool(item))); - + { + if(!request.ParameterCollection.ContainsKey("BooleanList")) + request.ParameterCollection.Add("BooleanList", publicRequest.QueryBooleanList.ConvertAll(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(item => StringUtils.FromDouble(item))); - + { + if(!request.ParameterCollection.ContainsKey("DoubleList")) + request.ParameterCollection.Add("DoubleList", publicRequest.QueryDoubleList.ConvertAll(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(item => StringUtils.FromInt(item))); - + { + if(!request.ParameterCollection.ContainsKey("IntegerEnumList")) + request.ParameterCollection.Add("IntegerEnumList", publicRequest.QueryIntegerEnumList.ConvertAll(item => StringUtils.FromInt(item))); + + } if (publicRequest.IsSetQueryIntegerList()) - request.ParameterCollection.Add("IntegerList", publicRequest.QueryIntegerList.ConvertAll(item => StringUtils.FromInt(item))); - + { + if(!request.ParameterCollection.ContainsKey("IntegerList")) + request.ParameterCollection.Add("IntegerList", publicRequest.QueryIntegerList.ConvertAll(item => StringUtils.FromInt(item))); + + } if (publicRequest.IsSetQueryIntegerSet()) - request.ParameterCollection.Add("IntegerSet", publicRequest.QueryIntegerSet.ConvertAll(item => StringUtils.FromInt(item))); - + { + if(!request.ParameterCollection.ContainsKey("IntegerSet")) + request.ParameterCollection.Add("IntegerSet", publicRequest.QueryIntegerSet.ConvertAll(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.IsSetQueryParamsMapOfStrings()) { foreach(var kvp in publicRequest.QueryParamsMapOfStrings) { + if(request.Parameters.ContainsKey(kvp.Key)) + request.Parameters.Remove(kvp.Key); request.Parameters.Add(kvp.Key, StringUtils.FromString(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(item => StringUtils.FromDateTimeToISO8601WithOptionalMs(item))); + { + if(!request.ParameterCollection.ContainsKey("TimestampList")) + request.ParameterCollection.Add("TimestampList", publicRequest.QueryTimestampList.ConvertAll(item => StringUtils.FromDateTimeToISO8601WithOptionalMs(item))); + + } request.ResourcePath = "/AllQueryStringTypesInput"; diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/QueryParamsAsStringListMapRequestMarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/QueryParamsAsStringListMapRequestMarshaller.cs index db85ab40837a..3820a65f0d80 100644 --- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/QueryParamsAsStringListMapRequestMarshaller.cs +++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/QueryParamsAsStringListMapRequestMarshaller.cs @@ -56,17 +56,20 @@ public IRequest Marshall(QueryParamsAsStringListMapRequest publicRequest) { var request = new DefaultRequest(publicRequest, "Amazon.RestXmlProtocol"); 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"; diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/QueryPrecedenceRequestMarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/QueryPrecedenceRequestMarshaller.cs index 508e0be20cc7..825867fb2eb0 100644 --- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/QueryPrecedenceRequestMarshaller.cs +++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/QueryPrecedenceRequestMarshaller.cs @@ -56,17 +56,20 @@ public IRequest Marshall(QueryPrecedenceRequest publicRequest) { var request = new DefaultRequest(publicRequest, "Amazon.RestXmlProtocol"); 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";