chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow empty request / response if all body parameters are optional

Browse Source
This commit is contained in:
Jonas Platte 2020-12-06 22:33:14 +01:00
parent f17c5fc619
commit cc07d26af6
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
1 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
ruma-api-macros/src/api.rs
View File

@ -161,11 +161,20 @@ pub fn expand_all(api: Api) -> syn::Result<TokenStream> {
let request_body: < let request_body: <
RequestBody #body_lifetimes RequestBody #body_lifetimes
as #ruma_api_import::exports::ruma_serde::Outgoing as #ruma_api_import::exports::ruma_serde::Outgoing
>::Incoming = >::Incoming = {
// If the request body is completely empty, pretend it is an empty JSON object
// instead. This allows requests with only optional body parameters to be
// deserialized in that case.
let json = match request.body().as_slice() {
b"" => b"{}",
body => body,
};
#ruma_api_import::try_deserialize!( #ruma_api_import::try_deserialize!(
request, request,
#ruma_api_import::exports::serde_json::from_slice(request.body().as_slice()) #ruma_api_import::exports::serde_json::from_slice(json)
); )
};
} }
} else { } else {
TokenStream::new() TokenStream::new()
@ -189,22 +198,30 @@ pub fn expand_all(api: Api) -> syn::Result<TokenStream> {
TokenStream::new() TokenStream::new()
}; };
let typed_response_body_decl = if api.response.has_body_fields() let typed_response_body_decl =
|| api.response.newtype_body_field().is_some() if api.response.has_body_fields() || api.response.newtype_body_field().is_some() {
{ quote! {
quote! { let response_body: <
let response_body: < ResponseBody
ResponseBody as #ruma_api_import::exports::ruma_serde::Outgoing
as #ruma_api_import::exports::ruma_serde::Outgoing >::Incoming = {
>::Incoming = // If the reponse body is completely empty, pretend it is an empty JSON object
#ruma_api_import::try_deserialize!( // instead. This allows reponses with only optional body parameters to be
response, // deserialized in that case.
#ruma_api_import::exports::serde_json::from_slice(response.body().as_slice()), let json = match response.body().as_slice() {
); b"" => b"{}",
} body => body,
} else { };
TokenStream::new()
}; #ruma_api_import::try_deserialize!(
response,
#ruma_api_import::exports::serde_json::from_slice(json),
)
};
}
} else {
TokenStream::new()
};
let response_init_fields = api.response.init_fields(); let response_init_fields = api.response.init_fields();