Client Test

Client Test

rev. 3c756f73b1f83a0eed4275d9d1e22df0b10b66fb

Files changed:

tmp-codegen-diff/codegen-client-test/rest_xml/rust-client-codegen/src/operation/ignore_query_params_in_response.rs

@@ -157,157 +223,223 @@
  177    177   
                _input: &crate::operation::ignore_query_params_in_response::IgnoreQueryParamsInResponseInput,
  178    178   
                output: &mut ::std::string::String,
  179    179   
            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
  180    180   
                use ::std::fmt::Write as _;
  181    181   
                ::std::write!(output, "/IgnoreQueryParamsInResponse").expect("formatting should succeed");
  182    182   
                ::std::result::Result::Ok(())
  183    183   
            }
  184    184   
            #[allow(clippy::unnecessary_wraps)]
  185    185   
            fn update_http_builder(
  186    186   
                input: &crate::operation::ignore_query_params_in_response::IgnoreQueryParamsInResponseInput,
  187         -
                builder: ::http::request::Builder,
  188         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         187  +
                builder: ::http_1x::request::Builder,
         188  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  189    189   
                let mut uri = ::std::string::String::new();
  190    190   
                uri_base(input, &mut uri)?;
  191    191   
                ::std::result::Result::Ok(builder.method("GET").uri(uri))
  192    192   
            }
  193         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
         193  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
  194    194   
            builder
  195    195   
        };
  196    196   
        let body = ::aws_smithy_types::body::SdkBody::from("");
  197    197   
  198    198   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  199    199   
    }
  200    200   
}
  201    201   
#[derive(Debug)]
  202    202   
struct IgnoreQueryParamsInResponseEndpointParamsInterceptor;
  203    203   

tmp-codegen-diff/codegen-client-test/rest_xml/rust-client-codegen/src/operation/input_and_output_with_headers.rs

@@ -157,157 +224,224 @@
  177    177   
                _input: &crate::operation::input_and_output_with_headers::InputAndOutputWithHeadersInput,
  178    178   
                output: &mut ::std::string::String,
  179    179   
            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
  180    180   
                use ::std::fmt::Write as _;
  181    181   
                ::std::write!(output, "/InputAndOutputWithHeaders").expect("formatting should succeed");
  182    182   
                ::std::result::Result::Ok(())
  183    183   
            }
  184    184   
            #[allow(clippy::unnecessary_wraps)]
  185    185   
            fn update_http_builder(
  186    186   
                input: &crate::operation::input_and_output_with_headers::InputAndOutputWithHeadersInput,
  187         -
                builder: ::http::request::Builder,
  188         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         187  +
                builder: ::http_1x::request::Builder,
         188  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  189    189   
                let mut uri = ::std::string::String::new();
  190    190   
                uri_base(input, &mut uri)?;
  191    191   
                let builder = crate::protocol_serde::shape_input_and_output_with_headers::ser_input_and_output_with_headers_headers(input, builder)?;
  192    192   
                ::std::result::Result::Ok(builder.method("POST").uri(uri))
  193    193   
            }
  194         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
         194  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
  195    195   
            builder
  196    196   
        };
  197    197   
        let body = ::aws_smithy_types::body::SdkBody::from("");
  198    198   
  199    199   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  200    200   
    }
  201    201   
}
  202    202   
#[derive(Debug)]
  203    203   
struct InputAndOutputWithHeadersEndpointParamsInterceptor;
  204    204   

tmp-codegen-diff/codegen-client-test/rest_xml/rust-client-codegen/src/operation/nested_xml_map_with_xml_name.rs

@@ -157,157 +232,232 @@
  177    177   
                _input: &crate::operation::nested_xml_map_with_xml_name::NestedXmlMapWithXmlNameInput,
  178    178   
                output: &mut ::std::string::String,
  179    179   
            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
  180    180   
                use ::std::fmt::Write as _;
  181    181   
                ::std::write!(output, "/NestedXmlMapWithXmlName").expect("formatting should succeed");
  182    182   
                ::std::result::Result::Ok(())
  183    183   
            }
  184    184   
            #[allow(clippy::unnecessary_wraps)]
  185    185   
            fn update_http_builder(
  186    186   
                input: &crate::operation::nested_xml_map_with_xml_name::NestedXmlMapWithXmlNameInput,
  187         -
                builder: ::http::request::Builder,
  188         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         187  +
                builder: ::http_1x::request::Builder,
         188  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  189    189   
                let mut uri = ::std::string::String::new();
  190    190   
                uri_base(input, &mut uri)?;
  191    191   
                ::std::result::Result::Ok(builder.method("POST").uri(uri))
  192    192   
            }
  193         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
  194         -
            builder = _header_serialization_settings.set_default_header(builder, ::http::header::CONTENT_TYPE, "application/xml");
         193  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
         194  +
            builder = _header_serialization_settings.set_default_header(builder, ::http_1x::header::CONTENT_TYPE, "application/xml");
  195    195   
            builder
  196    196   
        };
  197    197   
        let body = ::aws_smithy_types::body::SdkBody::from(
  198    198   
            crate::protocol_serde::shape_nested_xml_map_with_xml_name::ser_nested_xml_map_with_xml_name_op_input(&input)?,
  199    199   
        );
  200    200   
        if let Some(content_length) = body.content_length() {
  201    201   
            let content_length = content_length.to_string();
  202         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         202  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  203    203   
        }
  204    204   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  205    205   
    }
  206    206   
}
  207    207   
#[derive(Debug)]
  208    208   
struct NestedXmlMapWithXmlNameEndpointParamsInterceptor;
  209    209   
  210    210   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for NestedXmlMapWithXmlNameEndpointParamsInterceptor {
  211    211   
    fn name(&self) -> &'static str {
  212    212   
        "NestedXmlMapWithXmlNameEndpointParamsInterceptor"

tmp-codegen-diff/codegen-client-test/rest_xml/rust-client-codegen/src/operation/nested_xml_maps.rs

@@ -151,151 +224,224 @@
  171    171   
                _input: &crate::operation::nested_xml_maps::NestedXmlMapsInput,
  172    172   
                output: &mut ::std::string::String,
  173    173   
            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
  174    174   
                use ::std::fmt::Write as _;
  175    175   
                ::std::write!(output, "/NestedXmlMaps").expect("formatting should succeed");
  176    176   
                ::std::result::Result::Ok(())
  177    177   
            }
  178    178   
            #[allow(clippy::unnecessary_wraps)]
  179    179   
            fn update_http_builder(
  180    180   
                input: &crate::operation::nested_xml_maps::NestedXmlMapsInput,
  181         -
                builder: ::http::request::Builder,
  182         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         181  +
                builder: ::http_1x::request::Builder,
         182  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  183    183   
                let mut uri = ::std::string::String::new();
  184    184   
                uri_base(input, &mut uri)?;
  185    185   
                ::std::result::Result::Ok(builder.method("POST").uri(uri))
  186    186   
            }
  187         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
  188         -
            builder = _header_serialization_settings.set_default_header(builder, ::http::header::CONTENT_TYPE, "application/xml");
         187  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
         188  +
            builder = _header_serialization_settings.set_default_header(builder, ::http_1x::header::CONTENT_TYPE, "application/xml");
  189    189   
            builder
  190    190   
        };
  191    191   
        let body = ::aws_smithy_types::body::SdkBody::from(crate::protocol_serde::shape_nested_xml_maps::ser_nested_xml_maps_op_input(&input)?);
  192    192   
        if let Some(content_length) = body.content_length() {
  193    193   
            let content_length = content_length.to_string();
  194         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         194  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  195    195   
        }
  196    196   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  197    197   
    }
  198    198   
}
  199    199   
#[derive(Debug)]
  200    200   
struct NestedXmlMapsEndpointParamsInterceptor;
  201    201   
  202    202   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for NestedXmlMapsEndpointParamsInterceptor {
  203    203   
    fn name(&self) -> &'static str {
  204    204   
        "NestedXmlMapsEndpointParamsInterceptor"

tmp-codegen-diff/codegen-client-test/rest_xml/rust-client-codegen/src/operation/no_input_and_no_output.rs

@@ -157,157 +223,223 @@
  177    177   
                _input: &crate::operation::no_input_and_no_output::NoInputAndNoOutputInput,
  178    178   
                output: &mut ::std::string::String,
  179    179   
            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
  180    180   
                use ::std::fmt::Write as _;
  181    181   
                ::std::write!(output, "/NoInputAndNoOutput").expect("formatting should succeed");
  182    182   
                ::std::result::Result::Ok(())
  183    183   
            }
  184    184   
            #[allow(clippy::unnecessary_wraps)]
  185    185   
            fn update_http_builder(
  186    186   
                input: &crate::operation::no_input_and_no_output::NoInputAndNoOutputInput,
  187         -
                builder: ::http::request::Builder,
  188         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         187  +
                builder: ::http_1x::request::Builder,
         188  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  189    189   
                let mut uri = ::std::string::String::new();
  190    190   
                uri_base(input, &mut uri)?;
  191    191   
                ::std::result::Result::Ok(builder.method("POST").uri(uri))
  192    192   
            }
  193         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
         193  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
  194    194   
            builder
  195    195   
        };
  196    196   
        let body = ::aws_smithy_types::body::SdkBody::from("");
  197    197   
  198    198   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  199    199   
    }
  200    200   
}
  201    201   
#[derive(Debug)]
  202    202   
struct NoInputAndNoOutputEndpointParamsInterceptor;
  203    203   

tmp-codegen-diff/codegen-client-test/rest_xml/rust-client-codegen/src/operation/no_input_and_output.rs

@@ -157,157 +223,223 @@
  177    177   
                _input: &crate::operation::no_input_and_output::NoInputAndOutputInput,
  178    178   
                output: &mut ::std::string::String,
  179    179   
            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
  180    180   
                use ::std::fmt::Write as _;
  181    181   
                ::std::write!(output, "/NoInputAndOutputOutput").expect("formatting should succeed");
  182    182   
                ::std::result::Result::Ok(())
  183    183   
            }
  184    184   
            #[allow(clippy::unnecessary_wraps)]
  185    185   
            fn update_http_builder(
  186    186   
                input: &crate::operation::no_input_and_output::NoInputAndOutputInput,
  187         -
                builder: ::http::request::Builder,
  188         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         187  +
                builder: ::http_1x::request::Builder,
         188  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  189    189   
                let mut uri = ::std::string::String::new();
  190    190   
                uri_base(input, &mut uri)?;
  191    191   
                ::std::result::Result::Ok(builder.method("POST").uri(uri))
  192    192   
            }
  193         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
         193  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
  194    194   
            builder
  195    195   
        };
  196    196   
        let body = ::aws_smithy_types::body::SdkBody::from("");
  197    197   
  198    198   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  199    199   
    }
  200    200   
}
  201    201   
#[derive(Debug)]
  202    202   
struct NoInputAndOutputEndpointParamsInterceptor;
  203    203   

tmp-codegen-diff/codegen-client-test/rest_xml/rust-client-codegen/src/operation/null_and_empty_headers_client.rs

@@ -157,157 +224,224 @@
  177    177   
                _input: &crate::operation::null_and_empty_headers_client::NullAndEmptyHeadersClientInput,
  178    178   
                output: &mut ::std::string::String,
  179    179   
            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
  180    180   
                use ::std::fmt::Write as _;
  181    181   
                ::std::write!(output, "/NullAndEmptyHeadersClient").expect("formatting should succeed");
  182    182   
                ::std::result::Result::Ok(())
  183    183   
            }
  184    184   
            #[allow(clippy::unnecessary_wraps)]
  185    185   
            fn update_http_builder(
  186    186   
                input: &crate::operation::null_and_empty_headers_client::NullAndEmptyHeadersClientInput,
  187         -
                builder: ::http::request::Builder,
  188         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         187  +
                builder: ::http_1x::request::Builder,
         188  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  189    189   
                let mut uri = ::std::string::String::new();
  190    190   
                uri_base(input, &mut uri)?;
  191    191   
                let builder = crate::protocol_serde::shape_null_and_empty_headers_client::ser_null_and_empty_headers_client_headers(input, builder)?;
  192    192   
                ::std::result::Result::Ok(builder.method("GET").uri(uri))
  193    193   
            }
  194         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
         194  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
  195    195   
            builder
  196    196   
        };
  197    197   
        let body = ::aws_smithy_types::body::SdkBody::from("");
  198    198   
  199    199   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  200    200   
    }
  201    201   
}
  202    202   
#[derive(Debug)]
  203    203   
struct NullAndEmptyHeadersClientEndpointParamsInterceptor;
  204    204   

tmp-codegen-diff/codegen-client-test/rest_xml/rust-client-codegen/src/operation/null_and_empty_headers_server.rs

@@ -157,157 +224,224 @@
  177    177   
                _input: &crate::operation::null_and_empty_headers_server::NullAndEmptyHeadersServerInput,
  178    178   
                output: &mut ::std::string::String,
  179    179   
            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
  180    180   
                use ::std::fmt::Write as _;
  181    181   
                ::std::write!(output, "/NullAndEmptyHeadersServer").expect("formatting should succeed");
  182    182   
                ::std::result::Result::Ok(())
  183    183   
            }
  184    184   
            #[allow(clippy::unnecessary_wraps)]
  185    185   
            fn update_http_builder(
  186    186   
                input: &crate::operation::null_and_empty_headers_server::NullAndEmptyHeadersServerInput,
  187         -
                builder: ::http::request::Builder,
  188         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         187  +
                builder: ::http_1x::request::Builder,
         188  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  189    189   
                let mut uri = ::std::string::String::new();
  190    190   
                uri_base(input, &mut uri)?;
  191    191   
                let builder = crate::protocol_serde::shape_null_and_empty_headers_server::ser_null_and_empty_headers_server_headers(input, builder)?;
  192    192   
                ::std::result::Result::Ok(builder.method("GET").uri(uri))
  193    193   
            }
  194         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
         194  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
  195    195   
            builder
  196    196   
        };
  197    197   
        let body = ::aws_smithy_types::body::SdkBody::from("");
  198    198   
  199    199   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  200    200   
    }
  201    201   
}
  202    202   
#[derive(Debug)]
  203    203   
struct NullAndEmptyHeadersServerEndpointParamsInterceptor;
  204    204   

tmp-codegen-diff/codegen-client-test/rest_xml/rust-client-codegen/src/operation/omits_null_serializes_empty_string.rs

@@ -176,176 +243,243 @@
  196    196   
                if let ::std::option::Option::Some(inner_2) = &_input.empty_string {
  197    197   
                    {
  198    198   
                        query.push_kv("Empty", &::aws_smithy_http::query::fmt_string(inner_2));
  199    199   
                    }
  200    200   
                }
  201    201   
                ::std::result::Result::Ok(())
  202    202   
            }
  203    203   
            #[allow(clippy::unnecessary_wraps)]
  204    204   
            fn update_http_builder(
  205    205   
                input: &crate::operation::omits_null_serializes_empty_string::OmitsNullSerializesEmptyStringInput,
  206         -
                builder: ::http::request::Builder,
  207         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         206  +
                builder: ::http_1x::request::Builder,
         207  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  208    208   
                let mut uri = ::std::string::String::new();
  209    209   
                uri_base(input, &mut uri)?;
  210    210   
                uri_query(input, &mut uri)?;
  211    211   
                ::std::result::Result::Ok(builder.method("GET").uri(uri))
  212    212   
            }
  213         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
         213  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
  214    214   
            builder
  215    215   
        };
  216    216   
        let body = ::aws_smithy_types::body::SdkBody::from("");
  217    217   
  218    218   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  219    219   
    }
  220    220   
}
  221    221   
#[derive(Debug)]
  222    222   
struct OmitsNullSerializesEmptyStringEndpointParamsInterceptor;
  223    223   

tmp-codegen-diff/codegen-client-test/rest_xml/rust-client-codegen/src/operation/put_with_content_encoding.rs

@@ -157,157 +233,233 @@
  177    177   
                _input: &crate::operation::put_with_content_encoding::PutWithContentEncodingInput,
  178    178   
                output: &mut ::std::string::String,
  179    179   
            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
  180    180   
                use ::std::fmt::Write as _;
  181    181   
                ::std::write!(output, "/requestcompression/putcontentwithencoding").expect("formatting should succeed");
  182    182   
                ::std::result::Result::Ok(())
  183    183   
            }
  184    184   
            #[allow(clippy::unnecessary_wraps)]
  185    185   
            fn update_http_builder(
  186    186   
                input: &crate::operation::put_with_content_encoding::PutWithContentEncodingInput,
  187         -
                builder: ::http::request::Builder,
  188         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         187  +
                builder: ::http_1x::request::Builder,
         188  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  189    189   
                let mut uri = ::std::string::String::new();
  190    190   
                uri_base(input, &mut uri)?;
  191    191   
                let builder = crate::protocol_serde::shape_put_with_content_encoding::ser_put_with_content_encoding_headers(input, builder)?;
  192    192   
                ::std::result::Result::Ok(builder.method("POST").uri(uri))
  193    193   
            }
  194         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
  195         -
            builder = _header_serialization_settings.set_default_header(builder, ::http::header::CONTENT_TYPE, "application/xml");
         194  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
         195  +
            builder = _header_serialization_settings.set_default_header(builder, ::http_1x::header::CONTENT_TYPE, "application/xml");
  196    196   
            builder
  197    197   
        };
  198    198   
        let body = ::aws_smithy_types::body::SdkBody::from(
  199    199   
            crate::protocol_serde::shape_put_with_content_encoding::ser_put_with_content_encoding_op_input(&input)?,
  200    200   
        );
  201    201   
        if let Some(content_length) = body.content_length() {
  202    202   
            let content_length = content_length.to_string();
  203         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         203  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  204    204   
        }
  205    205   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  206    206   
    }
  207    207   
}
  208    208   
#[derive(Debug)]
  209    209   
struct PutWithContentEncodingEndpointParamsInterceptor;
  210    210   
  211    211   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for PutWithContentEncodingEndpointParamsInterceptor {
  212    212   
    fn name(&self) -> &'static str {
  213    213   
        "PutWithContentEncodingEndpointParamsInterceptor"

tmp-codegen-diff/codegen-client-test/rest_xml/rust-client-codegen/src/operation/query_idempotency_token_auto_fill.rs

@@ -177,177 +244,244 @@
  197    197   
                if let ::std::option::Option::Some(inner_1) = &_input.token {
  198    198   
                    {
  199    199   
                        query.push_kv("token", &::aws_smithy_http::query::fmt_string(inner_1));
  200    200   
                    }
  201    201   
                }
  202    202   
                ::std::result::Result::Ok(())
  203    203   
            }
  204    204   
            #[allow(clippy::unnecessary_wraps)]
  205    205   
            fn update_http_builder(
  206    206   
                input: &crate::operation::query_idempotency_token_auto_fill::QueryIdempotencyTokenAutoFillInput,
  207         -
                builder: ::http::request::Builder,
  208         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         207  +
                builder: ::http_1x::request::Builder,
         208  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  209    209   
                let mut uri = ::std::string::String::new();
  210    210   
                uri_base(input, &mut uri)?;
  211    211   
                uri_query(input, &mut uri)?;
  212    212   
                ::std::result::Result::Ok(builder.method("POST").uri(uri))
  213    213   
            }
  214         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
         214  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
  215    215   
            builder
  216    216   
        };
  217    217   
        let body = ::aws_smithy_types::body::SdkBody::from("");
  218    218   
  219    219   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  220    220   
    }
  221    221   
}
  222    222   
#[derive(Debug)]
  223    223   
struct QueryIdempotencyTokenAutoFillEndpointParamsInterceptor;
  224    224   

tmp-codegen-diff/codegen-client-test/rest_xml/rust-client-codegen/src/operation/query_params_as_string_list_map.rs

@@ -181,181 +248,248 @@
  201    201   
                if let ::std::option::Option::Some(inner_3) = &_input.qux {
  202    202   
                    {
  203    203   
                        query.push_kv("corge", &::aws_smithy_http::query::fmt_string(inner_3));
  204    204   
                    }
  205    205   
                }
  206    206   
                ::std::result::Result::Ok(())
  207    207   
            }
  208    208   
            #[allow(clippy::unnecessary_wraps)]
  209    209   
            fn update_http_builder(
  210    210   
                input: &crate::operation::query_params_as_string_list_map::QueryParamsAsStringListMapInput,
  211         -
                builder: ::http::request::Builder,
  212         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         211  +
                builder: ::http_1x::request::Builder,
         212  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  213    213   
                let mut uri = ::std::string::String::new();
  214    214   
                uri_base(input, &mut uri)?;
  215    215   
                uri_query(input, &mut uri)?;
  216    216   
                ::std::result::Result::Ok(builder.method("POST").uri(uri))
  217    217   
            }
  218         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
         218  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
  219    219   
            builder
  220    220   
        };
  221    221   
        let body = ::aws_smithy_types::body::SdkBody::from("");
  222    222   
  223    223   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  224    224   
    }
  225    225   
}
  226    226   
#[derive(Debug)]
  227    227   
struct QueryParamsAsStringListMapEndpointParamsInterceptor;
  228    228   

tmp-codegen-diff/codegen-client-test/rest_xml/rust-client-codegen/src/operation/query_precedence.rs

@@ -173,173 +240,240 @@
  193    193   
                if let ::std::option::Option::Some(inner_2) = &_input.foo {
  194    194   
                    {
  195    195   
                        query.push_kv("bar", &::aws_smithy_http::query::fmt_string(inner_2));
  196    196   
                    }
  197    197   
                }
  198    198   
                ::std::result::Result::Ok(())
  199    199   
            }
  200    200   
            #[allow(clippy::unnecessary_wraps)]
  201    201   
            fn update_http_builder(
  202    202   
                input: &crate::operation::query_precedence::QueryPrecedenceInput,
  203         -
                builder: ::http::request::Builder,
  204         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         203  +
                builder: ::http_1x::request::Builder,
         204  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  205    205   
                let mut uri = ::std::string::String::new();
  206    206   
                uri_base(input, &mut uri)?;
  207    207   
                uri_query(input, &mut uri)?;
  208    208   
                ::std::result::Result::Ok(builder.method("POST").uri(uri))
  209    209   
            }
  210         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
         210  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
  211    211   
            builder
  212    212   
        };
  213    213   
        let body = ::aws_smithy_types::body::SdkBody::from("");
  214    214   
  215    215   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  216    216   
    }
  217    217   
}
  218    218   
#[derive(Debug)]
  219    219   
struct QueryPrecedenceEndpointParamsInterceptor;
  220    220   

tmp-codegen-diff/codegen-client-test/rest_xml/rust-client-codegen/src/operation/recursive_shapes.rs

@@ -151,151 +224,224 @@
  171    171   
                _input: &crate::operation::recursive_shapes::RecursiveShapesInput,
  172    172   
                output: &mut ::std::string::String,
  173    173   
            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
  174    174   
                use ::std::fmt::Write as _;
  175    175   
                ::std::write!(output, "/RecursiveShapes").expect("formatting should succeed");
  176    176   
                ::std::result::Result::Ok(())
  177    177   
            }
  178    178   
            #[allow(clippy::unnecessary_wraps)]
  179    179   
            fn update_http_builder(
  180    180   
                input: &crate::operation::recursive_shapes::RecursiveShapesInput,
  181         -
                builder: ::http::request::Builder,
  182         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         181  +
                builder: ::http_1x::request::Builder,
         182  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  183    183   
                let mut uri = ::std::string::String::new();
  184    184   
                uri_base(input, &mut uri)?;
  185    185   
                ::std::result::Result::Ok(builder.method("PUT").uri(uri))
  186    186   
            }
  187         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
  188         -
            builder = _header_serialization_settings.set_default_header(builder, ::http::header::CONTENT_TYPE, "application/xml");
         187  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
         188  +
            builder = _header_serialization_settings.set_default_header(builder, ::http_1x::header::CONTENT_TYPE, "application/xml");
  189    189   
            builder
  190    190   
        };
  191    191   
        let body = ::aws_smithy_types::body::SdkBody::from(crate::protocol_serde::shape_recursive_shapes::ser_recursive_shapes_op_input(&input)?);
  192    192   
        if let Some(content_length) = body.content_length() {
  193    193   
            let content_length = content_length.to_string();
  194         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         194  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  195    195   
        }
  196    196   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  197    197   
    }
  198    198   
}
  199    199   
#[derive(Debug)]
  200    200   
struct RecursiveShapesEndpointParamsInterceptor;
  201    201   
  202    202   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for RecursiveShapesEndpointParamsInterceptor {
  203    203   
    fn name(&self) -> &'static str {
  204    204   
        "RecursiveShapesEndpointParamsInterceptor"

tmp-codegen-diff/codegen-client-test/rest_xml/rust-client-codegen/src/operation/simple_scalar_properties.rs

@@ -157,157 +233,233 @@
  177    177   
                _input: &crate::operation::simple_scalar_properties::SimpleScalarPropertiesInput,
  178    178   
                output: &mut ::std::string::String,
  179    179   
            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
  180    180   
                use ::std::fmt::Write as _;
  181    181   
                ::std::write!(output, "/SimpleScalarProperties").expect("formatting should succeed");
  182    182   
                ::std::result::Result::Ok(())
  183    183   
            }
  184    184   
            #[allow(clippy::unnecessary_wraps)]
  185    185   
            fn update_http_builder(
  186    186   
                input: &crate::operation::simple_scalar_properties::SimpleScalarPropertiesInput,
  187         -
                builder: ::http::request::Builder,
  188         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         187  +
                builder: ::http_1x::request::Builder,
         188  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  189    189   
                let mut uri = ::std::string::String::new();
  190    190   
                uri_base(input, &mut uri)?;
  191    191   
                let builder = crate::protocol_serde::shape_simple_scalar_properties::ser_simple_scalar_properties_headers(input, builder)?;
  192    192   
                ::std::result::Result::Ok(builder.method("PUT").uri(uri))
  193    193   
            }
  194         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
  195         -
            builder = _header_serialization_settings.set_default_header(builder, ::http::header::CONTENT_TYPE, "application/xml");
         194  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
         195  +
            builder = _header_serialization_settings.set_default_header(builder, ::http_1x::header::CONTENT_TYPE, "application/xml");
  196    196   
            builder
  197    197   
        };
  198    198   
        let body = ::aws_smithy_types::body::SdkBody::from(
  199    199   
            crate::protocol_serde::shape_simple_scalar_properties::ser_simple_scalar_properties_op_input(&input)?,
  200    200   
        );
  201    201   
        if let Some(content_length) = body.content_length() {
  202    202   
            let content_length = content_length.to_string();
  203         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         203  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  204    204   
        }
  205    205   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  206    206   
    }
  207    207   
}
  208    208   
#[derive(Debug)]
  209    209   
struct SimpleScalarPropertiesEndpointParamsInterceptor;
  210    210   
  211    211   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for SimpleScalarPropertiesEndpointParamsInterceptor {
  212    212   
    fn name(&self) -> &'static str {
  213    213   
        "SimpleScalarPropertiesEndpointParamsInterceptor"

tmp-codegen-diff/codegen-client-test/rest_xml/rust-client-codegen/src/operation/timestamp_format_headers.rs

@@ -157,157 +224,224 @@
  177    177   
                _input: &crate::operation::timestamp_format_headers::TimestampFormatHeadersInput,
  178    178   
                output: &mut ::std::string::String,
  179    179   
            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
  180    180   
                use ::std::fmt::Write as _;
  181    181   
                ::std::write!(output, "/TimestampFormatHeaders").expect("formatting should succeed");
  182    182   
                ::std::result::Result::Ok(())
  183    183   
            }
  184    184   
            #[allow(clippy::unnecessary_wraps)]
  185    185   
            fn update_http_builder(
  186    186   
                input: &crate::operation::timestamp_format_headers::TimestampFormatHeadersInput,
  187         -
                builder: ::http::request::Builder,
  188         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         187  +
                builder: ::http_1x::request::Builder,
         188  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  189    189   
                let mut uri = ::std::string::String::new();
  190    190   
                uri_base(input, &mut uri)?;
  191    191   
                let builder = crate::protocol_serde::shape_timestamp_format_headers::ser_timestamp_format_headers_headers(input, builder)?;
  192    192   
                ::std::result::Result::Ok(builder.method("POST").uri(uri))
  193    193   
            }
  194         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
         194  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
  195    195   
            builder
  196    196   
        };
  197    197   
        let body = ::aws_smithy_types::body::SdkBody::from("");
  198    198   
  199    199   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  200    200   
    }
  201    201   
}
  202    202   
#[derive(Debug)]
  203    203   
struct TimestampFormatHeadersEndpointParamsInterceptor;
  204    204