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

Avoid overwriting of default values

Browse Source
This commit is contained in:
didier-brizet 2022-09-14 09:28:02 +02:00
parent 27a1dec4e7
commit 2354610da5
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/json-validator.cpp
View File

@ -974,6 +974,20 @@ public:
: schema(root), required_(r) {} : schema(root), required_(r) {}
}; };
json find_patch_add(const json::json_pointer &ptr, const json_patch &patch)
{
if (!patch.operator json().is_array()) {
return nullptr;
}
std::string path = ptr.to_string();
for (const auto &op : patch.operator json()) {
if (op.at("path") == path && op.at("op") == "add") {
return op.at("value");
}
}
return nullptr;
}
class object : public schema class object : public schema
{ {
std::pair<bool, size_t> maxProperties_{false, 0}; std::pair<bool, size_t> maxProperties_{false, 0};
@ -1037,6 +1051,12 @@ class object : public schema
for (auto const &prop : properties_) { for (auto const &prop : properties_) {
const auto finding = instance.find(prop.first); const auto finding = instance.find(prop.first);
if (instance.end() == finding) { // if the prop is not in the instance if (instance.end() == finding) { // if the prop is not in the instance
{
json default_value = find_patch_add((ptr / prop.first), patch);
if (!default_value.is_null()) {
continue;
}
}
const auto &default_value = prop.second->default_value(ptr, instance, e); const auto &default_value = prop.second->default_value(ptr, instance, e);
if (!default_value.is_null()) { // if default value is available if (!default_value.is_null()) { // if default value is available
patch.add((ptr / prop.first), default_value); patch.add((ptr / prop.first), default_value);