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

validator: items and additionalItems implemented

Browse Source
This commit is contained in:
Patrick Boettcher 2016-12-24 00:09:04 +01:00
parent f77dfdb068
commit 0789403a4b
2 changed files with 56 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -84,7 +84,7 @@ int main(void)
There is an application which can be used for testing the validator with the There is an application which can be used for testing the validator with the
[JSON-Schema-Test-Suite](https://github.com/json-schema-org/JSON-Schema-Test-Suite). [JSON-Schema-Test-Suite](https://github.com/json-schema-org/JSON-Schema-Test-Suite).
Currently **107** of ~**308** tests are still failing, because simply not all keywords and Currently **93** of ~**308** tests are still failing, because simply not all keywords and
their functionalities have been implemented. Some of the missing feature will their functionalities have been implemented. Some of the missing feature will
require a rework. Some will only work with external libraries. (remote references) require a rework. Some will only work with external libraries. (remote references)

60
src/json-schema-validator.hpp
View File

@ -177,9 +177,6 @@ class json_validator
void validate_array(json &instance, const json &schema, const std::string &name) void validate_array(json &instance, const json &schema, const std::string &name)
{ {
not_yet_implemented(schema, "items", "array");
not_yet_implemented(schema, "additionalItems", "array");
validate_type(schema, "array", name); validate_type(schema, "array", name);
// maxItems // maxItems
@ -205,11 +202,64 @@ class json_validator
throw std::out_of_range(name + " should have only unique items."); throw std::out_of_range(name + " should have only unique items.");
} }
} }
// items and additionalItems
// default to empty schemas
auto items_iter = schema.find("items");
json items = {};
if (items_iter != schema.end())
items = items_iter.value();
auto additionalItems_iter = schema.find("additionalItems");
json additionalItems = {};
if (additionalItems_iter != schema.end())
additionalItems = additionalItems_iter.value();
size_t i = 0;
bool validation_done = false;
for (auto &value : instance) {
std::string sub_name = name + "[" + std::to_string(i) + "]";
switch (items.type()) {
case json::value_t::array:
if (i < items.size())
validate(value, items[i], sub_name);
else {
switch (additionalItems.type()) { // items is an array
// we need to take into consideration additionalItems
case json::value_t::object:
validate(value, additionalItems, sub_name);
break;
case json::value_t::boolean:
if (additionalItems == false)
throw std::out_of_range("additional values in array are not allowed for " + sub_name);
else
validation_done = true;
break;
default:
break;
}
} }
if (instance.size() != array_to_set.size()) break;
throw std::out_of_range(name + " should have only unique items.");
case json::value_t::object: // items is a schema
validate(value, items, sub_name);
break;
default:
break;
} }
if (validation_done)
break;
i++;
}
} }
void validate_object(json &instance, const json &schema, const std::string &name) void validate_object(json &instance, const json &schema, const std::string &name)