luo980/json-schema-validator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix #54: use signed-integer-validator even for number_unsigned

Browse Source
This commit is contained in:
Patrick Boettcher 2019-03-29 10:57:01 +01:00
parent d6ed73f240
commit 4ca18cbd63
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/json-validator.cpp
View File

@ -398,7 +398,6 @@ public:
{"string", json::value_t::string}, {"string", json::value_t::string},
{"boolean", json::value_t::boolean}, {"boolean", json::value_t::boolean},
{"integer", json::value_t::number_integer}, {"integer", json::value_t::number_integer},
{"integer", json::value_t::number_unsigned},
{"number", json::value_t::number_float}, {"number", json::value_t::number_float},
}; };
@ -435,12 +434,14 @@ public:
for (auto &key : known_keywords) for (auto &key : known_keywords)
sch.erase(key); sch.erase(key);
// with nlohmann::json floats can be seen as unsigned or integer - reuse the number-validator for // with nlohmann::json float instance (but number in schema-definition) can be seen as unsigned or integer -
// integer values as well, if they have not been specified // reuse the number-validator for integer values as well, if they have not been specified explicitly
if (type_[(uint8_t) json::value_t::number_float] && !type_[(uint8_t) json::value_t::number_integer]) if (type_[(uint8_t) json::value_t::number_float] && !type_[(uint8_t) json::value_t::number_integer])
type_[(uint8_t) json::value_t::number_integer] = type_[(uint8_t) json::value_t::number_integer] = type_[(uint8_t) json::value_t::number_float];
type_[(uint8_t) json::value_t::number_unsigned] =
type_[(uint8_t) json::value_t::number_float]; // #54: JSON-schema does not differentiate between unsigned and signed integer - nlohmann::json does
// we stick with JSON-schema: use the integer-validator if instance-value is unsigned
type_[(uint8_t) json::value_t::number_unsigned] = type_[(uint8_t) json::value_t::number_integer];
attr = sch.find("enum"); attr = sch.find("enum");
if (attr != sch.end()) { if (attr != sch.end()) {
@ -995,8 +996,8 @@ std::shared_ptr<schema> type_schema::make(json &schema,
switch (type) { switch (type) {
case json::value_t::null: case json::value_t::null:
return std::make_shared<null>(schema, root); return std::make_shared<null>(schema, root);
case json::value_t::number_unsigned: case json::value_t::number_unsigned:
return std::make_shared<numeric<json::number_unsigned_t>>(schema, root, kw);
case json::value_t::number_integer: case json::value_t::number_integer:
return std::make_shared<numeric<json::number_integer_t>>(schema, root, kw); return std::make_shared<numeric<json::number_integer_t>>(schema, root, kw);
case json::value_t::number_float: case json::value_t::number_float:

3
test/issue-54/CMakeLists.txt Normal file
View File

@ -0,0 +1,3 @@
add_test_simple_schema(Issue::54
${CMAKE_CURRENT_SOURCE_DIR}/schema.json
${CMAKE_CURRENT_SOURCE_DIR}/instance.json)

1
test/issue-54/instance.json Normal file
View File

@ -0,0 +1 @@
0

4
test/issue-54/schema.json Normal file
View File

@ -0,0 +1,4 @@
{
"type": "integer",
"minimum": -2
}