Server Test

rev. 0b749be6d000fdc7ef59d1bc26f1dce00358d95c (ignoring whitespace)

Files changed:

tmp-codegen-diff/codegen-server-test/Cargo.toml

@@ -1,1 +5,5 @@

 [workspace]
 resolver = "2"
 members = [
     "naming_test_ops/rust-server-codegen","naming_test_casing/rust-server-codegen","naming_test_structs/rust-server-codegen","simple/rust-server-codegen","constraints_without_public_constrained_types/rust-server-codegen","unique_items/rust-server-codegen","constraints/rust-server-codegen","rest_json/rust-server-codegen","rest_json_extras/rust-server-codegen","rest_json_validation/rust-server-codegen","json_rpc10/rust-server-codegen","json_rpc11/rust-server-codegen","misc/rust-server-codegen","ebs/rust-server-codegen","s3/rust-server-codegen","pokemon-service-server-sdk/rust-server-codegen","pokemon-service-awsjson-server-sdk/rust-server-codegen","rest_xml_extras/rust-server-codegen"
     "naming_test_ops/rust-server-codegen","naming_test_casing/rust-server-codegen","naming_test_structs/rust-server-codegen","simple/rust-server-codegen","constraints_without_public_constrained_types/rust-server-codegen","unique_items/rust-server-codegen","constraints/rust-server-codegen","rest_json/rust-server-codegen","rest_json_extras/rust-server-codegen","rest_json_validation/rust-server-codegen","json_rpc10/rust-server-codegen","json_rpc11/rust-server-codegen","misc/rust-server-codegen","ebs/rust-server-codegen","s3/rust-server-codegen","pokemon-service-server-sdk/rust-server-codegen","pokemon-service-awsjson-server-sdk/rust-server-codegen"
-5
+]

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

@@ -52,52 +111,135 @@

↥ Expand context

     #[allow(missing_docs)] // documentation missing in model
     pub fn defaults(&self) -> ::std::option::Option<&crate::model::Defaults> {
         self.defaults.as_ref()
-55
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn client_optional_defaults(
         &self,
     ) -> ::std::option::Option<&crate::model::ClientOptionalDefaults> {
         self.client_optional_defaults.as_ref()
-61
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn top_level_default(&self) -> &str {
         use std::ops::Deref;
         self.top_level_default.deref()
-66
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn other_top_level_default(&self) -> i32 {
         self.other_top_level_default
-70
+    }
-71
+}

 impl OperationWithDefaultsInput {
     /// Creates a new builder-style object to manufacture [`OperationWithDefaultsInput`](crate::input::OperationWithDefaultsInput).
     pub fn builder() -> crate::input::operation_with_defaults_input::Builder {
         crate::input::operation_with_defaults_input::Builder::default()
-76
+    }
-77
+}
 impl crate::constrained::Constrained for crate::input::OperationWithDefaultsInput {
     type Unconstrained = crate::input::operation_with_defaults_input::Builder;
-80
+}
-81
 #[allow(missing_docs)] // documentation missing in model
 #[derive(
     ::std::clone::Clone, ::std::cmp::Eq, ::std::cmp::PartialEq, ::std::fmt::Debug, ::std::hash::Hash,
 )]
 pub struct ContentTypeParametersInput {
     #[allow(missing_docs)] // documentation missing in model
     pub value: ::std::option::Option<i32>,
-+
+}
 impl ContentTypeParametersInput {
     #[allow(missing_docs)] // documentation missing in model
     pub fn value(&self) -> ::std::option::Option<i32> {
         self.value
-+
+    }
-+
+}
 impl ContentTypeParametersInput {
     /// Creates a new builder-style object to manufacture [`ContentTypeParametersInput`](crate::input::ContentTypeParametersInput).
     pub fn builder() -> crate::input::content_type_parameters_input::Builder {
         crate::input::content_type_parameters_input::Builder::default()
-+
+    }
-+
+}
 impl crate::constrained::Constrained for crate::input::ContentTypeParametersInput {
     type Unconstrained = crate::input::content_type_parameters_input::Builder;
-+
+}
-+
 #[allow(missing_docs)] // documentation missing in model
 #[derive(
     ::std::clone::Clone, ::std::cmp::Eq, ::std::cmp::PartialEq, ::std::fmt::Debug, ::std::hash::Hash,
 )]
 pub struct PutWithContentEncodingInput {
     #[allow(missing_docs)] // documentation missing in model
     pub encoding: ::std::option::Option<::std::string::String>,
     #[allow(missing_docs)] // documentation missing in model
     pub data: ::std::option::Option<::std::string::String>,
-115
+}

↧ Expand context

 impl PutWithContentEncodingInput {
     #[allow(missing_docs)] // documentation missing in model
     pub fn encoding(&self) -> ::std::option::Option<&str> {
         self.encoding.as_deref()
-120
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn data(&self) -> ::std::option::Option<&str> {
         self.data.as_deref()
-124
+    }
-125
+}
 impl PutWithContentEncodingInput {
     /// Creates a new builder-style object to manufacture [`PutWithContentEncodingInput`](crate::input::PutWithContentEncodingInput).
     pub fn builder() -> crate::input::put_with_content_encoding_input::Builder {
         crate::input::put_with_content_encoding_input::Builder::default()
-130
+    }
-131
+}
 impl crate::constrained::Constrained for crate::input::PutWithContentEncodingInput {
     type Unconstrained = crate::input::put_with_content_encoding_input::Builder;
-134
+}
-135

@@ -567,591 +626,684 @@

↥ Expand context

         ///
         /// The builder fails to construct a [`OperationWithDefaultsInput`](crate::input::OperationWithDefaultsInput) if a [`ConstraintViolation`] occurs.
         ///
         pub fn build(
             self,
         ) -> Result<crate::input::OperationWithDefaultsInput, ConstraintViolation> {
             self.build_enforcing_all_constraints()
-598
+        }
         fn build_enforcing_all_constraints(
             self,
         ) -> Result<crate::input::OperationWithDefaultsInput, ConstraintViolation> {
             Ok(crate::input::OperationWithDefaultsInput {
                 defaults: self
                     .defaults
                     .map(|v| match v {
                         crate::constrained::MaybeConstrained::Constrained(x) => Ok(x),
                         crate::constrained::MaybeConstrained::Unconstrained(x) => x.try_into(),
                     })
                     .map(|res| res.map_err(ConstraintViolation::Defaults))
                     .transpose()?,

                 client_optional_defaults: self.client_optional_defaults,
                 top_level_default: self.top_level_default.unwrap_or_else(
                     #[allow(clippy::redundant_closure)]
                     || String::from("hi"),
                 ),
                 other_top_level_default: self.other_top_level_default.unwrap_or(0i32),
             })
-618
+        }
-619
+    }
-620
+}
 /// See [`ContentTypeParametersInput`](crate::input::ContentTypeParametersInput).
 ///
 pub mod content_type_parameters_input {
-+
     impl ::std::convert::From<Builder> for crate::input::ContentTypeParametersInput {
         fn from(builder: Builder) -> Self {
             builder.build()
-+
+        }
-+
+    }
     /// A builder for [`ContentTypeParametersInput`](crate::input::ContentTypeParametersInput).
     #[derive(::std::clone::Clone, ::std::default::Default, ::std::fmt::Debug)]
     pub struct Builder {
         pub(crate) value: ::std::option::Option<i32>,
-+
+    }
     impl Builder {
         #[allow(missing_docs)] // documentation missing in model
         pub fn value(mut self, input: ::std::option::Option<i32>) -> Self {
             self.value = input;
             self
-+
+        }
         #[allow(missing_docs)] // documentation missing in model
         pub(crate) fn set_value(mut self, input: Option<impl ::std::convert::Into<i32>>) -> Self {
             self.value = input.map(|v| v.into());
             self
-+
+        }
         /// Consumes the builder and constructs a [`ContentTypeParametersInput`](crate::input::ContentTypeParametersInput).
         pub fn build(self) -> crate::input::ContentTypeParametersInput {
             self.build_enforcing_all_constraints()
-+
+        }
         fn build_enforcing_all_constraints(self) -> crate::input::ContentTypeParametersInput {
             crate::input::ContentTypeParametersInput { value: self.value }
-+
+        }
-+
+    }
-+
+}
 /// See [`PutWithContentEncodingInput`](crate::input::PutWithContentEncodingInput).
 ///
 pub mod put_with_content_encoding_input {
-658
     impl ::std::convert::From<Builder> for crate::input::PutWithContentEncodingInput {
         fn from(builder: Builder) -> Self {
             builder.build()
-662
+        }
-663
+    }
     /// A builder for [`PutWithContentEncodingInput`](crate::input::PutWithContentEncodingInput).

↧ Expand context

     #[derive(::std::clone::Clone, ::std::default::Default, ::std::fmt::Debug)]
     pub struct Builder {
         pub(crate) encoding: ::std::option::Option<::std::string::String>,
         pub(crate) data: ::std::option::Option<::std::string::String>,
-669
+    }
     impl Builder {
         #[allow(missing_docs)] // documentation missing in model
         pub fn encoding(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
             self.encoding = input;
             self
-675
+        }
         #[allow(missing_docs)] // documentation missing in model
         pub(crate) fn set_encoding(
             mut self,
             input: Option<impl ::std::convert::Into<::std::string::String>>,
         ) -> Self {
             self.encoding = input.map(|v| v.into());
             self
-683
+        }
         #[allow(missing_docs)] // documentation missing in model

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

@@ -130,130 +218,223 @@

↥ Expand context

 //! async fn handler_with_two_extractors(
 //!     input: Input,
 //!     ext0: Extension<State>,
 //!     ext1: ConnectInfo<SocketAddr>,
 //! ) -> Output {
 //!     todo!()
 //! }
 //! ```
 //!
 //! See the [`operation module`](::aws_smithy_http_server::operation) for information on precisely what constitutes a handler.
 //!
 //! ## Build
 //!
 //! You can convert [`JsonRpc10Builder`] into [`JsonRpc10`] using either [`JsonRpc10Builder::build`] or [`JsonRpc10Builder::build_unchecked`].
 //!
 //! [`JsonRpc10Builder::build`] requires you to provide a handler for every single operation in your Smithy model. It will return an error if that is not the case.
 //!
 //! [`JsonRpc10Builder::build_unchecked`], instead, does not require exhaustiveness. The server will automatically return 500 Internal Server Error to all requests for operations that do not have a registered handler.
 //! [`JsonRpc10Builder::build_unchecked`] is particularly useful if you are deploying your Smithy service as a collection of Lambda functions, where each Lambda is only responsible for a subset of the operations in the Smithy service (or even a single one!).
 //!

 //! # Example
 //!
 //! ```rust,no_run
 //! # use std::net::SocketAddr;
 //! use json_rpc10::{JsonRpc10, JsonRpc10Config};
 //!
 //! #[::tokio::main]
 //! pub async fn main() {
 //!    let config = JsonRpc10Config::builder().build();
 //!    let app = JsonRpc10::builder(config)
 //!        .content_type_parameters(content_type_parameters)
 //!        .empty_input_and_empty_output(empty_input_and_empty_output)
 //!        .endpoint_operation(endpoint_operation)
 //!        .endpoint_with_host_label_operation(endpoint_with_host_label_operation)
 //!        .greeting_with_errors(greeting_with_errors)
 //!        .host_with_path_operation(host_with_path_operation)
 //!        .json_unions(json_unions)
 //!        .no_input_and_no_output(no_input_and_no_output)
 //!        .no_input_and_output(no_input_and_output)
 //!        .operation_with_defaults(operation_with_defaults)
 //!        .operation_with_nested_structure(operation_with_nested_structure)
 //!        .operation_with_required_members(operation_with_required_members)
 //!        .put_with_content_encoding(put_with_content_encoding)
 //!        .simple_scalar_properties(simple_scalar_properties)
 //!        .build()
 //!        .expect("failed to build an instance of JsonRpc10");
 //!
 //!    let bind: SocketAddr = "127.0.0.1:6969".parse()
 //!        .expect("unable to parse the server bind address and port");
 //!    let server = ::hyper::Server::bind(&bind).serve(app.into_make_service());
 //!    # let server = async { Ok::<_, ()>(()) };
 //!
 //!    // Run your service!
 //!    if let Err(err) = server.await {
 //!        eprintln!("server error: {:?}", err);
 //!    }
 //! }
 //!
 //! use json_rpc10::{input, output, error};
 //!
 //! async fn content_type_parameters(input: input::ContentTypeParametersInput) -> output::ContentTypeParametersOutput {
 //!     todo!()
 //! }
 //!
 //! async fn empty_input_and_empty_output(input: input::EmptyInputAndEmptyOutputInput) -> output::EmptyInputAndEmptyOutputOutput {
 //!     todo!()
 //! }
 //!
 //! async fn endpoint_operation(input: input::EndpointOperationInput) -> output::EndpointOperationOutput {
 //!     todo!()
 //! }
 //!
 //! async fn endpoint_with_host_label_operation(input: input::EndpointWithHostLabelOperationInput) -> Result<output::EndpointWithHostLabelOperationOutput, error::EndpointWithHostLabelOperationError> {
 //!     todo!()

↧ Expand context

 //! }
 //!
 //! async fn greeting_with_errors(input: input::GreetingWithErrorsInput) -> Result<output::GreetingWithErrorsOutput, error::GreetingWithErrorsError> {
 //!     todo!()
 //! }
 //!
 //! async fn host_with_path_operation(input: input::HostWithPathOperationInput) -> output::HostWithPathOperationOutput {
 //!     todo!()
 //! }
 //!
 //! async fn json_unions(input: input::JsonUnionsInput) -> Result<output::JsonUnionsOutput, error::JsonUnionsError> {
 //!     todo!()
 //! }
 //!
 //! async fn no_input_and_no_output(input: input::NoInputAndNoOutputInput) -> output::NoInputAndNoOutputOutput {
 //!     todo!()
 //! }
 //!
 //! async fn no_input_and_output(input: input::NoInputAndOutputInput) -> output::NoInputAndOutputOutput {
 //!     todo!()

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

@@ -756,756 +815,949 @@

↥ Expand context

             zero_float: 0_f32,
             zero_double: 0_f64,
             default_null_document: ::std::option::Option::Some({
                 let json_bytes = br#"null"#;
                 let mut tokens =
                     ::aws_smithy_json::deserialize::json_token_iter(json_bytes).peekable();
                 ::aws_smithy_json::deserialize::token::expect_document(&mut tokens)
                     .expect("well formed json")
             }),
         };
         use ::aws_smithy_http_server::response::IntoResponse;
         let http_response = output.into_response();
         ::pretty_assertions::assert_eq!(
             http::StatusCode::from_u16(200).expect("invalid expected HTTP status code"),
             http_response.status()
         );
         let expected_headers = [("Content-Type", "application/x-amz-json-1.0")];
         ::aws_smithy_protocol_test::assert_ok(::aws_smithy_protocol_test::validate_headers(
             http_response.headers(),
             expected_headers,

         ));
         let body = ::hyper::body::to_bytes(http_response.into_body())
             .await
             .expect("unable to extract body to bytes");
         ::aws_smithy_protocol_test::assert_ok(
         ::aws_smithy_protocol_test::validate_body(&body, "{\n    \"defaultString\": \"hi\",\n    \"defaultBoolean\": true,\n    \"defaultList\": [],\n    \"defaultDocumentMap\": {},\n    \"defaultDocumentString\": \"hi\",\n    \"defaultDocumentBoolean\": true,\n    \"defaultDocumentList\": [],\n    \"defaultTimestamp\": 0,\n    \"defaultBlob\": \"YWJj\",\n    \"defaultByte\": 1,\n    \"defaultShort\": 1,\n    \"defaultInteger\": 10,\n    \"defaultLong\": 100,\n    \"defaultFloat\": 1.0,\n    \"defaultDouble\": 1.0,\n    \"defaultMap\": {},\n    \"defaultEnum\": \"FOO\",\n    \"defaultIntEnum\": 1,\n    \"emptyString\": \"\",\n    \"falseBoolean\": false,\n    \"emptyBlob\": \"\",\n    \"zeroByte\": 0,\n    \"zeroShort\": 0,\n    \"zeroInteger\": 0,\n    \"zeroLong\": 0,\n    \"zeroFloat\": 0.0,\n    \"zeroDouble\": 0.0\n}", ::aws_smithy_protocol_test::MediaType::from("application/json"))
         );
-783
+    }
-784
+}
-785
 static CONTENT_TYPE_CONTENTTYPEPARAMETERS: ::once_cell::sync::Lazy<::mime::Mime> =
     ::once_cell::sync::Lazy::new(|| {
         "application/x-amz-json-1.0"
             .parse::<::mime::Mime>()
             .expect("BUG: MIME parsing failed, content_type is not valid")
     });
 ::pin_project_lite::pin_project! {
     /// A [`Future`](std::future::Future) aggregating the body bytes of a [`Request`] and constructing the
     /// [`ContentTypeParametersInput`](crate::input::ContentTypeParametersInput) using modelled bindings.
     pub struct ContentTypeParametersInputFuture {
         inner: std::pin::Pin<Box<dyn std::future::Future<Output = Result<crate::input::ContentTypeParametersInput, ::aws_smithy_http_server::protocol::aws_json::runtime_error::RuntimeError>> + Send>>
-+
+    }
-+
+}
-+
 impl std::future::Future for ContentTypeParametersInputFuture {
     type Output = Result<
         crate::input::ContentTypeParametersInput,
         ::aws_smithy_http_server::protocol::aws_json::runtime_error::RuntimeError,
     >;
-+
     fn poll(
         self: std::pin::Pin<&mut Self>,
         cx: &mut std::task::Context<'_>,
     ) -> std::task::Poll<Self::Output> {
         let this = self.project();
         this.inner.as_mut().poll(cx)
-+
+    }
-+
+}
-+
 impl<B>
     ::aws_smithy_http_server::request::FromRequest<
         ::aws_smithy_http_server::protocol::aws_json_10::AwsJson1_0,
         B,
     > for crate::input::ContentTypeParametersInput
 where
     B: ::aws_smithy_http_server::body::HttpBody + Send,
     B: 'static,
-+
     B::Data: Send,
     ::aws_smithy_http_server::protocol::aws_json::rejection::RequestRejection:
         From<<B as ::aws_smithy_http_server::body::HttpBody>::Error>,
-+
+{
     type Rejection = ::aws_smithy_http_server::protocol::aws_json::runtime_error::RuntimeError;
     type Future = ContentTypeParametersInputFuture;
-+
     fn from_request(request: ::http::Request<B>) -> Self::Future {
         let fut = async move {
             if !::aws_smithy_http_server::protocol::accept_header_classifier(
                 request.headers(),
                 &CONTENT_TYPE_CONTENTTYPEPARAMETERS,
             ) {
                 return Err(::aws_smithy_http_server::protocol::aws_json::rejection::RequestRejection::NotAcceptable);
-+
+            }
             crate::protocol_serde::shape_content_type_parameters::de_content_type_parameters_http_request(request)
                             .await
                             .map_err(Into::into)
         };
         use ::futures_util::future::TryFutureExt;
         let fut = fut.map_err(
             |e: ::aws_smithy_http_server::protocol::aws_json::rejection::RequestRejection| {
                 ::tracing::debug!(error = %e, "failed to deserialize request");
                 ::aws_smithy_http_server::protocol::aws_json::runtime_error::RuntimeError::from(e)
             },
         );
         ContentTypeParametersInputFuture {
             inner: Box::pin(fut),
-+
+        }
-+
+    }
-+
+}
 impl
     ::aws_smithy_http_server::response::IntoResponse<
         ::aws_smithy_http_server::protocol::aws_json_10::AwsJson1_0,
     > for crate::output::ContentTypeParametersOutput
-+
+{
     fn into_response(self) -> ::aws_smithy_http_server::response::Response {
         match crate::protocol_serde::shape_content_type_parameters::ser_content_type_parameters_http_response(self) {
                         Ok(response) => response,
                         Err(e) => {
                             ::tracing::error!(error = %e, "failed to serialize response");
                             ::aws_smithy_http_server::response::IntoResponse::<::aws_smithy_http_server::protocol::aws_json_10::AwsJson1_0>::into_response(::aws_smithy_http_server::protocol::aws_json::runtime_error::RuntimeError::from(e))
-+
+                        }
-+
+                    }
-+
+    }
-+
+}
-+
 #[allow(unreachable_code, unused_variables)]
 #[cfg(test)]
 mod content_type_parameters_test {
-+
     /// A server should ignore parameters added to the content type
     /// Test ID: AwsJson10MustSupportParametersInContentType
     #[::tokio::test]
     #[::tracing_test::traced_test]
     async fn aws_json10_must_support_parameters_in_content_type_request() {
         #[allow(unused_mut)]
         let mut http_request = http::Request::builder()
             .uri("/")
             .method("POST")
             .header("Content-Type", "application/x-amz-json-1.0; charset=utf-8")
             .header("X-Amz-Target", "JsonRpc10.ContentTypeParameters")
             .body(::aws_smithy_http_server::body::Body::from(
                 ::bytes::Bytes::from_static("{\"value\":5}".as_bytes()),
             ))
             .unwrap();
         #[allow(unused_mut)]
         let (sender, mut receiver) = ::tokio::sync::mpsc::channel(1);
         let config = crate::service::JsonRpc10Config::builder().build();
         let service = crate::service::JsonRpc10::builder::<::hyper::body::Body, _, _, _>(config)
             .content_type_parameters(move |input: crate::input::ContentTypeParametersInput| {
                 let sender = sender.clone();
                 async move {
                     let result = {
                         let expected = crate::input::ContentTypeParametersInput {
                             value: ::std::option::Option::Some(5),
                         };
                         ::pretty_assertions::assert_eq!(input, expected);
                         let response = crate::output::ContentTypeParametersOutput {};
                         response
                     };
                     sender.send(()).await.expect("receiver dropped early");
                     result
-+
+                }
             })
             .build_unchecked();
         let http_response = ::tower::ServiceExt::oneshot(service, http_request)
             .await
             .expect("unable to make an HTTP request");
         assert!(
             receiver.recv().await.is_some(),
             "we expected operation handler to be invoked but it was not entered"
         );
-+
+    }
-+
+}
-+
 static CONTENT_TYPE_PUTWITHCONTENTENCODING: ::once_cell::sync::Lazy<::mime::Mime> =
     ::once_cell::sync::Lazy::new(|| {
         "application/x-amz-json-1.0"
             .parse::<::mime::Mime>()
             .expect("BUG: MIME parsing failed, content_type is not valid")
     });
 ::pin_project_lite::pin_project! {
     /// A [`Future`](std::future::Future) aggregating the body bytes of a [`Request`] and constructing the
     /// [`PutWithContentEncodingInput`](crate::input::PutWithContentEncodingInput) using modelled bindings.
     pub struct PutWithContentEncodingInputFuture {

↧ Expand context

         inner: std::pin::Pin<Box<dyn std::future::Future<Output = Result<crate::input::PutWithContentEncodingInput, ::aws_smithy_http_server::protocol::aws_json::runtime_error::RuntimeError>> + Send>>
-931
+    }
-932
+}
-933
 impl std::future::Future for PutWithContentEncodingInputFuture {
     type Output = Result<
         crate::input::PutWithContentEncodingInput,
         ::aws_smithy_http_server::protocol::aws_json::runtime_error::RuntimeError,
     >;
-939
     fn poll(
         self: std::pin::Pin<&mut Self>,
         cx: &mut std::task::Context<'_>,
     ) -> std::task::Poll<Self::Output> {
         let this = self.project();
         this.inner.as_mut().poll(cx)
-946
+    }
-947
+}
-948
 impl<B>

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

@@ -63,63 +122,151 @@

↥ Expand context

-63
 #[allow(missing_docs)] // documentation missing in model
 pub struct OperationWithDefaults;
-66
 impl ::aws_smithy_http_server::operation::OperationShape for OperationWithDefaults {
     const ID: ::aws_smithy_http_server::shape_id::ShapeId =
         ::aws_smithy_http_server::shape_id::ShapeId::new(
             "aws.protocoltests.json10#OperationWithDefaults",
             "aws.protocoltests.json10",
             "OperationWithDefaults",
         );
-74
     type Input = crate::input::OperationWithDefaultsInput;
     type Output = crate::output::OperationWithDefaultsOutput;
     type Error = crate::error::OperationWithDefaultsError;
-78
+}
-79
 impl ::aws_smithy_http_server::instrumentation::sensitivity::Sensitivity for OperationWithDefaults {
     type RequestFmt = ::aws_smithy_http_server::instrumentation::sensitivity::DefaultRequestFmt;
     type ResponseFmt = ::aws_smithy_http_server::instrumentation::sensitivity::DefaultResponseFmt;

-83
     fn request_fmt() -> Self::RequestFmt {
         ::aws_smithy_http_server::instrumentation::sensitivity::RequestFmt::new()
-86
+    }
-87
     fn response_fmt() -> Self::ResponseFmt {
         ::aws_smithy_http_server::instrumentation::sensitivity::ResponseFmt::new()
-90
+    }
-91
+}
-92
 /// The example tests how servers must support requests containing a `Content-Type` header with parameters.
 pub struct ContentTypeParameters;
-+
 impl ::aws_smithy_http_server::operation::OperationShape for ContentTypeParameters {
     const ID: ::aws_smithy_http_server::shape_id::ShapeId =
         ::aws_smithy_http_server::shape_id::ShapeId::new(
             "aws.protocoltests.json10#ContentTypeParameters",
             "aws.protocoltests.json10",
             "ContentTypeParameters",
         );
-+
     type Input = crate::input::ContentTypeParametersInput;
     type Output = crate::output::ContentTypeParametersOutput;
     type Error = std::convert::Infallible;
-+
+}
-+
 impl ::aws_smithy_http_server::instrumentation::sensitivity::Sensitivity for ContentTypeParameters {
     type RequestFmt = ::aws_smithy_http_server::instrumentation::sensitivity::DefaultRequestFmt;
     type ResponseFmt = ::aws_smithy_http_server::instrumentation::sensitivity::DefaultResponseFmt;
-+
     fn request_fmt() -> Self::RequestFmt {
         ::aws_smithy_http_server::instrumentation::sensitivity::RequestFmt::new()
-+
+    }
-+
     fn response_fmt() -> Self::ResponseFmt {
         ::aws_smithy_http_server::instrumentation::sensitivity::ResponseFmt::new()
-+
+    }
-+
+}
-+
 #[allow(missing_docs)] // documentation missing in model
 pub struct PutWithContentEncoding;
-124
 impl ::aws_smithy_http_server::operation::OperationShape for PutWithContentEncoding {
     const ID: ::aws_smithy_http_server::shape_id::ShapeId =
         ::aws_smithy_http_server::shape_id::ShapeId::new(
             "aws.protocoltests.json10#PutWithContentEncoding",
             "aws.protocoltests.json10",
             "PutWithContentEncoding",
         );

↧ Expand context

-132
     type Input = crate::input::PutWithContentEncodingInput;
     type Output = crate::output::PutWithContentEncodingOutput;
     type Error = std::convert::Infallible;
-136
+}
-137
 impl ::aws_smithy_http_server::instrumentation::sensitivity::Sensitivity
     for PutWithContentEncoding
-140
+{
     type RequestFmt = ::aws_smithy_http_server::instrumentation::sensitivity::DefaultRequestFmt;
     type ResponseFmt = ::aws_smithy_http_server::instrumentation::sensitivity::DefaultResponseFmt;
-143
     fn request_fmt() -> Self::RequestFmt {
         ::aws_smithy_http_server::instrumentation::sensitivity::RequestFmt::new()
-146
+    }
-147
     fn response_fmt() -> Self::ResponseFmt {
         ::aws_smithy_http_server::instrumentation::sensitivity::ResponseFmt::new()
-150
+    }
-151
+}

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

@@ -281,281 +340,352 @@

↥ Expand context

         self.zero_byte
-282
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn zero_short(&self) -> i16 {
         self.zero_short
-286
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn zero_integer(&self) -> i32 {
         self.zero_integer
-290
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn zero_long(&self) -> i64 {
         self.zero_long
-294
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn zero_float(&self) -> f32 {
         self.zero_float
-298
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn zero_double(&self) -> f64 {

         self.zero_double
-302
+    }
-303
+}
 impl OperationWithDefaultsOutput {
     /// Creates a new builder-style object to manufacture [`OperationWithDefaultsOutput`](crate::output::OperationWithDefaultsOutput).
     pub fn builder() -> crate::output::operation_with_defaults_output::Builder {
         crate::output::operation_with_defaults_output::Builder::default()
-308
+    }
-309
+}
-310
 #[allow(missing_docs)] // documentation missing in model
 #[derive(
     ::std::clone::Clone, ::std::cmp::Eq, ::std::cmp::PartialEq, ::std::fmt::Debug, ::std::hash::Hash,
 )]
 pub struct ContentTypeParametersOutput {}
 impl ContentTypeParametersOutput {
     /// Creates a new builder-style object to manufacture [`ContentTypeParametersOutput`](crate::output::ContentTypeParametersOutput).
     pub fn builder() -> crate::output::content_type_parameters_output::Builder {
         crate::output::content_type_parameters_output::Builder::default()
-+
+    }
-+
+}
-+
 #[allow(missing_docs)] // documentation missing in model
 #[derive(
     ::std::clone::Clone, ::std::cmp::Eq, ::std::cmp::PartialEq, ::std::fmt::Debug, ::std::hash::Hash,
 )]
 pub struct PutWithContentEncodingOutput {}
 impl PutWithContentEncodingOutput {
     /// Creates a new builder-style object to manufacture [`PutWithContentEncodingOutput`](crate::output::PutWithContentEncodingOutput).
     pub fn builder() -> crate::output::put_with_content_encoding_output::Builder {
         crate::output::put_with_content_encoding_output::Builder::default()
-332
+    }

↧ Expand context

-333
+}
-334
 #[allow(missing_docs)] // documentation missing in model
 #[derive(
     ::std::clone::Clone, ::std::cmp::Eq, ::std::cmp::PartialEq, ::std::fmt::Debug, ::std::hash::Hash,
 )]
 pub struct HostWithPathOperationOutput {}
 impl HostWithPathOperationOutput {
     /// Creates a new builder-style object to manufacture [`HostWithPathOperationOutput`](crate::output::HostWithPathOperationOutput).
     pub fn builder() -> crate::output::host_with_path_operation_output::Builder {
         crate::output::host_with_path_operation_output::Builder::default()
-344
+    }
-345
+}
-346
 #[allow(missing_docs)] // documentation missing in model
 #[derive(
     ::std::clone::Clone, ::std::cmp::Eq, ::std::cmp::PartialEq, ::std::fmt::Debug, ::std::hash::Hash,
 )]
 pub struct EndpointWithHostLabelOperationOutput {}
 impl EndpointWithHostLabelOperationOutput {

@@ -974,986 +1033,1067 @@

↥ Expand context

                 default_double: self.default_double.unwrap_or(1.0f64),
                 default_map: self.default_map.unwrap_or_else(
                     #[allow(clippy::redundant_closure)]
                     || ::std::collections::HashMap::new(),
                 ),
                 default_enum: self.default_enum.unwrap_or(
                     "FOO"
                         .parse::<crate::model::TestEnum>()
                         .expect("static value validated to member"),
                 ),
                 default_int_enum: self.default_int_enum.unwrap_or(1i32),
                 empty_string: self.empty_string.unwrap_or_else(
                     #[allow(clippy::redundant_closure)]
                     || String::from(""),
                 ),
                 false_boolean: self.false_boolean.unwrap_or(false),
                 empty_blob: self.empty_blob.unwrap_or_else(
                     #[allow(clippy::redundant_closure)]
                     || ::aws_smithy_types::Blob::new(""),
                 ),

                 zero_byte: self.zero_byte.unwrap_or(0i8),
                 zero_short: self.zero_short.unwrap_or(0i16),
                 zero_integer: self.zero_integer.unwrap_or(0i32),
                 zero_long: self.zero_long.unwrap_or(0i64),
                 zero_float: self.zero_float.unwrap_or(0.0f32),
                 zero_double: self.zero_double.unwrap_or(0.0f64),
-1012
+            }
-1013
+        }
-1014
+    }
-1015
+}
 /// See [`ContentTypeParametersOutput`](crate::output::ContentTypeParametersOutput).
 ///
 pub mod content_type_parameters_output {
-+
     impl ::std::convert::From<Builder> for crate::output::ContentTypeParametersOutput {
         fn from(builder: Builder) -> Self {
             builder.build()
-+
+        }
-+
+    }
     /// A builder for [`ContentTypeParametersOutput`](crate::output::ContentTypeParametersOutput).
     #[derive(::std::clone::Clone, ::std::default::Default, ::std::fmt::Debug)]
     pub struct Builder {}
     impl Builder {
         /// Consumes the builder and constructs a [`ContentTypeParametersOutput`](crate::output::ContentTypeParametersOutput).
         pub fn build(self) -> crate::output::ContentTypeParametersOutput {
             self.build_enforcing_all_constraints()
-+
+        }
         fn build_enforcing_all_constraints(self) -> crate::output::ContentTypeParametersOutput {
             crate::output::ContentTypeParametersOutput {}
-+
+        }
-+
+    }
-+
+}
 /// See [`PutWithContentEncodingOutput`](crate::output::PutWithContentEncodingOutput).
 ///
 pub mod put_with_content_encoding_output {
-1041
     impl ::std::convert::From<Builder> for crate::output::PutWithContentEncodingOutput {
         fn from(builder: Builder) -> Self {
             builder.build()
-1045
+        }
-1046
+    }
     /// A builder for [`PutWithContentEncodingOutput`](crate::output::PutWithContentEncodingOutput).

↧ Expand context

     #[derive(::std::clone::Clone, ::std::default::Default, ::std::fmt::Debug)]
     pub struct Builder {}
     impl Builder {
         /// Consumes the builder and constructs a [`PutWithContentEncodingOutput`](crate::output::PutWithContentEncodingOutput).
         pub fn build(self) -> crate::output::PutWithContentEncodingOutput {
             self.build_enforcing_all_constraints()
-1054
+        }
         fn build_enforcing_all_constraints(self) -> crate::output::PutWithContentEncodingOutput {
             crate::output::PutWithContentEncodingOutput {}
-1057
+        }
-1058
+    }
-1059
+}
 /// See [`HostWithPathOperationOutput`](crate::output::HostWithPathOperationOutput).
 ///
 pub mod host_with_path_operation_output {
-1063
     impl ::std::convert::From<Builder> for crate::output::HostWithPathOperationOutput {
         fn from(builder: Builder) -> Self {
             builder.build()
-1067
+        }

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

@@ -1,1 +69,73 @@

 // 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;
-5
 pub(crate) mod shape_endpoint_operation;
-7
 pub(crate) mod shape_endpoint_with_host_label_operation;
-9
 pub(crate) mod shape_greeting_with_errors;
-11
 pub(crate) mod shape_host_with_path_operation;
-13
 pub(crate) mod shape_json_unions;
-15
 pub(crate) mod shape_no_input_and_no_output;
-17
 pub(crate) mod shape_no_input_and_output;
-19
 pub(crate) mod shape_operation_with_defaults;
-21
 pub(crate) mod shape_operation_with_nested_structure;
-23
 pub(crate) mod shape_operation_with_required_members;
-25
 pub(crate) mod shape_put_with_content_encoding;
-27
 pub(crate) mod shape_simple_scalar_properties;
-29
 pub(crate) mod shape_complex_error;
-31
 pub(crate) mod shape_empty_input_and_empty_output_output;
--
 pub(crate) fn or_empty_doc(data: &[u8]) -> &[u8] {
     if data.is_empty() {
         b"{}"
     } else {
         data
-37
+    }
-38
+}
-39
 pub(crate) mod shape_content_type_parameters_output;
-+
 pub(crate) mod shape_empty_input_and_empty_output_output;
-+
 pub(crate) mod shape_foo_error;
-45
 pub(crate) mod shape_greeting_with_errors_output;
-47
 pub(crate) mod shape_invalid_greeting;
-49
 pub(crate) mod shape_json_unions_output;
-51
 pub(crate) mod shape_no_input_and_output_output;
-53

↧ Expand context

 pub(crate) mod shape_operation_with_defaults_output;
-55
 pub(crate) mod shape_operation_with_nested_structure_output;
-57
 pub(crate) mod shape_operation_with_required_members_output;
-59
 pub(crate) mod shape_simple_scalar_properties_output;
-61
 pub(crate) mod shape_validation_exception;
-63
 pub(crate) mod shape_client_optional_defaults;
-65
 pub(crate) mod shape_defaults;
-67
 pub(crate) mod shape_my_union;
-69
 pub(crate) mod shape_top_level;
-71
 pub(crate) mod shape_complex_nested_error_data;
-73

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

Renamed from tmp-codegen-diff/codegen-server-test/rest_xml_extras/rust-server-codegen/src/protocol_serde/shape_content_type_parameters.rs

@@ -1,1 +103,116 @@

 // 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_http_server::protocol::rest_xml::rejection::RequestRejection,
     ::aws_smithy_http_server::protocol::aws_json::rejection::RequestRejection,
-8
+>
 where
     B: ::aws_smithy_http_server::body::HttpBody + Send,
     B::Data: Send,
     ::aws_smithy_http_server::protocol::rest_xml::rejection::RequestRejection:
     ::aws_smithy_http_server::protocol::aws_json::rejection::RequestRejection:
         From<<B as ::aws_smithy_http_server::body::HttpBody>::Error>,
-14
+{
     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_http_server::protocol::content_type_header_classifier_smithy(
                 &headers,
                 Some("application/xml"),
                 Some("application/x-amz-json-1.0"),
             )?;
             input =
                 crate::protocol_serde::shape_content_type_parameters::de_content_type_parameters(
                     bytes.as_ref(),
                     input,
                 )?;
-33
+        }
         input.build()
     })
-36
+}
-37
 #[allow(clippy::unnecessary_wraps)]
 pub fn ser_content_type_parameters_http_response(
     #[allow(unused_variables)] output: crate::output::ContentTypeParametersOutput,
 ) -> std::result::Result<
     ::aws_smithy_http_server::response::Response,
     ::aws_smithy_http_server::protocol::rest_xml::rejection::ResponseRejection,
     ::aws_smithy_http_server::protocol::aws_json::rejection::ResponseRejection,
 > {
     Ok({
         #[allow(unused_mut)]
         let mut builder = ::http::Response::builder();
         builder = ::aws_smithy_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 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_http::header::set_response_header_if_absent(
             builder,
             ::http::header::CONTENT_LENGTH,
             content_length,
         );
         let body = ::aws_smithy_http_server::body::to_boxed(payload);
         builder.body(body)?
     })
-67
+}
-68
 #[allow(unused_mut)]
 pub fn de_content_type_parameters(
     inp: &[u8],
 pub(crate) fn de_content_type_parameters(
     value: &[u8],
     mut builder: crate::input::content_type_parameters_input::Builder,
 ) -> Result<
     crate::input::content_type_parameters_input::Builder,
     ::aws_smithy_xml::decode::XmlDecodeError,
     ::aws_smithy_json::deserialize::error::DeserializeError,
 > {
     let mut doc = ::aws_smithy_xml::decode::Document::try_from(inp)?;
--
     #[allow(unused_mut)]
     let mut decoder = doc.root_element()?;
     let start_el = decoder.start_el();
     if !start_el.matches("ContentTypeParametersInput") {
         return Err(
                                 ::aws_smithy_xml::decode::XmlDecodeError::custom(
                                     format!("encountered invalid XML root: expected ContentTypeParametersInput but got {:?}. This is likely a bug in the SDK.", start_el)
--
+                                )
     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()?,
                         );
-94
+                    }
     while let Some(mut tag) = decoder.next_tag() {
         match tag.start_el() {
             s if s.matches("value") /* value aws.protocoltests.restxml.synthetic#ContentTypeParametersInput$value */ =>  {
                 let var_1 =
                     Some(
--
+                         {
                             <i32 as ::aws_smithy_types::primitive::Parse>::parse_smithy_primitive(
                                 ::aws_smithy_xml::decode::try_data(&mut tag)?.as_ref()
--
+                            )
                             .map_err(|_|::aws_smithy_xml::decode::XmlDecodeError::custom("expected (integer: `smithy.api#Integer`)"))
                     _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
-+
+                }
-97
+            }
--
+                        ?
             other => {
                 return Err(
                     ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
                         "expected object key or end object, found: {:?}",
                         other
                     )),
-104
+                )
--
+                ;
                 builder = builder.set_value(var_1);
-105
+            }
--
+            ,
             _ => {}
-106
+        }
-107
+    }
     if tokens.next().is_some() {
         return Err(
             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                 "found more JSON tokens after completing parsing",
             ),
         );
-+
+    }
     Ok(builder)
-116
+}

tmp-codegen-diff/codegen-server-test/json_rpc10/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,
 ) -> Result<String, ::aws_smithy_types::error::operation::SerializationError> {
     let mut out = 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,
 ) -> Result<(), ::aws_smithy_types::error::operation::SerializationError> {
     Ok(())
-+
+}

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

@@ -1,1 +54,205 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /// The service builder for [`JsonRpc10`].
 ///
 /// Constructed via [`JsonRpc10::builder`].
 pub struct JsonRpc10Builder<Body, L, HttpPl, ModelPl> {
     content_type_parameters: Option<::aws_smithy_http_server::routing::Route<Body>>,
     empty_input_and_empty_output: Option<::aws_smithy_http_server::routing::Route<Body>>,
     endpoint_operation: Option<::aws_smithy_http_server::routing::Route<Body>>,
     endpoint_with_host_label_operation: Option<::aws_smithy_http_server::routing::Route<Body>>,
     greeting_with_errors: Option<::aws_smithy_http_server::routing::Route<Body>>,
     host_with_path_operation: Option<::aws_smithy_http_server::routing::Route<Body>>,
     json_unions: Option<::aws_smithy_http_server::routing::Route<Body>>,
     no_input_and_no_output: Option<::aws_smithy_http_server::routing::Route<Body>>,
     no_input_and_output: Option<::aws_smithy_http_server::routing::Route<Body>>,
     operation_with_defaults: Option<::aws_smithy_http_server::routing::Route<Body>>,
     operation_with_nested_structure: Option<::aws_smithy_http_server::routing::Route<Body>>,
     operation_with_required_members: Option<::aws_smithy_http_server::routing::Route<Body>>,
     put_with_content_encoding: Option<::aws_smithy_http_server::routing::Route<Body>>,
     simple_scalar_properties: Option<::aws_smithy_http_server::routing::Route<Body>>,
     layer: L,
     http_plugin: HttpPl,
     model_plugin: ModelPl,
-23
+}
-24
 impl<Body, L, HttpPl, ModelPl> JsonRpc10Builder<Body, L, HttpPl, ModelPl> {
     /// Sets the [`ContentTypeParameters`](crate::operation_shape::ContentTypeParameters) operation.
     ///
     /// This should be an async function satisfying the [`Handler`](::aws_smithy_http_server::operation::Handler) trait.
     /// See the [operation module documentation](::aws_smithy_http_server::operation) for more information.
     ///
     /// # Example
     ///
     /// ```no_run
     /// use json_rpc10::{JsonRpc10, JsonRpc10Config};
     ///
     /// use json_rpc10::{input, output, error};
     ///
     /// async fn handler(input: input::ContentTypeParametersInput) -> output::ContentTypeParametersOutput {
     ///     todo!()
     /// }
     ///
     /// let config = JsonRpc10Config::builder().build();
     /// let app = JsonRpc10::builder(config)
     ///     .content_type_parameters(handler)
     ///     /* Set other handlers */
     ///     .build()
     ///     .unwrap();
     /// # let app: JsonRpc10<::aws_smithy_http_server::routing::RoutingService<::aws_smithy_http_server::protocol::aws_json::router::AwsJsonRouter<::aws_smithy_http_server::routing::Route>, ::aws_smithy_http_server::protocol::aws_json_10::AwsJson1_0>> = app;
     /// ```
     ///
                     pub fn content_type_parameters<HandlerType, HandlerExtractors, UpgradeExtractors>(self, handler: HandlerType) -> Self
                     where
                         HandlerType: ::aws_smithy_http_server::operation::Handler<crate::operation_shape::ContentTypeParameters, HandlerExtractors>,
-+
                         ModelPl: ::aws_smithy_http_server::plugin::Plugin<
                             JsonRpc10<L>,
                             crate::operation_shape::ContentTypeParameters,
                             ::aws_smithy_http_server::operation::IntoService<crate::operation_shape::ContentTypeParameters, HandlerType>
                         >,
                         ::aws_smithy_http_server::operation::UpgradePlugin::<UpgradeExtractors>: ::aws_smithy_http_server::plugin::Plugin<
                             JsonRpc10<L>,
                             crate::operation_shape::ContentTypeParameters,
                             ModelPl::Output
                         >,
                         HttpPl: ::aws_smithy_http_server::plugin::Plugin<
                             JsonRpc10<L>,
                             crate::operation_shape::ContentTypeParameters,
-+
+                            <
                                 ::aws_smithy_http_server::operation::UpgradePlugin::<UpgradeExtractors>
                                 as ::aws_smithy_http_server::plugin::Plugin<
                                     JsonRpc10<L>,
                                     crate::operation_shape::ContentTypeParameters,
                                     ModelPl::Output
-+
+                                >
                             >::Output
                         >,
-+
                         HttpPl::Output: ::tower::Service<::http::Request<Body>, Response = ::http::Response<::aws_smithy_http_server::body::BoxBody>, Error = ::std::convert::Infallible> + Clone + Send + 'static,
                         <HttpPl::Output as ::tower::Service<::http::Request<Body>>>::Future: Send + 'static,
-+
-+
+                    {
         use ::aws_smithy_http_server::operation::OperationShapeExt;
         use ::aws_smithy_http_server::plugin::Plugin;
         let svc = crate::operation_shape::ContentTypeParameters::from_handler(handler);
         let svc = self.model_plugin.apply(svc);
         let svc = ::aws_smithy_http_server::operation::UpgradePlugin::<UpgradeExtractors>::new()
             .apply(svc);
         let svc = self.http_plugin.apply(svc);
         self.content_type_parameters_custom(svc)
-+
+    }
-+
     /// Sets the [`ContentTypeParameters`](crate::operation_shape::ContentTypeParameters) operation.
     ///
     /// This should be an async function satisfying the [`Handler`](::aws_smithy_http_server::operation::Handler) trait.
     /// See the [operation module documentation](::aws_smithy_http_server::operation) for more information.
     ///
     /// # Example
     ///
     /// ```no_run
     /// use json_rpc10::{JsonRpc10, JsonRpc10Config};
     ///
     /// use json_rpc10::{input, output, error};
     ///
     /// async fn handler(input: input::ContentTypeParametersInput) -> Result<output::ContentTypeParametersOutput, std::convert::Infallible> {
     ///     todo!()
     /// }
     ///
     /// let config = JsonRpc10Config::builder().build();
     /// let svc = ::tower::util::service_fn(handler);
     /// let app = JsonRpc10::builder(config)
     ///     .content_type_parameters_service(svc)
     ///     /* Set other handlers */
     ///     .build()
     ///     .unwrap();
     /// # let app: JsonRpc10<::aws_smithy_http_server::routing::RoutingService<::aws_smithy_http_server::protocol::aws_json::router::AwsJsonRouter<::aws_smithy_http_server::routing::Route>, ::aws_smithy_http_server::protocol::aws_json_10::AwsJson1_0>> = app;
     /// ```
     ///
                     pub fn content_type_parameters_service<S, ServiceExtractors, UpgradeExtractors>(self, service: S) -> Self
                     where
                         S: ::aws_smithy_http_server::operation::OperationService<crate::operation_shape::ContentTypeParameters, ServiceExtractors>,
-+
                         ModelPl: ::aws_smithy_http_server::plugin::Plugin<
                             JsonRpc10<L>,
                             crate::operation_shape::ContentTypeParameters,
                             ::aws_smithy_http_server::operation::Normalize<crate::operation_shape::ContentTypeParameters, S>
                         >,
                         ::aws_smithy_http_server::operation::UpgradePlugin::<UpgradeExtractors>: ::aws_smithy_http_server::plugin::Plugin<
                             JsonRpc10<L>,
                             crate::operation_shape::ContentTypeParameters,
                             ModelPl::Output
                         >,
                         HttpPl: ::aws_smithy_http_server::plugin::Plugin<
                             JsonRpc10<L>,
                             crate::operation_shape::ContentTypeParameters,
-+
+                            <
                                 ::aws_smithy_http_server::operation::UpgradePlugin::<UpgradeExtractors>
                                 as ::aws_smithy_http_server::plugin::Plugin<
                                     JsonRpc10<L>,
                                     crate::operation_shape::ContentTypeParameters,
                                     ModelPl::Output
-+
+                                >
                             >::Output
                         >,
-+
                         HttpPl::Output: ::tower::Service<::http::Request<Body>, Response = ::http::Response<::aws_smithy_http_server::body::BoxBody>, Error = ::std::convert::Infallible> + Clone + Send + 'static,
                         <HttpPl::Output as ::tower::Service<::http::Request<Body>>>::Future: Send + 'static,
-+
-+
+                    {
         use ::aws_smithy_http_server::operation::OperationShapeExt;
         use ::aws_smithy_http_server::plugin::Plugin;
         let svc = crate::operation_shape::ContentTypeParameters::from_service(service);
         let svc = self.model_plugin.apply(svc);
         let svc = ::aws_smithy_http_server::operation::UpgradePlugin::<UpgradeExtractors>::new()
             .apply(svc);
         let svc = self.http_plugin.apply(svc);
         self.content_type_parameters_custom(svc)
-+
+    }
-+
     /// Sets the [`ContentTypeParameters`](crate::operation_shape::ContentTypeParameters) to a custom [`Service`](tower::Service).
     /// not constrained by the Smithy contract.
     fn content_type_parameters_custom<S>(mut self, svc: S) -> Self
     where
         S: ::tower::Service<
                 ::http::Request<Body>,
                 Response = ::http::Response<::aws_smithy_http_server::body::BoxBody>,
                 Error = ::std::convert::Infallible,
             > + Clone
             + Send
             + 'static,
         S::Future: Send + 'static,
-+
+    {
         self.content_type_parameters = Some(::aws_smithy_http_server::routing::Route::new(svc));
         self
-+
+    }
-+
     /// Sets the [`EmptyInputAndEmptyOutput`](crate::operation_shape::EmptyInputAndEmptyOutput) operation.
     ///
     /// This should be an async function satisfying the [`Handler`](::aws_smithy_http_server::operation::Handler) trait.
     /// See the [operation module documentation](::aws_smithy_http_server::operation) for more information.
     ///
     /// # Example
     ///
     /// ```no_run
     /// use json_rpc10::{JsonRpc10, JsonRpc10Config};
     ///

↧ Expand context

     /// use json_rpc10::{input, output, error};
     ///
     /// async fn handler(input: input::EmptyInputAndEmptyOutputInput) -> output::EmptyInputAndEmptyOutputOutput {
     ///     todo!()
     /// }
     ///
     /// let config = JsonRpc10Config::builder().build();
     /// let app = JsonRpc10::builder(config)
     ///     .empty_input_and_empty_output(handler)
     ///     /* Set other handlers */
     ///     .build()
     ///     .unwrap();
     /// # let app: JsonRpc10<::aws_smithy_http_server::routing::RoutingService<::aws_smithy_http_server::protocol::aws_json::router::AwsJsonRouter<::aws_smithy_http_server::routing::Route>, ::aws_smithy_http_server::protocol::aws_json_10::AwsJson1_0>> = app;
     /// ```
     ///
                     pub fn empty_input_and_empty_output<HandlerType, HandlerExtractors, UpgradeExtractors>(self, handler: HandlerType) -> Self
                     where
                         HandlerType: ::aws_smithy_http_server::operation::Handler<crate::operation_shape::EmptyInputAndEmptyOutput, HandlerExtractors>,
-204
                         ModelPl: ::aws_smithy_http_server::plugin::Plugin<

@@ -1974,2125 +2033,2190 @@

↥ Expand context

-2125
+    {
         self.simple_scalar_properties = Some(::aws_smithy_http_server::routing::Route::new(svc));
         self
-2128
+    }
-2129
+}
-2130
 impl<Body, L, HttpPl, ModelPl> JsonRpc10Builder<Body, L, HttpPl, ModelPl> {
     /// Constructs a [`JsonRpc10`] from the arguments provided to the builder.
     ///
     /// Forgetting to register a handler for one or more operations will result in an error.
     ///
     /// Check out [`JsonRpc10Builder::build_unchecked`] if you'd prefer the service to return status code 500 when an
     /// unspecified route is requested.
     pub fn build(
         self,
     ) -> Result<
         JsonRpc10<
             ::aws_smithy_http_server::routing::RoutingService<
                 ::aws_smithy_http_server::protocol::aws_json::router::AwsJsonRouter<L::Service>,
                 ::aws_smithy_http_server::protocol::aws_json_10::AwsJson1_0,

             >,
         >,
         MissingOperationsError,
-2148
+    >
     where
         L: ::tower::Layer<::aws_smithy_http_server::routing::Route<Body>>,
-2151
+    {
         let router = {
             use ::aws_smithy_http_server::operation::OperationShape;
             let mut missing_operation_names = std::collections::HashMap::new();
             if self.content_type_parameters.is_none() {
                 missing_operation_names.insert(
                     crate::operation_shape::ContentTypeParameters::ID,
                     ".content_type_parameters()",
                 );
-+
+            }
             if self.empty_input_and_empty_output.is_none() {
                 missing_operation_names.insert(
                     crate::operation_shape::EmptyInputAndEmptyOutput::ID,
                     ".empty_input_and_empty_output()",
                 );
-2166
+            }
             if self.endpoint_operation.is_none() {
                 missing_operation_names.insert(
                     crate::operation_shape::EndpointOperation::ID,
                     ".endpoint_operation()",

↧ Expand context

                 );
-2172
+            }
             if self.endpoint_with_host_label_operation.is_none() {
                 missing_operation_names.insert(
                     crate::operation_shape::EndpointWithHostLabelOperation::ID,
                     ".endpoint_with_host_label_operation()",
                 );
-2178
+            }
             if self.greeting_with_errors.is_none() {
                 missing_operation_names.insert(
                     crate::operation_shape::GreetingWithErrors::ID,
                     ".greeting_with_errors()",
                 );
-2184
+            }
             if self.host_with_path_operation.is_none() {
                 missing_operation_names.insert(
                     crate::operation_shape::HostWithPathOperation::ID,
                     ".host_with_path_operation()",
                 );
-2190
+            }

@@ -2058,2215 +2117,2278 @@

↥ Expand context

                     crate::operation_shape::OperationWithNestedStructure::ID,
                     ".operation_with_nested_structure()",
                 );
-2218
+            }
             if self.operation_with_required_members.is_none() {
                 missing_operation_names.insert(
                     crate::operation_shape::OperationWithRequiredMembers::ID,
                     ".operation_with_required_members()",
                 );
-2224
+            }
             if self.put_with_content_encoding.is_none() {
                 missing_operation_names.insert(
                     crate::operation_shape::PutWithContentEncoding::ID,
                     ".put_with_content_encoding()",
                 );
-2230
+            }
             if self.simple_scalar_properties.is_none() {
                 missing_operation_names.insert(
                     crate::operation_shape::SimpleScalarProperties::ID,
                     ".simple_scalar_properties()",

                 );
-2236
+            }
             if !missing_operation_names.is_empty() {
                 return Err(MissingOperationsError {
                     operation_names2setter_methods: missing_operation_names,
                 });
-2241
+            }
             let unexpected_error_msg = "this should never panic since we are supposed to check beforehand that a handler has been registered for this operation; please file a bug report under https://github.com/smithy-lang/smithy-rs/issues";
-2243
             ::aws_smithy_http_server::protocol::aws_json::router::AwsJsonRouter::from_iter([
-+
+                (
                     request_specs::content_type_parameters(),
                     self.content_type_parameters.expect(unexpected_error_msg),
                 ),
-2249
+                (
                     request_specs::empty_input_and_empty_output(),
                     self.empty_input_and_empty_output
                         .expect(unexpected_error_msg),
                 ),
-2254
+                (
                     request_specs::endpoint_operation(),
                     self.endpoint_operation.expect(unexpected_error_msg),
                 ),
-2258
+                (

↧ Expand context

                     request_specs::endpoint_with_host_label_operation(),
                     self.endpoint_with_host_label_operation
                         .expect(unexpected_error_msg),
                 ),
-2263
+                (
                     request_specs::greeting_with_errors(),
                     self.greeting_with_errors.expect(unexpected_error_msg),
                 ),
-2267
+                (
                     request_specs::host_with_path_operation(),
                     self.host_with_path_operation.expect(unexpected_error_msg),
                 ),
-2271
+                (
                     request_specs::json_unions(),
                     self.json_unions.expect(unexpected_error_msg),
                 ),
-2275
+                (
                     request_specs::no_input_and_no_output(),
                     self.no_input_and_no_output.expect(unexpected_error_msg),
                 ),

@@ -2140,2301 +2199,2369 @@

↥ Expand context

-2301
+                (
                     request_specs::simple_scalar_properties(),
                     self.simple_scalar_properties.expect(unexpected_error_msg),
                 ),
             ])
         };
         let svc = ::aws_smithy_http_server::routing::RoutingService::new(router);
         let svc = svc.map(|s| s.layer(self.layer));
         Ok(JsonRpc10 { svc })
-2310
+    }
-2311
     /// Constructs a [`JsonRpc10`] from the arguments provided to the builder.
     /// Operations without a handler default to returning 500 Internal Server Error to the caller.
     ///
     /// Check out [`JsonRpc10Builder::build`] if you'd prefer the builder to fail if one or more operations do
     /// not have a registered handler.
     pub fn build_unchecked(self) -> JsonRpc10<L::Service>
     where
         Body: Send + 'static,
         L: ::tower::Layer<

             ::aws_smithy_http_server::routing::RoutingService<
                 ::aws_smithy_http_server::protocol::aws_json::router::AwsJsonRouter<
                     ::aws_smithy_http_server::routing::Route<Body>,
                 >,
                 ::aws_smithy_http_server::protocol::aws_json_10::AwsJson1_0,
             >,
         >,
-2328
+    {
         let router =
             ::aws_smithy_http_server::protocol::aws_json::router::AwsJsonRouter::from_iter([
-+
+                (
                     request_specs::content_type_parameters(),
                     self.content_type_parameters.unwrap_or_else(|| {
                         let svc = ::aws_smithy_http_server::operation::MissingFailure::<
                             ::aws_smithy_http_server::protocol::aws_json_10::AwsJson1_0,
                         >::default();
                         ::aws_smithy_http_server::routing::Route::new(svc)
                     }),
                 ),
-2340
+                (
                     request_specs::empty_input_and_empty_output(),
                     self.empty_input_and_empty_output.unwrap_or_else(|| {
                         let svc = ::aws_smithy_http_server::operation::MissingFailure::<
                             ::aws_smithy_http_server::protocol::aws_json_10::AwsJson1_0,
                         >::default();
                         ::aws_smithy_http_server::routing::Route::new(svc)
                     }),
                 ),
-2349
+                (

↧ Expand context

                     request_specs::endpoint_operation(),
                     self.endpoint_operation.unwrap_or_else(|| {
                         let svc = ::aws_smithy_http_server::operation::MissingFailure::<
                             ::aws_smithy_http_server::protocol::aws_json_10::AwsJson1_0,
                         >::default();
                         ::aws_smithy_http_server::routing::Route::new(svc)
                     }),
                 ),
-2358
+                (
                     request_specs::endpoint_with_host_label_operation(),
                     self.endpoint_with_host_label_operation.unwrap_or_else(|| {
                         let svc = ::aws_smithy_http_server::operation::MissingFailure::<
                             ::aws_smithy_http_server::protocol::aws_json_10::AwsJson1_0,
                         >::default();
                         ::aws_smithy_http_server::routing::Route::new(svc)
                     }),
                 ),
-2367
+                (
                     request_specs::greeting_with_errors(),
                     self.greeting_with_errors.unwrap_or_else(|| {

@@ -2300,2470 +2359,2532 @@

↥ Expand context

 pub struct MissingOperationsError {
     operation_names2setter_methods:
         std::collections::HashMap<::aws_smithy_http_server::shape_id::ShapeId, &'static str>,
-2473
+}
-2474
 impl std::fmt::Display for MissingOperationsError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(
             f,
             "You must specify a handler for all operations attached to `JsonRpc10`.\n\
                             We are missing handlers for the following operations:\n",
         )?;
         for operation_name in self.operation_names2setter_methods.keys() {
             writeln!(f, "- {}", operation_name.absolute())?;
-2484
+        }
-2485
         writeln!(
             f,
             "\nUse the dedicated methods on `JsonRpc10Builder` to register the missing handlers:"
         )?;

         for setter_name in self.operation_names2setter_methods.values() {
             writeln!(f, "- {}", setter_name)?;
-2492
+        }
         Ok(())
-2494
+    }
-2495
+}
-2496
 impl std::error::Error for MissingOperationsError {}
-2498
 mod request_specs {
     pub(super) fn content_type_parameters() -> ::std::string::String {
         String::from("JsonRpc10.ContentTypeParameters")
-+
+    }
     pub(super) fn empty_input_and_empty_output() -> ::std::string::String {
         String::from("JsonRpc10.EmptyInputAndEmptyOutput")
-2505
+    }
     pub(super) fn endpoint_operation() -> ::std::string::String {
         String::from("JsonRpc10.EndpointOperation")
-2508
+    }
     pub(super) fn endpoint_with_host_label_operation() -> ::std::string::String {
         String::from("JsonRpc10.EndpointWithHostLabelOperation")
-2511
+    }
     pub(super) fn greeting_with_errors() -> ::std::string::String {

↧ Expand context

         String::from("JsonRpc10.GreetingWithErrors")
-2514
+    }
     pub(super) fn host_with_path_operation() -> ::std::string::String {
         String::from("JsonRpc10.HostWithPathOperation")
-2517
+    }
     pub(super) fn json_unions() -> ::std::string::String {
         String::from("JsonRpc10.JsonUnions")
-2520
+    }
     pub(super) fn no_input_and_no_output() -> ::std::string::String {
         String::from("JsonRpc10.NoInputAndNoOutput")
-2523
+    }
     pub(super) fn no_input_and_output() -> ::std::string::String {
         String::from("JsonRpc10.NoInputAndOutput")
-2526
+    }
     pub(super) fn operation_with_defaults() -> ::std::string::String {
         String::from("JsonRpc10.OperationWithDefaults")
-2529
+    }
     pub(super) fn operation_with_nested_structure() -> ::std::string::String {
         String::from("JsonRpc10.OperationWithNestedStructure")
-2532
+    }

@@ -2370,2543 +2469,2644 @@

↥ Expand context

-2543
 #[allow(missing_docs)] // documentation missing in model
 ///
 /// See the [root](crate) documentation for more information.
 #[derive(Clone)]
 pub struct JsonRpc10<
     S = ::aws_smithy_http_server::routing::RoutingService<
         ::aws_smithy_http_server::protocol::aws_json::router::AwsJsonRouter<
             ::aws_smithy_http_server::routing::Route<::aws_smithy_http_server::body::BoxBody>,
         >,
         ::aws_smithy_http_server::protocol::aws_json_10::AwsJson1_0,
     >,
 > {
     // This is the router wrapped by layers.
     svc: S,
-2558
+}
-2559
 impl JsonRpc10<()> {
     /// Constructs a builder for [`JsonRpc10`].
     /// You must specify a configuration object holding any plugins and layers that should be applied

     /// to the operations in this service.
     pub fn builder<
         Body,
         L,
         HttpPl: ::aws_smithy_http_server::plugin::HttpMarker,
         ModelPl: ::aws_smithy_http_server::plugin::ModelMarker,
     >(
         config: JsonRpc10Config<L, HttpPl, ModelPl>,
     ) -> JsonRpc10Builder<Body, L, HttpPl, ModelPl> {
         JsonRpc10Builder {
             content_type_parameters: None,
             empty_input_and_empty_output: None,
             endpoint_operation: None,
             endpoint_with_host_label_operation: None,
             greeting_with_errors: None,
             host_with_path_operation: None,
             json_unions: None,
             no_input_and_no_output: None,
             no_input_and_output: None,
             operation_with_defaults: None,
             operation_with_nested_structure: None,
             operation_with_required_members: None,
             put_with_content_encoding: None,
             simple_scalar_properties: None,
             layer: config.layers,
             http_plugin: config.http_plugins,
             model_plugin: config.model_plugins,
-2590
+        }
-2591
+    }
-2592
     /// Constructs a builder for [`JsonRpc10`].
     /// You must specify what plugins should be applied to the operations in this service.
     ///
     /// Use [`JsonRpc10::builder_without_plugins`] if you don't need to apply plugins.
     ///
     /// Check out [`HttpPlugins`](::aws_smithy_http_server::plugin::HttpPlugins) and
     /// [`ModelPlugins`](::aws_smithy_http_server::plugin::ModelPlugins) if you need to apply
     /// multiple plugins.
     #[deprecated(
         since = "0.57.0",
         note = "please use the `builder` constructor and register plugins on the `JsonRpc10Config` object instead; see https://github.com/smithy-lang/smithy-rs/discussions/3096"
     )]
     pub fn builder_with_plugins<
         Body,
         HttpPl: ::aws_smithy_http_server::plugin::HttpMarker,
         ModelPl: ::aws_smithy_http_server::plugin::ModelMarker,
     >(
         http_plugin: HttpPl,
         model_plugin: ModelPl,
     ) -> JsonRpc10Builder<Body, ::tower::layer::util::Identity, HttpPl, ModelPl> {
         JsonRpc10Builder {
             content_type_parameters: None,
             empty_input_and_empty_output: None,
             endpoint_operation: None,
             endpoint_with_host_label_operation: None,
             greeting_with_errors: None,
             host_with_path_operation: None,
             json_unions: None,
             no_input_and_no_output: None,
             no_input_and_output: None,
             operation_with_defaults: None,
             operation_with_nested_structure: None,

↧ Expand context

             operation_with_required_members: None,
             put_with_content_encoding: None,
             simple_scalar_properties: None,
             layer: ::tower::layer::util::Identity::new(),
             http_plugin,
             model_plugin,
-2631
+        }
-2632
+    }
-2633
     /// Constructs a builder for [`JsonRpc10`].
     ///
     /// Use [`JsonRpc10::builder_with_plugins`] if you need to specify plugins.
     #[deprecated(
         since = "0.57.0",
         note = "please use the `builder` constructor instead; see https://github.com/smithy-lang/smithy-rs/discussions/3096"
     )]
     pub fn builder_without_plugins<Body>() -> JsonRpc10Builder<
         Body,
         ::tower::layer::util::Identity,
         ::aws_smithy_http_server::plugin::IdentityPlugin,

@@ -2545,2720 +2623,2804 @@

↥ Expand context

         self.layer(&::tower::layer::layer_fn(
             ::aws_smithy_http_server::routing::Route::new,
         ))
-2723
+    }
-2724
+}
-2725
 impl<S, R> ::tower::Service<R> for JsonRpc10<S>
 where
     S: ::tower::Service<R>,
-2729
+{
     type Response = S::Response;
     type Error = S::Error;
     type Future = S::Future;
-2733
     fn poll_ready(
         &mut self,
         cx: &mut std::task::Context,
     ) -> std::task::Poll<Result<(), Self::Error>> {
         self.svc.poll_ready(cx)
-2739
+    }

-2740
     fn call(&mut self, request: R) -> Self::Future {
         self.svc.call(request)
-2743
+    }
-2744
+}
-2745
 /// An enumeration of all [operations](https://smithy.io/2.0/spec/service-types.html#operation) in JsonRpc10.
 #[allow(clippy::enum_variant_names)]
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
 pub enum Operation {
     ContentTypeParameters,
     EmptyInputAndEmptyOutput,
     EndpointOperation,
     EndpointWithHostLabelOperation,
     GreetingWithErrors,
     HostWithPathOperation,
     JsonUnions,
     NoInputAndNoOutput,
     NoInputAndOutput,
     OperationWithDefaults,
     OperationWithNestedStructure,
     OperationWithRequiredMembers,
     PutWithContentEncoding,
     SimpleScalarProperties,
-2764
+}
-2765
 impl Operation {
     /// Returns the [operations](https://smithy.io/2.0/spec/service-types.html#operation) [`ShapeId`](::aws_smithy_http_server::shape_id::ShapeId).
     pub fn shape_id(&self) -> ::aws_smithy_http_server::shape_id::ShapeId {
         match self {
             Operation::ContentTypeParameters => ::aws_smithy_http_server::shape_id::ShapeId::new(
                 "aws.protocoltests.json10#ContentTypeParameters",
                 "aws.protocoltests.json10",
                 "ContentTypeParameters",
             ),
             Operation::EmptyInputAndEmptyOutput => {
                 ::aws_smithy_http_server::shape_id::ShapeId::new(
                     "aws.protocoltests.json10#EmptyInputAndEmptyOutput",
                     "aws.protocoltests.json10",
                     "EmptyInputAndEmptyOutput",
-2780
+                )
-2781
+            }
             Operation::EndpointOperation => ::aws_smithy_http_server::shape_id::ShapeId::new(
                 "aws.protocoltests.json10#EndpointOperation",
                 "aws.protocoltests.json10",

↧ Expand context

                 "EndpointOperation",
             ),
             Operation::EndpointWithHostLabelOperation => {
                 ::aws_smithy_http_server::shape_id::ShapeId::new(
                     "aws.protocoltests.json10#EndpointWithHostLabelOperation",
                     "aws.protocoltests.json10",
                     "EndpointWithHostLabelOperation",
-2792
+                )
-2793
+            }
             Operation::GreetingWithErrors => ::aws_smithy_http_server::shape_id::ShapeId::new(
                 "aws.protocoltests.json10#GreetingWithErrors",
                 "aws.protocoltests.json10",
                 "GreetingWithErrors",
             ),
             Operation::HostWithPathOperation => ::aws_smithy_http_server::shape_id::ShapeId::new(
                 "aws.protocoltests.json10#HostWithPathOperation",
                 "aws.protocoltests.json10",
                 "HostWithPathOperation",
             ),
             Operation::JsonUnions => ::aws_smithy_http_server::shape_id::ShapeId::new(

@@ -2640,2821 +2699,2887 @@

↥ Expand context

                 "aws.protocoltests.json10",
                 "OperationWithDefaults",
             ),
             Operation::OperationWithNestedStructure => {
                 ::aws_smithy_http_server::shape_id::ShapeId::new(
                     "aws.protocoltests.json10#OperationWithNestedStructure",
                     "aws.protocoltests.json10",
                     "OperationWithNestedStructure",
-2829
+                )
-2830
+            }
             Operation::OperationWithRequiredMembers => {
                 ::aws_smithy_http_server::shape_id::ShapeId::new(
                     "aws.protocoltests.json10#OperationWithRequiredMembers",
                     "aws.protocoltests.json10",
                     "OperationWithRequiredMembers",
-2836
+                )
-2837
+            }
             Operation::PutWithContentEncoding => ::aws_smithy_http_server::shape_id::ShapeId::new(
                 "aws.protocoltests.json10#PutWithContentEncoding",
                 "aws.protocoltests.json10",

                 "PutWithContentEncoding",
             ),
             Operation::SimpleScalarProperties => ::aws_smithy_http_server::shape_id::ShapeId::new(
                 "aws.protocoltests.json10#SimpleScalarProperties",
                 "aws.protocoltests.json10",
                 "SimpleScalarProperties",
             ),
-2848
+        }
-2849
+    }
-2850
+}
 impl<L>
     ::aws_smithy_http_server::service::ContainsOperation<
         crate::operation_shape::ContentTypeParameters,
     > for JsonRpc10<L>
-+
+{
     const VALUE: Operation = Operation::ContentTypeParameters;
-+
+}
 impl<L>
     ::aws_smithy_http_server::service::ContainsOperation<
         crate::operation_shape::EmptyInputAndEmptyOutput,
     > for JsonRpc10<L>
-2862
+{
     const VALUE: Operation = Operation::EmptyInputAndEmptyOutput;
-2864
+}
 impl<L>
     ::aws_smithy_http_server::service::ContainsOperation<crate::operation_shape::EndpointOperation>
     for JsonRpc10<L>

↧ Expand context

-2868
+{
     const VALUE: Operation = Operation::EndpointOperation;
-2870
+}
 impl<L>
     ::aws_smithy_http_server::service::ContainsOperation<
         crate::operation_shape::EndpointWithHostLabelOperation,
     > for JsonRpc10<L>
-2875
+{
     const VALUE: Operation = Operation::EndpointWithHostLabelOperation;
-2877
+}
 impl<L>
     ::aws_smithy_http_server::service::ContainsOperation<crate::operation_shape::GreetingWithErrors>
     for JsonRpc10<L>
-2881
+{
     const VALUE: Operation = Operation::GreetingWithErrors;
-2883
+}
 impl<L>
     ::aws_smithy_http_server::service::ContainsOperation<
         crate::operation_shape::HostWithPathOperation,
     > for JsonRpc10<L>

@@ -2864,3052 +2967,3164 @@

↥ Expand context

     ) -> JsonRpc10ConfigBuilder<L, H, ::aws_smithy_http_server::plugin::PluginStack<NewPlugin, M>>
-3053
+    {
         JsonRpc10ConfigBuilder {
             layers: self.layers,
             http_plugins: self.http_plugins,
             model_plugins: ::aws_smithy_http_server::plugin::PluginStack::new(
                 model_plugin,
                 self.model_plugins,
             ),
-3061
+        }
-3062
+    }
-3063
     /// Build the configuration.
     pub fn build(self) -> super::JsonRpc10Config<L, H, M> {
         super::JsonRpc10Config {
             layers: self.layers,
             http_plugins: self.http_plugins,
             model_plugins: self.model_plugins,
-3070
+        }
-3071
+    }

-3072
+}
 /// A macro to help with scoping [plugins](::aws_smithy_http_server::plugin) to a subset of all operations.
 ///
 /// In contrast to [`aws_smithy_http_server::scope`](::aws_smithy_http_server::scope), this macro has knowledge
 /// of the service and any operations _not_ specified will be placed in the opposing group.
 ///
 /// # Example
 ///
 /// ```rust
 /// scope! {
 ///     /// Includes [`EmptyInputAndEmptyOutput`], excluding all other operations.
 ///     /// Includes [`ContentTypeParameters`], excluding all other operations.
 ///     struct ScopeA {
 ///         includes: [EmptyInputAndEmptyOutput]
 ///         includes: [ContentTypeParameters]
 ///     }
 /// }
 ///
 /// scope! {
 ///     /// Excludes [`EmptyInputAndEmptyOutput`], excluding all other operations.
 ///     /// Excludes [`ContentTypeParameters`], excluding all other operations.
 ///     struct ScopeB {
 ///         excludes: [EmptyInputAndEmptyOutput]
 ///         excludes: [ContentTypeParameters]
 ///     }
 /// }
 ///
 /// # use ::aws_smithy_http_server::plugin::{Plugin, Scoped};
 /// # use json_rpc10::scope;
 /// # struct MockPlugin;
 /// # impl<S, Op, T> Plugin<S, Op, T> for MockPlugin { type Output = u32; fn apply(&self, input: T) -> u32 { 3 } }
 /// # let scoped_a = Scoped::new::<ScopeA>(MockPlugin);
 /// # let scoped_b = Scoped::new::<ScopeB>(MockPlugin);
 /// # let a = Plugin::<(), json_rpc10::operation_shape::EmptyInputAndEmptyOutput, u64>::apply(&scoped_a, 6);
 /// # let b = Plugin::<(), json_rpc10::operation_shape::EmptyInputAndEmptyOutput, u64>::apply(&scoped_b, 6);
 /// # let a = Plugin::<(), json_rpc10::operation_shape::ContentTypeParameters, u64>::apply(&scoped_a, 6);
 /// # let b = Plugin::<(), json_rpc10::operation_shape::ContentTypeParameters, u64>::apply(&scoped_b, 6);
 /// # assert_eq!(a, 3_u32);
 /// # assert_eq!(b, 6_u64);
 /// ```
 #[macro_export]
 macro_rules! scope {
                     // Completed, render impls
                     (@ $ name: ident, $ contains: ident () ($($ temp: ident)*) ($($ not_member: ident)*)) => {
                         $(
                             impl ::aws_smithy_http_server::plugin::scoped::Membership<$ temp> for $ name {
                                 type Contains = ::aws_smithy_http_server::plugin::scoped::$ contains;
-3113
+                            }
                         )*
                         $(
                             impl ::aws_smithy_http_server::plugin::scoped::Membership<$ not_member> for $ name {
                                 type Contains = ::aws_smithy_http_server::plugin::scoped::$ contains;
-3118
+                            }
                         )*
                     };
                     // All `not_member`s exhausted, move `temp` into `not_member`
                     (@ $ name: ident, $ contains: ident ($($ member: ident)*) ($($ temp: ident)*) ()) => {
                         scope! { @ $ name, $ contains ($($ member)*) () ($($ temp)*) }
                     };
-3125
                         // ContentTypeParameters match found, pop from both `member` and `not_member`
                         (@ $ name: ident, $ contains: ident (ContentTypeParameters $($ member: ident)*) ($($ temp: ident)*) (ContentTypeParameters $($ not_member: ident)*)) => {
                             scope! { @ $ name, $ contains ($($ member)*) ($($ temp)*) ($($ not_member)*) }
                         };
                         // ContentTypeParameters match not found, pop from `not_member` into `temp` stack
                         (@ $ name: ident, $ contains: ident (ContentTypeParameters $($ member: ident)*) ($($ temp: ident)*) ($ other: ident $($ not_member: ident)*)) => {
                             scope! { @ $ name, $ contains (ContentTypeParameters $($ member)*) ($ other $($ temp)*) ($($ not_member)*) }
                         };
-+
                         // EmptyInputAndEmptyOutput match found, pop from both `member` and `not_member`
                         (@ $ name: ident, $ contains: ident (EmptyInputAndEmptyOutput $($ member: ident)*) ($($ temp: ident)*) (EmptyInputAndEmptyOutput $($ not_member: ident)*)) => {
                             scope! { @ $ name, $ contains ($($ member)*) ($($ temp)*) ($($ not_member)*) }
                         };
                         // EmptyInputAndEmptyOutput match not found, pop from `not_member` into `temp` stack
                         (@ $ name: ident, $ contains: ident (EmptyInputAndEmptyOutput $($ member: ident)*) ($($ temp: ident)*) ($ other: ident $($ not_member: ident)*)) => {
                             scope! { @ $ name, $ contains (EmptyInputAndEmptyOutput $($ member)*) ($ other $($ temp)*) ($($ not_member)*) }
                         };
-3143
                         // EndpointOperation match found, pop from both `member` and `not_member`

↧ Expand context

                         (@ $ name: ident, $ contains: ident (EndpointOperation $($ member: ident)*) ($($ temp: ident)*) (EndpointOperation $($ not_member: ident)*)) => {
                             scope! { @ $ name, $ contains ($($ member)*) ($($ temp)*) ($($ not_member)*) }
                         };
                         // EndpointOperation match not found, pop from `not_member` into `temp` stack
                         (@ $ name: ident, $ contains: ident (EndpointOperation $($ member: ident)*) ($($ temp: ident)*) ($ other: ident $($ not_member: ident)*)) => {
                             scope! { @ $ name, $ contains (EndpointOperation $($ member)*) ($ other $($ temp)*) ($($ not_member)*) }
                         };
-3152
                         // EndpointWithHostLabelOperation match found, pop from both `member` and `not_member`
                         (@ $ name: ident, $ contains: ident (EndpointWithHostLabelOperation $($ member: ident)*) ($($ temp: ident)*) (EndpointWithHostLabelOperation $($ not_member: ident)*)) => {
                             scope! { @ $ name, $ contains ($($ member)*) ($($ temp)*) ($($ not_member)*) }
                         };
                         // EndpointWithHostLabelOperation match not found, pop from `not_member` into `temp` stack
                         (@ $ name: ident, $ contains: ident (EndpointWithHostLabelOperation $($ member: ident)*) ($($ temp: ident)*) ($ other: ident $($ not_member: ident)*)) => {
                             scope! { @ $ name, $ contains (EndpointWithHostLabelOperation $($ member)*) ($ other $($ temp)*) ($($ not_member)*) }
                         };
-3161
                         // GreetingWithErrors match found, pop from both `member` and `not_member`
                         (@ $ name: ident, $ contains: ident (GreetingWithErrors $($ member: ident)*) ($($ temp: ident)*) (GreetingWithErrors $($ not_member: ident)*)) => {
                             scope! { @ $ name, $ contains ($($ member)*) ($($ temp)*) ($($ not_member)*) }

@@ -3039,3236 +3088,3285 @@

↥ Expand context

                             scope! { @ $ name, $ contains ($($ member)*) ($($ temp)*) ($($ not_member)*) }
                         };
                         // PutWithContentEncoding match not found, pop from `not_member` into `temp` stack
                         (@ $ name: ident, $ contains: ident (PutWithContentEncoding $($ member: ident)*) ($($ temp: ident)*) ($ other: ident $($ not_member: ident)*)) => {
                             scope! { @ $ name, $ contains (PutWithContentEncoding $($ member)*) ($ other $($ temp)*) ($($ not_member)*) }
                         };
-3242
                         // SimpleScalarProperties match found, pop from both `member` and `not_member`
                         (@ $ name: ident, $ contains: ident (SimpleScalarProperties $($ member: ident)*) ($($ temp: ident)*) (SimpleScalarProperties $($ not_member: ident)*)) => {
                             scope! { @ $ name, $ contains ($($ member)*) ($($ temp)*) ($($ not_member)*) }
                         };
                         // SimpleScalarProperties match not found, pop from `not_member` into `temp` stack
                         (@ $ name: ident, $ contains: ident (SimpleScalarProperties $($ member: ident)*) ($($ temp: ident)*) ($ other: ident $($ not_member: ident)*)) => {
                             scope! { @ $ name, $ contains (SimpleScalarProperties $($ member)*) ($ other $($ temp)*) ($($ not_member)*) }
                         };
-3251
-3252
+                    (
                         $(#[$ attrs:meta])*
                         $ vis:vis struct $ name:ident {
                             includes: [$($ include:ident),*]

-3256
+                        }
                     ) => {
                         use $ crate::operation_shape::*;
                         ::aws_smithy_http_server::scope! {
                             $(#[$ attrs])*
                             $ vis struct $ name {
                                 includes: [$($ include),*],
                                 excludes: []
-3264
+                            }
-3265
+                        }
                         scope! { @ $ name, False ($($ include)*) () (EmptyInputAndEmptyOutput EndpointOperation EndpointWithHostLabelOperation GreetingWithErrors HostWithPathOperation JsonUnions NoInputAndNoOutput NoInputAndOutput OperationWithDefaults OperationWithNestedStructure OperationWithRequiredMembers PutWithContentEncoding SimpleScalarProperties) }
                         scope! { @ $ name, False ($($ include)*) () (ContentTypeParameters EmptyInputAndEmptyOutput EndpointOperation EndpointWithHostLabelOperation GreetingWithErrors HostWithPathOperation JsonUnions NoInputAndNoOutput NoInputAndOutput OperationWithDefaults OperationWithNestedStructure OperationWithRequiredMembers PutWithContentEncoding SimpleScalarProperties) }
                     };
-3268
+                    (
                         $(#[$ attrs:meta])*
                         $ vis:vis struct $ name:ident {
                             excludes: [$($ exclude:ident),*]
-3272
+                        }
                     ) => {
                         use $ crate::operation_shape::*;
-3275
                         ::aws_smithy_http_server::scope! {
                             $(#[$ attrs])*
                             $ vis struct $ name {
                                 includes: [],
                                 excludes: [$($ exclude),*]
-3281
+                            }
-3282
+                        }
                         scope! { @ $ name, True ($($ exclude)*) () (EmptyInputAndEmptyOutput EndpointOperation EndpointWithHostLabelOperation GreetingWithErrors HostWithPathOperation JsonUnions NoInputAndNoOutput NoInputAndOutput OperationWithDefaults OperationWithNestedStructure OperationWithRequiredMembers PutWithContentEncoding SimpleScalarProperties) }
                         scope! { @ $ name, True ($($ exclude)*) () (ContentTypeParameters EmptyInputAndEmptyOutput EndpointOperation EndpointWithHostLabelOperation GreetingWithErrors HostWithPathOperation JsonUnions NoInputAndNoOutput NoInputAndOutput OperationWithDefaults OperationWithNestedStructure OperationWithRequiredMembers PutWithContentEncoding SimpleScalarProperties) }
                     };
-3285
+                }

tmp-codegen-diff/codegen-server-test/json_rpc11/rust-server-codegen/src/input.rs

@@ -1,1 +31,55 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 #[allow(missing_docs)] // documentation missing in model
 #[derive(
     ::std::clone::Clone, ::std::cmp::Eq, ::std::cmp::PartialEq, ::std::fmt::Debug, ::std::hash::Hash,
 )]
 pub struct ContentTypeParametersInput {
     #[allow(missing_docs)] // documentation missing in model
     pub value: ::std::option::Option<i32>,
-+
+}
 impl ContentTypeParametersInput {
     #[allow(missing_docs)] // documentation missing in model
     pub fn value(&self) -> ::std::option::Option<i32> {
         self.value
-+
+    }
-+
+}
 impl ContentTypeParametersInput {
     /// Creates a new builder-style object to manufacture [`ContentTypeParametersInput`](crate::input::ContentTypeParametersInput).
     pub fn builder() -> crate::input::content_type_parameters_input::Builder {
         crate::input::content_type_parameters_input::Builder::default()
-+
+    }
-+
+}
 impl crate::constrained::Constrained for crate::input::ContentTypeParametersInput {
     type Unconstrained = crate::input::content_type_parameters_input::Builder;
-+
+}
-+
 #[allow(missing_docs)] // documentation missing in model
 #[derive(
     ::std::clone::Clone, ::std::cmp::Eq, ::std::cmp::PartialEq, ::std::fmt::Debug, ::std::hash::Hash,
 )]
 pub struct PutWithContentEncodingInput {
     #[allow(missing_docs)] // documentation missing in model
     pub encoding: ::std::option::Option<::std::string::String>,
     #[allow(missing_docs)] // documentation missing in model
     pub data: ::std::option::Option<::std::string::String>,
-35
+}

↧ Expand context

 impl PutWithContentEncodingInput {
     #[allow(missing_docs)] // documentation missing in model
     pub fn encoding(&self) -> ::std::option::Option<&str> {
         self.encoding.as_deref()
-40
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn data(&self) -> ::std::option::Option<&str> {
         self.data.as_deref()
-44
+    }
-45
+}
 impl PutWithContentEncodingInput {
     /// Creates a new builder-style object to manufacture [`PutWithContentEncodingInput`](crate::input::PutWithContentEncodingInput).
     pub fn builder() -> crate::input::put_with_content_encoding_input::Builder {
         crate::input::put_with_content_encoding_input::Builder::default()
-50
+    }
-51
+}
 impl crate::constrained::Constrained for crate::input::PutWithContentEncodingInput {
     type Unconstrained = crate::input::put_with_content_encoding_input::Builder;
-54
+}
-55

@@ -556,580 +615,673 @@

↥ Expand context

-580
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn unix_timestamp(&self) -> ::std::option::Option<&::aws_smithy_types::DateTime> {
         self.unix_timestamp.as_ref()
-584
+    }
-585
+}
 impl KitchenSinkOperationInput {
     /// Creates a new builder-style object to manufacture [`KitchenSinkOperationInput`](crate::input::KitchenSinkOperationInput).
     pub fn builder() -> crate::input::kitchen_sink_operation_input::Builder {
         crate::input::kitchen_sink_operation_input::Builder::default()
-590
+    }
-591
+}
 impl crate::constrained::Constrained for crate::input::KitchenSinkOperationInput {
     type Unconstrained = crate::input::kitchen_sink_operation_input::Builder;
-594
+}
-595
 #[allow(missing_docs)] // documentation missing in model
 #[derive(
     ::std::clone::Clone, ::std::cmp::Eq, ::std::cmp::PartialEq, ::std::fmt::Debug, ::std::hash::Hash,
 )]

 pub struct EmptyOperationInput {}
 impl EmptyOperationInput {
     /// Creates a new builder-style object to manufacture [`EmptyOperationInput`](crate::input::EmptyOperationInput).
     pub fn builder() -> crate::input::empty_operation_input::Builder {
         crate::input::empty_operation_input::Builder::default()
-605
+    }
-606
+}
 impl crate::constrained::Constrained for crate::input::EmptyOperationInput {
     type Unconstrained = crate::input::empty_operation_input::Builder;
-609
+}
 /// See [`ContentTypeParametersInput`](crate::input::ContentTypeParametersInput).
 ///
 pub mod content_type_parameters_input {
-+
     impl ::std::convert::From<Builder> for crate::input::ContentTypeParametersInput {
         fn from(builder: Builder) -> Self {
             builder.build()
-+
+        }
-+
+    }
     /// A builder for [`ContentTypeParametersInput`](crate::input::ContentTypeParametersInput).
     #[derive(::std::clone::Clone, ::std::default::Default, ::std::fmt::Debug)]
     pub struct Builder {
         pub(crate) value: ::std::option::Option<i32>,
-+
+    }
     impl Builder {
         #[allow(missing_docs)] // documentation missing in model
         pub fn value(mut self, input: ::std::option::Option<i32>) -> Self {
             self.value = input;
             self
-+
+        }
         #[allow(missing_docs)] // documentation missing in model
         pub(crate) fn set_value(mut self, input: Option<impl ::std::convert::Into<i32>>) -> Self {
             self.value = input.map(|v| v.into());
             self
-+
+        }
         /// Consumes the builder and constructs a [`ContentTypeParametersInput`](crate::input::ContentTypeParametersInput).
         pub fn build(self) -> crate::input::ContentTypeParametersInput {
             self.build_enforcing_all_constraints()
-+
+        }
         fn build_enforcing_all_constraints(self) -> crate::input::ContentTypeParametersInput {
             crate::input::ContentTypeParametersInput { value: self.value }
-+
+        }
-+
+    }
-+
+}
 /// See [`PutWithContentEncodingInput`](crate::input::PutWithContentEncodingInput).
 ///
 pub mod put_with_content_encoding_input {
-647
     impl ::std::convert::From<Builder> for crate::input::PutWithContentEncodingInput {
         fn from(builder: Builder) -> Self {
             builder.build()
-651
+        }
-652
+    }
     /// A builder for [`PutWithContentEncodingInput`](crate::input::PutWithContentEncodingInput).

↧ Expand context

     #[derive(::std::clone::Clone, ::std::default::Default, ::std::fmt::Debug)]
     pub struct Builder {
         pub(crate) encoding: ::std::option::Option<::std::string::String>,
         pub(crate) data: ::std::option::Option<::std::string::String>,
-658
+    }
     impl Builder {
         #[allow(missing_docs)] // documentation missing in model
         pub fn encoding(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
             self.encoding = input;
             self
-664
+        }
         #[allow(missing_docs)] // documentation missing in model
         pub(crate) fn set_encoding(
             mut self,
             input: Option<impl ::std::convert::Into<::std::string::String>>,
         ) -> Self {
             self.encoding = input.map(|v| v.into());
             self
-672
+        }
         #[allow(missing_docs)] // documentation missing in model

tmp-codegen-diff/codegen-server-test/json_rpc11/rust-server-codegen/src/lib.rs

@@ -130,130 +221,226 @@

↥ Expand context

 //! async fn handler_with_two_extractors(
 //!     input: Input,
 //!     ext0: Extension<State>,
 //!     ext1: ConnectInfo<SocketAddr>,
 //! ) -> Output {
 //!     todo!()
 //! }
 //! ```
 //!
 //! See the [`operation module`](::aws_smithy_http_server::operation) for information on precisely what constitutes a handler.
 //!
 //! ## Build
 //!
 //! You can convert [`JsonProtocolBuilder`] into [`JsonProtocol`] using either [`JsonProtocolBuilder::build`] or [`JsonProtocolBuilder::build_unchecked`].
 //!
 //! [`JsonProtocolBuilder::build`] requires you to provide a handler for every single operation in your Smithy model. It will return an error if that is not the case.
 //!
 //! [`JsonProtocolBuilder::build_unchecked`], instead, does not require exhaustiveness. The server will automatically return 500 Internal Server Error to all requests for operations that do not have a registered handler.
 //! [`JsonProtocolBuilder::build_unchecked`] is particularly useful if you are deploying your Smithy service as a collection of Lambda functions, where each Lambda is only responsible for a subset of the operations in the Smithy service (or even a single one!).
 //!

 //! # Example
 //!
 //! ```rust,no_run
 //! # use std::net::SocketAddr;
 //! use json_rpc11::{JsonProtocol, JsonProtocolConfig};
 //!
 //! #[::tokio::main]
 //! pub async fn main() {
 //!    let config = JsonProtocolConfig::builder().build();
 //!    let app = JsonProtocol::builder(config)
 //!        .content_type_parameters(content_type_parameters)
 //!        .datetime_offsets(datetime_offsets)
 //!        .empty_operation(empty_operation)
 //!        .endpoint_operation(endpoint_operation)
 //!        .endpoint_with_host_label_operation(endpoint_with_host_label_operation)
 //!        .fractional_seconds(fractional_seconds)
 //!        .greeting_with_errors(greeting_with_errors)
 //!        .host_with_path_operation(host_with_path_operation)
 //!        .json_enums(json_enums)
 //!        .json_unions(json_unions)
 //!        .kitchen_sink_operation(kitchen_sink_operation)
 //!        .null_operation(null_operation)
 //!        .operation_with_optional_input_output(operation_with_optional_input_output)
 //!        .put_and_get_inline_documents(put_and_get_inline_documents)
 //!        .put_with_content_encoding(put_with_content_encoding)
 //!        .simple_scalar_properties(simple_scalar_properties)
 //!        .sparse_nulls_operation(sparse_nulls_operation)
 //!        .build()
 //!        .expect("failed to build an instance of JsonProtocol");
 //!
 //!    let bind: SocketAddr = "127.0.0.1:6969".parse()
 //!        .expect("unable to parse the server bind address and port");
 //!    let server = ::hyper::Server::bind(&bind).serve(app.into_make_service());
 //!    # let server = async { Ok::<_, ()>(()) };
 //!
 //!    // Run your service!
 //!    if let Err(err) = server.await {
 //!        eprintln!("server error: {:?}", err);
 //!    }
 //! }
 //!
 //! use json_rpc11::{input, output, error};
 //!
 //! async fn content_type_parameters(input: input::ContentTypeParametersInput) -> output::ContentTypeParametersOutput {
 //!     todo!()
 //! }
 //!
 //! async fn datetime_offsets(input: input::DatetimeOffsetsInput) -> output::DatetimeOffsetsOutput {
 //!     todo!()
 //! }
 //!
 //! async fn empty_operation(input: input::EmptyOperationInput) -> output::EmptyOperationOutput {
 //!     todo!()
 //! }
 //!
 //! async fn endpoint_operation(input: input::EndpointOperationInput) -> output::EndpointOperationOutput {
 //!     todo!()

↧ Expand context

 //! }
 //!
 //! async fn endpoint_with_host_label_operation(input: input::EndpointWithHostLabelOperationInput) -> Result<output::EndpointWithHostLabelOperationOutput, error::EndpointWithHostLabelOperationError> {
 //!     todo!()
 //! }
 //!
 //! async fn fractional_seconds(input: input::FractionalSecondsInput) -> output::FractionalSecondsOutput {
 //!     todo!()
 //! }
 //!
 //! async fn greeting_with_errors(input: input::GreetingWithErrorsInput) -> Result<output::GreetingWithErrorsOutput, error::GreetingWithErrorsError> {
 //!     todo!()
 //! }
 //!
 //! async fn host_with_path_operation(input: input::HostWithPathOperationInput) -> output::HostWithPathOperationOutput {
 //!     todo!()
 //! }
 //!
 //! async fn json_enums(input: input::JsonEnumsInput) -> Result<output::JsonEnumsOutput, error::JsonEnumsError> {
 //!     todo!()

tmp-codegen-diff/codegen-server-test/json_rpc11/rust-server-codegen/src/operation.rs

@@ -1,1 +31,165 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 static CONTENT_TYPE_CONTENTTYPEPARAMETERS: ::once_cell::sync::Lazy<::mime::Mime> =
     ::once_cell::sync::Lazy::new(|| {
         "application/x-amz-json-1.1"
             .parse::<::mime::Mime>()
             .expect("BUG: MIME parsing failed, content_type is not valid")
     });
 ::pin_project_lite::pin_project! {
     /// A [`Future`](std::future::Future) aggregating the body bytes of a [`Request`] and constructing the
     /// [`ContentTypeParametersInput`](crate::input::ContentTypeParametersInput) using modelled bindings.
     pub struct ContentTypeParametersInputFuture {
         inner: std::pin::Pin<Box<dyn std::future::Future<Output = Result<crate::input::ContentTypeParametersInput, ::aws_smithy_http_server::protocol::aws_json::runtime_error::RuntimeError>> + Send>>
-+
+    }
-+
+}
-+
 impl std::future::Future for ContentTypeParametersInputFuture {
     type Output = Result<
         crate::input::ContentTypeParametersInput,
         ::aws_smithy_http_server::protocol::aws_json::runtime_error::RuntimeError,
     >;
-+
     fn poll(
         self: std::pin::Pin<&mut Self>,
         cx: &mut std::task::Context<'_>,
     ) -> std::task::Poll<Self::Output> {
         let this = self.project();
         this.inner.as_mut().poll(cx)
-+
+    }
-+
+}
-+
 impl<B>
     ::aws_smithy_http_server::request::FromRequest<
         ::aws_smithy_http_server::protocol::aws_json_11::AwsJson1_1,
         B,
     > for crate::input::ContentTypeParametersInput
 where
     B: ::aws_smithy_http_server::body::HttpBody + Send,
     B: 'static,
-+
     B::Data: Send,
     ::aws_smithy_http_server::protocol::aws_json::rejection::RequestRejection:
         From<<B as ::aws_smithy_http_server::body::HttpBody>::Error>,
-+
+{
     type Rejection = ::aws_smithy_http_server::protocol::aws_json::runtime_error::RuntimeError;
     type Future = ContentTypeParametersInputFuture;
-+
     fn from_request(request: ::http::Request<B>) -> Self::Future {
         let fut = async move {
             if !::aws_smithy_http_server::protocol::accept_header_classifier(
                 request.headers(),
                 &CONTENT_TYPE_CONTENTTYPEPARAMETERS,
             ) {
                 return Err(::aws_smithy_http_server::protocol::aws_json::rejection::RequestRejection::NotAcceptable);
-+
+            }
             crate::protocol_serde::shape_content_type_parameters::de_content_type_parameters_http_request(request)
                             .await
                             .map_err(Into::into)
         };
         use ::futures_util::future::TryFutureExt;
         let fut = fut.map_err(
             |e: ::aws_smithy_http_server::protocol::aws_json::rejection::RequestRejection| {
                 ::tracing::debug!(error = %e, "failed to deserialize request");
                 ::aws_smithy_http_server::protocol::aws_json::runtime_error::RuntimeError::from(e)
             },
         );
         ContentTypeParametersInputFuture {
             inner: Box::pin(fut),
-+
+        }
-+
+    }
-+
+}
 impl
     ::aws_smithy_http_server::response::IntoResponse<
         ::aws_smithy_http_server::protocol::aws_json_11::AwsJson1_1,
     > for crate::output::ContentTypeParametersOutput
-+
+{
     fn into_response(self) -> ::aws_smithy_http_server::response::Response {
         match crate::protocol_serde::shape_content_type_parameters::ser_content_type_parameters_http_response(self) {
                         Ok(response) => response,
                         Err(e) => {
                             ::tracing::error!(error = %e, "failed to serialize response");
                             ::aws_smithy_http_server::response::IntoResponse::<::aws_smithy_http_server::protocol::aws_json_11::AwsJson1_1>::into_response(::aws_smithy_http_server::protocol::aws_json::runtime_error::RuntimeError::from(e))
-+
+                        }
-+
+                    }
-+
+    }
-+
+}
-+
 #[allow(unreachable_code, unused_variables)]
 #[cfg(test)]
 mod content_type_parameters_test {
-+
     /// A server should ignore parameters added to the content type
     /// Test ID: AwsJson11MustSupportParametersInContentType
     #[::tokio::test]
     #[::tracing_test::traced_test]
     async fn aws_json11_must_support_parameters_in_content_type_request() {
         #[allow(unused_mut)]
         let mut http_request = http::Request::builder()
             .uri("/")
             .method("POST")
             .header("Content-Type", "application/x-amz-json-1.1; charset=utf-8")
             .header("X-Amz-Target", "JsonProtocol.ContentTypeParameters")
             .body(::aws_smithy_http_server::body::Body::from(
                 ::bytes::Bytes::from_static("{\"value\":5}".as_bytes()),
             ))
             .unwrap();
         #[allow(unused_mut)]
         let (sender, mut receiver) = ::tokio::sync::mpsc::channel(1);
         let config = crate::service::JsonProtocolConfig::builder().build();
         let service = crate::service::JsonProtocol::builder::<::hyper::body::Body, _, _, _>(config)
             .content_type_parameters(move |input: crate::input::ContentTypeParametersInput| {
                 let sender = sender.clone();
                 async move {
                     let result = {
                         let expected = crate::input::ContentTypeParametersInput {
                             value: ::std::option::Option::Some(5),
                         };
                         ::pretty_assertions::assert_eq!(input, expected);
                         let response = crate::output::ContentTypeParametersOutput {};
                         response
                     };
                     sender.send(()).await.expect("receiver dropped early");
                     result
-+
+                }
             })
             .build_unchecked();
         let http_response = ::tower::ServiceExt::oneshot(service, http_request)
             .await
             .expect("unable to make an HTTP request");
         assert!(
             receiver.recv().await.is_some(),
             "we expected operation handler to be invoked but it was not entered"
         );
-+
+    }
-+
+}
-+
 static CONTENT_TYPE_PUTWITHCONTENTENCODING: ::once_cell::sync::Lazy<::mime::Mime> =
     ::once_cell::sync::Lazy::new(|| {
         "application/x-amz-json-1.1"
             .parse::<::mime::Mime>()
             .expect("BUG: MIME parsing failed, content_type is not valid")
     });
 ::pin_project_lite::pin_project! {
     /// A [`Future`](std::future::Future) aggregating the body bytes of a [`Request`] and constructing the
     /// [`PutWithContentEncodingInput`](crate::input::PutWithContentEncodingInput) using modelled bindings.
     pub struct PutWithContentEncodingInputFuture {

↧ Expand context

         inner: std::pin::Pin<Box<dyn std::future::Future<Output = Result<crate::input::PutWithContentEncodingInput, ::aws_smithy_http_server::protocol::aws_json::runtime_error::RuntimeError>> + Send>>
-147
+    }
-148
+}
-149
 impl std::future::Future for PutWithContentEncodingInputFuture {
     type Output = Result<
         crate::input::PutWithContentEncodingInput,
         ::aws_smithy_http_server::protocol::aws_json::runtime_error::RuntimeError,
     >;
-155
     fn poll(
         self: std::pin::Pin<&mut Self>,
         cx: &mut std::task::Context<'_>,
     ) -> std::task::Poll<Self::Output> {
         let this = self.project();
         this.inner.as_mut().poll(cx)
-162
+    }
-163
+}
-164
 impl<B>

tmp-codegen-diff/codegen-server-test/json_rpc11/rust-server-codegen/src/operation_shape.rs

@@ -1,1 +31,61 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
-+
 /// The example tests how servers must support requests containing a `Content-Type` header with parameters.
 pub struct ContentTypeParameters;
-+
 impl ::aws_smithy_http_server::operation::OperationShape for ContentTypeParameters {
     const ID: ::aws_smithy_http_server::shape_id::ShapeId =
         ::aws_smithy_http_server::shape_id::ShapeId::new(
             "aws.protocoltests.json#ContentTypeParameters",
             "aws.protocoltests.json",
             "ContentTypeParameters",
         );
-+
     type Input = crate::input::ContentTypeParametersInput;
     type Output = crate::output::ContentTypeParametersOutput;
     type Error = std::convert::Infallible;
-+
+}
-+
 impl ::aws_smithy_http_server::instrumentation::sensitivity::Sensitivity for ContentTypeParameters {
     type RequestFmt = ::aws_smithy_http_server::instrumentation::sensitivity::DefaultRequestFmt;
     type ResponseFmt = ::aws_smithy_http_server::instrumentation::sensitivity::DefaultResponseFmt;
-+
     fn request_fmt() -> Self::RequestFmt {
         ::aws_smithy_http_server::instrumentation::sensitivity::RequestFmt::new()
-+
+    }
-+
     fn response_fmt() -> Self::ResponseFmt {
         ::aws_smithy_http_server::instrumentation::sensitivity::ResponseFmt::new()
-+
+    }
-+
+}
-+
 #[allow(missing_docs)] // documentation missing in model
 pub struct PutWithContentEncoding;
-34
 impl ::aws_smithy_http_server::operation::OperationShape for PutWithContentEncoding {
     const ID: ::aws_smithy_http_server::shape_id::ShapeId =
         ::aws_smithy_http_server::shape_id::ShapeId::new(
             "aws.protocoltests.json#PutWithContentEncoding",
             "aws.protocoltests.json",
             "PutWithContentEncoding",
         );

↧ Expand context

-42
     type Input = crate::input::PutWithContentEncodingInput;
     type Output = crate::output::PutWithContentEncodingOutput;
     type Error = std::convert::Infallible;
-46
+}
-47
 impl ::aws_smithy_http_server::instrumentation::sensitivity::Sensitivity
     for PutWithContentEncoding
-50
+{
     type RequestFmt = ::aws_smithy_http_server::instrumentation::sensitivity::DefaultRequestFmt;
     type ResponseFmt = ::aws_smithy_http_server::instrumentation::sensitivity::DefaultResponseFmt;
-53
     fn request_fmt() -> Self::RequestFmt {
         ::aws_smithy_http_server::instrumentation::sensitivity::RequestFmt::new()
-56
+    }
-57
     fn response_fmt() -> Self::ResponseFmt {
         ::aws_smithy_http_server::instrumentation::sensitivity::ResponseFmt::new()
-60
+    }
-61
+}

tmp-codegen-diff/codegen-server-test/json_rpc11/rust-server-codegen/src/output.rs

@@ -1,1 +31,43 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 #[allow(missing_docs)] // documentation missing in model
 #[derive(
     ::std::clone::Clone, ::std::cmp::Eq, ::std::cmp::PartialEq, ::std::fmt::Debug, ::std::hash::Hash,
 )]
 pub struct ContentTypeParametersOutput {}
 impl ContentTypeParametersOutput {
     /// Creates a new builder-style object to manufacture [`ContentTypeParametersOutput`](crate::output::ContentTypeParametersOutput).
     pub fn builder() -> crate::output::content_type_parameters_output::Builder {
         crate::output::content_type_parameters_output::Builder::default()
-+
+    }
-+
+}
-+
 #[allow(missing_docs)] // documentation missing in model
 #[derive(
     ::std::clone::Clone, ::std::cmp::Eq, ::std::cmp::PartialEq, ::std::fmt::Debug, ::std::hash::Hash,
 )]
 pub struct PutWithContentEncodingOutput {}
 impl PutWithContentEncodingOutput {
     /// Creates a new builder-style object to manufacture [`PutWithContentEncodingOutput`](crate::output::PutWithContentEncodingOutput).
     pub fn builder() -> crate::output::put_with_content_encoding_output::Builder {
         crate::output::put_with_content_encoding_output::Builder::default()
-23
+    }

↧ Expand context

-24
+}
-25
 #[allow(missing_docs)] // documentation missing in model
 #[derive(
     ::std::clone::Clone, ::std::cmp::Eq, ::std::cmp::PartialEq, ::std::fmt::Debug, ::std::hash::Hash,
 )]
 pub struct FractionalSecondsOutput {
     #[allow(missing_docs)] // documentation missing in model
     pub datetime: ::std::option::Option<::aws_smithy_types::DateTime>,
-33
+}
 impl FractionalSecondsOutput {
     #[allow(missing_docs)] // documentation missing in model
     pub fn datetime(&self) -> ::std::option::Option<&::aws_smithy_types::DateTime> {
         self.datetime.as_ref()
-38
+    }
-39
+}
 impl FractionalSecondsOutput {
     /// Creates a new builder-style object to manufacture [`FractionalSecondsOutput`](crate::output::FractionalSecondsOutput).
     pub fn builder() -> crate::output::fractional_seconds_output::Builder {
         crate::output::fractional_seconds_output::Builder::default()

@@ -510,522 +569,603 @@

↥ Expand context

     ) -> ::std::option::Option<&crate::model::StructWithJsonName> {
         self.struct_with_json_name.as_ref()
-524
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn timestamp(&self) -> ::std::option::Option<&::aws_smithy_types::DateTime> {
         self.timestamp.as_ref()
-528
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn unix_timestamp(&self) -> ::std::option::Option<&::aws_smithy_types::DateTime> {
         self.unix_timestamp.as_ref()
-532
+    }
-533
+}
 impl KitchenSinkOperationOutput {
     /// Creates a new builder-style object to manufacture [`KitchenSinkOperationOutput`](crate::output::KitchenSinkOperationOutput).
     pub fn builder() -> crate::output::kitchen_sink_operation_output::Builder {
         crate::output::kitchen_sink_operation_output::Builder::default()
-538
+    }
-539
+}
-540
 #[allow(missing_docs)] // documentation missing in model

 #[derive(
     ::std::clone::Clone, ::std::cmp::Eq, ::std::cmp::PartialEq, ::std::fmt::Debug, ::std::hash::Hash,
 )]
 pub struct EmptyOperationOutput {}
 impl EmptyOperationOutput {
     /// Creates a new builder-style object to manufacture [`EmptyOperationOutput`](crate::output::EmptyOperationOutput).
     pub fn builder() -> crate::output::empty_operation_output::Builder {
         crate::output::empty_operation_output::Builder::default()
-550
+    }
-551
+}
 /// See [`ContentTypeParametersOutput`](crate::output::ContentTypeParametersOutput).
 ///
 pub mod content_type_parameters_output {
-+
     impl ::std::convert::From<Builder> for crate::output::ContentTypeParametersOutput {
         fn from(builder: Builder) -> Self {
             builder.build()
-+
+        }
-+
+    }
     /// A builder for [`ContentTypeParametersOutput`](crate::output::ContentTypeParametersOutput).
     #[derive(::std::clone::Clone, ::std::default::Default, ::std::fmt::Debug)]
     pub struct Builder {}
     impl Builder {
         /// Consumes the builder and constructs a [`ContentTypeParametersOutput`](crate::output::ContentTypeParametersOutput).
         pub fn build(self) -> crate::output::ContentTypeParametersOutput {
             self.build_enforcing_all_constraints()
-+
+        }
         fn build_enforcing_all_constraints(self) -> crate::output::ContentTypeParametersOutput {
             crate::output::ContentTypeParametersOutput {}
-+
+        }
-+
+    }
-+
+}
 /// See [`PutWithContentEncodingOutput`](crate::output::PutWithContentEncodingOutput).
 ///
 pub mod put_with_content_encoding_output {
-577
     impl ::std::convert::From<Builder> for crate::output::PutWithContentEncodingOutput {
         fn from(builder: Builder) -> Self {
             builder.build()
-581
+        }
-582
+    }
     /// A builder for [`PutWithContentEncodingOutput`](crate::output::PutWithContentEncodingOutput).

↧ Expand context

     #[derive(::std::clone::Clone, ::std::default::Default, ::std::fmt::Debug)]
     pub struct Builder {}
     impl Builder {
         /// Consumes the builder and constructs a [`PutWithContentEncodingOutput`](crate::output::PutWithContentEncodingOutput).
         pub fn build(self) -> crate::output::PutWithContentEncodingOutput {
             self.build_enforcing_all_constraints()
-590
+        }
         fn build_enforcing_all_constraints(self) -> crate::output::PutWithContentEncodingOutput {
             crate::output::PutWithContentEncodingOutput {}
-593
+        }
-594
+    }
-595
+}
 /// See [`FractionalSecondsOutput`](crate::output::FractionalSecondsOutput).
 ///
 pub mod fractional_seconds_output {
-599
     impl ::std::convert::From<Builder> for crate::output::FractionalSecondsOutput {
         fn from(builder: Builder) -> Self {
             builder.build()
-603
+        }

Pages: 1 2 3 4 5 6 7 8 9 10 11