msrd0/deprecated-gotham-restful
1
0
Fork 0
mirror of https://gitlab.com/msrd0/gotham-restful.git synced 2025-02-23 04:52:28 +00:00
Code Issues Releases Activity Actions

add HashMap as OpenapiType

Browse source
This commit is contained in:
Dominic 2020-05-19 19:23:29 +02:00
parent 7268cc0567
commit 81803fd54a
Signed by: msrd0
GPG key ID: DCC8C247452E98F9
1 changed files with 36 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/openapi/types.rs
View file

@ -10,7 +10,7 @@ use openapiv3::{
#[cfg(feature = "uuid")] #[cfg(feature = "uuid")]
use uuid::Uuid; use uuid::Uuid;
use std::{ use std::{
collections::{BTreeSet, HashSet}, collections::{BTreeSet, HashMap, HashSet},
hash::BuildHasher hash::BuildHasher
}; };
@ -267,8 +267,7 @@ impl<T : OpenapiType> OpenapiType for Vec<T>
let schema = T::schema(); let schema = T::schema();
let mut dependencies = schema.dependencies.clone(); let mut dependencies = schema.dependencies.clone();
let items = match schema.name.clone() let items = match schema.name.clone() {
{
Some(name) => { Some(name) => {
let reference = Reference { reference: format!("#/components/schemas/{}", name) }; let reference = Reference { reference: format!("#/components/schemas/{}", name) };
dependencies.insert(name, schema); dependencies.insert(name, schema);
@ -307,6 +306,34 @@ impl<T : OpenapiType, S : BuildHasher> OpenapiType for HashSet<T, S>
} }
} }
impl<K, T : OpenapiType, S : BuildHasher> OpenapiType for HashMap<K, T, S>
{
fn schema() -> OpenapiSchema
{
let schema = T::schema();
let mut dependencies = schema.dependencies.clone();
let items = Box::new(match schema.name.clone() {
Some(name) => {
let reference = Reference { reference: format!("#/components/schemas/{}", name) };
dependencies.insert(name, schema);
reference
},
None => Item(schema.into_schema())
});
OpenapiSchema {
nullable: false,
name: None,
schema: SchemaKind::Type(Type::Object(ObjectType {
additional_properties: Some(AdditionalProperties::Schema(items)),
..Default::default()
})),
dependencies
}
}
}
impl OpenapiType for serde_json::Value impl OpenapiType for serde_json::Value
{ {
fn schema() -> OpenapiSchema fn schema() -> OpenapiSchema
@ -330,12 +357,12 @@ mod test
type Unit = (); type Unit = ();
macro_rules! assert_schema { macro_rules! assert_schema {
($ty:ident $(<$generic:ident>)* => $json:expr) => { ($ty:ident $(<$($generic:ident),+>)* => $json:expr) => {
paste::item! { paste::item! {
#[test] #[test]
fn [<test_schema_ $ty:snake $(_ $generic:snake)*>]() fn [<test_schema_ $ty:lower $($(_ $generic:lower)+)*>]()
{ {
let schema = <$ty $(<$generic>)* as OpenapiType>::schema().into_schema(); let schema = <$ty $(<$($generic),+>)* as OpenapiType>::schema().into_schema();
let schema_json = serde_json::to_string(&schema).expect(&format!("Unable to serialize schema for {}", stringify!($ty))); let schema_json = serde_json::to_string(&schema).expect(&format!("Unable to serialize schema for {}", stringify!($ty)));
assert_eq!(schema_json, $json); assert_eq!(schema_json, $json);
} }
@ -382,6 +409,8 @@ mod test
assert_schema!(Option<String> => r#"{"nullable":true,"type":"string"}"#); assert_schema!(Option<String> => r#"{"nullable":true,"type":"string"}"#);
assert_schema!(Vec<String> => r#"{"type":"array","items":{"type":"string"}}"#); assert_schema!(Vec<String> => r#"{"type":"array","items":{"type":"string"}}"#);
assert_schema!(BTreeSet<String> => r#"{"type":"array","items":{"type":"string"}}"#);
assert_schema!(HashSet<String> => r#"{"type":"array","items":{"type":"string"}}"#);
assert_schema!(HashMap<String, String> => r#"{"type":"object","additionalProperties":{"type":"string"}}"#);
assert_schema!(Value => r#"{"nullable":true}"#); assert_schema!(Value => r#"{"nullable":true}"#);
} }