Server Test

tmp-codegen-diff/codegen-server-test/json_rpc10-http0x/rust-server-codegen/src/protocol_serde.rs

@@ -0,1 +0,98 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub(crate) mod shape_content_type_parameters;
-+
 pub(crate) mod shape_empty_input_and_empty_output;
-+
 pub(crate) mod shape_endpoint_operation;
-+
 pub(crate) mod shape_endpoint_with_host_label_operation;
-+
 pub(crate) mod shape_greeting_with_errors;
-+
 pub(crate) mod shape_host_with_path_operation;
-+
 pub(crate) mod shape_json_unions;
-+
 pub(crate) mod shape_no_input_and_no_output;
-+
 pub(crate) mod shape_no_input_and_output;
-+
 pub(crate) mod shape_operation_with_defaults;
-+
 pub(crate) mod shape_operation_with_nested_structure;
-+
 pub(crate) mod shape_operation_with_required_members;
-+
 pub(crate) mod shape_operation_with_required_members_with_defaults;
-+
 pub(crate) mod shape_put_with_content_encoding;
-+
 pub(crate) mod shape_query_incompatible_operation;
-+
 pub(crate) mod shape_simple_scalar_properties;
-+
 pub(crate) mod shape_complex_error;
-+
 pub(crate) fn or_empty_doc(data: &[u8]) -> &[u8] {
     if data.is_empty() {
         b"{}"
     } else {
         data
-+
+    }
-+
+}
-+
 pub(crate) mod shape_content_type_parameters_output;
-+
 pub(crate) mod shape_empty_input_and_empty_output_output;
-+
 pub(crate) mod shape_foo_error;
-+
 pub(crate) mod shape_greeting_with_errors_output;
-+
 pub(crate) mod shape_invalid_greeting;
-+
 pub(crate) mod shape_json_unions_output;
-+
 pub(crate) mod shape_no_input_and_output_output;
-+
 pub(crate) mod shape_operation_with_defaults_output;
-+
 pub(crate) mod shape_operation_with_nested_structure_output;
-+
 pub(crate) mod shape_operation_with_required_members_output;
-+
 pub(crate) mod shape_operation_with_required_members_with_defaults_output;
-+
 pub(crate) mod shape_simple_scalar_properties_output;
-+
 pub(crate) mod shape_validation_exception;
-+
 pub(crate) mod shape_client_optional_defaults;
-+
 pub(crate) mod shape_defaults;
-+
 pub(crate) mod shape_my_union;
-+
 pub(crate) mod shape_top_level;
-+
 pub(crate) mod shape_complex_nested_error_data;
-+
 pub(crate) mod shape_dialog;
-+
 pub(crate) mod shape_dialog_list;
-+
 pub(crate) mod shape_dialog_map;
-+
 pub(crate) mod shape_greeting_struct;
-+
 pub(crate) mod shape_string_list;
-+
 pub(crate) mod shape_string_map;
-+
 pub(crate) mod shape_test_string_list;
-+
 pub(crate) mod shape_test_string_map;
-+
 pub(crate) mod shape_validation_exception_field;
-+
 pub(crate) mod shape_farewell;

tmp-codegen-diff/codegen-server-test/json_rpc10-http0x/rust-server-codegen/src/protocol_serde/shape_client_optional_defaults.rs

@@ -0,1 +0,57 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub(crate) fn de_client_optional_defaults<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
 ) -> ::std::result::Result<
     Option<crate::model::ClientOptionalDefaults>,
     ::aws_smithy_json::deserialize::error::DeserializeError,
-+
+>
 where
     I: Iterator<
         Item = Result<
             ::aws_smithy_json::deserialize::Token<'a>,
             ::aws_smithy_json::deserialize::error::DeserializeError,
         >,
     >,
-+
+{
     match tokens.next().transpose()? {
         Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
         Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
             #[allow(unused_mut)]
             let mut builder = crate::model::client_optional_defaults::Builder::default();
             loop {
                 match tokens.next().transpose()? {
                     Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
                     Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
                         match key.to_unescaped()?.as_ref() {
                             "member" => {
                                 if let Some(v) =
                                     ::aws_smithy_json::deserialize::token::expect_number_or_null(
                                         tokens.next(),
                                     )?
                                     .map(i32::try_from)
                                     .transpose()?
-+
+                                {
                                     builder = builder.set_member(v);
-+
+                                }
-+
+                            }
                             _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
-+
+                        }
-+
+                    }
                     other => {
                         return Err(
                             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                 format!("expected object key or end object, found: {other:?}"),
                             ),
-+
+                        )
-+
+                    }
-+
+                }
-+
+            }
             Ok(Some(builder.build()))
-+
+        }
         _ => Err(
             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                 "expected start object or null",
             ),
         ),
-+
+    }
-+
+}

tmp-codegen-diff/codegen-server-test/json_rpc10-http0x/rust-server-codegen/src/protocol_serde/shape_complex_error.rs

@@ -0,1 +0,32 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub fn ser_complex_error_error(
     value: &crate::error::ComplexError,
 ) -> ::std::result::Result<String, ::aws_smithy_types::error::operation::SerializationError> {
     let mut out = ::std::string::String::new();
     let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
     crate::protocol_serde::shape_complex_error::ser_complex_error(&mut object, value)?;
     object
         .key("__type")
         .string("aws.protocoltests.json10#ComplexError");
     object.finish();
     Ok(out)
-+
+}
-+
 pub fn ser_complex_error(
     object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
     input: &crate::error::ComplexError,
 ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
     if let Some(var_1) = &input.top_level {
         object.key("TopLevel").string(var_1.as_str());
-+
+    }
     if let Some(var_2) = &input.nested {
         #[allow(unused_mut)]
         let mut object_3 = object.key("Nested").start_object();
         crate::protocol_serde::shape_complex_nested_error_data::ser_complex_nested_error_data(
             &mut object_3,
             var_2,
         )?;
         object_3.finish();
-+
+    }
     Ok(())
-+
+}

tmp-codegen-diff/codegen-server-test/json_rpc10-http0x/rust-server-codegen/src/protocol_serde/shape_complex_nested_error_data.rs

@@ -0,1 +0,10 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub fn ser_complex_nested_error_data(
     object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
     input: &crate::model::ComplexNestedErrorData,
 ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
     if let Some(var_1) = &input.foo {
         object.key("Foo").string(var_1.as_str());
-+
+    }
     Ok(())
-+
+}

tmp-codegen-diff/codegen-server-test/json_rpc10-http0x/rust-server-codegen/src/protocol_serde/shape_content_type_parameters.rs

@@ -0,1 +0,115 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 #[allow(clippy::unnecessary_wraps)]
 pub async fn de_content_type_parameters_http_request<B>(
     #[allow(unused_variables)] request: ::http::Request<B>,
 ) -> std::result::Result<
     crate::input::ContentTypeParametersInput,
     ::aws_smithy_legacy_http_server::protocol::aws_json::rejection::RequestRejection,
-+
+>
 where
     B: ::aws_smithy_legacy_http_server::body::HttpBody + Send,
     B::Data: Send,
     ::aws_smithy_legacy_http_server::protocol::aws_json::rejection::RequestRejection:
         From<<B as ::aws_smithy_legacy_http_server::body::HttpBody>::Error>,
-+
+{
     Ok({
         #[allow(unused_mut)]
         let mut input = crate::input::content_type_parameters_input::Builder::default();
         #[allow(unused_variables)]
         let ::aws_smithy_runtime_api::http::RequestParts {
             uri, headers, body, ..
         } = ::aws_smithy_runtime_api::http::Request::try_from(request)?.into_parts();
         let bytes = ::hyper::body::to_bytes(body).await?;
         if !bytes.is_empty() {
             ::aws_smithy_legacy_http_server::protocol::content_type_header_classifier_smithy(
                 &headers,
                 Some("application/x-amz-json-1.0"),
             )?;
             input =
                 crate::protocol_serde::shape_content_type_parameters::de_content_type_parameters(
                     bytes.as_ref(),
                     input,
                 )?;
-+
+        }
         input.build()
     })
-+
+}
-+
 #[allow(clippy::unnecessary_wraps)]
 pub fn ser_content_type_parameters_http_response(
     #[allow(unused_variables)] output: crate::output::ContentTypeParametersOutput,
 ) -> std::result::Result<
     ::aws_smithy_legacy_http_server::response::Response,
     ::aws_smithy_legacy_http_server::protocol::aws_json::rejection::ResponseRejection,
 > {
     Ok({
         #[allow(unused_mut)]
         let mut builder = ::http::Response::builder();
         builder = ::aws_smithy_legacy_http::header::set_response_header_if_absent(
             builder,
             ::http::header::CONTENT_TYPE,
             "application/x-amz-json-1.0",
         );
         let http_status: u16 = 200;
         builder = builder.status(http_status);
         let payload =
             crate::protocol_serde::shape_content_type_parameters_output::ser_content_type_parameters_output_output_output(&output)?
-+
+        ;
         let content_length = payload.len();
         builder = ::aws_smithy_legacy_http::header::set_response_header_if_absent(
             builder,
             ::http::header::CONTENT_LENGTH,
             content_length,
         );
         let body = ::aws_smithy_legacy_http_server::body::to_boxed(payload);
         builder.body(body)?
     })
-+
+}
-+
 pub(crate) fn de_content_type_parameters(
     value: &[u8],
     mut builder: crate::input::content_type_parameters_input::Builder,
 ) -> ::std::result::Result<
     crate::input::content_type_parameters_input::Builder,
     ::aws_smithy_json::deserialize::error::DeserializeError,
 > {
     let mut tokens_owned =
         ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value))
             .peekable();
     let tokens = &mut tokens_owned;
     ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
     loop {
         match tokens.next().transpose()? {
             Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
             Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
                 match key.to_unescaped()?.as_ref() {
                     "value" => {
                         builder = builder.set_value(
                             ::aws_smithy_json::deserialize::token::expect_number_or_null(
                                 tokens.next(),
                             )?
                             .map(i32::try_from)
                             .transpose()?,
                         );
-+
+                    }
                     _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
-+
+                }
-+
+            }
             other => {
                 return Err(
                     ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
                         "expected object key or end object, found: {other:?}"
                     )),
-+
+                )
-+
+            }
-+
+        }
-+
+    }
     if tokens.next().is_some() {
         return Err(
             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                 "found more JSON tokens after completing parsing",
             ),
         );
-+
+    }
     Ok(builder)
-+
+}

tmp-codegen-diff/codegen-server-test/json_rpc10-http0x/rust-server-codegen/src/protocol_serde/shape_content_type_parameters_output.rs

@@ -0,1 +0,17 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub fn ser_content_type_parameters_output_output_output(
     value: &crate::output::ContentTypeParametersOutput,
 ) -> ::std::result::Result<String, ::aws_smithy_types::error::operation::SerializationError> {
     let mut out = ::std::string::String::new();
     let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
     crate::protocol_serde::shape_content_type_parameters_output::ser_content_type_parameters_output_output(&mut object, value)?;
     object.finish();
     Ok(out)
-+
+}
-+
 pub fn ser_content_type_parameters_output_output(
     #[allow(unused_variables)] object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
     #[allow(unused_variables)] input: &crate::output::ContentTypeParametersOutput,
 ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
     Ok(())
-+
+}

tmp-codegen-diff/codegen-server-test/json_rpc10-http0x/rust-server-codegen/src/protocol_serde/shape_defaults.rs

@@ -0,1 +0,311 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub(crate) fn de_defaults<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
 ) -> ::std::result::Result<
     Option<crate::model::defaults::Builder>,
     ::aws_smithy_json::deserialize::error::DeserializeError,
-+
+>
 where
     I: Iterator<
         Item = Result<
             ::aws_smithy_json::deserialize::Token<'a>,
             ::aws_smithy_json::deserialize::error::DeserializeError,
         >,
     >,
-+
+{
     match tokens.next().transpose()? {
         Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
         Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
             #[allow(unused_mut)]
             let mut builder = crate::model::defaults::Builder::default();
             loop {
                 match tokens.next().transpose()? {
                     Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
                     Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
                         match key.to_unescaped()?.as_ref() {
                             "defaultString" => {
                                 if let Some(v) =
                                     ::aws_smithy_json::deserialize::token::expect_string_or_null(
                                         tokens.next(),
                                     )?
                                     .map(|s| s.to_unescaped().map(|u| u.into_owned()))
                                     .transpose()?
-+
+                                {
                                     builder = builder.set_default_string(v);
-+
+                                }
-+
+                            }
                             "defaultBoolean" => {
                                 if let Some(v) =
                                     ::aws_smithy_json::deserialize::token::expect_bool_or_null(
                                         tokens.next(),
                                     )?
-+
+                                {
                                     builder = builder.set_default_boolean(v);
-+
+                                }
-+
+                            }
                             "defaultList" => {
                                 if let Some(v) =
                                 crate::protocol_serde::shape_test_string_list::de_test_string_list(tokens)?
-+
+                                {
                                                                             builder = builder.set_default_list(v);
-+
+                                                                        }
-+
+                            }
                             "defaultDocumentMap" => {
                                 if let Some(v) = Some(
                                     ::aws_smithy_json::deserialize::token::expect_document(tokens)?,
                                 ) {
                                     builder = builder.set_default_document_map(v);
-+
+                                }
-+
+                            }
                             "defaultDocumentString" => {
                                 if let Some(v) = Some(
                                     ::aws_smithy_json::deserialize::token::expect_document(tokens)?,
                                 ) {
                                     builder = builder.set_default_document_string(v);
-+
+                                }
-+
+                            }
                             "defaultDocumentBoolean" => {
                                 if let Some(v) = Some(
                                     ::aws_smithy_json::deserialize::token::expect_document(tokens)?,
                                 ) {
                                     builder = builder.set_default_document_boolean(v);
-+
+                                }
-+
+                            }
                             "defaultDocumentList" => {
                                 if let Some(v) = Some(
                                     ::aws_smithy_json::deserialize::token::expect_document(tokens)?,
                                 ) {
                                     builder = builder.set_default_document_list(v);
-+
+                                }
-+
+                            }
                             "defaultNullDocument" => {
                                 builder = builder.set_default_null_document(Some(
                                     ::aws_smithy_json::deserialize::token::expect_document(tokens)?,
                                 ));
-+
+                            }
                             "defaultTimestamp" => {
                                 if let Some(v) =
                                     ::aws_smithy_json::deserialize::token::expect_timestamp_or_null(
                                         tokens.next(),
                                         ::aws_smithy_types::date_time::Format::EpochSeconds,
                                     )?
-+
+                                {
                                     builder = builder.set_default_timestamp(v);
-+
+                                }
-+
+                            }
                             "defaultBlob" => {
                                 if let Some(v) =
                                     ::aws_smithy_json::deserialize::token::expect_blob_or_null(
                                         tokens.next(),
                                     )?
-+
+                                {
                                     builder = builder.set_default_blob(v);
-+
+                                }
-+
+                            }
                             "defaultByte" => {
                                 if let Some(v) =
                                     ::aws_smithy_json::deserialize::token::expect_number_or_null(
                                         tokens.next(),
                                     )?
                                     .map(i8::try_from)
                                     .transpose()?
-+
+                                {
                                     builder = builder.set_default_byte(v);
-+
+                                }
-+
+                            }
                             "defaultShort" => {
                                 if let Some(v) =
                                     ::aws_smithy_json::deserialize::token::expect_number_or_null(
                                         tokens.next(),
                                     )?
                                     .map(i16::try_from)
                                     .transpose()?
-+
+                                {
                                     builder = builder.set_default_short(v);
-+
+                                }
-+
+                            }
                             "defaultInteger" => {
                                 if let Some(v) =
                                     ::aws_smithy_json::deserialize::token::expect_number_or_null(
                                         tokens.next(),
                                     )?
                                     .map(i32::try_from)
                                     .transpose()?
-+
+                                {
                                     builder = builder.set_default_integer(v);
-+
+                                }
-+
+                            }
                             "defaultLong" => {
                                 if let Some(v) =
                                     ::aws_smithy_json::deserialize::token::expect_number_or_null(
                                         tokens.next(),
                                     )?
                                     .map(i64::try_from)
                                     .transpose()?
-+
+                                {
                                     builder = builder.set_default_long(v);
-+
+                                }
-+
+                            }
                             "defaultFloat" => {
                                 if let Some(v) =
                                     ::aws_smithy_json::deserialize::token::expect_number_or_null(
                                         tokens.next(),
                                     )?
                                     .map(|v| v.to_f32_lossy())
-+
+                                {
                                     builder = builder.set_default_float(v);
-+
+                                }
-+
+                            }
                             "defaultDouble" => {
                                 if let Some(v) =
                                     ::aws_smithy_json::deserialize::token::expect_number_or_null(
                                         tokens.next(),
                                     )?
                                     .map(|v| v.to_f64_lossy())
-+
+                                {
                                     builder = builder.set_default_double(v);
-+
+                                }
-+
+                            }
                             "defaultMap" => {
                                 if let Some(v) =
                                 crate::protocol_serde::shape_test_string_map::de_test_string_map(tokens)?
-+
+                                {
                                                                             builder = builder.set_default_map(v);
-+
+                                                                        }
-+
+                            }
                             "defaultEnum" => {
                                 if let Some(v) =
                                     ::aws_smithy_json::deserialize::token::expect_string_or_null(
                                         tokens.next(),
                                     )?
                                     .map(|s| s.to_unescaped().map(|u| u.into_owned()))
                                     .transpose()?
-+
+                                {
                                     builder = builder.set_default_enum(v);
-+
+                                }
-+
+                            }
                             "defaultIntEnum" => {
                                 if let Some(v) =
                                     ::aws_smithy_json::deserialize::token::expect_number_or_null(
                                         tokens.next(),
                                     )?
                                     .map(i32::try_from)
                                     .transpose()?
-+
+                                {
                                     builder = builder.set_default_int_enum(v);
-+
+                                }
-+
+                            }
                             "emptyString" => {
                                 if let Some(v) =
                                     ::aws_smithy_json::deserialize::token::expect_string_or_null(
                                         tokens.next(),
                                     )?
                                     .map(|s| s.to_unescaped().map(|u| u.into_owned()))
                                     .transpose()?
-+
+                                {
                                     builder = builder.set_empty_string(v);
-+
+                                }
-+
+                            }
                             "falseBoolean" => {
                                 if let Some(v) =
                                     ::aws_smithy_json::deserialize::token::expect_bool_or_null(
                                         tokens.next(),
                                     )?
-+
+                                {
                                     builder = builder.set_false_boolean(v);
-+
+                                }
-+
+                            }
                             "emptyBlob" => {
                                 if let Some(v) =
                                     ::aws_smithy_json::deserialize::token::expect_blob_or_null(
                                         tokens.next(),
                                     )?
-+
+                                {
                                     builder = builder.set_empty_blob(v);
-+
+                                }
-+
+                            }
                             "zeroByte" => {
                                 if let Some(v) =
                                     ::aws_smithy_json::deserialize::token::expect_number_or_null(
                                         tokens.next(),
                                     )?
                                     .map(i8::try_from)
                                     .transpose()?
-+
+                                {
                                     builder = builder.set_zero_byte(v);
-+
+                                }
-+
+                            }
                             "zeroShort" => {
                                 if let Some(v) =
                                     ::aws_smithy_json::deserialize::token::expect_number_or_null(
                                         tokens.next(),
                                     )?
                                     .map(i16::try_from)
                                     .transpose()?
-+
+                                {
                                     builder = builder.set_zero_short(v);
-+
+                                }
-+
+                            }
                             "zeroInteger" => {
                                 if let Some(v) =
                                     ::aws_smithy_json::deserialize::token::expect_number_or_null(
                                         tokens.next(),
                                     )?
                                     .map(i32::try_from)
                                     .transpose()?
-+
+                                {
                                     builder = builder.set_zero_integer(v);
-+
+                                }
-+
+                            }
                             "zeroLong" => {
                                 if let Some(v) =
                                     ::aws_smithy_json::deserialize::token::expect_number_or_null(
                                         tokens.next(),
                                     )?
                                     .map(i64::try_from)
                                     .transpose()?
-+
+                                {
                                     builder = builder.set_zero_long(v);
-+
+                                }
-+
+                            }
                             "zeroFloat" => {
                                 if let Some(v) =
                                     ::aws_smithy_json::deserialize::token::expect_number_or_null(
                                         tokens.next(),
                                     )?
                                     .map(|v| v.to_f32_lossy())
-+
+                                {
                                     builder = builder.set_zero_float(v);
-+
+                                }
-+
+                            }
                             "zeroDouble" => {
                                 if let Some(v) =
                                     ::aws_smithy_json::deserialize::token::expect_number_or_null(
                                         tokens.next(),
                                     )?
                                     .map(|v| v.to_f64_lossy())
-+
+                                {
                                     builder = builder.set_zero_double(v);
-+
+                                }
-+
+                            }
                             _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
-+
+                        }
-+
+                    }
                     other => {
                         return Err(
                             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                 format!("expected object key or end object, found: {other:?}"),
                             ),
-+
+                        )
-+
+                    }
-+
+                }
-+
+            }
             Ok(Some(builder))
-+
+        }
         _ => Err(
             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                 "expected start object or null",
             ),
         ),
-+
+    }
-+
+}

tmp-codegen-diff/codegen-server-test/json_rpc10-http0x/rust-server-codegen/src/protocol_serde/shape_dialog.rs

@@ -0,1 +0,90 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub fn ser_dialog(
     object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
     input: &crate::model::Dialog,
 ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
     if let Some(var_1) = &input.language {
         object.key("language").string(var_1.as_str());
-+
+    }
-+
+    {
         object.key("greeting").string(input.greeting.as_str());
-+
+    }
     if let Some(var_2) = &input.farewell {
         #[allow(unused_mut)]
         let mut object_3 = object.key("farewell").start_object();
         crate::protocol_serde::shape_farewell::ser_farewell(&mut object_3, var_2)?;
         object_3.finish();
-+
+    }
     Ok(())
-+
+}
-+
 pub(crate) fn de_dialog<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
 ) -> ::std::result::Result<
     Option<crate::model::Dialog>,
     ::aws_smithy_json::deserialize::error::DeserializeError,
-+
+>
 where
     I: Iterator<
         Item = Result<
             ::aws_smithy_json::deserialize::Token<'a>,
             ::aws_smithy_json::deserialize::error::DeserializeError,
         >,
     >,
-+
+{
     match tokens.next().transpose()? {
         Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
         Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
             #[allow(unused_mut)]
             let mut builder = crate::model::dialog::Builder::default();
             loop {
                 match tokens.next().transpose()? {
                     Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
                     Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
                         match key.to_unescaped()?.as_ref() {
                             "language" => {
                                 builder = builder.set_language(
                                     ::aws_smithy_json::deserialize::token::expect_string_or_null(
                                         tokens.next(),
                                     )?
                                     .map(|s| s.to_unescaped().map(|u| u.into_owned()))
                                     .transpose()?,
                                 );
-+
+                            }
                             "greeting" => {
                                 if let Some(v) =
                                     ::aws_smithy_json::deserialize::token::expect_string_or_null(
                                         tokens.next(),
                                     )?
                                     .map(|s| s.to_unescaped().map(|u| u.into_owned()))
                                     .transpose()?
-+
+                                {
                                     builder = builder.set_greeting(v);
-+
+                                }
-+
+                            }
                             "farewell" => {
                                 builder = builder.set_farewell(
                                     crate::protocol_serde::shape_farewell::de_farewell(tokens)?,
                                 );
-+
+                            }
                             _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
-+
+                        }
-+
+                    }
                     other => {
                         return Err(
                             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                 format!("expected object key or end object, found: {other:?}"),
                             ),
-+
+                        )
-+
+                    }
-+
+                }
-+
+            }
             Ok(Some(builder.build()))
-+
+        }
         _ => Err(
             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                 "expected start object or null",
             ),
         ),
-+
+    }
-+
+}

tmp-codegen-diff/codegen-server-test/json_rpc10-http0x/rust-server-codegen/src/protocol_serde/shape_dialog_list.rs

@@ -0,1 +0,48 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub(crate) fn de_dialog_list<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
 ) -> ::std::result::Result<
     Option<::std::vec::Vec<crate::model::Dialog>>,
     ::aws_smithy_json::deserialize::error::DeserializeError,
-+
+>
 where
     I: Iterator<
         Item = Result<
             ::aws_smithy_json::deserialize::Token<'a>,
             ::aws_smithy_json::deserialize::error::DeserializeError,
         >,
     >,
-+
+{
     match tokens.next().transpose()? {
         Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
         Some(::aws_smithy_json::deserialize::Token::StartArray { .. }) => {
             let mut items = Vec::new();
             loop {
                 match tokens.peek() {
                     Some(Ok(::aws_smithy_json::deserialize::Token::EndArray { .. })) => {
                         tokens.next().transpose().unwrap();
                         break;
-+
+                    }
                     _ => {
                         let value = crate::protocol_serde::shape_dialog::de_dialog(tokens)?;
                         if let Some(value) = value {
                             items.push(value);
                         } else {
                             return Err(
                                 ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                     "dense list cannot contain null values",
                                 ),
                             );
-+
+                        }
-+
+                    }
-+
+                }
-+
+            }
             Ok(Some(items))
-+
+        }
         _ => Err(
             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                 "expected start array or null",
             ),
         ),
-+
+    }
-+
+}

tmp-codegen-diff/codegen-server-test/json_rpc10-http0x/rust-server-codegen/src/protocol_serde/shape_dialog_map.rs

@@ -0,1 +0,56 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub(crate) fn de_dialog_map<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
 ) -> ::std::result::Result<
     Option<::std::collections::HashMap<::std::string::String, crate::model::Dialog>>,
     ::aws_smithy_json::deserialize::error::DeserializeError,
-+
+>
 where
     I: Iterator<
         Item = Result<
             ::aws_smithy_json::deserialize::Token<'a>,
             ::aws_smithy_json::deserialize::error::DeserializeError,
         >,
     >,
-+
+{
     match tokens.next().transpose()? {
         Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
         Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
             let mut map = ::std::collections::HashMap::new();
             loop {
                 match tokens.next().transpose()? {
                     Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
                     Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
                         let key = key.to_unescaped().map(|u| u.into_owned())?;
                         let value = crate::protocol_serde::shape_dialog::de_dialog(tokens)?;
                         match value {
                             Some(value) => {
                                 map.insert(key, value);
-+
+                            }
                             None => {
                                 return Err(
                                     ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                         "dense map cannot contain null values",
                                     ),
-+
+                                )
-+
+                            }
-+
+                        }
-+
+                    }
                     other => {
                         return Err(
                             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                 format!("expected object key or end object, found: {other:?}"),
                             ),
-+
+                        )
-+
+                    }
-+
+                }
-+
+            }
             Ok(Some(map))
-+
+        }
         _ => Err(
             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                 "expected start object or null",
             ),
         ),
-+
+    }
-+
+}

tmp-codegen-diff/codegen-server-test/json_rpc10-http0x/rust-server-codegen/src/protocol_serde/shape_empty_input_and_empty_output.rs

@@ -0,1 +0,55 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 #[allow(clippy::unnecessary_wraps)]
 pub async fn de_empty_input_and_empty_output_http_request<B>(
     #[allow(unused_variables)] request: ::http::Request<B>,
 ) -> std::result::Result<
     crate::input::EmptyInputAndEmptyOutputInput,
     ::aws_smithy_legacy_http_server::protocol::aws_json::rejection::RequestRejection,
-+
+>
 where
     B: ::aws_smithy_legacy_http_server::body::HttpBody + Send,
     B::Data: Send,
     ::aws_smithy_legacy_http_server::protocol::aws_json::rejection::RequestRejection:
         From<<B as ::aws_smithy_legacy_http_server::body::HttpBody>::Error>,
-+
+{
     Ok({
         #[allow(unused_mut)]
         let mut input = crate::input::empty_input_and_empty_output_input::Builder::default();
         #[allow(unused_variables)]
         let ::aws_smithy_runtime_api::http::RequestParts {
             uri, headers, body, ..
         } = ::aws_smithy_runtime_api::http::Request::try_from(request)?.into_parts();
         input.build()
     })
-+
+}
-+
 #[allow(clippy::unnecessary_wraps)]
 pub fn ser_empty_input_and_empty_output_http_response(
     #[allow(unused_variables)] output: crate::output::EmptyInputAndEmptyOutputOutput,
 ) -> std::result::Result<
     ::aws_smithy_legacy_http_server::response::Response,
     ::aws_smithy_legacy_http_server::protocol::aws_json::rejection::ResponseRejection,
 > {
     Ok({
         #[allow(unused_mut)]
         let mut builder = ::http::Response::builder();
         builder = ::aws_smithy_legacy_http::header::set_response_header_if_absent(
             builder,
             ::http::header::CONTENT_TYPE,
             "application/x-amz-json-1.0",
         );
         let http_status: u16 = 200;
         builder = builder.status(http_status);
         let payload =
             crate::protocol_serde::shape_empty_input_and_empty_output_output::ser_empty_input_and_empty_output_output_output_output(&output)?
-+
+        ;
         let content_length = payload.len();
         builder = ::aws_smithy_legacy_http::header::set_response_header_if_absent(
             builder,
             ::http::header::CONTENT_LENGTH,
             content_length,
         );
         let body = ::aws_smithy_legacy_http_server::body::to_boxed(payload);
         builder.body(body)?
     })
-+
+}

tmp-codegen-diff/codegen-server-test/json_rpc10-http0x/rust-server-codegen/src/protocol_serde/shape_empty_input_and_empty_output_output.rs

@@ -0,1 +0,17 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub fn ser_empty_input_and_empty_output_output_output_output(
     value: &crate::output::EmptyInputAndEmptyOutputOutput,
 ) -> ::std::result::Result<String, ::aws_smithy_types::error::operation::SerializationError> {
     let mut out = ::std::string::String::new();
     let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
     crate::protocol_serde::shape_empty_input_and_empty_output_output::ser_empty_input_and_empty_output_output_output(&mut object, value)?;
     object.finish();
     Ok(out)
-+
+}
-+
 pub fn ser_empty_input_and_empty_output_output_output(
     #[allow(unused_variables)] object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
     #[allow(unused_variables)] input: &crate::output::EmptyInputAndEmptyOutputOutput,
 ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
     Ok(())
-+
+}

tmp-codegen-diff/codegen-server-test/json_rpc10-http0x/rust-server-codegen/src/protocol_serde/shape_endpoint_operation.rs

@@ -0,1 +0,53 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 #[allow(clippy::unnecessary_wraps)]
 pub async fn de_endpoint_operation_http_request<B>(
     #[allow(unused_variables)] request: ::http::Request<B>,
 ) -> std::result::Result<
     crate::input::EndpointOperationInput,
     ::aws_smithy_legacy_http_server::protocol::aws_json::rejection::RequestRejection,
-+
+>
 where
     B: ::aws_smithy_legacy_http_server::body::HttpBody + Send,
     B::Data: Send,
     ::aws_smithy_legacy_http_server::protocol::aws_json::rejection::RequestRejection:
         From<<B as ::aws_smithy_legacy_http_server::body::HttpBody>::Error>,
-+
+{
     Ok({
         #[allow(unused_mut)]
         let mut input = crate::input::endpoint_operation_input::Builder::default();
         #[allow(unused_variables)]
         let ::aws_smithy_runtime_api::http::RequestParts {
             uri, headers, body, ..
         } = ::aws_smithy_runtime_api::http::Request::try_from(request)?.into_parts();
         input.build()
     })
-+
+}
-+
 #[allow(clippy::unnecessary_wraps)]
 pub fn ser_endpoint_operation_http_response(
     #[allow(unused_variables)] output: crate::output::EndpointOperationOutput,
 ) -> std::result::Result<
     ::aws_smithy_legacy_http_server::response::Response,
     ::aws_smithy_legacy_http_server::protocol::aws_json::rejection::ResponseRejection,
 > {
     Ok({
         #[allow(unused_mut)]
         let mut builder = ::http::Response::builder();
         builder = ::aws_smithy_legacy_http::header::set_response_header_if_absent(
             builder,
             ::http::header::CONTENT_TYPE,
             "application/x-amz-json-1.0",
         );
         let http_status: u16 = 200;
         builder = builder.status(http_status);
         let payload = "";
         let content_length = payload.len();
         builder = ::aws_smithy_legacy_http::header::set_response_header_if_absent(
             builder,
             ::http::header::CONTENT_LENGTH,
             content_length,
         );
         let body = ::aws_smithy_legacy_http_server::body::to_boxed(payload);
         builder.body(body)?
     })
-+
+}

tmp-codegen-diff/codegen-server-test/json_rpc10-http0x/rust-server-codegen/src/protocol_serde/shape_endpoint_with_host_label_operation.rs

@@ -0,1 +0,143 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 #[allow(clippy::unnecessary_wraps)]
 pub async fn de_endpoint_with_host_label_operation_http_request<B>(
     #[allow(unused_variables)] request: ::http::Request<B>,
 ) -> std::result::Result<
     crate::input::EndpointWithHostLabelOperationInput,
     ::aws_smithy_legacy_http_server::protocol::aws_json::rejection::RequestRejection,
-+
+>
 where
     B: ::aws_smithy_legacy_http_server::body::HttpBody + Send,
     B::Data: Send,
     ::aws_smithy_legacy_http_server::protocol::aws_json::rejection::RequestRejection:
         From<<B as ::aws_smithy_legacy_http_server::body::HttpBody>::Error>,
-+
+{
     Ok({
         #[allow(unused_mut)]
         let mut input = crate::input::endpoint_with_host_label_operation_input::Builder::default();
         #[allow(unused_variables)]
         let ::aws_smithy_runtime_api::http::RequestParts {
             uri, headers, body, ..
         } = ::aws_smithy_runtime_api::http::Request::try_from(request)?.into_parts();
         let bytes = ::hyper::body::to_bytes(body).await?;
         if !bytes.is_empty() {
             ::aws_smithy_legacy_http_server::protocol::content_type_header_classifier_smithy(
                 &headers,
                 Some("application/x-amz-json-1.0"),
             )?;
             input = crate::protocol_serde::shape_endpoint_with_host_label_operation::de_endpoint_with_host_label_operation(bytes.as_ref(), input)?;
-+
+        }
         input.build()?
     })
-+
+}
-+
 #[allow(clippy::unnecessary_wraps)]
 pub fn ser_endpoint_with_host_label_operation_http_response(
     #[allow(unused_variables)] output: crate::output::EndpointWithHostLabelOperationOutput,
 ) -> std::result::Result<
     ::aws_smithy_legacy_http_server::response::Response,
     ::aws_smithy_legacy_http_server::protocol::aws_json::rejection::ResponseRejection,
 > {
     Ok({
         #[allow(unused_mut)]
         let mut builder = ::http::Response::builder();
         builder = ::aws_smithy_legacy_http::header::set_response_header_if_absent(
             builder,
             ::http::header::CONTENT_TYPE,
             "application/x-amz-json-1.0",
         );
         let http_status: u16 = 200;
         builder = builder.status(http_status);
         let payload = "";
         let content_length = payload.len();
         builder = ::aws_smithy_legacy_http::header::set_response_header_if_absent(
             builder,
             ::http::header::CONTENT_LENGTH,
             content_length,
         );
         let body = ::aws_smithy_legacy_http_server::body::to_boxed(payload);
         builder.body(body)?
     })
-+
+}
-+
 #[allow(clippy::unnecessary_wraps)]
 pub fn ser_endpoint_with_host_label_operation_http_error(
     error: &crate::error::EndpointWithHostLabelOperationError,
 ) -> std::result::Result<
     ::aws_smithy_legacy_http_server::response::Response,
     ::aws_smithy_legacy_http_server::protocol::aws_json::rejection::ResponseRejection,
 > {
     Ok({
         match error {
             crate::error::EndpointWithHostLabelOperationError::ValidationException(output) => {
                 let payload = crate::protocol_serde::shape_validation_exception::ser_validation_exception_error(output)?;
                 #[allow(unused_mut)]
                 let mut builder = ::http::Response::builder();
                 builder = ::aws_smithy_legacy_http::header::set_response_header_if_absent(
                     builder,
                     ::http::header::CONTENT_TYPE,
                     "application/x-amz-json-1.0",
                 );
                 let content_length = payload.len();
                 builder = ::aws_smithy_legacy_http::header::set_response_header_if_absent(
                     builder,
                     ::http::header::CONTENT_LENGTH,
                     content_length,
                 );
                 builder
                     .status(400)
                     .body(::aws_smithy_legacy_http_server::body::to_boxed(payload))?
-+
+            }
-+
+        }
     })
-+
+}
-+
 pub(crate) fn de_endpoint_with_host_label_operation(
     value: &[u8],
     mut builder: crate::input::endpoint_with_host_label_operation_input::Builder,
 ) -> ::std::result::Result<
     crate::input::endpoint_with_host_label_operation_input::Builder,
     ::aws_smithy_json::deserialize::error::DeserializeError,
 > {
     let mut tokens_owned =
         ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value))
             .peekable();
     let tokens = &mut tokens_owned;
     ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
     loop {
         match tokens.next().transpose()? {
             Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
             Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
                 match key.to_unescaped()?.as_ref() {
                     "label" => {
                         if let Some(v) =
                             ::aws_smithy_json::deserialize::token::expect_string_or_null(
                                 tokens.next(),
                             )?
                             .map(|s| s.to_unescaped().map(|u| u.into_owned()))
                             .transpose()?
-+
+                        {
                             builder = builder.set_label(v);
-+
+                        }
-+
+                    }
                     _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
-+
+                }
-+
+            }
             other => {
                 return Err(
                     ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
                         "expected object key or end object, found: {other:?}"
                     )),
-+
+                )
-+
+            }
-+
+        }
-+
+    }
     if tokens.next().is_some() {
         return Err(
             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                 "found more JSON tokens after completing parsing",
             ),
         );
-+
+    }
     Ok(builder)
-+
+}

Server Test

Files changed: