VienDesu/schemars
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't include number format in schema for value

Browse source 
Guessing the format for serde_json::Number can be very misleading, so let's not
This commit is contained in:
Graham Esau 2021-03-25 19:47:36 +00:00
parent 9b71b428cb
commit 04996efeb3
6 changed files with 109 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

49
schemars/tests/expected/from_json_value.json Normal file
View file

@ -0,0 +1,49 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"examples": [
{
"bool": true,
"minusOne": -1,
"null": null,
"object": {
"array": [
"foo",
"bar"
]
},
"one": 1,
"zero": 0,
"zeroPointZero": 0.0
}
],
"type": "object",
"properties": {
"bool": {
"type": "boolean"
},
"minusOne": {
"type": "integer"
},
"null": true,
"object": {
"type": "object",
"properties": {
"array": {
"type": "array",
"items": {
"type": "string"
}
}
}
},
"one": {
"type": "integer"
},
"zero": {
"type": "integer"
},
"zeroPointZero": {
"type": "number"
}
}
}

10
schemars/tests/expected/from_value_2019_09.json
View file

@ -26,8 +26,7 @@
"type": "object",
"properties": {
"myInt": {
"type": "integer",
"format": "int32"
"type": "integer"
},
"myBool": {
"type": "boolean"
@ -39,8 +38,7 @@
"my_map": {
"type": "object",
"additionalProperties": {
"type": "number",
"format": "double"
"type": "number"
}
},
"my_vec": {
@ -66,9 +64,7 @@
"minLength": 1
},
{
"type": "integer",
"format": "uint8",
"minimum": 0.0
"type": "integer"
}
],
"maxItems": 2,

10
schemars/tests/expected/from_value_draft07.json
View file

@ -26,8 +26,7 @@
"type": "object",
"properties": {
"myInt": {
"type": "integer",
"format": "int32"
"type": "integer"
},
"myBool": {
"type": "boolean"
@ -39,8 +38,7 @@
"my_map": {
"type": "object",
"additionalProperties": {
"type": "number",
"format": "double"
"type": "number"
}
},
"my_vec": {
@ -66,9 +64,7 @@
"minLength": 1
},
{
"type": "integer",
"format": "uint8",
"minimum": 0.0
"type": "integer"
}
],
"maxItems": 2,

10
schemars/tests/expected/from_value_openapi3.json
View file

@ -4,8 +4,7 @@
"type": "object",
"properties": {
"myInt": {
"type": "integer",
"format": "int32"
"type": "integer"
},
"myBool": {
"type": "boolean"
@ -19,8 +18,7 @@
"my_map": {
"type": "object",
"additionalProperties": {
"type": "number",
"format": "double"
"type": "number"
}
},
"my_vec": {
@ -46,9 +44,7 @@
"minLength": 1
},
{
"type": "integer",
"format": "uint8",
"minimum": 0.0
"type": "integer"
}
],
"maxItems": 2,

23
schemars/tests/from_value.rs
View file

@ -1,8 +1,7 @@
mod util;
use std::collections::HashMap;
use schemars::gen::SchemaSettings;
use schemars::gen::{SchemaGenerator, SchemaSettings};
use serde::Serialize;
use std::collections::HashMap;
use util::*;
#[derive(Serialize)]
@ -75,3 +74,21 @@ fn schema_from_value_matches_openapi3() -> TestResult {
test_schema(&actual, "from_value_openapi3")
}
#[test]
fn schema_from_json_value() -> TestResult {
let gen = SchemaGenerator::default();
let actual = gen.into_root_schema_for_value(&serde_json::json!({
"zero": 0,
"one": 1,
"minusOne": -1,
"zeroPointZero": 0.0,
"bool": true,
"null": null,
"object": {
"array": ["foo", "bar"]
},
}))?;
test_schema(&actual, "from_json_value")
}