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

To take default values into account, set them before check

Browse Source
This commit is contained in:
Sven Fink 2020-03-03 16:12:25 +01:00
parent 0dca07bdf8
commit f76274122b
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/json-validator.cpp
View File

@ -814,6 +814,17 @@ class object : public schema
void validate(const json::json_pointer &ptr, json &instance, error_handler &e) const override void validate(const json::json_pointer &ptr, json &instance, error_handler &e) const override
{ {
// reverse search
for (auto const &prop : properties_) {
const auto finding = instance.find(prop.first);
if (instance.end() == finding) { // if the prop is not in the instance
const auto &defaultValue = prop.second->defaultValue(ptr, instance, e);
if (!defaultValue.empty()) { // if default value is available
instance[prop.first] = defaultValue;
}
}
}
if (maxProperties_.first && instance.size() > maxProperties_.second) if (maxProperties_.first && instance.size() > maxProperties_.second)
e.error(ptr, instance, "too many properties"); e.error(ptr, instance, "too many properties");
@ -857,17 +868,6 @@ class object : public schema
} }
} }
// reverse search
for (auto const &prop : properties_) {
const auto finding = instance.find(prop.first);
if (instance.end() == finding) { // if the prop is not in the instance
const auto &defaultValue = prop.second->defaultValue(ptr, instance, e);
if (!defaultValue.empty()) { // if default value is available
instance[prop.first] = defaultValue;
}
}
}
for (auto &dep : dependencies_) { for (auto &dep : dependencies_) {
auto prop = instance.find(dep.first); auto prop = instance.find(dep.first);
if (prop != instance.end()) // if dependency-property is present in instance if (prop != instance.end()) // if dependency-property is present in instance