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

Make sure that errors from failed 'oneOf' or 'anyOf' constraint checks do not appear in error list

Browse Source
This commit is contained in:
Stefan Agner 2017-08-04 20:53:33 -07:00
parent 7ed8919fee
commit cf50f63665
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/valijson/validation_visitor.hpp
View File

@ -139,10 +139,20 @@ public:
{
unsigned int numValidated = 0;
ValidationResults newResults;
ValidationResults *childResults = (results) ? &newResults : NULL;
ValidationVisitor<AdapterType> v(target, context, strictTypes, childResults);
constraint.applyToSubschemas(ValidateSubschemas(target, context, false,
true, *this, results, &numValidated, NULL));
true, v, childResults, &numValidated, NULL));
if (numValidated == 0 && results) {
ValidationResults::Error childError;
while (childResults->popError(childError)) {
results->pushError(
childError.context,
childError.description);
}
results->pushError(context, "Failed to validate against any child "
"schemas allowed by anyOf constraint.");
}
@ -736,8 +746,9 @@ public:
ValidationResults newResults;
ValidationResults *childResults = (results) ? &newResults : NULL;
ValidationVisitor<AdapterType> v(target, context, strictTypes, childResults);
constraint.applyToSubschemas(ValidateSubschemas(target, context,
true, true, *this, childResults, &numValidated, NULL));
true, true, v, childResults, &numValidated, NULL));
if (numValidated == 0) {
if (results) {