Skip to content

#354-fixed OneOf validation error if number of valid schemas is not equal to 1 #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stevehu merged 1 commit into from
Dec 8, 2020
Merged

#354-fixed OneOf validation error if number of valid schemas is not equal to 1 #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 2 additions & 21 deletions src/main/java/com/networknt/schema/OneOfValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,31 +162,12 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
continue;

numberOfValidSchema++;
errors = new LinkedHashSet<ValidationMessage>();
} else {
errors.addAll(schemaErrors);
}
}

// no valid schema has been found after validating all schema validators
if (numberOfValidSchema == 0) {
for (Iterator<ValidationMessage> it = errors.iterator(); it.hasNext(); ) {
ValidationMessage msg = it.next();

if (ValidatorTypeCode.ADDITIONAL_PROPERTIES.getValue().equals(msg.getType())) {
it.remove();
}
}
if (errors.isEmpty()) {
// ensure there is always an error reported if number of valid schemas is 0
errors.add(buildValidationMessage(at, ""));
}
} else {
errors.clear();
}

// validated upfront
if (numberOfValidSchema > 1) {
// ensure there is always an "OneOf" error reported if number of valid schemas is not equal to 1.
if (numberOfValidSchema != 1) {
errors = Collections.singleton(buildValidationMessage(at, ""));
}

Expand Down
5 changes: 5 additions & 0 deletions src/test/resources/draft6/oneOf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,11 @@
"bar": "quux"
},
"valid": false
},
{
"description": "neither oneOf given (complex)",
"data": {},
"valid": false
}
]
},
Expand Down