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

Use explicit type conversion from json (#173)

Browse Source 
* Use explicit type conversion

As detailed in https://github.com/nlohmann/json#implicit-conversions, it's recommended not to use implicit conversions from json. This change allows those using "JSON_ImplicitConversions" OFF to still build this package.

* Use matching type from declaration for some variables.
This commit is contained in:
qvfh83 2021-10-10 12:03:09 -04:00 committed by GitHub
parent 4ebc6c2334
commit 0097de3c54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/json-validator.cpp
View File

@ -657,7 +657,7 @@ class string : public schema
void validate(const json::json_pointer &ptr, const json &instance, json_patch &, error_handler &e) const override void validate(const json::json_pointer &ptr, const json &instance, json_patch &, error_handler &e) const override
{ {
if (minLength_.first) { if (minLength_.first) {
if (utf8_length(instance) < minLength_.second) { if (utf8_length(instance.get<std::string>()) < minLength_.second) {
std::ostringstream s; std::ostringstream s;
s << "instance is too short as per minLength:" << minLength_.second; s << "instance is too short as per minLength:" << minLength_.second;
e.error(ptr, instance, s.str()); e.error(ptr, instance, s.str());
@ -665,7 +665,7 @@ class string : public schema
} }
if (maxLength_.first) { if (maxLength_.first) {
if (utf8_length(instance) > maxLength_.second) { if (utf8_length(instance.get<std::string>()) > maxLength_.second) {
std::ostringstream s; std::ostringstream s;
s << "instance is too long as per maxLength: " << maxLength_.second; s << "instance is too long as per maxLength: " << maxLength_.second;
e.error(ptr, instance, s.str()); e.error(ptr, instance, s.str());
@ -701,7 +701,7 @@ class string : public schema
e.error(ptr, instance, std::string("a format checker was not provided but a format keyword for this string is present: ") + format_.second); e.error(ptr, instance, std::string("a format checker was not provided but a format keyword for this string is present: ") + format_.second);
else { else {
try { try {
root_->format_check()(format_.second, instance); root_->format_check()(format_.second, instance.get<std::string>());
} catch (const std::exception &ex) { } catch (const std::exception &ex) {
e.error(ptr, instance, std::string("format-checking failed: ") + ex.what()); e.error(ptr, instance, std::string("format-checking failed: ") + ex.what());
} }
@ -715,13 +715,13 @@ public:
{ {
auto attr = sch.find("maxLength"); auto attr = sch.find("maxLength");
if (attr != sch.end()) { if (attr != sch.end()) {
maxLength_ = {true, attr.value()}; maxLength_ = {true, attr.value().get<size_t>()};
sch.erase(attr); sch.erase(attr);
} }
attr = sch.find("minLength"); attr = sch.find("minLength");
if (attr != sch.end()) { if (attr != sch.end()) {
minLength_ = {true, attr.value()}; minLength_ = {true, attr.value().get<size_t>()};
sch.erase(attr); sch.erase(attr);
} }
@ -759,7 +759,7 @@ public:
#ifndef NO_STD_REGEX #ifndef NO_STD_REGEX
attr = sch.find("pattern"); attr = sch.find("pattern");
if (attr != sch.end()) { if (attr != sch.end()) {
patternString_ = attr.value(); patternString_ = attr.value().get<std::string>();
pattern_ = {true, REGEX_NAMESPACE::regex(attr.value().get<std::string>(), pattern_ = {true, REGEX_NAMESPACE::regex(attr.value().get<std::string>(),
REGEX_NAMESPACE::regex::ECMAScript)}; REGEX_NAMESPACE::regex::ECMAScript)};
sch.erase(attr); sch.erase(attr);
@ -771,7 +771,7 @@ public:
if (root_->format_check() == nullptr) if (root_->format_check() == nullptr)
throw std::invalid_argument{"a format checker was not provided but a format keyword for this string is present: " + format_.second}; throw std::invalid_argument{"a format checker was not provided but a format keyword for this string is present: " + format_.second};
format_ = {true, attr.value()}; format_ = {true, attr.value().get<std::string>()};
sch.erase(attr); sch.erase(attr);
} }
} }
@ -821,33 +821,33 @@ public:
{ {
auto attr = sch.find("maximum"); auto attr = sch.find("maximum");
if (attr != sch.end()) { if (attr != sch.end()) {
maximum_ = {true, attr.value()}; maximum_ = {true, attr.value().get<T>()};
kw.insert("maximum"); kw.insert("maximum");
} }
attr = sch.find("minimum"); attr = sch.find("minimum");
if (attr != sch.end()) { if (attr != sch.end()) {
minimum_ = {true, attr.value()}; minimum_ = {true, attr.value().get<T>()};
kw.insert("minimum"); kw.insert("minimum");
} }
attr = sch.find("exclusiveMaximum"); attr = sch.find("exclusiveMaximum");
if (attr != sch.end()) { if (attr != sch.end()) {
exclusiveMaximum_ = true; exclusiveMaximum_ = true;
maximum_ = {true, attr.value()}; maximum_ = {true, attr.value().get<T>()};
kw.insert("exclusiveMaximum"); kw.insert("exclusiveMaximum");
} }
attr = sch.find("exclusiveMinimum"); attr = sch.find("exclusiveMinimum");
if (attr != sch.end()) { if (attr != sch.end()) {
minimum_ = {true, attr.value()};
exclusiveMinimum_ = true; exclusiveMinimum_ = true;
minimum_ = {true, attr.value().get<T>()};
kw.insert("exclusiveMinimum"); kw.insert("exclusiveMinimum");
} }
attr = sch.find("multipleOf"); attr = sch.find("multipleOf");
if (attr != sch.end()) { if (attr != sch.end()) {
multipleOf_ = {true, attr.value()}; multipleOf_ = {true, attr.value().get<json::number_float_t>()};
kw.insert("multipleOf"); kw.insert("multipleOf");
} }
} }
@ -999,13 +999,13 @@ public:
{ {
auto attr = sch.find("maxProperties"); auto attr = sch.find("maxProperties");
if (attr != sch.end()) { if (attr != sch.end()) {
maxProperties_ = {true, attr.value()}; maxProperties_ = {true, attr.value().get<size_t>()};
sch.erase(attr); sch.erase(attr);
} }
attr = sch.find("minProperties"); attr = sch.find("minProperties");
if (attr != sch.end()) { if (attr != sch.end()) {
minProperties_ = {true, attr.value()}; minProperties_ = {true, attr.value().get<size_t>()};
sch.erase(attr); sch.erase(attr);
} }
@ -1143,19 +1143,19 @@ public:
{ {
auto attr = sch.find("maxItems"); auto attr = sch.find("maxItems");
if (attr != sch.end()) { if (attr != sch.end()) {
maxItems_ = {true, attr.value()}; maxItems_ = {true, attr.value().get<size_t>()};
sch.erase(attr); sch.erase(attr);
} }
attr = sch.find("minItems"); attr = sch.find("minItems");
if (attr != sch.end()) { if (attr != sch.end()) {
minItems_ = {true, attr.value()}; minItems_ = {true, attr.value().get<size_t>()};
sch.erase(attr); sch.erase(attr);
} }
attr = sch.find("uniqueItems"); attr = sch.find("uniqueItems");
if (attr != sch.end()) { if (attr != sch.end()) {
uniqueItems_ = attr.value(); uniqueItems_ = attr.value().get<bool>();
sch.erase(attr); sch.erase(attr);
} }
@ -1255,7 +1255,7 @@ std::shared_ptr<schema> schema::make(json &schema,
if (std::find(uris.begin(), if (std::find(uris.begin(),
uris.end(), uris.end(),
attr.value().get<std::string>()) == uris.end()) attr.value().get<std::string>()) == uris.end())
uris.push_back(uris.back().derive(attr.value())); // so add it to the list if it is not there already uris.push_back(uris.back().derive(attr.value().get<std::string>())); // so add it to the list if it is not there already
schema.erase(attr); schema.erase(attr);
} }
@ -1270,7 +1270,7 @@ std::shared_ptr<schema> schema::make(json &schema,
if (attr != schema.end()) { // this schema is a reference if (attr != schema.end()) { // this schema is a reference
// the last one on the uri-stack is the last id seen before coming here, // the last one on the uri-stack is the last id seen before coming here,
// so this is the origial URI for this reference, the $ref-value has thus be resolved from it // so this is the origial URI for this reference, the $ref-value has thus be resolved from it
auto id = uris.back().derive(attr.value()); auto id = uris.back().derive(attr.value().get<std::string>());
sch = root->get_or_create_ref(id); sch = root->get_or_create_ref(id);
schema.erase(attr); schema.erase(attr);
} else { } else {