Server Test

Server Test

rev. ee474c7509d7728618c23068f3741e8e5b339ef9 (ignoring whitespace)

Files changed:

tmp-codegen-diff/codegen-server-test/rest_json/rust-server-codegen/src/protocol_serde/shape_streaming_traits_with_media_type_output.rs

@@ -1,1 +9,15 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* HttpBoundProtocolPayloadGenerator.kt:309 */
    2      3   
pub fn ser_blob_http_payload(
    3      4   
    payload: ::aws_smithy_types::byte_stream::ByteStream,
    4      5   
) -> ::std::result::Result<
    5      6   
    ::aws_smithy_types::byte_stream::ByteStream,
    6      7   
    ::aws_smithy_types::error::operation::BuildError,
    7      8   
> {
    8         -
    Ok(payload)
           9  +
    /* HttpBoundProtocolPayloadGenerator.kt:343 */
          10  +
    Ok(
          11  +
        /* HttpBoundProtocolPayloadGenerator.kt:372 */
          12  +
        payload, /* HttpBoundProtocolPayloadGenerator.kt:343 */
          13  +
    )
          14  +
    /* HttpBoundProtocolPayloadGenerator.kt:309 */
    9     15   
}

tmp-codegen-diff/codegen-server-test/rest_json/rust-server-codegen/src/protocol_serde/shape_string_list.rs

@@ -1,1 +52,78 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonParserGenerator.kt:398 */
    2      3   
pub(crate) fn de_string_list<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<
    5      6   
    Option<::std::vec::Vec<::std::string::String>>,
    6      7   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    7      8   
>
    8      9   
where
    9     10   
    I: Iterator<
   10     11   
        Item = Result<
   11     12   
            ::aws_smithy_json::deserialize::Token<'a>,
   12     13   
            ::aws_smithy_json::deserialize::error::DeserializeError,
   13     14   
        >,
   14     15   
    >,
   15     16   
{
          17  +
    /* JsonParserGenerator.kt:712 */
   16     18   
    match tokens.next().transpose()? {
          19  +
        /* JsonParserGenerator.kt:713 */
   17     20   
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   18     21   
        Some(::aws_smithy_json::deserialize::Token::StartArray { .. }) => {
          22  +
            /* JsonParserGenerator.kt:407 */
   19     23   
            let mut items = Vec::new();
          24  +
            /* JsonParserGenerator.kt:408 */
   20     25   
            loop {
          26  +
                /* JsonParserGenerator.kt:409 */
   21     27   
                match tokens.peek() {
          28  +
                    /* JsonParserGenerator.kt:410 */
   22     29   
                    Some(Ok(::aws_smithy_json::deserialize::Token::EndArray { .. })) => {
          30  +
                        /* JsonParserGenerator.kt:411 */
   23     31   
                        tokens.next().transpose().unwrap();
   24     32   
                        break;
          33  +
                        /* JsonParserGenerator.kt:410 */
   25     34   
                    }
          35  +
                    /* JsonParserGenerator.kt:413 */
   26     36   
                    _ => {
   27         -
                        let value = ::aws_smithy_json::deserialize::token::expect_string_or_null(
   28         -
                            tokens.next(),
   29         -
                        )?
   30         -
                        .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   31         -
                        .transpose()?;
          37  +
                        /* JsonParserGenerator.kt:419 */
          38  +
                        let value =
          39  +
                            /* JsonParserGenerator.kt:354 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
          40  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          41  +
                                    /* JsonParserGenerator.kt:348 */u.into_owned()
          42  +
                                /* JsonParserGenerator.kt:339 */)
          43  +
                            /* JsonParserGenerator.kt:354 */).transpose()?
          44  +
                        /* JsonParserGenerator.kt:419 */;
          45  +
                        /* JsonParserGenerator.kt:422 */
   32     46   
                        if let Some(value) = value {
   33     47   
                            items.push(value);
   34         -
                        } else {
          48  +
                        }
          49  +
                        /* JsonParserGenerator.kt:430 */
          50  +
                        else {
   35     51   
                            return Err(
   36     52   
                                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   37     53   
                                    "dense list cannot contain null values",
   38     54   
                                ),
   39     55   
                            );
   40     56   
                        }
          57  +
                        /* JsonParserGenerator.kt:413 */
          58  +
                    } /* JsonParserGenerator.kt:409 */
   41     59   
                }
          60  +
                /* JsonParserGenerator.kt:408 */
   42     61   
            }
   43         -
            }
          62  +
            /* JsonParserGenerator.kt:446 */
   44     63   
            Ok(Some(items))
          64  +
            /* JsonParserGenerator.kt:713 */
   45     65   
        }
   46         -
        _ => Err(
          66  +
        /* JsonParserGenerator.kt:722 */
          67  +
        _ => {
          68  +
            /* JsonParserGenerator.kt:723 */
          69  +
            Err(
   47     70   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   48     71   
                    "expected start array or null",
   49     72   
                ),
   50         -
        ),
          73  +
            )
          74  +
            /* JsonParserGenerator.kt:722 */
          75  +
        } /* JsonParserGenerator.kt:712 */
   51     76   
    }
          77  +
    /* JsonParserGenerator.kt:398 */
   52     78   
}

tmp-codegen-diff/codegen-server-test/rest_json/rust-server-codegen/src/protocol_serde/shape_string_map.rs

@@ -1,1 +60,87 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonParserGenerator.kt:460 */
    2      3   
pub(crate) fn de_string_map<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<
    5      6   
    Option<::std::collections::HashMap<::std::string::String, ::std::string::String>>,
    6      7   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    7      8   
>
    8      9   
where
    9     10   
    I: Iterator<
   10     11   
        Item = Result<
   11     12   
            ::aws_smithy_json::deserialize::Token<'a>,
   12     13   
            ::aws_smithy_json::deserialize::error::DeserializeError,
   13     14   
        >,
   14     15   
    >,
   15     16   
{
          17  +
    /* JsonParserGenerator.kt:712 */
   16     18   
    match tokens.next().transpose()? {
          19  +
        /* JsonParserGenerator.kt:713 */
   17     20   
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   18     21   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
          22  +
            /* JsonParserGenerator.kt:469 */
   19     23   
            let mut map = ::std::collections::HashMap::new();
          24  +
            /* JsonParserGenerator.kt:684 */
   20     25   
            loop {
          26  +
                /* JsonParserGenerator.kt:685 */
   21     27   
                match tokens.next().transpose()? {
          28  +
                    /* JsonParserGenerator.kt:686 */
   22     29   
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   23     30   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   24         -
                        let key = key.to_unescaped().map(|u| u.into_owned())?;
   25         -
                        let value = ::aws_smithy_json::deserialize::token::expect_string_or_null(
   26         -
                            tokens.next(),
   27         -
                        )?
   28         -
                        .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   29         -
                        .transpose()?;
          31  +
                        /* JsonParserGenerator.kt:471 */
          32  +
                        let key =
          33  +
                            /* JsonParserGenerator.kt:339 */key.to_unescaped().map(|u|
          34  +
                                /* JsonParserGenerator.kt:348 */u.into_owned()
          35  +
                            /* JsonParserGenerator.kt:339 */)
          36  +
                        /* JsonParserGenerator.kt:471 */?;
          37  +
                        /* JsonParserGenerator.kt:474 */
          38  +
                        let value =
          39  +
                            /* JsonParserGenerator.kt:354 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
          40  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          41  +
                                    /* JsonParserGenerator.kt:348 */u.into_owned()
          42  +
                                /* JsonParserGenerator.kt:339 */)
          43  +
                            /* JsonParserGenerator.kt:354 */).transpose()?
          44  +
                        /* JsonParserGenerator.kt:474 */;
          45  +
                        /* JsonParserGenerator.kt:481 */
   30     46   
                        match value {
   31     47   
                            Some(value) => {
   32     48   
                                map.insert(key, value);
   33     49   
                            }
   34     50   
                            None => {
   35     51   
                                return Err(
   36     52   
                                    ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   37     53   
                                        "dense map cannot contain null values",
   38     54   
                                    ),
   39     55   
                                )
   40     56   
                            }
   41     57   
                        }
          58  +
                        /* JsonParserGenerator.kt:686 */
   42     59   
                    }
          60  +
                    /* JsonParserGenerator.kt:695 */
   43     61   
                    other => {
   44     62   
                        return Err(
   45     63   
                            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   46     64   
                                format!("expected object key or end object, found: {other:?}"),
   47     65   
                            ),
   48     66   
                        )
          67  +
                    } /* JsonParserGenerator.kt:685 */
   49     68   
                }
          69  +
                /* JsonParserGenerator.kt:684 */
   50     70   
            }
   51         -
            }
          71  +
            /* JsonParserGenerator.kt:504 */
   52     72   
            Ok(Some(map))
          73  +
            /* JsonParserGenerator.kt:713 */
   53     74   
        }
   54         -
        _ => Err(
          75  +
        /* JsonParserGenerator.kt:722 */
          76  +
        _ => {
          77  +
            /* JsonParserGenerator.kt:723 */
          78  +
            Err(
   55     79   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   56     80   
                    "expected start object or null",
   57     81   
                ),
   58         -
        ),
          82  +
            )
          83  +
            /* JsonParserGenerator.kt:722 */
          84  +
        } /* JsonParserGenerator.kt:712 */
   59     85   
    }
          86  +
    /* JsonParserGenerator.kt:460 */
   60     87   
}

tmp-codegen-diff/codegen-server-test/rest_json/rust-server-codegen/src/protocol_serde/shape_string_set.rs

@@ -1,1 +54,80 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonParserGenerator.kt:398 */
    2      3   
pub(crate) fn de_string_set<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<
    5      6   
    Option<crate::unconstrained::string_set_unconstrained::StringSetUnconstrained>,
    6      7   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    7      8   
>
    8      9   
where
    9     10   
    I: Iterator<
   10     11   
        Item = Result<
   11     12   
            ::aws_smithy_json::deserialize::Token<'a>,
   12     13   
            ::aws_smithy_json::deserialize::error::DeserializeError,
   13     14   
        >,
   14     15   
    >,
   15     16   
{
          17  +
    /* JsonParserGenerator.kt:712 */
   16     18   
    match tokens.next().transpose()? {
          19  +
        /* JsonParserGenerator.kt:713 */
   17     20   
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   18     21   
        Some(::aws_smithy_json::deserialize::Token::StartArray { .. }) => {
          22  +
            /* JsonParserGenerator.kt:407 */
   19     23   
            let mut items = Vec::new();
          24  +
            /* JsonParserGenerator.kt:408 */
   20     25   
            loop {
          26  +
                /* JsonParserGenerator.kt:409 */
   21     27   
                match tokens.peek() {
          28  +
                    /* JsonParserGenerator.kt:410 */
   22     29   
                    Some(Ok(::aws_smithy_json::deserialize::Token::EndArray { .. })) => {
          30  +
                        /* JsonParserGenerator.kt:411 */
   23     31   
                        tokens.next().transpose().unwrap();
   24     32   
                        break;
          33  +
                        /* JsonParserGenerator.kt:410 */
   25     34   
                    }
          35  +
                    /* JsonParserGenerator.kt:413 */
   26     36   
                    _ => {
   27         -
                        let value = ::aws_smithy_json::deserialize::token::expect_string_or_null(
   28         -
                            tokens.next(),
   29         -
                        )?
   30         -
                        .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   31         -
                        .transpose()?;
          37  +
                        /* JsonParserGenerator.kt:419 */
          38  +
                        let value =
          39  +
                            /* JsonParserGenerator.kt:354 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
          40  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          41  +
                                    /* JsonParserGenerator.kt:348 */u.into_owned()
          42  +
                                /* JsonParserGenerator.kt:339 */)
          43  +
                            /* JsonParserGenerator.kt:354 */).transpose()?
          44  +
                        /* JsonParserGenerator.kt:419 */;
          45  +
                        /* JsonParserGenerator.kt:422 */
   32     46   
                        if let Some(value) = value {
   33     47   
                            items.push(value);
   34         -
                        } else {
          48  +
                        }
          49  +
                        /* JsonParserGenerator.kt:430 */
          50  +
                        else {
   35     51   
                            return Err(
   36     52   
                                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   37     53   
                                    "dense list cannot contain null values",
   38     54   
                                ),
   39     55   
                            );
   40     56   
                        }
          57  +
                        /* JsonParserGenerator.kt:413 */
          58  +
                    } /* JsonParserGenerator.kt:409 */
   41     59   
                }
          60  +
                /* JsonParserGenerator.kt:408 */
   42     61   
            }
   43         -
            }
          62  +
            /* JsonParserGenerator.kt:444 */
   44     63   
            Ok(Some(
   45     64   
                crate::unconstrained::string_set_unconstrained::StringSetUnconstrained(items),
   46     65   
            ))
          66  +
            /* JsonParserGenerator.kt:713 */
   47     67   
        }
   48         -
        _ => Err(
          68  +
        /* JsonParserGenerator.kt:722 */
          69  +
        _ => {
          70  +
            /* JsonParserGenerator.kt:723 */
          71  +
            Err(
   49     72   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   50     73   
                    "expected start array or null",
   51     74   
                ),
   52         -
        ),
          75  +
            )
          76  +
            /* JsonParserGenerator.kt:722 */
          77  +
        } /* JsonParserGenerator.kt:712 */
   53     78   
    }
          79  +
    /* JsonParserGenerator.kt:398 */
   54     80   
}

tmp-codegen-diff/codegen-server-test/rest_json/rust-server-codegen/src/protocol_serde/shape_structure_list.rs

@@ -1,1 +50,74 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonParserGenerator.kt:398 */
    2      3   
pub(crate) fn de_structure_list<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<
    5      6   
    Option<::std::vec::Vec<crate::model::StructureListMember>>,
    6      7   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    7      8   
>
    8      9   
where
    9     10   
    I: Iterator<
   10     11   
        Item = Result<
   11     12   
            ::aws_smithy_json::deserialize::Token<'a>,
   12     13   
            ::aws_smithy_json::deserialize::error::DeserializeError,
   13     14   
        >,
   14     15   
    >,
   15     16   
{
          17  +
    /* JsonParserGenerator.kt:712 */
   16     18   
    match tokens.next().transpose()? {
          19  +
        /* JsonParserGenerator.kt:713 */
   17     20   
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   18     21   
        Some(::aws_smithy_json::deserialize::Token::StartArray { .. }) => {
          22  +
            /* JsonParserGenerator.kt:407 */
   19     23   
            let mut items = Vec::new();
          24  +
            /* JsonParserGenerator.kt:408 */
   20     25   
            loop {
          26  +
                /* JsonParserGenerator.kt:409 */
   21     27   
                match tokens.peek() {
          28  +
                    /* JsonParserGenerator.kt:410 */
   22     29   
                    Some(Ok(::aws_smithy_json::deserialize::Token::EndArray { .. })) => {
          30  +
                        /* JsonParserGenerator.kt:411 */
   23     31   
                        tokens.next().transpose().unwrap();
   24     32   
                        break;
          33  +
                        /* JsonParserGenerator.kt:410 */
   25     34   
                    }
          35  +
                    /* JsonParserGenerator.kt:413 */
   26     36   
                    _ => {
          37  +
                        /* JsonParserGenerator.kt:419 */
   27     38   
                        let value =
   28         -
                            crate::protocol_serde::shape_structure_list_member::de_structure_list_member(tokens)?
   29         -
                        ;
          39  +
                            /* JsonParserGenerator.kt:544 */crate::protocol_serde::shape_structure_list_member::de_structure_list_member(tokens)?
          40  +
                        /* JsonParserGenerator.kt:419 */;
          41  +
                        /* JsonParserGenerator.kt:422 */
   30     42   
                        if let Some(value) = value {
   31     43   
                            items.push(value);
   32         -
                        } else {
          44  +
                        }
          45  +
                        /* JsonParserGenerator.kt:430 */
          46  +
                        else {
   33     47   
                            return Err(
   34     48   
                                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   35     49   
                                    "dense list cannot contain null values",
   36     50   
                                ),
   37     51   
                            );
   38     52   
                        }
          53  +
                        /* JsonParserGenerator.kt:413 */
          54  +
                    } /* JsonParserGenerator.kt:409 */
   39     55   
                }
          56  +
                /* JsonParserGenerator.kt:408 */
   40     57   
            }
   41         -
            }
          58  +
            /* JsonParserGenerator.kt:446 */
   42     59   
            Ok(Some(items))
          60  +
            /* JsonParserGenerator.kt:713 */
   43     61   
        }
   44         -
        _ => Err(
          62  +
        /* JsonParserGenerator.kt:722 */
          63  +
        _ => {
          64  +
            /* JsonParserGenerator.kt:723 */
          65  +
            Err(
   45     66   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   46     67   
                    "expected start array or null",
   47     68   
                ),
   48         -
        ),
          69  +
            )
          70  +
            /* JsonParserGenerator.kt:722 */
          71  +
        } /* JsonParserGenerator.kt:712 */
   49     72   
    }
          73  +
    /* JsonParserGenerator.kt:398 */
   50     74   
}

tmp-codegen-diff/codegen-server-test/rest_json/rust-server-codegen/src/protocol_serde/shape_structure_list_member.rs

@@ -1,1 +77,113 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonSerializerGenerator.kt:358 */
    2      3   
pub fn ser_structure_list_member(
    3      4   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
    4      5   
    input: &crate::model::StructureListMember,
    5      6   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
           7  +
    /* JsonSerializerGenerator.kt:382 */
    6      8   
    if let Some(var_1) = &input.a {
           9  +
        /* JsonSerializerGenerator.kt:423 */
    7     10   
        object.key("value").string(var_1.as_str());
          11  +
        /* JsonSerializerGenerator.kt:382 */
    8     12   
    }
          13  +
    /* JsonSerializerGenerator.kt:382 */
    9     14   
    if let Some(var_2) = &input.b {
          15  +
        /* JsonSerializerGenerator.kt:423 */
   10     16   
        object.key("other").string(var_2.as_str());
          17  +
        /* JsonSerializerGenerator.kt:382 */
   11     18   
    }
          19  +
    /* JsonSerializerGenerator.kt:372 */
   12     20   
    Ok(())
          21  +
    /* JsonSerializerGenerator.kt:358 */
   13     22   
}
   14     23   
          24  +
/* JsonParserGenerator.kt:516 */
   15     25   
pub(crate) fn de_structure_list_member<'a, I>(
   16     26   
    tokens: &mut ::std::iter::Peekable<I>,
   17     27   
) -> ::std::result::Result<
   18     28   
    Option<crate::model::StructureListMember>,
   19     29   
    ::aws_smithy_json::deserialize::error::DeserializeError,
   20     30   
>
   21     31   
where
   22     32   
    I: Iterator<
   23     33   
        Item = Result<
   24     34   
            ::aws_smithy_json::deserialize::Token<'a>,
   25     35   
            ::aws_smithy_json::deserialize::error::DeserializeError,
   26     36   
        >,
   27     37   
    >,
   28     38   
{
          39  +
    /* JsonParserGenerator.kt:712 */
   29     40   
    match tokens.next().transpose()? {
          41  +
        /* JsonParserGenerator.kt:713 */
   30     42   
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   31     43   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
          44  +
            /* RustType.kt:534 */
   32     45   
            #[allow(unused_mut)]
          46  +
            /* JsonParserGenerator.kt:526 */
   33     47   
            let mut builder = crate::model::structure_list_member::Builder::default();
          48  +
            /* JsonParserGenerator.kt:684 */
   34     49   
            loop {
          50  +
                /* JsonParserGenerator.kt:685 */
   35     51   
                match tokens.next().transpose()? {
          52  +
                    /* JsonParserGenerator.kt:686 */
   36     53   
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   37     54   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
          55  +
                        /* JsonParserGenerator.kt:260 */
   38     56   
                        match key.to_unescaped()?.as_ref() {
          57  +
                            /* JsonParserGenerator.kt:262 */
   39     58   
                            "value" => {
          59  +
                                /* JsonParserGenerator.kt:272 */
   40     60   
                                builder = builder.set_a(
   41         -
                                    ::aws_smithy_json::deserialize::token::expect_string_or_null(
   42         -
                                        tokens.next(),
   43         -
                                    )?
   44         -
                                    .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   45         -
                                    .transpose()?,
   46         -
                                );
          61  +
                                    /* JsonParserGenerator.kt:354 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
          62  +
                                        /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          63  +
                                            /* JsonParserGenerator.kt:348 */u.into_owned()
          64  +
                                        /* JsonParserGenerator.kt:339 */)
          65  +
                                    /* JsonParserGenerator.kt:354 */).transpose()?
          66  +
                                /* JsonParserGenerator.kt:272 */);
          67  +
                                /* JsonParserGenerator.kt:262 */
   47     68   
                            }
          69  +
                            /* JsonParserGenerator.kt:262 */
   48     70   
                            "other" => {
          71  +
                                /* JsonParserGenerator.kt:272 */
   49     72   
                                builder = builder.set_b(
   50         -
                                    ::aws_smithy_json::deserialize::token::expect_string_or_null(
   51         -
                                        tokens.next(),
   52         -
                                    )?
   53         -
                                    .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   54         -
                                    .transpose()?,
   55         -
                                );
          73  +
                                    /* JsonParserGenerator.kt:354 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
          74  +
                                        /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          75  +
                                            /* JsonParserGenerator.kt:348 */u.into_owned()
          76  +
                                        /* JsonParserGenerator.kt:339 */)
          77  +
                                    /* JsonParserGenerator.kt:354 */).transpose()?
          78  +
                                /* JsonParserGenerator.kt:272 */);
          79  +
                                /* JsonParserGenerator.kt:262 */
   56     80   
                            }
   57         -
                            _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
          81  +
                            /* JsonParserGenerator.kt:290 */
          82  +
                            _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
   58     83   
                        }
          84  +
                        /* JsonParserGenerator.kt:686 */
   59     85   
                    }
          86  +
                    /* JsonParserGenerator.kt:695 */
   60     87   
                    other => {
   61     88   
                        return Err(
   62     89   
                            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   63     90   
                                format!("expected object key or end object, found: {other:?}"),
   64     91   
                            ),
   65     92   
                        )
          93  +
                    } /* JsonParserGenerator.kt:685 */
   66     94   
                }
          95  +
                /* JsonParserGenerator.kt:684 */
   67     96   
            }
   68         -
            }
          97  +
            /* JsonParserGenerator.kt:540 */
   69     98   
            Ok(Some(builder.build()))
          99  +
            /* JsonParserGenerator.kt:713 */
   70    100   
        }
   71         -
        _ => Err(
         101  +
        /* JsonParserGenerator.kt:722 */
         102  +
        _ => {
         103  +
            /* JsonParserGenerator.kt:723 */
         104  +
            Err(
   72    105   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   73    106   
                    "expected start object or null",
   74    107   
                ),
   75         -
        ),
         108  +
            )
         109  +
            /* JsonParserGenerator.kt:722 */
         110  +
        } /* JsonParserGenerator.kt:712 */
   76    111   
    }
         112  +
    /* JsonParserGenerator.kt:516 */
   77    113   
}

tmp-codegen-diff/codegen-server-test/rest_json/rust-server-codegen/src/protocol_serde/shape_test_body_structure.rs

@@ -1,1 +143,204 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* RustType.kt:534 */
    2      3   
#[allow(clippy::unnecessary_wraps)]
           4  +
/* ServerHttpBoundProtocolGenerator.kt:408 */
    3      5   
pub async fn de_test_body_structure_http_request<B>(
    4         -
    #[allow(unused_variables)] request: ::http::Request<B>,
           6  +
    #[allow(unused_variables)] request: ::http_1x::Request<B>,
    5      7   
) -> std::result::Result<
    6      8   
    crate::input::TestBodyStructureInput,
    7      9   
    ::aws_smithy_http_server::protocol::rest_json_1::rejection::RequestRejection,
    8     10   
>
    9     11   
where
   10     12   
    B: ::aws_smithy_http_server::body::HttpBody + Send,
   11     13   
    B::Data: Send,
   12     14   
    ::aws_smithy_http_server::protocol::rest_json_1::rejection::RequestRejection:
   13     15   
        From<<B as ::aws_smithy_http_server::body::HttpBody>::Error>,
   14     16   
{
          17  +
    /* ServerHttpBoundProtocolGenerator.kt:424 */
   15     18   
    Ok({
          19  +
        /* RustType.kt:534 */
   16     20   
        #[allow(unused_mut)]
          21  +
        /* ServerHttpBoundProtocolGenerator.kt:759 */
   17     22   
        let mut input = crate::input::test_body_structure_input::Builder::default();
          23  +
        /* RustType.kt:534 */
   18     24   
        #[allow(unused_variables)]
          25  +
        /* ServerHttpBoundProtocolGenerator.kt:764 */
   19     26   
        let ::aws_smithy_runtime_api::http::RequestParts {
   20     27   
            uri, headers, body, ..
   21     28   
        } = ::aws_smithy_runtime_api::http::Request::try_from(request)?.into_parts();
   22         -
        let bytes = ::hyper::body::to_bytes(body).await?;
          29  +
        /* ServerHttpBoundProtocolGenerator.kt:789 */
          30  +
        let bytes = {
          31  +
            use ::http_body_util::BodyExt;
          32  +
            body.collect().await?.to_bytes()
          33  +
        };
          34  +
        /* ServerHttpBoundProtocolGenerator.kt:825 */
   23     35   
        if !bytes.is_empty() {
          36  +
            /* ServerHttpBoundProtocolGenerator.kt:826 */
   24     37   
            ::aws_smithy_http_server::protocol::content_type_header_classifier_smithy(
   25     38   
                &headers,
   26     39   
                Some("application/json"),
   27     40   
            )?;
   28     41   
            input = crate::protocol_serde::shape_test_body_structure::de_test_body_structure(
   29     42   
                bytes.as_ref(),
   30     43   
                input,
   31     44   
            )?;
          45  +
            /* ServerHttpBoundProtocolGenerator.kt:825 */
   32     46   
        }
          47  +
        /* ServerHttpBoundProtocolGenerator.kt:856 */
   33     48   
        if let Some(value) =
   34     49   
            crate::protocol_serde::shape_test_body_structure_input::de_test_id_header(&headers)?
   35     50   
        {
   36     51   
            input = input.set_test_id(Some(value))
   37     52   
        }
          53  +
        /* ServerHttpBoundProtocolGenerator.kt:896 */
   38     54   
        input.build()
          55  +
        /* ServerHttpBoundProtocolGenerator.kt:424 */
   39     56   
    })
          57  +
    /* ServerHttpBoundProtocolGenerator.kt:408 */
   40     58   
}
   41     59   
          60  +
/* RustType.kt:534 */
   42     61   
#[allow(clippy::unnecessary_wraps)]
          62  +
/* ServerHttpBoundProtocolGenerator.kt:445 */
   43     63   
pub fn ser_test_body_structure_http_response(
   44     64   
    #[allow(unused_variables)] output: crate::output::TestBodyStructureOutput,
   45     65   
) -> std::result::Result<
   46     66   
    ::aws_smithy_http_server::response::Response,
   47     67   
    ::aws_smithy_http_server::protocol::rest_json_1::rejection::ResponseRejection,
   48     68   
> {
          69  +
    /* ServerHttpBoundProtocolGenerator.kt:457 */
   49     70   
    Ok({
          71  +
        /* RustType.kt:534 */
   50     72   
        #[allow(unused_mut)]
   51         -
        let mut builder = ::http::Response::builder();
          73  +
        /* ServerHttpBoundProtocolGenerator.kt:547 */
          74  +
        let mut builder = ::http_1x::Response::builder();
          75  +
        /* ServerHttpBoundProtocolGenerator.kt:665 */
   52     76   
        builder =
   53     77   
            crate::protocol_serde::shape_test_body_structure::ser_test_body_structure_headers(
   54     78   
                &output, builder,
   55     79   
            )?;
          80  +
        /* ServerHttpBoundProtocolGenerator.kt:633 */
   56     81   
        builder = ::aws_smithy_http::header::set_response_header_if_absent(
   57     82   
            builder,
   58         -
            ::http::header::CONTENT_TYPE,
          83  +
            ::http_1x::header::CONTENT_TYPE,
   59     84   
            "application/json",
   60     85   
        );
          86  +
        /* ServerHttpBoundProtocolGenerator.kt:718 */
   61     87   
        let http_status: u16 = 200;
   62     88   
        builder = builder.status(http_status);
          89  +
        /* ServerHttpBoundProtocolGenerator.kt:597 */
   63     90   
        let payload =
   64         -
            crate::protocol_serde::shape_test_body_structure_output::ser_test_body_structure_output_output_output(&output)?
   65         -
        ;
          91  +
            /* HttpBoundProtocolPayloadGenerator.kt:235 */crate::protocol_serde::shape_test_body_structure_output::ser_test_body_structure_output_output_output(&output)?
          92  +
        /* ServerHttpBoundProtocolGenerator.kt:597 */;
          93  +
        /* ServerHttpBoundProtocolGenerator.kt:699 */
   66     94   
        let content_length = payload.len();
   67     95   
        builder = ::aws_smithy_http::header::set_response_header_if_absent(
   68     96   
            builder,
   69         -
            ::http::header::CONTENT_LENGTH,
          97  +
            ::http_1x::header::CONTENT_LENGTH,
   70     98   
            content_length,
   71     99   
        );
         100  +
        /* ServerHttpBoundProtocolGenerator.kt:603 */
   72    101   
        let body = ::aws_smithy_http_server::body::to_boxed(payload);
         102  +
        /* ServerHttpBoundProtocolGenerator.kt:611 */
   73    103   
        builder.body(body)?
         104  +
        /* ServerHttpBoundProtocolGenerator.kt:457 */
   74    105   
    })
         106  +
    /* ServerHttpBoundProtocolGenerator.kt:445 */
   75    107   
}
   76    108   
         109  +
/* JsonParserGenerator.kt:148 */
   77    110   
pub(crate) fn de_test_body_structure(
   78    111   
    value: &[u8],
   79    112   
    mut builder: crate::input::test_body_structure_input::Builder,
   80    113   
) -> ::std::result::Result<
   81    114   
    crate::input::test_body_structure_input::Builder,
   82    115   
    ::aws_smithy_json::deserialize::error::DeserializeError,
   83    116   
> {
         117  +
    /* JsonParserGenerator.kt:153 */
   84    118   
    let mut tokens_owned =
   85    119   
        ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value))
   86    120   
            .peekable();
   87    121   
    let tokens = &mut tokens_owned;
   88    122   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
         123  +
    /* JsonParserGenerator.kt:684 */
   89    124   
    loop {
         125  +
        /* JsonParserGenerator.kt:685 */
   90    126   
        match tokens.next().transpose()? {
         127  +
            /* JsonParserGenerator.kt:686 */
   91    128   
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   92    129   
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
         130  +
                /* JsonParserGenerator.kt:260 */
   93    131   
                match key.to_unescaped()?.as_ref() {
         132  +
                    /* JsonParserGenerator.kt:262 */
   94    133   
                    "testConfig" => {
         134  +
                        /* JsonParserGenerator.kt:272 */
   95    135   
                        builder = builder.set_test_config(
   96         -
                            crate::protocol_serde::shape_test_config::de_test_config(tokens)?,
   97         -
                        );
         136  +
                            /* JsonParserGenerator.kt:544 */crate::protocol_serde::shape_test_config::de_test_config(tokens)?
         137  +
                        /* JsonParserGenerator.kt:272 */);
         138  +
                        /* JsonParserGenerator.kt:262 */
   98    139   
                    }
   99         -
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
         140  +
                    /* JsonParserGenerator.kt:290 */
         141  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
  100    142   
                }
         143  +
                /* JsonParserGenerator.kt:686 */
  101    144   
            }
         145  +
            /* JsonParserGenerator.kt:695 */
  102    146   
            other => {
  103    147   
                return Err(
  104    148   
                    ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
  105    149   
                        "expected object key or end object, found: {other:?}"
  106    150   
                    )),
  107    151   
                )
         152  +
            } /* JsonParserGenerator.kt:685 */
  108    153   
        }
         154  +
        /* JsonParserGenerator.kt:684 */
  109    155   
    }
  110         -
    }
         156  +
    /* JsonParserGenerator.kt:250 */
  111    157   
    if tokens.next().is_some() {
         158  +
        /* JsonParserGenerator.kt:251 */
  112    159   
        return Err(
  113    160   
            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  114    161   
                "found more JSON tokens after completing parsing",
  115    162   
            ),
  116    163   
        );
         164  +
        /* JsonParserGenerator.kt:250 */
  117    165   
    }
         166  +
    /* JsonParserGenerator.kt:163 */
  118    167   
    Ok(builder)
         168  +
    /* JsonParserGenerator.kt:148 */
  119    169   
}
  120    170   
         171  +
/* HttpBindingGenerator.kt:565 */
  121    172   
pub fn ser_test_body_structure_headers(
  122    173   
    input: &crate::output::TestBodyStructureOutput,
  123         -
    mut builder: ::http::response::Builder,
  124         -
) -> std::result::Result<::http::response::Builder, ::aws_smithy_types::error::operation::BuildError>
  125         -
{
         174  +
    mut builder: ::http_1x::response::Builder,
         175  +
) -> std::result::Result<
         176  +
    ::http_1x::response::Builder,
         177  +
    ::aws_smithy_types::error::operation::BuildError,
         178  +
> {
         179  +
    /* HttpBindingGenerator.kt:615 */
  126    180   
    if let ::std::option::Option::Some(inner_1) = &input.test_id {
         181  +
        /* HttpBindingGenerator.kt:727 */
  127    182   
        let formatted_2 = inner_1.as_str();
         183  +
        /* HttpBindingGenerator.kt:728 */
  128    184   
        if !formatted_2.is_empty() {
         185  +
            /* HttpBindingGenerator.kt:729 */
  129    186   
            let header_value = formatted_2;
  130         -
            let header_value: ::http::HeaderValue = header_value.parse().map_err(|err| {
         187  +
            let header_value: ::http_1x::HeaderValue = header_value.parse().map_err(|err| {
  131    188   
                ::aws_smithy_types::error::operation::BuildError::invalid_field(
  132    189   
                    "test_id",
  133    190   
                    format!(
  134    191   
                        "`{}` cannot be used as a header value: {}",
  135    192   
                        &header_value, err
  136    193   
                    ),
  137    194   
                )
  138    195   
            })?;
  139    196   
            builder = builder.header("x-amz-test-id", header_value);
         197  +
            /* HttpBindingGenerator.kt:728 */
  140    198   
        }
         199  +
        /* HttpBindingGenerator.kt:615 */
  141    200   
    }
         201  +
    /* HttpBindingGenerator.kt:578 */
  142    202   
    Ok(builder)
         203  +
    /* HttpBindingGenerator.kt:565 */
  143    204   
}

tmp-codegen-diff/codegen-server-test/rest_json/rust-server-codegen/src/protocol_serde/shape_test_body_structure_input.rs

@@ -1,1 +10,14 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* HttpBindingGenerator.kt:159 */
    2      3   
pub(crate) fn de_test_id_header(
    3      4   
    header_map: &::aws_smithy_runtime_api::http::Headers,
    4      5   
) -> ::std::result::Result<
    5      6   
    ::std::option::Option<::std::string::String>,
    6      7   
    ::aws_smithy_http::header::ParseError,
    7      8   
> {
           9  +
    /* HttpBindingGenerator.kt:166 */
    8     10   
    let headers = header_map.get_all("x-amz-test-id");
          11  +
    /* HttpBindingGenerator.kt:398 */
    9     12   
    ::aws_smithy_http::header::one_or_none(headers)
          13  +
    /* HttpBindingGenerator.kt:159 */
   10     14   
}

tmp-codegen-diff/codegen-server-test/rest_json/rust-server-codegen/src/protocol_serde/shape_test_body_structure_output.rs

@@ -1,1 +26,40 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonSerializerGenerator.kt:213 */
    2      3   
pub fn ser_test_body_structure_output_output_output(
    3      4   
    value: &crate::output::TestBodyStructureOutput,
    4      5   
) -> ::std::result::Result<String, ::aws_smithy_types::error::operation::SerializationError> {
           6  +
    /* JsonSerializerGenerator.kt:218 */
    5      7   
    let mut out = ::std::string::String::new();
    6      8   
    let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
           9  +
    /* JsonSerializerGenerator.kt:375 */
    7     10   
    crate::protocol_serde::shape_test_body_structure_output::ser_test_body_structure_output_output(
    8     11   
        &mut object,
    9     12   
        value,
   10     13   
    )?;
          14  +
    /* JsonSerializerGenerator.kt:227 */
   11     15   
    object.finish();
   12     16   
    Ok(out)
          17  +
    /* JsonSerializerGenerator.kt:213 */
   13     18   
}
   14     19   
          20  +
/* JsonSerializerGenerator.kt:358 */
   15     21   
pub fn ser_test_body_structure_output_output(
   16     22   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
   17     23   
    input: &crate::output::TestBodyStructureOutput,
   18     24   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
          25  +
    /* JsonSerializerGenerator.kt:382 */
   19     26   
    if let Some(var_1) = &input.test_config {
          27  +
        /* JsonSerializerGenerator.kt:495 */
   20     28   
        #[allow(unused_mut)]
          29  +
        /* JsonSerializerGenerator.kt:496 */
   21     30   
        let mut object_2 = object.key("testConfig").start_object();
          31  +
        /* JsonSerializerGenerator.kt:375 */
   22     32   
        crate::protocol_serde::shape_test_config::ser_test_config(&mut object_2, var_1)?;
          33  +
        /* JsonSerializerGenerator.kt:515 */
   23     34   
        object_2.finish();
          35  +
        /* JsonSerializerGenerator.kt:382 */
   24     36   
    }
          37  +
    /* JsonSerializerGenerator.kt:372 */
   25     38   
    Ok(())
          39  +
    /* JsonSerializerGenerator.kt:358 */
   26     40   
}

tmp-codegen-diff/codegen-server-test/rest_json/rust-server-codegen/src/protocol_serde/shape_test_config.rs

@@ -1,1 +68,99 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonParserGenerator.kt:516 */
    2      3   
pub(crate) fn de_test_config<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<
    5      6   
    Option<crate::model::TestConfig>,
    6      7   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    7      8   
>
    8      9   
where
    9     10   
    I: Iterator<
   10     11   
        Item = Result<
   11     12   
            ::aws_smithy_json::deserialize::Token<'a>,
   12     13   
            ::aws_smithy_json::deserialize::error::DeserializeError,
   13     14   
        >,
   14     15   
    >,
   15     16   
{
          17  +
    /* JsonParserGenerator.kt:712 */
   16     18   
    match tokens.next().transpose()? {
          19  +
        /* JsonParserGenerator.kt:713 */
   17     20   
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   18     21   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
          22  +
            /* RustType.kt:534 */
   19     23   
            #[allow(unused_mut)]
          24  +
            /* JsonParserGenerator.kt:526 */
   20     25   
            let mut builder = crate::model::test_config::Builder::default();
          26  +
            /* JsonParserGenerator.kt:684 */
   21     27   
            loop {
          28  +
                /* JsonParserGenerator.kt:685 */
   22     29   
                match tokens.next().transpose()? {
          30  +
                    /* JsonParserGenerator.kt:686 */
   23     31   
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   24     32   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
          33  +
                        /* JsonParserGenerator.kt:260 */
   25     34   
                        match key.to_unescaped()?.as_ref() {
          35  +
                            /* JsonParserGenerator.kt:262 */
   26     36   
                            "timeout" => {
          37  +
                                /* JsonParserGenerator.kt:272 */
   27     38   
                                builder = builder.set_timeout(
          39  +
                                    /* JsonParserGenerator.kt:365 */
   28     40   
                                    ::aws_smithy_json::deserialize::token::expect_number_or_null(
   29     41   
                                        tokens.next(),
   30     42   
                                    )?
   31     43   
                                    .map(i32::try_from)
   32         -
                                    .transpose()?,
          44  +
                                    .transpose()?, /* JsonParserGenerator.kt:272 */
   33     45   
                                );
          46  +
                                /* JsonParserGenerator.kt:262 */
   34     47   
                            }
   35         -
                            _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
          48  +
                            /* JsonParserGenerator.kt:290 */
          49  +
                            _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
   36     50   
                        }
          51  +
                        /* JsonParserGenerator.kt:686 */
   37     52   
                    }
          53  +
                    /* JsonParserGenerator.kt:695 */
   38     54   
                    other => {
   39     55   
                        return Err(
   40     56   
                            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   41     57   
                                format!("expected object key or end object, found: {other:?}"),
   42     58   
                            ),
   43     59   
                        )
          60  +
                    } /* JsonParserGenerator.kt:685 */
   44     61   
                }
          62  +
                /* JsonParserGenerator.kt:684 */
   45     63   
            }
   46         -
            }
          64  +
            /* JsonParserGenerator.kt:540 */
   47     65   
            Ok(Some(builder.build()))
          66  +
            /* JsonParserGenerator.kt:713 */
   48     67   
        }
   49         -
        _ => Err(
          68  +
        /* JsonParserGenerator.kt:722 */
          69  +
        _ => {
          70  +
            /* JsonParserGenerator.kt:723 */
          71  +
            Err(
   50     72   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   51     73   
                    "expected start object or null",
   52     74   
                ),
   53         -
        ),
          75  +
            )
          76  +
            /* JsonParserGenerator.kt:722 */
          77  +
        } /* JsonParserGenerator.kt:712 */
   54     78   
    }
          79  +
    /* JsonParserGenerator.kt:516 */
   55     80   
}
   56     81   
          82  +
/* JsonSerializerGenerator.kt:358 */
   57     83   
pub fn ser_test_config(
   58     84   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
   59     85   
    input: &crate::model::TestConfig,
   60     86   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
          87  +
    /* JsonSerializerGenerator.kt:382 */
   61     88   
    if let Some(var_1) = &input.timeout {
          89  +
        /* JsonSerializerGenerator.kt:432 */
   62     90   
        object.key("timeout").number(
   63     91   
            #[allow(clippy::useless_conversion)]
   64     92   
            ::aws_smithy_types::Number::NegInt((*var_1).into()),
   65     93   
        );
          94  +
        /* JsonSerializerGenerator.kt:382 */
   66     95   
    }
          96  +
    /* JsonSerializerGenerator.kt:372 */
   67     97   
    Ok(())
          98  +
    /* JsonSerializerGenerator.kt:358 */
   68     99   
}

tmp-codegen-diff/codegen-server-test/rest_json/rust-server-codegen/src/protocol_serde/shape_test_get_no_input_no_payload.rs

@@ -1,1 +81,117 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* RustType.kt:534 */
    2      3   
#[allow(clippy::unnecessary_wraps)]
           4  +
/* ServerHttpBoundProtocolGenerator.kt:408 */
    3      5   
pub async fn de_test_get_no_input_no_payload_http_request<B>(
    4         -
    #[allow(unused_variables)] request: ::http::Request<B>,
           6  +
    #[allow(unused_variables)] request: ::http_1x::Request<B>,
    5      7   
) -> std::result::Result<
    6      8   
    crate::input::TestGetNoInputNoPayloadInput,
    7      9   
    ::aws_smithy_http_server::protocol::rest_json_1::rejection::RequestRejection,
    8     10   
>
    9     11   
where
   10     12   
    B: ::aws_smithy_http_server::body::HttpBody + Send,
   11     13   
    B::Data: Send,
   12     14   
    ::aws_smithy_http_server::protocol::rest_json_1::rejection::RequestRejection:
   13     15   
        From<<B as ::aws_smithy_http_server::body::HttpBody>::Error>,
   14     16   
{
          17  +
    /* ServerHttpBoundProtocolGenerator.kt:424 */
   15     18   
    Ok({
          19  +
        /* RustType.kt:534 */
   16     20   
        #[allow(unused_mut)]
          21  +
        /* ServerHttpBoundProtocolGenerator.kt:759 */
   17     22   
        let mut input = crate::input::test_get_no_input_no_payload_input::Builder::default();
          23  +
        /* RustType.kt:534 */
   18     24   
        #[allow(unused_variables)]
          25  +
        /* ServerHttpBoundProtocolGenerator.kt:764 */
   19     26   
        let ::aws_smithy_runtime_api::http::RequestParts {
   20     27   
            uri, headers, body, ..
   21     28   
        } = ::aws_smithy_runtime_api::http::Request::try_from(request)?.into_parts();
          29  +
        /* ServerHttpBoundProtocolGenerator.kt:873 */
   22     30   
        ::aws_smithy_http_server::protocol::content_type_header_classifier_smithy(&headers, None)?;
          31  +
        /* ServerHttpBoundProtocolGenerator.kt:896 */
   23     32   
        input.build()
          33  +
        /* ServerHttpBoundProtocolGenerator.kt:424 */
   24     34   
    })
          35  +
    /* ServerHttpBoundProtocolGenerator.kt:408 */
   25     36   
}
   26     37   
          38  +
/* RustType.kt:534 */
   27     39   
#[allow(clippy::unnecessary_wraps)]
          40  +
/* ServerHttpBoundProtocolGenerator.kt:445 */
   28     41   
pub fn ser_test_get_no_input_no_payload_http_response(
   29     42   
    #[allow(unused_variables)] output: crate::output::TestGetNoInputNoPayloadOutput,
   30     43   
) -> std::result::Result<
   31     44   
    ::aws_smithy_http_server::response::Response,
   32     45   
    ::aws_smithy_http_server::protocol::rest_json_1::rejection::ResponseRejection,
   33     46   
> {
          47  +
    /* ServerHttpBoundProtocolGenerator.kt:457 */
   34     48   
    Ok({
          49  +
        /* RustType.kt:534 */
   35     50   
        #[allow(unused_mut)]
   36         -
        let mut builder = ::http::Response::builder();
          51  +
        /* ServerHttpBoundProtocolGenerator.kt:547 */
          52  +
        let mut builder = ::http_1x::Response::builder();
          53  +
        /* ServerHttpBoundProtocolGenerator.kt:665 */
   37     54   
        builder = crate::protocol_serde::shape_test_get_no_input_no_payload::ser_test_get_no_input_no_payload_headers(&output, builder)?;
          55  +
        /* ServerHttpBoundProtocolGenerator.kt:633 */
   38     56   
        builder = ::aws_smithy_http::header::set_response_header_if_absent(
   39     57   
            builder,
   40         -
            ::http::header::CONTENT_TYPE,
          58  +
            ::http_1x::header::CONTENT_TYPE,
   41     59   
            "application/json",
   42     60   
        );
          61  +
        /* ServerHttpBoundProtocolGenerator.kt:718 */
   43     62   
        let http_status: u16 = 200;
   44     63   
        builder = builder.status(http_status);
          64  +
        /* ServerHttpBoundProtocolGenerator.kt:597 */
   45     65   
        let payload =
   46         -
            crate::protocol_serde::shape_test_get_no_input_no_payload_output::ser_test_get_no_input_no_payload_output_output_output(&output)?
   47         -
        ;
          66  +
            /* HttpBoundProtocolPayloadGenerator.kt:235 */crate::protocol_serde::shape_test_get_no_input_no_payload_output::ser_test_get_no_input_no_payload_output_output_output(&output)?
          67  +
        /* ServerHttpBoundProtocolGenerator.kt:597 */;
          68  +
        /* ServerHttpBoundProtocolGenerator.kt:699 */
   48     69   
        let content_length = payload.len();
   49     70   
        builder = ::aws_smithy_http::header::set_response_header_if_absent(
   50     71   
            builder,
   51         -
            ::http::header::CONTENT_LENGTH,
          72  +
            ::http_1x::header::CONTENT_LENGTH,
   52     73   
            content_length,
   53     74   
        );
          75  +
        /* ServerHttpBoundProtocolGenerator.kt:603 */
   54     76   
        let body = ::aws_smithy_http_server::body::to_boxed(payload);
          77  +
        /* ServerHttpBoundProtocolGenerator.kt:611 */
   55     78   
        builder.body(body)?
          79  +
        /* ServerHttpBoundProtocolGenerator.kt:457 */
   56     80   
    })
          81  +
    /* ServerHttpBoundProtocolGenerator.kt:445 */
   57     82   
}
   58     83   
          84  +
/* HttpBindingGenerator.kt:565 */
   59     85   
pub fn ser_test_get_no_input_no_payload_headers(
   60     86   
    input: &crate::output::TestGetNoInputNoPayloadOutput,
   61         -
    mut builder: ::http::response::Builder,
   62         -
) -> std::result::Result<::http::response::Builder, ::aws_smithy_types::error::operation::BuildError>
   63         -
{
          87  +
    mut builder: ::http_1x::response::Builder,
          88  +
) -> std::result::Result<
          89  +
    ::http_1x::response::Builder,
          90  +
    ::aws_smithy_types::error::operation::BuildError,
          91  +
> {
          92  +
    /* HttpBindingGenerator.kt:615 */
   64     93   
    if let ::std::option::Option::Some(inner_1) = &input.test_id {
          94  +
        /* HttpBindingGenerator.kt:727 */
   65     95   
        let formatted_2 = inner_1.as_str();
          96  +
        /* HttpBindingGenerator.kt:728 */
   66     97   
        if !formatted_2.is_empty() {
          98  +
            /* HttpBindingGenerator.kt:729 */
   67     99   
            let header_value = formatted_2;
   68         -
            let header_value: ::http::HeaderValue = header_value.parse().map_err(|err| {
         100  +
            let header_value: ::http_1x::HeaderValue = header_value.parse().map_err(|err| {
   69    101   
                ::aws_smithy_types::error::operation::BuildError::invalid_field(
   70    102   
                    "test_id",
   71    103   
                    format!(
   72    104   
                        "`{}` cannot be used as a header value: {}",
   73    105   
                        &header_value, err
   74    106   
                    ),
   75    107   
                )
   76    108   
            })?;
   77    109   
            builder = builder.header("X-Amz-Test-Id", header_value);
         110  +
            /* HttpBindingGenerator.kt:728 */
   78    111   
        }
         112  +
        /* HttpBindingGenerator.kt:615 */
   79    113   
    }
         114  +
    /* HttpBindingGenerator.kt:578 */
   80    115   
    Ok(builder)
         116  +
    /* HttpBindingGenerator.kt:565 */
   81    117   
}

tmp-codegen-diff/codegen-server-test/rest_json/rust-server-codegen/src/protocol_serde/shape_test_get_no_input_no_payload_output.rs

@@ -1,1 +17,25 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonSerializerGenerator.kt:213 */
    2      3   
pub fn ser_test_get_no_input_no_payload_output_output_output(
    3      4   
    value: &crate::output::TestGetNoInputNoPayloadOutput,
    4      5   
) -> ::std::result::Result<String, ::aws_smithy_types::error::operation::SerializationError> {
           6  +
    /* JsonSerializerGenerator.kt:218 */
    5      7   
    let mut out = ::std::string::String::new();
    6      8   
    let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
           9  +
    /* JsonSerializerGenerator.kt:375 */
    7     10   
    crate::protocol_serde::shape_test_get_no_input_no_payload_output::ser_test_get_no_input_no_payload_output_output(&mut object, value)?;
          11  +
    /* JsonSerializerGenerator.kt:227 */
    8     12   
    object.finish();
    9     13   
    Ok(out)
          14  +
    /* JsonSerializerGenerator.kt:213 */
   10     15   
}
   11     16   
          17  +
/* JsonSerializerGenerator.kt:358 */
   12     18   
pub fn ser_test_get_no_input_no_payload_output_output(
   13     19   
    #[allow(unused_variables)] object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
   14     20   
    #[allow(unused_variables)] input: &crate::output::TestGetNoInputNoPayloadOutput,
   15     21   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
          22  +
    /* JsonSerializerGenerator.kt:372 */
   16     23   
    Ok(())
          24  +
    /* JsonSerializerGenerator.kt:358 */
   17     25   
}

tmp-codegen-diff/codegen-server-test/rest_json/rust-server-codegen/src/protocol_serde/shape_test_get_no_payload.rs

@@ -1,1 +88,124 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* RustType.kt:534 */
    2      3   
#[allow(clippy::unnecessary_wraps)]
           4  +
/* ServerHttpBoundProtocolGenerator.kt:408 */
    3      5   
pub async fn de_test_get_no_payload_http_request<B>(
    4         -
    #[allow(unused_variables)] request: ::http::Request<B>,
           6  +
    #[allow(unused_variables)] request: ::http_1x::Request<B>,
    5      7   
) -> std::result::Result<
    6      8   
    crate::input::TestGetNoPayloadInput,
    7      9   
    ::aws_smithy_http_server::protocol::rest_json_1::rejection::RequestRejection,
    8     10   
>
    9     11   
where
   10     12   
    B: ::aws_smithy_http_server::body::HttpBody + Send,
   11     13   
    B::Data: Send,
   12     14   
    ::aws_smithy_http_server::protocol::rest_json_1::rejection::RequestRejection:
   13     15   
        From<<B as ::aws_smithy_http_server::body::HttpBody>::Error>,
   14     16   
{
          17  +
    /* ServerHttpBoundProtocolGenerator.kt:424 */
   15     18   
    Ok({
          19  +
        /* RustType.kt:534 */
   16     20   
        #[allow(unused_mut)]
          21  +
        /* ServerHttpBoundProtocolGenerator.kt:759 */
   17     22   
        let mut input = crate::input::test_get_no_payload_input::Builder::default();
          23  +
        /* RustType.kt:534 */
   18     24   
        #[allow(unused_variables)]
          25  +
        /* ServerHttpBoundProtocolGenerator.kt:764 */
   19     26   
        let ::aws_smithy_runtime_api::http::RequestParts {
   20     27   
            uri, headers, body, ..
   21     28   
        } = ::aws_smithy_runtime_api::http::Request::try_from(request)?.into_parts();
          29  +
        /* ServerHttpBoundProtocolGenerator.kt:856 */
   22     30   
        if let Some(value) =
   23     31   
            crate::protocol_serde::shape_test_get_no_payload_input::de_test_id_header(&headers)?
   24     32   
        {
   25     33   
            input = input.set_test_id(Some(value))
   26     34   
        }
          35  +
        /* ServerHttpBoundProtocolGenerator.kt:896 */
   27     36   
        input.build()
          37  +
        /* ServerHttpBoundProtocolGenerator.kt:424 */
   28     38   
    })
          39  +
    /* ServerHttpBoundProtocolGenerator.kt:408 */
   29     40   
}
   30     41   
          42  +
/* RustType.kt:534 */
   31     43   
#[allow(clippy::unnecessary_wraps)]
          44  +
/* ServerHttpBoundProtocolGenerator.kt:445 */
   32     45   
pub fn ser_test_get_no_payload_http_response(
   33     46   
    #[allow(unused_variables)] output: crate::output::TestGetNoPayloadOutput,
   34     47   
) -> std::result::Result<
   35     48   
    ::aws_smithy_http_server::response::Response,
   36     49   
    ::aws_smithy_http_server::protocol::rest_json_1::rejection::ResponseRejection,
   37     50   
> {
          51  +
    /* ServerHttpBoundProtocolGenerator.kt:457 */
   38     52   
    Ok({
          53  +
        /* RustType.kt:534 */
   39     54   
        #[allow(unused_mut)]
   40         -
        let mut builder = ::http::Response::builder();
          55  +
        /* ServerHttpBoundProtocolGenerator.kt:547 */
          56  +
        let mut builder = ::http_1x::Response::builder();
          57  +
        /* ServerHttpBoundProtocolGenerator.kt:665 */
   41     58   
        builder =
   42     59   
            crate::protocol_serde::shape_test_get_no_payload::ser_test_get_no_payload_headers(
   43     60   
                &output, builder,
   44     61   
            )?;
          62  +
        /* ServerHttpBoundProtocolGenerator.kt:633 */
   45     63   
        builder = ::aws_smithy_http::header::set_response_header_if_absent(
   46     64   
            builder,
   47         -
            ::http::header::CONTENT_TYPE,
          65  +
            ::http_1x::header::CONTENT_TYPE,
   48     66   
            "application/json",
   49     67   
        );
          68  +
        /* ServerHttpBoundProtocolGenerator.kt:718 */
   50     69   
        let http_status: u16 = 200;
   51     70   
        builder = builder.status(http_status);
          71  +
        /* ServerHttpBoundProtocolGenerator.kt:597 */
   52     72   
        let payload =
   53         -
            crate::protocol_serde::shape_test_get_no_payload_output::ser_test_get_no_payload_output_output_output(&output)?
   54         -
        ;
          73  +
            /* HttpBoundProtocolPayloadGenerator.kt:235 */crate::protocol_serde::shape_test_get_no_payload_output::ser_test_get_no_payload_output_output_output(&output)?
          74  +
        /* ServerHttpBoundProtocolGenerator.kt:597 */;
          75  +
        /* ServerHttpBoundProtocolGenerator.kt:699 */
   55     76   
        let content_length = payload.len();
   56     77   
        builder = ::aws_smithy_http::header::set_response_header_if_absent(
   57     78   
            builder,
   58         -
            ::http::header::CONTENT_LENGTH,
          79  +
            ::http_1x::header::CONTENT_LENGTH,
   59     80   
            content_length,
   60     81   
        );
          82  +
        /* ServerHttpBoundProtocolGenerator.kt:603 */
   61     83   
        let body = ::aws_smithy_http_server::body::to_boxed(payload);
          84  +
        /* ServerHttpBoundProtocolGenerator.kt:611 */
   62     85   
        builder.body(body)?
          86  +
        /* ServerHttpBoundProtocolGenerator.kt:457 */
   63     87   
    })
          88  +
    /* ServerHttpBoundProtocolGenerator.kt:445 */
   64     89   
}
   65     90   
          91  +
/* HttpBindingGenerator.kt:565 */
   66     92   
pub fn ser_test_get_no_payload_headers(
   67     93   
    input: &crate::output::TestGetNoPayloadOutput,
   68         -
    mut builder: ::http::response::Builder,
   69         -
) -> std::result::Result<::http::response::Builder, ::aws_smithy_types::error::operation::BuildError>
   70         -
{
          94  +
    mut builder: ::http_1x::response::Builder,
          95  +
) -> std::result::Result<
          96  +
    ::http_1x::response::Builder,
          97  +
    ::aws_smithy_types::error::operation::BuildError,
          98  +
> {
          99  +
    /* HttpBindingGenerator.kt:615 */
   71    100   
    if let ::std::option::Option::Some(inner_1) = &input.test_id {
         101  +
        /* HttpBindingGenerator.kt:727 */
   72    102   
        let formatted_2 = inner_1.as_str();
         103  +
        /* HttpBindingGenerator.kt:728 */
   73    104   
        if !formatted_2.is_empty() {
         105  +
            /* HttpBindingGenerator.kt:729 */
   74    106   
            let header_value = formatted_2;
   75         -
            let header_value: ::http::HeaderValue = header_value.parse().map_err(|err| {
         107  +
            let header_value: ::http_1x::HeaderValue = header_value.parse().map_err(|err| {
   76    108   
                ::aws_smithy_types::error::operation::BuildError::invalid_field(
   77    109   
                    "test_id",
   78    110   
                    format!(
   79    111   
                        "`{}` cannot be used as a header value: {}",
   80    112   
                        &header_value, err
   81    113   
                    ),
   82    114   
                )
   83    115   
            })?;
   84    116   
            builder = builder.header("X-Amz-Test-Id", header_value);
         117  +
            /* HttpBindingGenerator.kt:728 */
   85    118   
        }
         119  +
        /* HttpBindingGenerator.kt:615 */
   86    120   
    }
         121  +
    /* HttpBindingGenerator.kt:578 */
   87    122   
    Ok(builder)
         123  +
    /* HttpBindingGenerator.kt:565 */
   88    124   
}

tmp-codegen-diff/codegen-server-test/rest_json/rust-server-codegen/src/protocol_serde/shape_test_get_no_payload_input.rs

@@ -1,1 +10,14 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* HttpBindingGenerator.kt:159 */
    2      3   
pub(crate) fn de_test_id_header(
    3      4   
    header_map: &::aws_smithy_runtime_api::http::Headers,
    4      5   
) -> ::std::result::Result<
    5      6   
    ::std::option::Option<::std::string::String>,
    6      7   
    ::aws_smithy_http::header::ParseError,
    7      8   
> {
           9  +
    /* HttpBindingGenerator.kt:166 */
    8     10   
    let headers = header_map.get_all("X-Amz-Test-Id");
          11  +
    /* HttpBindingGenerator.kt:398 */
    9     12   
    ::aws_smithy_http::header::one_or_none(headers)
          13  +
    /* HttpBindingGenerator.kt:159 */
   10     14   
}

tmp-codegen-diff/codegen-server-test/rest_json/rust-server-codegen/src/protocol_serde/shape_test_get_no_payload_output.rs

@@ -1,1 +20,28 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonSerializerGenerator.kt:213 */
    2      3   
pub fn ser_test_get_no_payload_output_output_output(
    3      4   
    value: &crate::output::TestGetNoPayloadOutput,
    4      5   
) -> ::std::result::Result<String, ::aws_smithy_types::error::operation::SerializationError> {
           6  +
    /* JsonSerializerGenerator.kt:218 */
    5      7   
    let mut out = ::std::string::String::new();
    6      8   
    let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
           9  +
    /* JsonSerializerGenerator.kt:375 */
    7     10   
    crate::protocol_serde::shape_test_get_no_payload_output::ser_test_get_no_payload_output_output(
    8     11   
        &mut object,
    9     12   
        value,
   10     13   
    )?;
          14  +
    /* JsonSerializerGenerator.kt:227 */
   11     15   
    object.finish();
   12     16   
    Ok(out)
          17  +
    /* JsonSerializerGenerator.kt:213 */
   13     18   
}
   14     19   
          20  +
/* JsonSerializerGenerator.kt:358 */
   15     21   
pub fn ser_test_get_no_payload_output_output(
   16     22   
    #[allow(unused_variables)] object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
   17     23   
    #[allow(unused_variables)] input: &crate::output::TestGetNoPayloadOutput,
   18     24   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
          25  +
    /* JsonSerializerGenerator.kt:372 */
   19     26   
    Ok(())
          27  +
    /* JsonSerializerGenerator.kt:358 */
   20     28   
}

tmp-codegen-diff/codegen-server-test/rest_json/rust-server-codegen/src/protocol_serde/shape_test_payload_blob.rs

@@ -1,1 +89,128 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* RustType.kt:534 */
    2      3   
#[allow(clippy::unnecessary_wraps)]
           4  +
/* ServerHttpBoundProtocolGenerator.kt:408 */
    3      5   
pub async fn de_test_payload_blob_http_request<B>(
    4         -
    #[allow(unused_variables)] request: ::http::Request<B>,
           6  +
    #[allow(unused_variables)] request: ::http_1x::Request<B>,
    5      7   
) -> std::result::Result<
    6      8   
    crate::input::TestPayloadBlobInput,
    7      9   
    ::aws_smithy_http_server::protocol::rest_json_1::rejection::RequestRejection,
    8     10   
>
    9     11   
where
   10     12   
    B: ::aws_smithy_http_server::body::HttpBody + Send,
   11     13   
    B::Data: Send,
   12     14   
    ::aws_smithy_http_server::protocol::rest_json_1::rejection::RequestRejection:
   13     15   
        From<<B as ::aws_smithy_http_server::body::HttpBody>::Error>,
   14     16   
{
          17  +
    /* ServerHttpBoundProtocolGenerator.kt:424 */
   15     18   
    Ok({
          19  +
        /* RustType.kt:534 */
   16     20   
        #[allow(unused_mut)]
          21  +
        /* ServerHttpBoundProtocolGenerator.kt:759 */
   17     22   
        let mut input = crate::input::test_payload_blob_input::Builder::default();
          23  +
        /* RustType.kt:534 */
   18     24   
        #[allow(unused_variables)]
          25  +
        /* ServerHttpBoundProtocolGenerator.kt:764 */
   19     26   
        let ::aws_smithy_runtime_api::http::RequestParts {
   20     27   
            uri, headers, body, ..
   21     28   
        } = ::aws_smithy_runtime_api::http::Request::try_from(request)?.into_parts();
          29  +
        /* ServerHttpBoundProtocolGenerator.kt:856 */
   22     30   
        if let Some(value) =
   23     31   
            crate::protocol_serde::shape_test_payload_blob_input::de_content_type_header(&headers)?
   24     32   
        {
   25     33   
            input = input.set_content_type(Some(value))
   26     34   
        }
          35  +
        /* ServerHttpBoundProtocolGenerator.kt:856 */
   27     36   
        if let Some(value) = {
   28         -
            let bytes = ::hyper::body::to_bytes(body).await?;
          37  +
            let bytes = {
          38  +
                use ::http_body_util::BodyExt;
          39  +
                body.collect().await?.to_bytes()
          40  +
            };
   29     41   
   30     42   
            crate::protocol_serde::shape_test_payload_blob_input::de_data_payload(&bytes)?
   31     43   
        } {
   32     44   
            input = input.set_data(Some(value))
   33     45   
        }
          46  +
        /* ServerHttpBoundProtocolGenerator.kt:896 */
   34     47   
        input.build()
          48  +
        /* ServerHttpBoundProtocolGenerator.kt:424 */
   35     49   
    })
          50  +
    /* ServerHttpBoundProtocolGenerator.kt:408 */
   36     51   
}
   37     52   
          53  +
/* RustType.kt:534 */
   38     54   
#[allow(clippy::unnecessary_wraps)]
          55  +
/* ServerHttpBoundProtocolGenerator.kt:445 */
   39     56   
pub fn ser_test_payload_blob_http_response(
   40     57   
    #[allow(unused_variables)] output: crate::output::TestPayloadBlobOutput,
   41     58   
) -> std::result::Result<
   42     59   
    ::aws_smithy_http_server::response::Response,
   43     60   
    ::aws_smithy_http_server::protocol::rest_json_1::rejection::ResponseRejection,
   44     61   
> {
          62  +
    /* ServerHttpBoundProtocolGenerator.kt:457 */
   45     63   
    Ok({
          64  +
        /* RustType.kt:534 */
   46     65   
        #[allow(unused_mut)]
   47         -
        let mut builder = ::http::Response::builder();
          66  +
        /* ServerHttpBoundProtocolGenerator.kt:547 */
          67  +
        let mut builder = ::http_1x::Response::builder();
          68  +
        /* ServerHttpBoundProtocolGenerator.kt:665 */
   48     69   
        builder = crate::protocol_serde::shape_test_payload_blob::ser_test_payload_blob_headers(
   49     70   
            &output, builder,
   50     71   
        )?;
          72  +
        /* ServerHttpBoundProtocolGenerator.kt:718 */
   51     73   
        let http_status: u16 = 200;
   52     74   
        builder = builder.status(http_status);
   53         -
        let payload = crate::protocol_serde::shape_test_payload_blob_output::ser_data_http_payload(
   54         -
            output.data,
   55         -
        )?;
          75  +
        /* ServerHttpBoundProtocolGenerator.kt:597 */
          76  +
        let payload =
          77  +
            /* HttpBoundProtocolPayloadGenerator.kt:348 */crate::protocol_serde::shape_test_payload_blob_output::ser_data_http_payload( output.data)?
          78  +
        /* ServerHttpBoundProtocolGenerator.kt:597 */;
          79  +
        /* ServerHttpBoundProtocolGenerator.kt:699 */
   56     80   
        let content_length = payload.len();
   57     81   
        builder = ::aws_smithy_http::header::set_response_header_if_absent(
   58     82   
            builder,
   59         -
            ::http::header::CONTENT_LENGTH,
          83  +
            ::http_1x::header::CONTENT_LENGTH,
   60     84   
            content_length,
   61     85   
        );
          86  +
        /* ServerHttpBoundProtocolGenerator.kt:603 */
   62     87   
        let body = ::aws_smithy_http_server::body::to_boxed(payload);
          88  +
        /* ServerHttpBoundProtocolGenerator.kt:611 */
   63     89   
        builder.body(body)?
          90  +
        /* ServerHttpBoundProtocolGenerator.kt:457 */
   64     91   
    })
          92  +
    /* ServerHttpBoundProtocolGenerator.kt:445 */
   65     93   
}
   66     94   
          95  +
/* HttpBindingGenerator.kt:565 */
   67     96   
pub fn ser_test_payload_blob_headers(
   68     97   
    input: &crate::output::TestPayloadBlobOutput,
   69         -
    mut builder: ::http::response::Builder,
   70         -
) -> std::result::Result<::http::response::Builder, ::aws_smithy_types::error::operation::BuildError>
   71         -
{
          98  +
    mut builder: ::http_1x::response::Builder,
          99  +
) -> std::result::Result<
         100  +
    ::http_1x::response::Builder,
         101  +
    ::aws_smithy_types::error::operation::BuildError,
         102  +
> {
         103  +
    /* HttpBindingGenerator.kt:615 */
   72    104   
    if let ::std::option::Option::Some(inner_1) = &input.content_type {
         105  +
        /* HttpBindingGenerator.kt:727 */
   73    106   
        let formatted_2 = inner_1.as_str();
         107  +
        /* HttpBindingGenerator.kt:728 */
   74    108   
        if !formatted_2.is_empty() {
         109  +
            /* HttpBindingGenerator.kt:729 */
   75    110   
            let header_value = formatted_2;
   76         -
            let header_value: ::http::HeaderValue = header_value.parse().map_err(|err| {
         111  +
            let header_value: ::http_1x::HeaderValue = header_value.parse().map_err(|err| {
   77    112   
                ::aws_smithy_types::error::operation::BuildError::invalid_field(
   78    113   
                    "content_type",
   79    114   
                    format!(
   80    115   
                        "`{}` cannot be used as a header value: {}",
   81    116   
                        &header_value, err
   82    117   
                    ),
   83    118   
                )
   84    119   
            })?;
   85    120   
            builder = builder.header("Content-Type", header_value);
         121  +
            /* HttpBindingGenerator.kt:728 */
   86    122   
        }
         123  +
        /* HttpBindingGenerator.kt:615 */
   87    124   
    }
         125  +
    /* HttpBindingGenerator.kt:578 */
   88    126   
    Ok(builder)
         127  +
    /* HttpBindingGenerator.kt:565 */
   89    128   
}