Client Test

Client Test

rev. dfb5149b65b7bcc09edd15b8e071ad43b5ac5943 (ignoring whitespace)

Files changed:

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_constant_query_string.rs

@@ -1,1 +32,47 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* RustType.kt:516 */
    2      3   
#[allow(clippy::unnecessary_wraps)]
           4  +
/* ProtocolParserGenerator.kt:99 */
    3      5   
pub fn de_constant_query_string_http_error(
    4      6   
    _response_status: u16,
    5      7   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
    6      8   
    _response_body: &[u8],
    7      9   
) -> std::result::Result<
    8     10   
    crate::operation::constant_query_string::ConstantQueryStringOutput,
    9     11   
    crate::operation::constant_query_string::ConstantQueryStringError,
   10     12   
> {
          13  +
    /* RustType.kt:516 */
   11     14   
    #[allow(unused_mut)]
          15  +
    /* ProtocolParserGenerator.kt:106 */
   12     16   
    let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
   13     17   
        .map_err(crate::operation::constant_query_string::ConstantQueryStringError::unhandled)?;
          18  +
    /* ProtocolParserGenerator.kt:120 */
   14     19   
    let generic = generic_builder.build();
          20  +
    /* ProtocolParserGenerator.kt:185 */
   15     21   
    Err(crate::operation::constant_query_string::ConstantQueryStringError::generic(generic))
          22  +
    /* ProtocolParserGenerator.kt:99 */
   16     23   
}
   17     24   
          25  +
/* RustType.kt:516 */
   18     26   
#[allow(clippy::unnecessary_wraps)]
          27  +
/* ProtocolParserGenerator.kt:71 */
   19     28   
pub fn de_constant_query_string_http_response(
   20     29   
    _response_status: u16,
   21     30   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
   22     31   
    _response_body: &[u8],
   23     32   
) -> std::result::Result<
   24     33   
    crate::operation::constant_query_string::ConstantQueryStringOutput,
   25     34   
    crate::operation::constant_query_string::ConstantQueryStringError,
   26     35   
> {
          36  +
    /* ProtocolParserGenerator.kt:77 */
   27     37   
    Ok({
          38  +
        /* RustType.kt:516 */
   28     39   
        #[allow(unused_mut)]
          40  +
        /* ProtocolParserGenerator.kt:240 */
   29     41   
        let mut output = crate::operation::constant_query_string::builders::ConstantQueryStringOutputBuilder::default();
          42  +
        /* ClientBuilderInstantiator.kt:56 */
   30     43   
        output.build()
          44  +
        /* ProtocolParserGenerator.kt:77 */
   31     45   
    })
          46  +
    /* ProtocolParserGenerator.kt:71 */
   32     47   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_content_type_parameters.rs

@@ -1,1 +42,64 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* RustType.kt:516 */
    2      3   
#[allow(clippy::unnecessary_wraps)]
           4  +
/* ProtocolParserGenerator.kt:99 */
    3      5   
pub fn de_content_type_parameters_http_error(
    4      6   
    _response_status: u16,
    5      7   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
    6      8   
    _response_body: &[u8],
    7      9   
) -> std::result::Result<
    8     10   
    crate::operation::content_type_parameters::ContentTypeParametersOutput,
    9     11   
    crate::operation::content_type_parameters::ContentTypeParametersError,
   10     12   
> {
          13  +
    /* RustType.kt:516 */
   11     14   
    #[allow(unused_mut)]
          15  +
    /* ProtocolParserGenerator.kt:106 */
   12     16   
    let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
   13     17   
        .map_err(crate::operation::content_type_parameters::ContentTypeParametersError::unhandled)?;
          18  +
    /* ProtocolParserGenerator.kt:120 */
   14     19   
    let generic = generic_builder.build();
          20  +
    /* ProtocolParserGenerator.kt:185 */
   15     21   
    Err(crate::operation::content_type_parameters::ContentTypeParametersError::generic(generic))
          22  +
    /* ProtocolParserGenerator.kt:99 */
   16     23   
}
   17     24   
          25  +
/* RustType.kt:516 */
   18     26   
#[allow(clippy::unnecessary_wraps)]
          27  +
/* ProtocolParserGenerator.kt:71 */
   19     28   
pub fn de_content_type_parameters_http_response(
   20     29   
    _response_status: u16,
   21     30   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
   22     31   
    _response_body: &[u8],
   23     32   
) -> std::result::Result<
   24     33   
    crate::operation::content_type_parameters::ContentTypeParametersOutput,
   25     34   
    crate::operation::content_type_parameters::ContentTypeParametersError,
   26     35   
> {
          36  +
    /* ProtocolParserGenerator.kt:77 */
   27     37   
    Ok({
          38  +
        /* RustType.kt:516 */
   28     39   
        #[allow(unused_mut)]
          40  +
        /* ProtocolParserGenerator.kt:240 */
   29     41   
        let mut output = crate::operation::content_type_parameters::builders::ContentTypeParametersOutputBuilder::default();
          42  +
        /* ClientBuilderInstantiator.kt:56 */
   30     43   
        output.build()
          44  +
        /* ProtocolParserGenerator.kt:77 */
   31     45   
    })
          46  +
    /* ProtocolParserGenerator.kt:71 */
   32     47   
}
   33     48   
          49  +
/* JsonSerializerGenerator.kt:287 */
   34     50   
pub fn ser_content_type_parameters_input(
   35     51   
    input: &crate::operation::content_type_parameters::ContentTypeParametersInput,
   36     52   
) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError> {
          53  +
    /* JsonSerializerGenerator.kt:291 */
   37     54   
    let mut out = String::new();
          55  +
    /* JsonSerializerGenerator.kt:292 */
   38     56   
    let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
          57  +
    /* JsonSerializerGenerator.kt:375 */
   39     58   
    crate::protocol_serde::shape_content_type_parameters_input::ser_content_type_parameters_input_input(&mut object, input)?;
          59  +
    /* JsonSerializerGenerator.kt:295 */
   40     60   
    object.finish();
          61  +
    /* JsonSerializerGenerator.kt:296 */
   41     62   
    Ok(::aws_smithy_types::body::SdkBody::from(out))
          63  +
    /* JsonSerializerGenerator.kt:287 */
   42     64   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_content_type_parameters_input.rs

@@ -1,1 +13,19 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonSerializerGenerator.kt:358 */
    2      3   
pub fn ser_content_type_parameters_input_input(
    3      4   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
    4      5   
    input: &crate::operation::content_type_parameters::ContentTypeParametersInput,
    5      6   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
           7  +
    /* JsonSerializerGenerator.kt:382 */
    6      8   
    if let Some(var_1) = &input.value {
           9  +
        /* JsonSerializerGenerator.kt:432 */
    7     10   
        object.key("value").number(
    8     11   
            #[allow(clippy::useless_conversion)]
    9     12   
            ::aws_smithy_types::Number::NegInt((*var_1).into()),
   10     13   
        );
          14  +
        /* JsonSerializerGenerator.kt:382 */
   11     15   
    }
          16  +
    /* JsonSerializerGenerator.kt:372 */
   12     17   
    Ok(())
          18  +
    /* JsonSerializerGenerator.kt:358 */
   13     19   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_datetime_offsets.rs

@@ -1,1 +66,104 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* RustType.kt:516 */
    2      3   
#[allow(clippy::unnecessary_wraps)]
           4  +
/* ProtocolParserGenerator.kt:99 */
    3      5   
pub fn de_datetime_offsets_http_error(
    4      6   
    _response_status: u16,
    5      7   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
    6      8   
    _response_body: &[u8],
    7      9   
) -> std::result::Result<crate::operation::datetime_offsets::DatetimeOffsetsOutput, crate::operation::datetime_offsets::DatetimeOffsetsError> {
          10  +
    /* RustType.kt:516 */
    8     11   
    #[allow(unused_mut)]
          12  +
    /* ProtocolParserGenerator.kt:106 */
    9     13   
    let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
   10     14   
        .map_err(crate::operation::datetime_offsets::DatetimeOffsetsError::unhandled)?;
          15  +
    /* ProtocolParserGenerator.kt:120 */
   11     16   
    let generic = generic_builder.build();
          17  +
    /* ProtocolParserGenerator.kt:185 */
   12     18   
    Err(crate::operation::datetime_offsets::DatetimeOffsetsError::generic(generic))
          19  +
    /* ProtocolParserGenerator.kt:99 */
   13     20   
}
   14     21   
          22  +
/* RustType.kt:516 */
   15     23   
#[allow(clippy::unnecessary_wraps)]
          24  +
/* ProtocolParserGenerator.kt:71 */
   16     25   
pub fn de_datetime_offsets_http_response(
   17     26   
    _response_status: u16,
   18     27   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
   19     28   
    _response_body: &[u8],
   20     29   
) -> std::result::Result<crate::operation::datetime_offsets::DatetimeOffsetsOutput, crate::operation::datetime_offsets::DatetimeOffsetsError> {
          30  +
    /* ProtocolParserGenerator.kt:77 */
   21     31   
    Ok({
          32  +
        /* RustType.kt:516 */
   22     33   
        #[allow(unused_mut)]
          34  +
        /* ProtocolParserGenerator.kt:240 */
   23     35   
        let mut output = crate::operation::datetime_offsets::builders::DatetimeOffsetsOutputBuilder::default();
          36  +
        /* ProtocolParserGenerator.kt:247 */
   24     37   
        output = crate::protocol_serde::shape_datetime_offsets::de_datetime_offsets(_response_body, output)
   25     38   
            .map_err(crate::operation::datetime_offsets::DatetimeOffsetsError::unhandled)?;
          39  +
        /* ClientBuilderInstantiator.kt:56 */
   26     40   
        output.build()
          41  +
        /* ProtocolParserGenerator.kt:77 */
   27     42   
    })
          43  +
    /* ProtocolParserGenerator.kt:71 */
   28     44   
}
   29     45   
          46  +
/* JsonParserGenerator.kt:148 */
   30     47   
pub(crate) fn de_datetime_offsets(
   31     48   
    value: &[u8],
   32     49   
    mut builder: crate::operation::datetime_offsets::builders::DatetimeOffsetsOutputBuilder,
   33     50   
) -> ::std::result::Result<
   34     51   
    crate::operation::datetime_offsets::builders::DatetimeOffsetsOutputBuilder,
   35     52   
    ::aws_smithy_json::deserialize::error::DeserializeError,
   36     53   
> {
          54  +
    /* JsonParserGenerator.kt:153 */
   37     55   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value)).peekable();
   38     56   
    let tokens = &mut tokens_owned;
   39     57   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
          58  +
    /* JsonParserGenerator.kt:684 */
   40     59   
    loop {
          60  +
        /* JsonParserGenerator.kt:685 */
   41     61   
        match tokens.next().transpose()? {
   42         -
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   43         -
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
          62  +
            /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          63  +
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
          64  +
                /* JsonParserGenerator.kt:260 */
          65  +
                match key.to_unescaped()?.as_ref() {
          66  +
                    /* JsonParserGenerator.kt:262 */
   44     67   
                    "datetime" => {
   45         -
                    builder = builder.set_datetime(::aws_smithy_json::deserialize::token::expect_timestamp_or_null(
          68  +
                        /* JsonParserGenerator.kt:265 */
          69  +
                        builder = builder.set_datetime(
          70  +
                            /* JsonParserGenerator.kt:384 */
          71  +
                            ::aws_smithy_json::deserialize::token::expect_timestamp_or_null(
   46     72   
                                tokens.next(),
   47     73   
                                ::aws_smithy_types::date_time::Format::DateTimeWithOffset,
   48         -
                    )?);
          74  +
                            )?, /* JsonParserGenerator.kt:265 */
          75  +
                        );
          76  +
                        /* JsonParserGenerator.kt:262 */
   49     77   
                    }
   50         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   51         -
            },
          78  +
                    /* JsonParserGenerator.kt:290 */
          79  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
          80  +
                }
          81  +
                /* JsonParserGenerator.kt:686 */
          82  +
            }
          83  +
            /* JsonParserGenerator.kt:695 */
   52     84   
            other => {
   53     85   
                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   54     86   
                    "expected object key or end object, found: {:?}",
   55     87   
                    other
   56     88   
                )))
          89  +
            } /* JsonParserGenerator.kt:685 */
   57     90   
        }
          91  +
        /* JsonParserGenerator.kt:684 */
   58     92   
    }
   59         -
    }
          93  +
    /* JsonParserGenerator.kt:250 */
   60     94   
    if tokens.next().is_some() {
          95  +
        /* JsonParserGenerator.kt:251 */
   61     96   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   62     97   
            "found more JSON tokens after completing parsing",
   63     98   
        ));
          99  +
        /* JsonParserGenerator.kt:250 */
   64    100   
    }
         101  +
    /* JsonParserGenerator.kt:163 */
   65    102   
    Ok(builder)
         103  +
    /* JsonParserGenerator.kt:148 */
   66    104   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_defaults.rs

@@ -1,1 +149,249 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonSerializerGenerator.kt:358 */
    2      3   
pub fn ser_defaults(
    3      4   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
    4      5   
    input: &crate::types::Defaults,
    5      6   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
           7  +
    /* SerializerUtil.kt:46 */
    6      8   
    {
           9  +
        /* JsonSerializerGenerator.kt:423 */
    7     10   
        object.key("defaultString").string(input.default_string.as_str());
          11  +
        /* SerializerUtil.kt:46 */
    8     12   
    }
          13  +
    /* SerializerUtil.kt:46 */
    9     14   
    if !input.default_boolean {
          15  +
        /* JsonSerializerGenerator.kt:424 */
   10     16   
        object.key("defaultBoolean").boolean(input.default_boolean);
          17  +
        /* SerializerUtil.kt:46 */
   11     18   
    }
          19  +
    /* SerializerUtil.kt:46 */
   12     20   
    {
          21  +
        /* JsonSerializerGenerator.kt:484 */
   13     22   
        let mut array_1 = object.key("defaultList").start_array();
          23  +
        /* JsonSerializerGenerator.kt:524 */
   14     24   
        for item_2 in &input.default_list {
          25  +
            /* SerializerUtil.kt:42 */
   15     26   
            {
          27  +
                /* JsonSerializerGenerator.kt:423 */
   16     28   
                array_1.value().string(item_2.as_str());
          29  +
                /* SerializerUtil.kt:42 */
   17     30   
            }
          31  +
            /* JsonSerializerGenerator.kt:524 */
   18     32   
        }
          33  +
        /* JsonSerializerGenerator.kt:486 */
   19     34   
        array_1.finish();
          35  +
        /* SerializerUtil.kt:46 */
   20     36   
    }
          37  +
    /* SerializerUtil.kt:46 */
   21     38   
    {
          39  +
        /* JsonSerializerGenerator.kt:474 */
   22     40   
        object.key("defaultDocumentMap").document(&input.default_document_map);
          41  +
        /* SerializerUtil.kt:46 */
   23     42   
    }
          43  +
    /* SerializerUtil.kt:46 */
   24     44   
    {
          45  +
        /* JsonSerializerGenerator.kt:474 */
   25     46   
        object.key("defaultDocumentString").document(&input.default_document_string);
          47  +
        /* SerializerUtil.kt:46 */
   26     48   
    }
          49  +
    /* SerializerUtil.kt:46 */
   27     50   
    {
          51  +
        /* JsonSerializerGenerator.kt:474 */
   28     52   
        object.key("defaultDocumentBoolean").document(&input.default_document_boolean);
          53  +
        /* SerializerUtil.kt:46 */
   29     54   
    }
          55  +
    /* SerializerUtil.kt:46 */
   30     56   
    {
          57  +
        /* JsonSerializerGenerator.kt:474 */
   31     58   
        object.key("defaultDocumentList").document(&input.default_document_list);
          59  +
        /* SerializerUtil.kt:46 */
   32     60   
    }
          61  +
    /* JsonSerializerGenerator.kt:382 */
   33     62   
    if let Some(var_3) = &input.default_null_document {
          63  +
        /* JsonSerializerGenerator.kt:474 */
   34     64   
        object.key("defaultNullDocument").document(var_3);
          65  +
        /* JsonSerializerGenerator.kt:382 */
   35     66   
    }
          67  +
    /* SerializerUtil.kt:46 */
   36     68   
    {
          69  +
        /* JsonSerializerGenerator.kt:448 */
   37     70   
        object
   38     71   
            .key("defaultTimestamp")
   39     72   
            .date_time(&input.default_timestamp, ::aws_smithy_types::date_time::Format::EpochSeconds)?;
          73  +
        /* SerializerUtil.kt:46 */
   40     74   
    }
          75  +
    /* SerializerUtil.kt:46 */
   41     76   
    {
          77  +
        /* JsonSerializerGenerator.kt:439 */
   42     78   
        object
   43     79   
            .key("defaultBlob")
   44     80   
            .string_unchecked(&::aws_smithy_types::base64::encode(&input.default_blob));
          81  +
        /* SerializerUtil.kt:46 */
   45     82   
    }
          83  +
    /* SerializerUtil.kt:46 */
   46     84   
    if input.default_byte != 1 {
          85  +
        /* JsonSerializerGenerator.kt:432 */
   47     86   
        object.key("defaultByte").number(
   48     87   
            #[allow(clippy::useless_conversion)]
   49     88   
            ::aws_smithy_types::Number::NegInt((input.default_byte).into()),
   50     89   
        );
          90  +
        /* SerializerUtil.kt:46 */
   51     91   
    }
          92  +
    /* SerializerUtil.kt:46 */
   52     93   
    if input.default_short != 1 {
          94  +
        /* JsonSerializerGenerator.kt:432 */
   53     95   
        object.key("defaultShort").number(
   54     96   
            #[allow(clippy::useless_conversion)]
   55     97   
            ::aws_smithy_types::Number::NegInt((input.default_short).into()),
   56     98   
        );
          99  +
        /* SerializerUtil.kt:46 */
   57    100   
    }
         101  +
    /* SerializerUtil.kt:46 */
   58    102   
    if input.default_integer != 10 {
         103  +
        /* JsonSerializerGenerator.kt:432 */
   59    104   
        object.key("defaultInteger").number(
   60    105   
            #[allow(clippy::useless_conversion)]
   61    106   
            ::aws_smithy_types::Number::NegInt((input.default_integer).into()),
   62    107   
        );
         108  +
        /* SerializerUtil.kt:46 */
   63    109   
    }
         110  +
    /* SerializerUtil.kt:46 */
   64    111   
    if input.default_long != 100 {
         112  +
        /* JsonSerializerGenerator.kt:432 */
   65    113   
        object.key("defaultLong").number(
   66    114   
            #[allow(clippy::useless_conversion)]
   67    115   
            ::aws_smithy_types::Number::NegInt((input.default_long).into()),
   68    116   
        );
         117  +
        /* SerializerUtil.kt:46 */
   69    118   
    }
         119  +
    /* SerializerUtil.kt:46 */
   70    120   
    if input.default_float != 1.0 {
         121  +
        /* JsonSerializerGenerator.kt:432 */
   71    122   
        object.key("defaultFloat").number(
   72    123   
            #[allow(clippy::useless_conversion)]
   73    124   
            ::aws_smithy_types::Number::Float((input.default_float).into()),
   74    125   
        );
         126  +
        /* SerializerUtil.kt:46 */
   75    127   
    }
         128  +
    /* SerializerUtil.kt:46 */
   76    129   
    if input.default_double != 1.0 {
         130  +
        /* JsonSerializerGenerator.kt:432 */
   77    131   
        object.key("defaultDouble").number(
   78    132   
            #[allow(clippy::useless_conversion)]
   79    133   
            ::aws_smithy_types::Number::Float((input.default_double).into()),
   80    134   
        );
         135  +
        /* SerializerUtil.kt:46 */
   81    136   
    }
         137  +
    /* SerializerUtil.kt:46 */
   82    138   
    {
         139  +
        /* JsonSerializerGenerator.kt:495 */
   83    140   
        #[allow(unused_mut)]
         141  +
        /* JsonSerializerGenerator.kt:496 */
   84    142   
        let mut object_4 = object.key("defaultMap").start_object();
         143  +
        /* JsonSerializerGenerator.kt:537 */
   85    144   
        for (key_5, value_6) in &input.default_map {
         145  +
            /* SerializerUtil.kt:42 */
   86    146   
            {
         147  +
                /* JsonSerializerGenerator.kt:423 */
   87    148   
                object_4.key(key_5.as_str()).string(value_6.as_str());
         149  +
                /* SerializerUtil.kt:42 */
   88    150   
            }
         151  +
            /* JsonSerializerGenerator.kt:537 */
   89    152   
        }
         153  +
        /* JsonSerializerGenerator.kt:515 */
   90    154   
        object_4.finish();
         155  +
        /* SerializerUtil.kt:46 */
   91    156   
    }
         157  +
    /* SerializerUtil.kt:46 */
   92    158   
    {
         159  +
        /* JsonSerializerGenerator.kt:423 */
   93    160   
        object.key("defaultEnum").string(input.default_enum.as_str());
         161  +
        /* SerializerUtil.kt:46 */
   94    162   
    }
         163  +
    /* SerializerUtil.kt:46 */
   95    164   
    if input.default_int_enum != 1 {
         165  +
        /* JsonSerializerGenerator.kt:432 */
   96    166   
        object.key("defaultIntEnum").number(
   97    167   
            #[allow(clippy::useless_conversion)]
   98    168   
            ::aws_smithy_types::Number::NegInt((input.default_int_enum).into()),
   99    169   
        );
         170  +
        /* SerializerUtil.kt:46 */
  100    171   
    }
         172  +
    /* SerializerUtil.kt:46 */
  101    173   
    {
         174  +
        /* JsonSerializerGenerator.kt:423 */
  102    175   
        object.key("emptyString").string(input.empty_string.as_str());
         176  +
        /* SerializerUtil.kt:46 */
  103    177   
    }
         178  +
    /* SerializerUtil.kt:46 */
  104    179   
    if input.false_boolean {
         180  +
        /* JsonSerializerGenerator.kt:424 */
  105    181   
        object.key("falseBoolean").boolean(input.false_boolean);
         182  +
        /* SerializerUtil.kt:46 */
  106    183   
    }
         184  +
    /* SerializerUtil.kt:46 */
  107    185   
    {
         186  +
        /* JsonSerializerGenerator.kt:439 */
  108    187   
        object
  109    188   
            .key("emptyBlob")
  110    189   
            .string_unchecked(&::aws_smithy_types::base64::encode(&input.empty_blob));
         190  +
        /* SerializerUtil.kt:46 */
  111    191   
    }
         192  +
    /* SerializerUtil.kt:46 */
  112    193   
    if input.zero_byte != 0 {
         194  +
        /* JsonSerializerGenerator.kt:432 */
  113    195   
        object.key("zeroByte").number(
  114    196   
            #[allow(clippy::useless_conversion)]
  115    197   
            ::aws_smithy_types::Number::NegInt((input.zero_byte).into()),
  116    198   
        );
         199  +
        /* SerializerUtil.kt:46 */
  117    200   
    }
         201  +
    /* SerializerUtil.kt:46 */
  118    202   
    if input.zero_short != 0 {
         203  +
        /* JsonSerializerGenerator.kt:432 */
  119    204   
        object.key("zeroShort").number(
  120    205   
            #[allow(clippy::useless_conversion)]
  121    206   
            ::aws_smithy_types::Number::NegInt((input.zero_short).into()),
  122    207   
        );
         208  +
        /* SerializerUtil.kt:46 */
  123    209   
    }
         210  +
    /* SerializerUtil.kt:46 */
  124    211   
    if input.zero_integer != 0 {
         212  +
        /* JsonSerializerGenerator.kt:432 */
  125    213   
        object.key("zeroInteger").number(
  126    214   
            #[allow(clippy::useless_conversion)]
  127    215   
            ::aws_smithy_types::Number::NegInt((input.zero_integer).into()),
  128    216   
        );
         217  +
        /* SerializerUtil.kt:46 */
  129    218   
    }
         219  +
    /* SerializerUtil.kt:46 */
  130    220   
    if input.zero_long != 0 {
         221  +
        /* JsonSerializerGenerator.kt:432 */
  131    222   
        object.key("zeroLong").number(
  132    223   
            #[allow(clippy::useless_conversion)]
  133    224   
            ::aws_smithy_types::Number::NegInt((input.zero_long).into()),
  134    225   
        );
         226  +
        /* SerializerUtil.kt:46 */
  135    227   
    }
         228  +
    /* SerializerUtil.kt:46 */
  136    229   
    if input.zero_float != 0.0 {
         230  +
        /* JsonSerializerGenerator.kt:432 */
  137    231   
        object.key("zeroFloat").number(
  138    232   
            #[allow(clippy::useless_conversion)]
  139    233   
            ::aws_smithy_types::Number::Float((input.zero_float).into()),
  140    234   
        );
         235  +
        /* SerializerUtil.kt:46 */
  141    236   
    }
         237  +
    /* SerializerUtil.kt:46 */
  142    238   
    if input.zero_double != 0.0 {
         239  +
        /* JsonSerializerGenerator.kt:432 */
  143    240   
        object.key("zeroDouble").number(
  144    241   
            #[allow(clippy::useless_conversion)]
  145    242   
            ::aws_smithy_types::Number::Float((input.zero_double).into()),
  146    243   
        );
         244  +
        /* SerializerUtil.kt:46 */
  147    245   
    }
         246  +
    /* JsonSerializerGenerator.kt:372 */
  148    247   
    Ok(())
         248  +
    /* JsonSerializerGenerator.kt:358 */
  149    249   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_dense_boolean_map.rs

@@ -1,1 +36,61 @@
    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_dense_boolean_map<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<Option<::std::collections::HashMap<::std::string::String, bool>>, ::aws_smithy_json::deserialize::error::DeserializeError>
    5      6   
where
    6      7   
    I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
    7      8   
{
           9  +
    /* JsonParserGenerator.kt:712 */
    8     10   
    match tokens.next().transpose()? {
    9         -
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
          11  +
        /* JsonParserGenerator.kt:713 */ Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   10     12   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
          13  +
            /* JsonParserGenerator.kt:469 */
   11     14   
            let mut map = ::std::collections::HashMap::new();
          15  +
            /* JsonParserGenerator.kt:684 */
   12     16   
            loop {
          17  +
                /* JsonParserGenerator.kt:685 */
   13     18   
                match tokens.next().transpose()? {
   14         -
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          19  +
                    /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   15     20   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   16         -
                        let key = key.to_unescaped().map(|u| u.into_owned())?;
   17         -
                        let value = ::aws_smithy_json::deserialize::token::expect_bool_or_null(tokens.next())?;
          21  +
                        /* JsonParserGenerator.kt:471 */
          22  +
                        let key =
          23  +
                            /* JsonParserGenerator.kt:339 */key.to_unescaped().map(|u|
          24  +
                                /* JsonParserGenerator.kt:348 */u.into_owned()
          25  +
                            /* JsonParserGenerator.kt:339 */)
          26  +
                        /* JsonParserGenerator.kt:471 */?;
          27  +
                        /* JsonParserGenerator.kt:474 */
          28  +
                        let value =
          29  +
                            /* JsonParserGenerator.kt:298 */::aws_smithy_json::deserialize::token::expect_bool_or_null(tokens.next())?
          30  +
                        /* JsonParserGenerator.kt:474 */;
          31  +
                        /* JsonParserGenerator.kt:491 */
   18     32   
                        if let Some(value) = value {
   19     33   
                            map.insert(key, value);
   20     34   
                        }
          35  +
                        /* JsonParserGenerator.kt:686 */
   21     36   
                    }
          37  +
                    /* JsonParserGenerator.kt:695 */
   22     38   
                    other => {
   23     39   
                        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   24     40   
                            "expected object key or end object, found: {:?}",
   25     41   
                            other
   26     42   
                        )))
          43  +
                    } /* JsonParserGenerator.kt:685 */
   27     44   
                }
          45  +
                /* JsonParserGenerator.kt:684 */
   28     46   
            }
   29         -
            }
          47  +
            /* JsonParserGenerator.kt:504 */
   30     48   
            Ok(Some(map))
          49  +
            /* JsonParserGenerator.kt:713 */
   31     50   
        }
   32         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          51  +
        /* JsonParserGenerator.kt:722 */
          52  +
        _ => {
          53  +
            /* JsonParserGenerator.kt:723 */
          54  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   33     55   
                "expected start object or null",
   34         -
        )),
          56  +
            ))
          57  +
            /* JsonParserGenerator.kt:722 */
          58  +
        } /* JsonParserGenerator.kt:712 */
   35     59   
    }
          60  +
    /* JsonParserGenerator.kt:460 */
   36     61   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_dense_number_map.rs

@@ -1,1 +38,63 @@
    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_dense_number_map<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<Option<::std::collections::HashMap<::std::string::String, i32>>, ::aws_smithy_json::deserialize::error::DeserializeError>
    5      6   
where
    6      7   
    I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
    7      8   
{
           9  +
    /* JsonParserGenerator.kt:712 */
    8     10   
    match tokens.next().transpose()? {
    9         -
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
          11  +
        /* JsonParserGenerator.kt:713 */ Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   10     12   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
          13  +
            /* JsonParserGenerator.kt:469 */
   11     14   
            let mut map = ::std::collections::HashMap::new();
          15  +
            /* JsonParserGenerator.kt:684 */
   12     16   
            loop {
          17  +
                /* JsonParserGenerator.kt:685 */
   13     18   
                match tokens.next().transpose()? {
   14         -
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          19  +
                    /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   15     20   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   16         -
                        let key = key.to_unescaped().map(|u| u.into_owned())?;
   17         -
                        let value = ::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
          21  +
                        /* JsonParserGenerator.kt:471 */
          22  +
                        let key =
          23  +
                            /* JsonParserGenerator.kt:339 */key.to_unescaped().map(|u|
          24  +
                                /* JsonParserGenerator.kt:348 */u.into_owned()
          25  +
                            /* JsonParserGenerator.kt:339 */)
          26  +
                        /* JsonParserGenerator.kt:471 */?;
          27  +
                        /* JsonParserGenerator.kt:474 */
          28  +
                        let value =
          29  +
                            /* JsonParserGenerator.kt:365 */::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
   18     30   
                                                .map(i32::try_from)
   19         -
                            .transpose()?;
          31  +
                                                .transpose()?
          32  +
                        /* JsonParserGenerator.kt:474 */;
          33  +
                        /* JsonParserGenerator.kt:491 */
   20     34   
                        if let Some(value) = value {
   21     35   
                            map.insert(key, value);
   22     36   
                        }
          37  +
                        /* JsonParserGenerator.kt:686 */
   23     38   
                    }
          39  +
                    /* JsonParserGenerator.kt:695 */
   24     40   
                    other => {
   25     41   
                        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   26     42   
                            "expected object key or end object, found: {:?}",
   27     43   
                            other
   28     44   
                        )))
          45  +
                    } /* JsonParserGenerator.kt:685 */
   29     46   
                }
          47  +
                /* JsonParserGenerator.kt:684 */
   30     48   
            }
   31         -
            }
          49  +
            /* JsonParserGenerator.kt:504 */
   32     50   
            Ok(Some(map))
          51  +
            /* JsonParserGenerator.kt:713 */
   33     52   
        }
   34         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          53  +
        /* JsonParserGenerator.kt:722 */
          54  +
        _ => {
          55  +
            /* JsonParserGenerator.kt:723 */
          56  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   35     57   
                "expected start object or null",
   36         -
        )),
          58  +
            ))
          59  +
            /* JsonParserGenerator.kt:722 */
          60  +
        } /* JsonParserGenerator.kt:712 */
   37     61   
    }
          62  +
    /* JsonParserGenerator.kt:460 */
   38     63   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_dense_set_map.rs

@@ -1,1 +39,64 @@
    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_dense_set_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::vec::Vec<::std::string::String>>>,
    6      7   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    7      8   
>
    8      9   
where
    9     10   
    I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
   10     11   
{
          12  +
    /* JsonParserGenerator.kt:712 */
   11     13   
    match tokens.next().transpose()? {
   12         -
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
          14  +
        /* JsonParserGenerator.kt:713 */ Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   13     15   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
          16  +
            /* JsonParserGenerator.kt:469 */
   14     17   
            let mut map = ::std::collections::HashMap::new();
          18  +
            /* JsonParserGenerator.kt:684 */
   15     19   
            loop {
          20  +
                /* JsonParserGenerator.kt:685 */
   16     21   
                match tokens.next().transpose()? {
   17         -
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          22  +
                    /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   18     23   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   19         -
                        let key = key.to_unescaped().map(|u| u.into_owned())?;
   20         -
                        let value = crate::protocol_serde::shape_string_set::de_string_set(tokens)?;
          24  +
                        /* JsonParserGenerator.kt:471 */
          25  +
                        let key =
          26  +
                            /* JsonParserGenerator.kt:339 */key.to_unescaped().map(|u|
          27  +
                                /* JsonParserGenerator.kt:348 */u.into_owned()
          28  +
                            /* JsonParserGenerator.kt:339 */)
          29  +
                        /* JsonParserGenerator.kt:471 */?;
          30  +
                        /* JsonParserGenerator.kt:474 */
          31  +
                        let value =
          32  +
                            /* JsonParserGenerator.kt:451 */crate::protocol_serde::shape_string_set::de_string_set(tokens)?
          33  +
                        /* JsonParserGenerator.kt:474 */;
          34  +
                        /* JsonParserGenerator.kt:491 */
   21     35   
                        if let Some(value) = value {
   22     36   
                            map.insert(key, value);
   23     37   
                        }
          38  +
                        /* JsonParserGenerator.kt:686 */
   24     39   
                    }
          40  +
                    /* JsonParserGenerator.kt:695 */
   25     41   
                    other => {
   26     42   
                        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   27     43   
                            "expected object key or end object, found: {:?}",
   28     44   
                            other
   29     45   
                        )))
          46  +
                    } /* JsonParserGenerator.kt:685 */
   30     47   
                }
          48  +
                /* JsonParserGenerator.kt:684 */
   31     49   
            }
   32         -
            }
          50  +
            /* JsonParserGenerator.kt:504 */
   33     51   
            Ok(Some(map))
          52  +
            /* JsonParserGenerator.kt:713 */
   34     53   
        }
   35         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          54  +
        /* JsonParserGenerator.kt:722 */
          55  +
        _ => {
          56  +
            /* JsonParserGenerator.kt:723 */
          57  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   36     58   
                "expected start object or null",
   37         -
        )),
          59  +
            ))
          60  +
            /* JsonParserGenerator.kt:722 */
          61  +
        } /* JsonParserGenerator.kt:712 */
   38     62   
    }
          63  +
    /* JsonParserGenerator.kt:460 */
   39     64   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_dense_string_map.rs

@@ -1,1 +41,68 @@
    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_dense_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<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
   10     11   
{
          12  +
    /* JsonParserGenerator.kt:712 */
   11     13   
    match tokens.next().transpose()? {
   12         -
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
          14  +
        /* JsonParserGenerator.kt:713 */ Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   13     15   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
          16  +
            /* JsonParserGenerator.kt:469 */
   14     17   
            let mut map = ::std::collections::HashMap::new();
          18  +
            /* JsonParserGenerator.kt:684 */
   15     19   
            loop {
          20  +
                /* JsonParserGenerator.kt:685 */
   16     21   
                match tokens.next().transpose()? {
   17         -
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          22  +
                    /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   18     23   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   19         -
                        let key = key.to_unescaped().map(|u| u.into_owned())?;
   20         -
                        let value = ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   21         -
                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   22         -
                            .transpose()?;
          24  +
                        /* JsonParserGenerator.kt:471 */
          25  +
                        let key =
          26  +
                            /* JsonParserGenerator.kt:339 */key.to_unescaped().map(|u|
          27  +
                                /* JsonParserGenerator.kt:348 */u.into_owned()
          28  +
                            /* JsonParserGenerator.kt:339 */)
          29  +
                        /* JsonParserGenerator.kt:471 */?;
          30  +
                        /* JsonParserGenerator.kt:474 */
          31  +
                        let value =
          32  +
                            /* JsonParserGenerator.kt:354 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
          33  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          34  +
                                    /* JsonParserGenerator.kt:348 */u.into_owned()
          35  +
                                /* JsonParserGenerator.kt:339 */)
          36  +
                            /* JsonParserGenerator.kt:354 */).transpose()?
          37  +
                        /* JsonParserGenerator.kt:474 */;
          38  +
                        /* JsonParserGenerator.kt:491 */
   23     39   
                        if let Some(value) = value {
   24     40   
                            map.insert(key, value);
   25     41   
                        }
          42  +
                        /* JsonParserGenerator.kt:686 */
   26     43   
                    }
          44  +
                    /* JsonParserGenerator.kt:695 */
   27     45   
                    other => {
   28     46   
                        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   29     47   
                            "expected object key or end object, found: {:?}",
   30     48   
                            other
   31     49   
                        )))
          50  +
                    } /* JsonParserGenerator.kt:685 */
   32     51   
                }
          52  +
                /* JsonParserGenerator.kt:684 */
   33     53   
            }
   34         -
            }
          54  +
            /* JsonParserGenerator.kt:504 */
   35     55   
            Ok(Some(map))
          56  +
            /* JsonParserGenerator.kt:713 */
   36     57   
        }
   37         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          58  +
        /* JsonParserGenerator.kt:722 */
          59  +
        _ => {
          60  +
            /* JsonParserGenerator.kt:723 */
          61  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   38     62   
                "expected start object or null",
   39         -
        )),
          63  +
            ))
          64  +
            /* JsonParserGenerator.kt:722 */
          65  +
        } /* JsonParserGenerator.kt:712 */
   40     66   
    }
          67  +
    /* JsonParserGenerator.kt:460 */
   41     68   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_dense_struct_map.rs

@@ -1,1 +39,64 @@
    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_dense_struct_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, crate::types::GreetingStruct>>,
    6      7   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    7      8   
>
    8      9   
where
    9     10   
    I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
   10     11   
{
          12  +
    /* JsonParserGenerator.kt:712 */
   11     13   
    match tokens.next().transpose()? {
   12         -
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
          14  +
        /* JsonParserGenerator.kt:713 */ Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   13     15   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
          16  +
            /* JsonParserGenerator.kt:469 */
   14     17   
            let mut map = ::std::collections::HashMap::new();
          18  +
            /* JsonParserGenerator.kt:684 */
   15     19   
            loop {
          20  +
                /* JsonParserGenerator.kt:685 */
   16     21   
                match tokens.next().transpose()? {
   17         -
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          22  +
                    /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   18     23   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   19         -
                        let key = key.to_unescaped().map(|u| u.into_owned())?;
   20         -
                        let value = crate::protocol_serde::shape_greeting_struct::de_greeting_struct(tokens)?;
          24  +
                        /* JsonParserGenerator.kt:471 */
          25  +
                        let key =
          26  +
                            /* JsonParserGenerator.kt:339 */key.to_unescaped().map(|u|
          27  +
                                /* JsonParserGenerator.kt:348 */u.into_owned()
          28  +
                            /* JsonParserGenerator.kt:339 */)
          29  +
                        /* JsonParserGenerator.kt:471 */?;
          30  +
                        /* JsonParserGenerator.kt:474 */
          31  +
                        let value =
          32  +
                            /* JsonParserGenerator.kt:544 */crate::protocol_serde::shape_greeting_struct::de_greeting_struct(tokens)?
          33  +
                        /* JsonParserGenerator.kt:474 */;
          34  +
                        /* JsonParserGenerator.kt:491 */
   21     35   
                        if let Some(value) = value {
   22     36   
                            map.insert(key, value);
   23     37   
                        }
          38  +
                        /* JsonParserGenerator.kt:686 */
   24     39   
                    }
          40  +
                    /* JsonParserGenerator.kt:695 */
   25     41   
                    other => {
   26     42   
                        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   27     43   
                            "expected object key or end object, found: {:?}",
   28     44   
                            other
   29     45   
                        )))
          46  +
                    } /* JsonParserGenerator.kt:685 */
   30     47   
                }
          48  +
                /* JsonParserGenerator.kt:684 */
   31     49   
            }
   32         -
            }
          50  +
            /* JsonParserGenerator.kt:504 */
   33     51   
            Ok(Some(map))
          52  +
            /* JsonParserGenerator.kt:713 */
   34     53   
        }
   35         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          54  +
        /* JsonParserGenerator.kt:722 */
          55  +
        _ => {
          56  +
            /* JsonParserGenerator.kt:723 */
          57  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   36     58   
                "expected start object or null",
   37         -
        )),
          59  +
            ))
          60  +
            /* JsonParserGenerator.kt:722 */
          61  +
        } /* JsonParserGenerator.kt:712 */
   38     62   
    }
          63  +
    /* JsonParserGenerator.kt:460 */
   39     64   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_dialog.rs

@@ -1,1 +69,125 @@
    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_dialog<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<Option<crate::types::Dialog>, ::aws_smithy_json::deserialize::error::DeserializeError>
    5      6   
where
    6      7   
    I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
    7      8   
{
           9  +
    /* JsonParserGenerator.kt:712 */
    8     10   
    match tokens.next().transpose()? {
    9         -
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
          11  +
        /* JsonParserGenerator.kt:713 */ Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   10     12   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
          13  +
            /* RustType.kt:516 */
   11     14   
            #[allow(unused_mut)]
          15  +
            /* JsonParserGenerator.kt:526 */
   12     16   
            let mut builder = crate::types::builders::DialogBuilder::default();
          17  +
            /* JsonParserGenerator.kt:684 */
   13     18   
            loop {
          19  +
                /* JsonParserGenerator.kt:685 */
   14     20   
                match tokens.next().transpose()? {
   15         -
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   16         -
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
          21  +
                    /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          22  +
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
          23  +
                        /* JsonParserGenerator.kt:260 */
          24  +
                        match key.to_unescaped()?.as_ref() {
          25  +
                            /* JsonParserGenerator.kt:262 */
   17     26   
                            "language" => {
          27  +
                                /* JsonParserGenerator.kt:265 */
   18     28   
                                builder = builder.set_language(
          29  +
                                    /* JsonParserGenerator.kt:354 */
   19     30   
                                    ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   20         -
                                    .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   21         -
                                    .transpose()?,
          31  +
                                        .map(|s|
          32  +
                                        /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          33  +
                                            /* JsonParserGenerator.kt:348 */u.into_owned()
          34  +
                                        /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
          35  +
                                        .transpose()?, /* JsonParserGenerator.kt:265 */
   22     36   
                                );
          37  +
                                /* JsonParserGenerator.kt:262 */
   23     38   
                            }
          39  +
                            /* JsonParserGenerator.kt:262 */
   24     40   
                            "greeting" => {
          41  +
                                /* JsonParserGenerator.kt:265 */
   25     42   
                                builder = builder.set_greeting(
          43  +
                                    /* JsonParserGenerator.kt:354 */
   26     44   
                                    ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   27         -
                                    .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   28         -
                                    .transpose()?,
          45  +
                                        .map(|s|
          46  +
                                        /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          47  +
                                            /* JsonParserGenerator.kt:348 */u.into_owned()
          48  +
                                        /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
          49  +
                                        .transpose()?, /* JsonParserGenerator.kt:265 */
   29     50   
                                );
          51  +
                                /* JsonParserGenerator.kt:262 */
   30     52   
                            }
          53  +
                            /* JsonParserGenerator.kt:262 */
   31     54   
                            "farewell" => {
   32         -
                            builder = builder.set_farewell(crate::protocol_serde::shape_farewell::de_farewell(tokens)?);
          55  +
                                /* JsonParserGenerator.kt:265 */
          56  +
                                builder = builder.set_farewell(
          57  +
                                    /* JsonParserGenerator.kt:544 */
          58  +
                                    crate::protocol_serde::shape_farewell::de_farewell(tokens)?, /* JsonParserGenerator.kt:265 */
          59  +
                                );
          60  +
                                /* JsonParserGenerator.kt:262 */
          61  +
                            }
          62  +
                            /* JsonParserGenerator.kt:290 */
          63  +
                            _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
   33     64   
                        }
   34         -
                        _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   35         -
                    },
          65  +
                        /* JsonParserGenerator.kt:686 */
          66  +
                    }
          67  +
                    /* JsonParserGenerator.kt:695 */
   36     68   
                    other => {
   37     69   
                        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   38     70   
                            "expected object key or end object, found: {:?}",
   39     71   
                            other
   40     72   
                        )))
          73  +
                    } /* JsonParserGenerator.kt:685 */
   41     74   
                }
          75  +
                /* JsonParserGenerator.kt:684 */
   42     76   
            }
   43         -
            }
          77  +
            /* JsonParserGenerator.kt:540 */
   44     78   
            Ok(Some(builder.build()))
          79  +
            /* JsonParserGenerator.kt:713 */
   45     80   
        }
   46         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          81  +
        /* JsonParserGenerator.kt:722 */
          82  +
        _ => {
          83  +
            /* JsonParserGenerator.kt:723 */
          84  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   47     85   
                "expected start object or null",
   48         -
        )),
          86  +
            ))
          87  +
            /* JsonParserGenerator.kt:722 */
          88  +
        } /* JsonParserGenerator.kt:712 */
   49     89   
    }
          90  +
    /* JsonParserGenerator.kt:516 */
   50     91   
}
   51     92   
          93  +
/* JsonSerializerGenerator.kt:358 */
   52     94   
pub fn ser_dialog(
   53     95   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
   54     96   
    input: &crate::types::Dialog,
   55     97   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
          98  +
    /* JsonSerializerGenerator.kt:382 */
   56     99   
    if let Some(var_1) = &input.language {
         100  +
        /* JsonSerializerGenerator.kt:423 */
   57    101   
        object.key("language").string(var_1.as_str());
         102  +
        /* JsonSerializerGenerator.kt:382 */
   58    103   
    }
         104  +
    /* SerializerUtil.kt:46 */
   59    105   
    {
         106  +
        /* JsonSerializerGenerator.kt:423 */
   60    107   
        object.key("greeting").string(input.greeting.as_str());
         108  +
        /* SerializerUtil.kt:46 */
   61    109   
    }
         110  +
    /* JsonSerializerGenerator.kt:382 */
   62    111   
    if let Some(var_2) = &input.farewell {
         112  +
        /* JsonSerializerGenerator.kt:495 */
   63    113   
        #[allow(unused_mut)]
         114  +
        /* JsonSerializerGenerator.kt:496 */
   64    115   
        let mut object_3 = object.key("farewell").start_object();
         116  +
        /* JsonSerializerGenerator.kt:375 */
   65    117   
        crate::protocol_serde::shape_farewell::ser_farewell(&mut object_3, var_2)?;
         118  +
        /* JsonSerializerGenerator.kt:515 */
   66    119   
        object_3.finish();
         120  +
        /* JsonSerializerGenerator.kt:382 */
   67    121   
    }
         122  +
    /* JsonSerializerGenerator.kt:372 */
   68    123   
    Ok(())
         124  +
    /* JsonSerializerGenerator.kt:358 */
   69    125   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_dialog_list.rs

@@ -1,1 +32,55 @@
    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_dialog_list<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<Option<::std::vec::Vec<crate::types::Dialog>>, ::aws_smithy_json::deserialize::error::DeserializeError>
    5      6   
where
    6      7   
    I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
    7      8   
{
           9  +
    /* JsonParserGenerator.kt:712 */
    8     10   
    match tokens.next().transpose()? {
    9         -
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
          11  +
        /* JsonParserGenerator.kt:713 */ Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   10     12   
        Some(::aws_smithy_json::deserialize::Token::StartArray { .. }) => {
          13  +
            /* JsonParserGenerator.kt:407 */
   11     14   
            let mut items = Vec::new();
          15  +
            /* JsonParserGenerator.kt:408 */
   12     16   
            loop {
          17  +
                /* JsonParserGenerator.kt:409 */
   13     18   
                match tokens.peek() {
          19  +
                    /* JsonParserGenerator.kt:410 */
   14     20   
                    Some(Ok(::aws_smithy_json::deserialize::Token::EndArray { .. })) => {
          21  +
                        /* JsonParserGenerator.kt:411 */
   15     22   
                        tokens.next().transpose().unwrap();
   16     23   
                        break;
          24  +
                        /* JsonParserGenerator.kt:410 */
   17     25   
                    }
          26  +
                    /* JsonParserGenerator.kt:413 */
   18     27   
                    _ => {
   19         -
                        let value = crate::protocol_serde::shape_dialog::de_dialog(tokens)?;
          28  +
                        /* JsonParserGenerator.kt:419 */
          29  +
                        let value =
          30  +
                            /* JsonParserGenerator.kt:544 */crate::protocol_serde::shape_dialog::de_dialog(tokens)?
          31  +
                        /* JsonParserGenerator.kt:419 */;
          32  +
                        /* JsonParserGenerator.kt:422 */
   20     33   
                        if let Some(value) = value {
   21     34   
                            items.push(value);
   22     35   
                        }
          36  +
                        /* JsonParserGenerator.kt:413 */
          37  +
                    } /* JsonParserGenerator.kt:409 */
   23     38   
                }
          39  +
                /* JsonParserGenerator.kt:408 */
   24     40   
            }
   25         -
            }
          41  +
            /* JsonParserGenerator.kt:446 */
   26     42   
            Ok(Some(items))
          43  +
            /* JsonParserGenerator.kt:713 */
   27     44   
        }
   28         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          45  +
        /* JsonParserGenerator.kt:722 */
          46  +
        _ => {
          47  +
            /* JsonParserGenerator.kt:723 */
          48  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   29     49   
                "expected start array or null",
   30         -
        )),
          50  +
            ))
          51  +
            /* JsonParserGenerator.kt:722 */
          52  +
        } /* JsonParserGenerator.kt:712 */
   31     53   
    }
          54  +
    /* JsonParserGenerator.kt:398 */
   32     55   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_dialog_map.rs

@@ -1,1 +39,64 @@
    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_dialog_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, crate::types::Dialog>>,
    6      7   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    7      8   
>
    8      9   
where
    9     10   
    I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
   10     11   
{
          12  +
    /* JsonParserGenerator.kt:712 */
   11     13   
    match tokens.next().transpose()? {
   12         -
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
          14  +
        /* JsonParserGenerator.kt:713 */ Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   13     15   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
          16  +
            /* JsonParserGenerator.kt:469 */
   14     17   
            let mut map = ::std::collections::HashMap::new();
          18  +
            /* JsonParserGenerator.kt:684 */
   15     19   
            loop {
          20  +
                /* JsonParserGenerator.kt:685 */
   16     21   
                match tokens.next().transpose()? {
   17         -
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          22  +
                    /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   18     23   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   19         -
                        let key = key.to_unescaped().map(|u| u.into_owned())?;
   20         -
                        let value = crate::protocol_serde::shape_dialog::de_dialog(tokens)?;
          24  +
                        /* JsonParserGenerator.kt:471 */
          25  +
                        let key =
          26  +
                            /* JsonParserGenerator.kt:339 */key.to_unescaped().map(|u|
          27  +
                                /* JsonParserGenerator.kt:348 */u.into_owned()
          28  +
                            /* JsonParserGenerator.kt:339 */)
          29  +
                        /* JsonParserGenerator.kt:471 */?;
          30  +
                        /* JsonParserGenerator.kt:474 */
          31  +
                        let value =
          32  +
                            /* JsonParserGenerator.kt:544 */crate::protocol_serde::shape_dialog::de_dialog(tokens)?
          33  +
                        /* JsonParserGenerator.kt:474 */;
          34  +
                        /* JsonParserGenerator.kt:491 */
   21     35   
                        if let Some(value) = value {
   22     36   
                            map.insert(key, value);
   23     37   
                        }
          38  +
                        /* JsonParserGenerator.kt:686 */
   24     39   
                    }
          40  +
                    /* JsonParserGenerator.kt:695 */
   25     41   
                    other => {
   26     42   
                        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   27     43   
                            "expected object key or end object, found: {:?}",
   28     44   
                            other
   29     45   
                        )))
          46  +
                    } /* JsonParserGenerator.kt:685 */
   30     47   
                }
          48  +
                /* JsonParserGenerator.kt:684 */
   31     49   
            }
   32         -
            }
          50  +
            /* JsonParserGenerator.kt:504 */
   33     51   
            Ok(Some(map))
          52  +
            /* JsonParserGenerator.kt:713 */
   34     53   
        }
   35         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          54  +
        /* JsonParserGenerator.kt:722 */
          55  +
        _ => {
          56  +
            /* JsonParserGenerator.kt:723 */
          57  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   36     58   
                "expected start object or null",
   37         -
        )),
          59  +
            ))
          60  +
            /* JsonParserGenerator.kt:722 */
          61  +
        } /* JsonParserGenerator.kt:712 */
   38     62   
    }
          63  +
    /* JsonParserGenerator.kt:460 */
   39     64   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_document.rs

@@ -1,1 +15,24 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonParserGenerator.kt:175 */
    2      3   
pub(crate) fn de_document_payload(
    3      4   
    input: &[u8],
    4      5   
) -> ::std::result::Result<::aws_smithy_types::Document, ::aws_smithy_json::deserialize::error::DeserializeError> {
           6  +
    /* JsonParserGenerator.kt:187 */
    5      7   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(input).peekable();
    6      8   
    let tokens = &mut tokens_owned;
    7         -
    let result = Some(::aws_smithy_json::deserialize::token::expect_document(tokens)?)
    8         -
        .ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("expected payload member value"));
           9  +
    /* JsonParserGenerator.kt:194 */
          10  +
    let result =
          11  +
    /* JsonParserGenerator.kt:319 */Some(::aws_smithy_json::deserialize::token::expect_document(tokens)?)
          12  +
    /* JsonParserGenerator.kt:196 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("expected payload member value"));
          13  +
    /* JsonParserGenerator.kt:250 */
    9     14   
    if tokens.next().is_some() {
          15  +
        /* JsonParserGenerator.kt:251 */
   10     16   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   11     17   
            "found more JSON tokens after completing parsing",
   12     18   
        ));
          19  +
        /* JsonParserGenerator.kt:250 */
   13     20   
    }
          21  +
    /* JsonParserGenerator.kt:198 */
   14     22   
    result
          23  +
    /* JsonParserGenerator.kt:175 */
   15     24   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_document_type.rs

@@ -1,1 +80,132 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* RustType.kt:516 */
    2      3   
#[allow(clippy::unnecessary_wraps)]
           4  +
/* ProtocolParserGenerator.kt:99 */
    3      5   
pub fn de_document_type_http_error(
    4      6   
    _response_status: u16,
    5      7   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
    6      8   
    _response_body: &[u8],
    7      9   
) -> std::result::Result<crate::operation::document_type::DocumentTypeOutput, crate::operation::document_type::DocumentTypeError> {
          10  +
    /* RustType.kt:516 */
    8     11   
    #[allow(unused_mut)]
          12  +
    /* ProtocolParserGenerator.kt:106 */
    9     13   
    let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
   10     14   
        .map_err(crate::operation::document_type::DocumentTypeError::unhandled)?;
          15  +
    /* ProtocolParserGenerator.kt:120 */
   11     16   
    let generic = generic_builder.build();
          17  +
    /* ProtocolParserGenerator.kt:185 */
   12     18   
    Err(crate::operation::document_type::DocumentTypeError::generic(generic))
          19  +
    /* ProtocolParserGenerator.kt:99 */
   13     20   
}
   14     21   
          22  +
/* RustType.kt:516 */
   15     23   
#[allow(clippy::unnecessary_wraps)]
          24  +
/* ProtocolParserGenerator.kt:71 */
   16     25   
pub fn de_document_type_http_response(
   17     26   
    _response_status: u16,
   18     27   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
   19     28   
    _response_body: &[u8],
   20     29   
) -> std::result::Result<crate::operation::document_type::DocumentTypeOutput, crate::operation::document_type::DocumentTypeError> {
          30  +
    /* ProtocolParserGenerator.kt:77 */
   21     31   
    Ok({
          32  +
        /* RustType.kt:516 */
   22     33   
        #[allow(unused_mut)]
          34  +
        /* ProtocolParserGenerator.kt:240 */
   23     35   
        let mut output = crate::operation::document_type::builders::DocumentTypeOutputBuilder::default();
          36  +
        /* ProtocolParserGenerator.kt:247 */
   24     37   
        output = crate::protocol_serde::shape_document_type::de_document_type(_response_body, output)
   25     38   
            .map_err(crate::operation::document_type::DocumentTypeError::unhandled)?;
          39  +
        /* ClientBuilderInstantiator.kt:56 */
   26     40   
        output.build()
          41  +
        /* ProtocolParserGenerator.kt:77 */
   27     42   
    })
          43  +
    /* ProtocolParserGenerator.kt:71 */
   28     44   
}
   29     45   
          46  +
/* JsonSerializerGenerator.kt:287 */
   30     47   
pub fn ser_document_type_input(
   31     48   
    input: &crate::operation::document_type::DocumentTypeInput,
   32     49   
) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError> {
          50  +
    /* JsonSerializerGenerator.kt:291 */
   33     51   
    let mut out = String::new();
          52  +
    /* JsonSerializerGenerator.kt:292 */
   34     53   
    let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
          54  +
    /* JsonSerializerGenerator.kt:375 */
   35     55   
    crate::protocol_serde::shape_document_type_input::ser_document_type_input_input(&mut object, input)?;
          56  +
    /* JsonSerializerGenerator.kt:295 */
   36     57   
    object.finish();
          58  +
    /* JsonSerializerGenerator.kt:296 */
   37     59   
    Ok(::aws_smithy_types::body::SdkBody::from(out))
          60  +
    /* JsonSerializerGenerator.kt:287 */
   38     61   
}
   39     62   
          63  +
/* JsonParserGenerator.kt:148 */
   40     64   
pub(crate) fn de_document_type(
   41     65   
    value: &[u8],
   42     66   
    mut builder: crate::operation::document_type::builders::DocumentTypeOutputBuilder,
   43     67   
) -> ::std::result::Result<
   44     68   
    crate::operation::document_type::builders::DocumentTypeOutputBuilder,
   45     69   
    ::aws_smithy_json::deserialize::error::DeserializeError,
   46     70   
> {
          71  +
    /* JsonParserGenerator.kt:153 */
   47     72   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value)).peekable();
   48     73   
    let tokens = &mut tokens_owned;
   49     74   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
          75  +
    /* JsonParserGenerator.kt:684 */
   50     76   
    loop {
          77  +
        /* JsonParserGenerator.kt:685 */
   51     78   
        match tokens.next().transpose()? {
   52         -
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   53         -
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
          79  +
            /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          80  +
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
          81  +
                /* JsonParserGenerator.kt:260 */
          82  +
                match key.to_unescaped()?.as_ref() {
          83  +
                    /* JsonParserGenerator.kt:262 */
   54     84   
                    "documentValue" => {
   55         -
                    builder = builder.set_document_value(Some(::aws_smithy_json::deserialize::token::expect_document(tokens)?));
          85  +
                        /* JsonParserGenerator.kt:265 */
          86  +
                        builder = builder.set_document_value(
          87  +
                            /* JsonParserGenerator.kt:319 */
          88  +
                            Some(::aws_smithy_json::deserialize::token::expect_document(tokens)?), /* JsonParserGenerator.kt:265 */
          89  +
                        );
          90  +
                        /* JsonParserGenerator.kt:262 */
   56     91   
                    }
          92  +
                    /* JsonParserGenerator.kt:262 */
   57     93   
                    "stringValue" => {
          94  +
                        /* JsonParserGenerator.kt:265 */
   58     95   
                        builder = builder.set_string_value(
          96  +
                            /* JsonParserGenerator.kt:354 */
   59     97   
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   60         -
                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   61         -
                            .transpose()?,
          98  +
                                .map(|s|
          99  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
         100  +
                                    /* JsonParserGenerator.kt:348 */u.into_owned()
         101  +
                                /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
         102  +
                                .transpose()?, /* JsonParserGenerator.kt:265 */
   62    103   
                        );
         104  +
                        /* JsonParserGenerator.kt:262 */
         105  +
                    }
         106  +
                    /* JsonParserGenerator.kt:290 */
         107  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
   63    108   
                }
   64         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   65         -
            },
         109  +
                /* JsonParserGenerator.kt:686 */
         110  +
            }
         111  +
            /* JsonParserGenerator.kt:695 */
   66    112   
            other => {
   67    113   
                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   68    114   
                    "expected object key or end object, found: {:?}",
   69    115   
                    other
   70    116   
                )))
         117  +
            } /* JsonParserGenerator.kt:685 */
   71    118   
        }
         119  +
        /* JsonParserGenerator.kt:684 */
   72    120   
    }
   73         -
    }
         121  +
    /* JsonParserGenerator.kt:250 */
   74    122   
    if tokens.next().is_some() {
         123  +
        /* JsonParserGenerator.kt:251 */
   75    124   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   76    125   
            "found more JSON tokens after completing parsing",
   77    126   
        ));
         127  +
        /* JsonParserGenerator.kt:250 */
   78    128   
    }
         129  +
    /* JsonParserGenerator.kt:163 */
   79    130   
    Ok(builder)
         131  +
    /* JsonParserGenerator.kt:148 */
   80    132   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_document_type_as_map_value.rs

@@ -1,1 +81,126 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* RustType.kt:516 */
    2      3   
#[allow(clippy::unnecessary_wraps)]
           4  +
/* ProtocolParserGenerator.kt:99 */
    3      5   
pub fn de_document_type_as_map_value_http_error(
    4      6   
    _response_status: u16,
    5      7   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
    6      8   
    _response_body: &[u8],
    7      9   
) -> std::result::Result<
    8     10   
    crate::operation::document_type_as_map_value::DocumentTypeAsMapValueOutput,
    9     11   
    crate::operation::document_type_as_map_value::DocumentTypeAsMapValueError,
   10     12   
> {
          13  +
    /* RustType.kt:516 */
   11     14   
    #[allow(unused_mut)]
          15  +
    /* ProtocolParserGenerator.kt:106 */
   12     16   
    let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
   13     17   
        .map_err(crate::operation::document_type_as_map_value::DocumentTypeAsMapValueError::unhandled)?;
          18  +
    /* ProtocolParserGenerator.kt:120 */
   14     19   
    let generic = generic_builder.build();
          20  +
    /* ProtocolParserGenerator.kt:185 */
   15     21   
    Err(crate::operation::document_type_as_map_value::DocumentTypeAsMapValueError::generic(
   16     22   
        generic,
   17     23   
    ))
          24  +
    /* ProtocolParserGenerator.kt:99 */
   18     25   
}
   19     26   
          27  +
/* RustType.kt:516 */
   20     28   
#[allow(clippy::unnecessary_wraps)]
          29  +
/* ProtocolParserGenerator.kt:71 */
   21     30   
pub fn de_document_type_as_map_value_http_response(
   22     31   
    _response_status: u16,
   23     32   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
   24     33   
    _response_body: &[u8],
   25     34   
) -> std::result::Result<
   26     35   
    crate::operation::document_type_as_map_value::DocumentTypeAsMapValueOutput,
   27     36   
    crate::operation::document_type_as_map_value::DocumentTypeAsMapValueError,
   28     37   
> {
          38  +
    /* ProtocolParserGenerator.kt:77 */
   29     39   
    Ok({
          40  +
        /* RustType.kt:516 */
   30     41   
        #[allow(unused_mut)]
          42  +
        /* ProtocolParserGenerator.kt:240 */
   31     43   
        let mut output = crate::operation::document_type_as_map_value::builders::DocumentTypeAsMapValueOutputBuilder::default();
          44  +
        /* ProtocolParserGenerator.kt:247 */
   32     45   
        output = crate::protocol_serde::shape_document_type_as_map_value::de_document_type_as_map_value(_response_body, output)
   33     46   
            .map_err(crate::operation::document_type_as_map_value::DocumentTypeAsMapValueError::unhandled)?;
          47  +
        /* ClientBuilderInstantiator.kt:56 */
   34     48   
        output.build()
          49  +
        /* ProtocolParserGenerator.kt:77 */
   35     50   
    })
          51  +
    /* ProtocolParserGenerator.kt:71 */
   36     52   
}
   37     53   
          54  +
/* JsonSerializerGenerator.kt:287 */
   38     55   
pub fn ser_document_type_as_map_value_input(
   39     56   
    input: &crate::operation::document_type_as_map_value::DocumentTypeAsMapValueInput,
   40     57   
) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError> {
          58  +
    /* JsonSerializerGenerator.kt:291 */
   41     59   
    let mut out = String::new();
          60  +
    /* JsonSerializerGenerator.kt:292 */
   42     61   
    let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
          62  +
    /* JsonSerializerGenerator.kt:375 */
   43     63   
    crate::protocol_serde::shape_document_type_as_map_value_input::ser_document_type_as_map_value_input_input(&mut object, input)?;
          64  +
    /* JsonSerializerGenerator.kt:295 */
   44     65   
    object.finish();
          66  +
    /* JsonSerializerGenerator.kt:296 */
   45     67   
    Ok(::aws_smithy_types::body::SdkBody::from(out))
          68  +
    /* JsonSerializerGenerator.kt:287 */
   46     69   
}
   47     70   
          71  +
/* JsonParserGenerator.kt:148 */
   48     72   
pub(crate) fn de_document_type_as_map_value(
   49     73   
    value: &[u8],
   50     74   
    mut builder: crate::operation::document_type_as_map_value::builders::DocumentTypeAsMapValueOutputBuilder,
   51     75   
) -> ::std::result::Result<
   52     76   
    crate::operation::document_type_as_map_value::builders::DocumentTypeAsMapValueOutputBuilder,
   53     77   
    ::aws_smithy_json::deserialize::error::DeserializeError,
   54     78   
> {
          79  +
    /* JsonParserGenerator.kt:153 */
   55     80   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value)).peekable();
   56     81   
    let tokens = &mut tokens_owned;
   57     82   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
          83  +
    /* JsonParserGenerator.kt:684 */
   58     84   
    loop {
          85  +
        /* JsonParserGenerator.kt:685 */
   59     86   
        match tokens.next().transpose()? {
   60         -
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   61         -
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
          87  +
            /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          88  +
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
          89  +
                /* JsonParserGenerator.kt:260 */
          90  +
                match key.to_unescaped()?.as_ref() {
          91  +
                    /* JsonParserGenerator.kt:262 */
   62     92   
                    "docValuedMap" => {
   63         -
                    builder = builder.set_doc_valued_map(crate::protocol_serde::shape_document_valued_map::de_document_valued_map(tokens)?);
          93  +
                        /* JsonParserGenerator.kt:265 */
          94  +
                        builder = builder.set_doc_valued_map(
          95  +
                            /* JsonParserGenerator.kt:509 */
          96  +
                            crate::protocol_serde::shape_document_valued_map::de_document_valued_map(tokens)?, /* JsonParserGenerator.kt:265 */
          97  +
                        );
          98  +
                        /* JsonParserGenerator.kt:262 */
   64     99   
                    }
   65         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   66         -
            },
         100  +
                    /* JsonParserGenerator.kt:290 */
         101  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
         102  +
                }
         103  +
                /* JsonParserGenerator.kt:686 */
         104  +
            }
         105  +
            /* JsonParserGenerator.kt:695 */
   67    106   
            other => {
   68    107   
                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   69    108   
                    "expected object key or end object, found: {:?}",
   70    109   
                    other
   71    110   
                )))
         111  +
            } /* JsonParserGenerator.kt:685 */
   72    112   
        }
         113  +
        /* JsonParserGenerator.kt:684 */
   73    114   
    }
   74         -
    }
         115  +
    /* JsonParserGenerator.kt:250 */
   75    116   
    if tokens.next().is_some() {
         117  +
        /* JsonParserGenerator.kt:251 */
   76    118   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   77    119   
            "found more JSON tokens after completing parsing",
   78    120   
        ));
         121  +
        /* JsonParserGenerator.kt:250 */
   79    122   
    }
         123  +
    /* JsonParserGenerator.kt:163 */
   80    124   
    Ok(builder)
         125  +
    /* JsonParserGenerator.kt:148 */
   81    126   
}