generic-library/valijson
1
0
Fork 0
mirror of https://github.com/tristanpenman/valijson.git synced 2024-12-12 10:13:51 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #103 from wwriter/cond_schema_errormessage

Browse Source 
Generate a detailed error message when if-then-else constraints are not met
This commit is contained in:
Tristan Penman 2020-11-08 11:36:08 +11:00 committed by GitHub
commit 3dd4482af2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/valijson/validation_visitor.hpp
View File

@ -178,17 +178,35 @@ public:
*/
bool visit(const ConditionalConstraint &constraint) override
{
ValidationResults newResults;
ValidationResults* conditionalResults = (m_results) ? &newResults : nullptr;
// Create a validator to evaluate the conditional
ValidationVisitor ifValidator(m_target, m_context, m_strictTypes, nullptr, m_regexesCache);
ValidationVisitor thenElseValidator(m_target, m_context, m_strictTypes, nullptr, m_regexesCache);
ValidationVisitor thenElseValidator(m_target, m_context, m_strictTypes, conditionalResults, m_regexesCache);
bool validated = false;
if (ifValidator.validateSchema(*constraint.getIfSubschema())) {
const Subschema *thenSubschema = constraint.getThenSubschema();
return thenSubschema == nullptr || thenElseValidator.validateSchema(*thenSubschema);
validated = thenSubschema == nullptr || thenElseValidator.validateSchema(*thenSubschema);
}
else
{
const Subschema *elseSubschema = constraint.getElseSubschema();
validated = elseSubschema == nullptr || thenElseValidator.validateSchema(*elseSubschema);
}
const Subschema *elseSubschema = constraint.getElseSubschema();
return elseSubschema == nullptr || thenElseValidator.validateSchema(*elseSubschema);
if (!validated && m_results)
{
ValidationResults::Error conditionalError;
while (conditionalResults->popError(conditionalError))
{
m_results->pushError(conditionalError.context, conditionalError.description);
}
m_results->pushError(m_context, "Failed to validate against a conditional schema set by if-then-else constraints.");
}
return validated;
}
/**