Client Test

Client Test

rev. 03e6e47f15dfd569240d570d98975ebba692c405 (ignoring whitespace)

Files changed:

tmp-codegen-diff/codegen-client-test/rpcv2Cbor/rust-client-codegen/src/operation/fractional_seconds.rs

@@ -151,151 +227,230 @@
  171    171   
                _input: &crate::operation::fractional_seconds::FractionalSecondsInput,
  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, "/service/RpcV2Protocol/operation/FractionalSeconds").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::fractional_seconds::FractionalSecondsInput,
  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())?;
         187  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
         188  +
            builder = _header_serialization_settings.set_default_header(
         189  +
                builder,
         190  +
                ::http_1x::header::HeaderName::from_static("smithy-protocol"),
         191  +
                "rpc-v2-cbor",
         192  +
            );
  188    193   
            builder =
  189         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("smithy-protocol"), "rpc-v2-cbor");
  190         -
            builder =
  191         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("accept"), "application/cbor");
         194  +
                _header_serialization_settings.set_default_header(builder, ::http_1x::header::HeaderName::from_static("accept"), "application/cbor");
  192    195   
            builder
  193    196   
        };
  194    197   
        let body = ::aws_smithy_types::body::SdkBody::from("");
  195    198   
        if let Some(content_length) = body.content_length() {
  196    199   
            let content_length = content_length.to_string();
  197         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         200  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  198    201   
        }
  199    202   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  200    203   
    }
  201    204   
}
  202    205   
#[derive(Debug)]
  203    206   
struct FractionalSecondsEndpointParamsInterceptor;
  204    207   
  205    208   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for FractionalSecondsEndpointParamsInterceptor {
  206    209   
    fn name(&self) -> &'static str {
  207    210   
        "FractionalSecondsEndpointParamsInterceptor"

tmp-codegen-diff/codegen-client-test/rpcv2Cbor/rust-client-codegen/src/operation/greeting_with_errors.rs

@@ -151,151 +227,230 @@
  171    171   
                _input: &crate::operation::greeting_with_errors::GreetingWithErrorsInput,
  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, "/service/RpcV2Protocol/operation/GreetingWithErrors").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::greeting_with_errors::GreetingWithErrorsInput,
  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())?;
         187  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
         188  +
            builder = _header_serialization_settings.set_default_header(
         189  +
                builder,
         190  +
                ::http_1x::header::HeaderName::from_static("smithy-protocol"),
         191  +
                "rpc-v2-cbor",
         192  +
            );
  188    193   
            builder =
  189         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("smithy-protocol"), "rpc-v2-cbor");
  190         -
            builder =
  191         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("accept"), "application/cbor");
         194  +
                _header_serialization_settings.set_default_header(builder, ::http_1x::header::HeaderName::from_static("accept"), "application/cbor");
  192    195   
            builder
  193    196   
        };
  194    197   
        let body = ::aws_smithy_types::body::SdkBody::from("");
  195    198   
        if let Some(content_length) = body.content_length() {
  196    199   
            let content_length = content_length.to_string();
  197         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         200  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  198    201   
        }
  199    202   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  200    203   
    }
  201    204   
}
  202    205   
#[derive(Debug)]
  203    206   
struct GreetingWithErrorsEndpointParamsInterceptor;
  204    207   
  205    208   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for GreetingWithErrorsEndpointParamsInterceptor {
  206    209   
    fn name(&self) -> &'static str {
  207    210   
        "GreetingWithErrorsEndpointParamsInterceptor"

tmp-codegen-diff/codegen-client-test/rpcv2Cbor/rust-client-codegen/src/operation/no_input_output.rs

@@ -151,151 +227,230 @@
  171    171   
                _input: &crate::operation::no_input_output::NoInputOutputInput,
  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, "/service/RpcV2Protocol/operation/NoInputOutput").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::no_input_output::NoInputOutputInput,
  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())?;
         187  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
         188  +
            builder = _header_serialization_settings.set_default_header(
         189  +
                builder,
         190  +
                ::http_1x::header::HeaderName::from_static("smithy-protocol"),
         191  +
                "rpc-v2-cbor",
         192  +
            );
  188    193   
            builder =
  189         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("smithy-protocol"), "rpc-v2-cbor");
  190         -
            builder =
  191         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("accept"), "application/cbor");
         194  +
                _header_serialization_settings.set_default_header(builder, ::http_1x::header::HeaderName::from_static("accept"), "application/cbor");
  192    195   
            builder
  193    196   
        };
  194    197   
        let body = ::aws_smithy_types::body::SdkBody::from("");
  195    198   
        if let Some(content_length) = body.content_length() {
  196    199   
            let content_length = content_length.to_string();
  197         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         200  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  198    201   
        }
  199    202   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  200    203   
    }
  201    204   
}
  202    205   
#[derive(Debug)]
  203    206   
struct NoInputOutputEndpointParamsInterceptor;
  204    207   
  205    208   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for NoInputOutputEndpointParamsInterceptor {
  206    209   
    fn name(&self) -> &'static str {
  207    210   
        "NoInputOutputEndpointParamsInterceptor"

tmp-codegen-diff/codegen-client-test/rpcv2Cbor/rust-client-codegen/src/operation/operation_with_defaults.rs

@@ -157,157 +236,239 @@
  177    177   
                _input: &crate::operation::operation_with_defaults::OperationWithDefaultsInput,
  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, "/service/RpcV2Protocol/operation/OperationWithDefaults").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::operation_with_defaults::OperationWithDefaultsInput,
  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/cbor");
  195         -
            builder =
  196         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("smithy-protocol"), "rpc-v2-cbor");
         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/cbor");
         195  +
            builder = _header_serialization_settings.set_default_header(
         196  +
                builder,
         197  +
                ::http_1x::header::HeaderName::from_static("smithy-protocol"),
         198  +
                "rpc-v2-cbor",
         199  +
            );
  197    200   
            builder =
  198         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("accept"), "application/cbor");
         201  +
                _header_serialization_settings.set_default_header(builder, ::http_1x::header::HeaderName::from_static("accept"), "application/cbor");
  199    202   
            builder
  200    203   
        };
  201    204   
        let body = ::aws_smithy_types::body::SdkBody::from(crate::protocol_serde::shape_operation_with_defaults::ser_operation_with_defaults_input(
  202    205   
            &input,
  203    206   
        )?);
  204    207   
        if let Some(content_length) = body.content_length() {
  205    208   
            let content_length = content_length.to_string();
  206         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         209  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  207    210   
        }
  208    211   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  209    212   
    }
  210    213   
}
  211    214   
#[derive(Debug)]
  212    215   
struct OperationWithDefaultsEndpointParamsInterceptor;
  213    216   
  214    217   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for OperationWithDefaultsEndpointParamsInterceptor {
  215    218   
    fn name(&self) -> &'static str {
  216    219   
        "OperationWithDefaultsEndpointParamsInterceptor"

tmp-codegen-diff/codegen-client-test/rpcv2Cbor/rust-client-codegen/src/operation/optional_input_output.rs

@@ -151,151 +230,233 @@
  171    171   
                _input: &crate::operation::optional_input_output::OptionalInputOutputInput,
  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, "/service/RpcV2Protocol/operation/OptionalInputOutput").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::optional_input_output::OptionalInputOutputInput,
  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/cbor");
         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/cbor");
         189  +
            builder = _header_serialization_settings.set_default_header(
         190  +
                builder,
         191  +
                ::http_1x::header::HeaderName::from_static("smithy-protocol"),
         192  +
                "rpc-v2-cbor",
         193  +
            );
  189    194   
            builder =
  190         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("smithy-protocol"), "rpc-v2-cbor");
  191         -
            builder =
  192         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("accept"), "application/cbor");
         195  +
                _header_serialization_settings.set_default_header(builder, ::http_1x::header::HeaderName::from_static("accept"), "application/cbor");
  193    196   
            builder
  194    197   
        };
  195    198   
        let body = ::aws_smithy_types::body::SdkBody::from(crate::protocol_serde::shape_optional_input_output::ser_optional_input_output_input(
  196    199   
            &input,
  197    200   
        )?);
  198    201   
        if let Some(content_length) = body.content_length() {
  199    202   
            let content_length = content_length.to_string();
  200         -
            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);
  201    204   
        }
  202    205   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  203    206   
    }
  204    207   
}
  205    208   
#[derive(Debug)]
  206    209   
struct OptionalInputOutputEndpointParamsInterceptor;
  207    210   
  208    211   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for OptionalInputOutputEndpointParamsInterceptor {
  209    212   
    fn name(&self) -> &'static str {
  210    213   
        "OptionalInputOutputEndpointParamsInterceptor"

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

@@ -151,151 +228,231 @@
  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, "/service/RpcV2Protocol/operation/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("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/cbor");
         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/cbor");
         189  +
            builder = _header_serialization_settings.set_default_header(
         190  +
                builder,
         191  +
                ::http_1x::header::HeaderName::from_static("smithy-protocol"),
         192  +
                "rpc-v2-cbor",
         193  +
            );
  189    194   
            builder =
  190         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("smithy-protocol"), "rpc-v2-cbor");
  191         -
            builder =
  192         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("accept"), "application/cbor");
         195  +
                _header_serialization_settings.set_default_header(builder, ::http_1x::header::HeaderName::from_static("accept"), "application/cbor");
  193    196   
            builder
  194    197   
        };
  195    198   
        let body = ::aws_smithy_types::body::SdkBody::from(crate::protocol_serde::shape_recursive_shapes::ser_recursive_shapes_input(&input)?);
  196    199   
        if let Some(content_length) = body.content_length() {
  197    200   
            let content_length = content_length.to_string();
  198         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         201  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  199    202   
        }
  200    203   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  201    204   
    }
  202    205   
}
  203    206   
#[derive(Debug)]
  204    207   
struct RecursiveShapesEndpointParamsInterceptor;
  205    208   
  206    209   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for RecursiveShapesEndpointParamsInterceptor {
  207    210   
    fn name(&self) -> &'static str {
  208    211   
        "RecursiveShapesEndpointParamsInterceptor"

tmp-codegen-diff/codegen-client-test/rpcv2Cbor/rust-client-codegen/src/operation/rpc_v2_cbor_dense_maps.rs

@@ -151,151 +230,233 @@
  171    171   
                _input: &crate::operation::rpc_v2_cbor_dense_maps::RpcV2CborDenseMapsInput,
  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, "/service/RpcV2Protocol/operation/RpcV2CborDenseMaps").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::rpc_v2_cbor_dense_maps::RpcV2CborDenseMapsInput,
  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/cbor");
  189         -
            builder =
  190         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("smithy-protocol"), "rpc-v2-cbor");
         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/cbor");
         189  +
            builder = _header_serialization_settings.set_default_header(
         190  +
                builder,
         191  +
                ::http_1x::header::HeaderName::from_static("smithy-protocol"),
         192  +
                "rpc-v2-cbor",
         193  +
            );
  191    194   
            builder =
  192         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("accept"), "application/cbor");
         195  +
                _header_serialization_settings.set_default_header(builder, ::http_1x::header::HeaderName::from_static("accept"), "application/cbor");
  193    196   
            builder
  194    197   
        };
  195    198   
        let body = ::aws_smithy_types::body::SdkBody::from(crate::protocol_serde::shape_rpc_v2_cbor_dense_maps::ser_rpc_v2_cbor_dense_maps_input(
  196    199   
            &input,
  197    200   
        )?);
  198    201   
        if let Some(content_length) = body.content_length() {
  199    202   
            let content_length = content_length.to_string();
  200         -
            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);
  201    204   
        }
  202    205   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  203    206   
    }
  204    207   
}
  205    208   
#[derive(Debug)]
  206    209   
struct RpcV2CborDenseMapsEndpointParamsInterceptor;
  207    210   
  208    211   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for RpcV2CborDenseMapsEndpointParamsInterceptor {
  209    212   
    fn name(&self) -> &'static str {
  210    213   
        "RpcV2CborDenseMapsEndpointParamsInterceptor"

tmp-codegen-diff/codegen-client-test/rpcv2Cbor/rust-client-codegen/src/operation/rpc_v2_cbor_lists.rs

@@ -151,151 +228,231 @@
  171    171   
                _input: &crate::operation::rpc_v2_cbor_lists::RpcV2CborListsInput,
  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, "/service/RpcV2Protocol/operation/RpcV2CborLists").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::rpc_v2_cbor_lists::RpcV2CborListsInput,
  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/cbor");
  189         -
            builder =
  190         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("smithy-protocol"), "rpc-v2-cbor");
         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/cbor");
         189  +
            builder = _header_serialization_settings.set_default_header(
         190  +
                builder,
         191  +
                ::http_1x::header::HeaderName::from_static("smithy-protocol"),
         192  +
                "rpc-v2-cbor",
         193  +
            );
  191    194   
            builder =
  192         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("accept"), "application/cbor");
         195  +
                _header_serialization_settings.set_default_header(builder, ::http_1x::header::HeaderName::from_static("accept"), "application/cbor");
  193    196   
            builder
  194    197   
        };
  195    198   
        let body = ::aws_smithy_types::body::SdkBody::from(crate::protocol_serde::shape_rpc_v2_cbor_lists::ser_rpc_v2_cbor_lists_input(&input)?);
  196    199   
        if let Some(content_length) = body.content_length() {
  197    200   
            let content_length = content_length.to_string();
  198         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         201  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  199    202   
        }
  200    203   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  201    204   
    }
  202    205   
}
  203    206   
#[derive(Debug)]
  204    207   
struct RpcV2CborListsEndpointParamsInterceptor;
  205    208   
  206    209   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for RpcV2CborListsEndpointParamsInterceptor {
  207    210   
    fn name(&self) -> &'static str {
  208    211   
        "RpcV2CborListsEndpointParamsInterceptor"

tmp-codegen-diff/codegen-client-test/rpcv2Cbor/rust-client-codegen/src/operation/rpc_v2_cbor_sparse_maps.rs

@@ -151,151 +230,233 @@
  171    171   
                _input: &crate::operation::rpc_v2_cbor_sparse_maps::RpcV2CborSparseMapsInput,
  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, "/service/RpcV2Protocol/operation/RpcV2CborSparseMaps").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::rpc_v2_cbor_sparse_maps::RpcV2CborSparseMapsInput,
  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/cbor");
  189         -
            builder =
  190         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("smithy-protocol"), "rpc-v2-cbor");
         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/cbor");
         189  +
            builder = _header_serialization_settings.set_default_header(
         190  +
                builder,
         191  +
                ::http_1x::header::HeaderName::from_static("smithy-protocol"),
         192  +
                "rpc-v2-cbor",
         193  +
            );
  191    194   
            builder =
  192         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("accept"), "application/cbor");
         195  +
                _header_serialization_settings.set_default_header(builder, ::http_1x::header::HeaderName::from_static("accept"), "application/cbor");
  193    196   
            builder
  194    197   
        };
  195    198   
        let body = ::aws_smithy_types::body::SdkBody::from(crate::protocol_serde::shape_rpc_v2_cbor_sparse_maps::ser_rpc_v2_cbor_sparse_maps_input(
  196    199   
            &input,
  197    200   
        )?);
  198    201   
        if let Some(content_length) = body.content_length() {
  199    202   
            let content_length = content_length.to_string();
  200         -
            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);
  201    204   
        }
  202    205   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  203    206   
    }
  204    207   
}
  205    208   
#[derive(Debug)]
  206    209   
struct RpcV2CborSparseMapsEndpointParamsInterceptor;
  207    210   
  208    211   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for RpcV2CborSparseMapsEndpointParamsInterceptor {
  209    212   
    fn name(&self) -> &'static str {
  210    213   
        "RpcV2CborSparseMapsEndpointParamsInterceptor"

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

@@ -157,157 +236,239 @@
  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, "/service/RpcV2Protocol/operation/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   
                ::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/cbor");
  195         -
            builder =
  196         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("smithy-protocol"), "rpc-v2-cbor");
         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/cbor");
         195  +
            builder = _header_serialization_settings.set_default_header(
         196  +
                builder,
         197  +
                ::http_1x::header::HeaderName::from_static("smithy-protocol"),
         198  +
                "rpc-v2-cbor",
         199  +
            );
  197    200   
            builder =
  198         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("accept"), "application/cbor");
         201  +
                _header_serialization_settings.set_default_header(builder, ::http_1x::header::HeaderName::from_static("accept"), "application/cbor");
  199    202   
            builder
  200    203   
        };
  201    204   
        let body = ::aws_smithy_types::body::SdkBody::from(
  202    205   
            crate::protocol_serde::shape_simple_scalar_properties::ser_simple_scalar_properties_input(&input)?,
  203    206   
        );
  204    207   
        if let Some(content_length) = body.content_length() {
  205    208   
            let content_length = content_length.to_string();
  206         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         209  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  207    210   
        }
  208    211   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  209    212   
    }
  210    213   
}
  211    214   
#[derive(Debug)]
  212    215   
struct SimpleScalarPropertiesEndpointParamsInterceptor;
  213    216   
  214    217   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for SimpleScalarPropertiesEndpointParamsInterceptor {
  215    218   
    fn name(&self) -> &'static str {
  216    219   
        "SimpleScalarPropertiesEndpointParamsInterceptor"

tmp-codegen-diff/codegen-client-test/rpcv2Cbor/rust-client-codegen/src/operation/sparse_nulls_operation.rs

@@ -157,157 +236,239 @@
  177    177   
                _input: &crate::operation::sparse_nulls_operation::SparseNullsOperationInput,
  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, "/service/RpcV2Protocol/operation/SparseNullsOperation").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::sparse_nulls_operation::SparseNullsOperationInput,
  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/cbor");
  195         -
            builder =
  196         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("smithy-protocol"), "rpc-v2-cbor");
         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/cbor");
         195  +
            builder = _header_serialization_settings.set_default_header(
         196  +
                builder,
         197  +
                ::http_1x::header::HeaderName::from_static("smithy-protocol"),
         198  +
                "rpc-v2-cbor",
         199  +
            );
  197    200   
            builder =
  198         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("accept"), "application/cbor");
         201  +
                _header_serialization_settings.set_default_header(builder, ::http_1x::header::HeaderName::from_static("accept"), "application/cbor");
  199    202   
            builder
  200    203   
        };
  201    204   
        let body = ::aws_smithy_types::body::SdkBody::from(crate::protocol_serde::shape_sparse_nulls_operation::ser_sparse_nulls_operation_input(
  202    205   
            &input,
  203    206   
        )?);
  204    207   
        if let Some(content_length) = body.content_length() {
  205    208   
            let content_length = content_length.to_string();
  206         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         209  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  207    210   
        }
  208    211   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  209    212   
    }
  210    213   
}
  211    214   
#[derive(Debug)]
  212    215   
struct SparseNullsOperationEndpointParamsInterceptor;
  213    216   
  214    217   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for SparseNullsOperationEndpointParamsInterceptor {
  215    218   
    fn name(&self) -> &'static str {
  216    219   
        "SparseNullsOperationEndpointParamsInterceptor"

tmp-codegen-diff/codegen-client-test/rpcv2Cbor/rust-client-codegen/src/serialization_settings.rs

@@ -1,1 +78,83 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
    2      2   
/*
    3      3   
 * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
    4      4   
 * SPDX-License-Identifier: Apache-2.0
    5      5   
 */
    6      6   
    7      7   
#![allow(dead_code)]
    8      8   
    9      9   
use aws_smithy_http::header::set_request_header_if_absent;
   10     10   
use aws_smithy_types::config_bag::{Storable, StoreReplace};
   11         -
use http::header::{HeaderName, CONTENT_LENGTH, CONTENT_TYPE};
          11  +
use http_1x::header::{HeaderName, CONTENT_LENGTH, CONTENT_TYPE};
   12     12   
   13     13   
/// Configuration for how default protocol headers are serialized
   14     14   
#[derive(Clone, Debug, Default)]
   15     15   
pub(crate) struct HeaderSerializationSettings {
   16     16   
    omit_default_content_length: bool,
   17     17   
    omit_default_content_type: bool,
   18     18   
}
   19     19   
   20     20   
impl HeaderSerializationSettings {
   21     21   
    /// Creates new [`HeaderSerializationSettings`]
   22     22   
    pub(crate) fn new() -> Self {
   23     23   
        Default::default()
   24     24   
    }
   25     25   
   26     26   
    /// Omit the default `Content-Length` header during serialization
   27     27   
    pub(crate) fn omit_default_content_length(self) -> Self {
   28     28   
        Self {
   29     29   
            omit_default_content_length: true,
   30     30   
            ..self
   31     31   
        }
   32     32   
    }
   33     33   
   34     34   
    /// Omit the default `Content-Type` header during serialization
   35     35   
    pub(crate) fn omit_default_content_type(self) -> Self {
   36     36   
        Self {
   37     37   
            omit_default_content_type: true,
   38     38   
            ..self
   39     39   
        }
   40     40   
    }
   41     41   
   42     42   
    /// Returns true if the given default header name should be serialized
   43     43   
    fn include_header(&self, header: &HeaderName) -> bool {
   44     44   
        (!self.omit_default_content_length || header != CONTENT_LENGTH) && (!self.omit_default_content_type || header != CONTENT_TYPE)
   45     45   
    }
   46     46   
   47     47   
    /// Sets a default header on the given request builder if it should be serialized
   48         -
    pub(crate) fn set_default_header(&self, mut request: http::request::Builder, header_name: HeaderName, value: &str) -> http::request::Builder {
          48  +
    pub(crate) fn set_default_header(
          49  +
        &self,
          50  +
        mut request: http_1x::request::Builder,
          51  +
        header_name: HeaderName,
          52  +
        value: &str,
          53  +
    ) -> http_1x::request::Builder {
   49     54   
        if self.include_header(&header_name) {
   50     55   
            request = set_request_header_if_absent(request, header_name, value);
   51     56   
        }
   52     57   
        request
   53     58   
    }
   54     59   
}
   55     60   
   56     61   
impl Storable for HeaderSerializationSettings {
   57     62   
    type Storer = StoreReplace<Self>;
   58     63   
}

tmp-codegen-diff/codegen-client-test/rpcv2Cbor_extras/rust-client-codegen/Cargo.toml

@@ -1,1 +66,70 @@
   16     16   
[dependencies.aws-smithy-eventstream]
   17     17   
path = "/home/build/workspace/smithy-rs/rust-runtime/aws-smithy-eventstream"
   18     18   
[dependencies.aws-smithy-http]
   19     19   
path = "/home/build/workspace/smithy-rs/rust-runtime/aws-smithy-http"
   20     20   
features = ["event-stream"]
   21     21   
[dependencies.aws-smithy-runtime]
   22     22   
path = "/home/build/workspace/smithy-rs/rust-runtime/aws-smithy-runtime"
   23     23   
features = ["client"]
   24     24   
[dependencies.aws-smithy-runtime-api]
   25     25   
path = "/home/build/workspace/smithy-rs/rust-runtime/aws-smithy-runtime-api"
   26         -
features = ["client", "http-02x"]
          26  +
features = ["client", "http-1x"]
   27     27   
[dependencies.aws-smithy-types]
   28     28   
path = "/home/build/workspace/smithy-rs/rust-runtime/aws-smithy-types"
   29         -
features = ["http-body-0-4-x"]
          29  +
features = ["http-body-1-x", "http-body-0-4-x"]
   30     30   
[dependencies.bytes]
   31     31   
version = "1.4.0"
   32     32   
[dependencies.fastrand]
   33     33   
version = "2.0.0"
   34     34   
[dependencies.futures-util]
   35     35   
version = "0.3.25"
   36     36   
features = ["alloc"]
   37     37   
default-features = false
   38     38   
[dependencies.http]
   39     39   
version = "0.2.9"
          40  +
[dependencies.http-1x]
          41  +
version = "1"
          42  +
package = "http"
   40     43   
[dependencies.hyper]
   41     44   
version = "0.14.26"
   42     45   
features = ["stream"]
   43     46   
[dependencies.tracing]
   44     47   
version = "0.1"
   45     48   
[dev-dependencies.aws-smithy-protocol-test]
   46     49   
path = "/home/build/workspace/smithy-rs/rust-runtime/aws-smithy-protocol-test"
   47     50   
[dev-dependencies.aws-smithy-types]
   48     51   
path = "/home/build/workspace/smithy-rs/rust-runtime/aws-smithy-types"
          52  +
features = ["http-body-1-x"]
   49     53   
[dev-dependencies.pretty_assertions]
   50     54   
version = "1.3.0"
   51     55   
[dev-dependencies.tokio]
   52     56   
version = "1.23.1"
   53     57   
features = ["macros", "test-util", "rt-multi-thread"]
   54     58   
[dev-dependencies.tracing-test]
   55     59   
version = "0.2.5"
   56     60   
features = ["no-env-filter"]
   57     61   
[features]
   58     62   
rt-tokio = ["aws-smithy-async/rt-tokio", "aws-smithy-types/rt-tokio"]

tmp-codegen-diff/codegen-client-test/rpcv2Cbor_extras/rust-client-codegen/src/operation/complex_struct_operation.rs

@@ -157,157 +236,239 @@
  177    177   
                _input: &crate::operation::complex_struct_operation::ComplexStructOperationInput,
  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, "/service/RpcV2CborService/operation/ComplexStructOperation").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::complex_struct_operation::ComplexStructOperationInput,
  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/cbor");
  195         -
            builder =
  196         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("smithy-protocol"), "rpc-v2-cbor");
         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/cbor");
         195  +
            builder = _header_serialization_settings.set_default_header(
         196  +
                builder,
         197  +
                ::http_1x::header::HeaderName::from_static("smithy-protocol"),
         198  +
                "rpc-v2-cbor",
         199  +
            );
  197    200   
            builder =
  198         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("accept"), "application/cbor");
         201  +
                _header_serialization_settings.set_default_header(builder, ::http_1x::header::HeaderName::from_static("accept"), "application/cbor");
  199    202   
            builder
  200    203   
        };
  201    204   
        let body = ::aws_smithy_types::body::SdkBody::from(
  202    205   
            crate::protocol_serde::shape_complex_struct_operation::ser_complex_struct_operation_input(&input)?,
  203    206   
        );
  204    207   
        if let Some(content_length) = body.content_length() {
  205    208   
            let content_length = content_length.to_string();
  206         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         209  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  207    210   
        }
  208    211   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  209    212   
    }
  210    213   
}
  211    214   
#[derive(Debug)]
  212    215   
struct ComplexStructOperationEndpointParamsInterceptor;
  213    216   
  214    217   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for ComplexStructOperationEndpointParamsInterceptor {
  215    218   
    fn name(&self) -> &'static str {
  216    219   
        "ComplexStructOperationEndpointParamsInterceptor"

tmp-codegen-diff/codegen-client-test/rpcv2Cbor_extras/rust-client-codegen/src/operation/empty_struct_operation.rs

@@ -157,157 +236,239 @@
  177    177   
                _input: &crate::operation::empty_struct_operation::EmptyStructOperationInput,
  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, "/service/RpcV2CborService/operation/EmptyStructOperation").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::empty_struct_operation::EmptyStructOperationInput,
  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/cbor");
         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/cbor");
         195  +
            builder = _header_serialization_settings.set_default_header(
         196  +
                builder,
         197  +
                ::http_1x::header::HeaderName::from_static("smithy-protocol"),
         198  +
                "rpc-v2-cbor",
         199  +
            );
  195    200   
            builder =
  196         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("smithy-protocol"), "rpc-v2-cbor");
  197         -
            builder =
  198         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("accept"), "application/cbor");
         201  +
                _header_serialization_settings.set_default_header(builder, ::http_1x::header::HeaderName::from_static("accept"), "application/cbor");
  199    202   
            builder
  200    203   
        };
  201    204   
        let body = ::aws_smithy_types::body::SdkBody::from(crate::protocol_serde::shape_empty_struct_operation::ser_empty_struct_operation_input(
  202    205   
            &input,
  203    206   
        )?);
  204    207   
        if let Some(content_length) = body.content_length() {
  205    208   
            let content_length = content_length.to_string();
  206         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         209  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  207    210   
        }
  208    211   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  209    212   
    }
  210    213   
}
  211    214   
#[derive(Debug)]
  212    215   
struct EmptyStructOperationEndpointParamsInterceptor;
  213    216   
  214    217   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for EmptyStructOperationEndpointParamsInterceptor {
  215    218   
    fn name(&self) -> &'static str {
  216    219   
        "EmptyStructOperationEndpointParamsInterceptor"

tmp-codegen-diff/codegen-client-test/rpcv2Cbor_extras/rust-client-codegen/src/operation/error_serialization_operation.rs

@@ -157,157 +236,239 @@
  177    177   
                _input: &crate::operation::error_serialization_operation::ErrorSerializationOperationInput,
  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, "/service/RpcV2CborService/operation/ErrorSerializationOperation").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::error_serialization_operation::ErrorSerializationOperationInput,
  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/cbor");
  195         -
            builder =
  196         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("smithy-protocol"), "rpc-v2-cbor");
         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/cbor");
         195  +
            builder = _header_serialization_settings.set_default_header(
         196  +
                builder,
         197  +
                ::http_1x::header::HeaderName::from_static("smithy-protocol"),
         198  +
                "rpc-v2-cbor",
         199  +
            );
  197    200   
            builder =
  198         -
                _header_serialization_settings.set_default_header(builder, ::http::header::HeaderName::from_static("accept"), "application/cbor");
         201  +
                _header_serialization_settings.set_default_header(builder, ::http_1x::header::HeaderName::from_static("accept"), "application/cbor");
  199    202   
            builder
  200    203   
        };
  201    204   
        let body = ::aws_smithy_types::body::SdkBody::from(
  202    205   
            crate::protocol_serde::shape_error_serialization_operation::ser_error_serialization_operation_input(&input)?,
  203    206   
        );
  204    207   
        if let Some(content_length) = body.content_length() {
  205    208   
            let content_length = content_length.to_string();
  206         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         209  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  207    210   
        }
  208    211   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  209    212   
    }
  210    213   
}
  211    214   
#[derive(Debug)]
  212    215   
struct ErrorSerializationOperationEndpointParamsInterceptor;
  213    216   
  214    217   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for ErrorSerializationOperationEndpointParamsInterceptor {
  215    218   
    fn name(&self) -> &'static str {
  216    219   
        "ErrorSerializationOperationEndpointParamsInterceptor"