Merge pull request #112 from c14s/master

ddobrin · web-flow · commit fba1e9bf9e5d · 2019-01-08T16:32:09.000-05:00
AnyOfValidator: only return expectedTypeList if not empty
diff --git a/src/main/java/com/networknt/schema/AnyOfValidator.java b/src/main/java/com/networknt/schema/AnyOfValidator.java
@@ -63,7 +63,7 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
             }
             allErrors.addAll(errors);
         }
-        if (!schemas.isEmpty()) {
+        if (!expectedTypeList.isEmpty()) {
             return Collections.singleton(buildValidationMessage(at, StringUtils.join(expectedTypeList)));
         }
         return Collections.unmodifiableSet(allErrors);

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String`
`63`	`63`	`}`
`64`	`64`	`allErrors.addAll(errors);`
`65`	`65`	`}`
`66`		`- if (!schemas.isEmpty()) {`
	`66`	`+ if (!expectedTypeList.isEmpty()) {`
`67`	`67`	`return Collections.singleton(buildValidationMessage(at, StringUtils.join(expectedTypeList)));`
`68`	`68`	`}`
`69`	`69`	`return Collections.unmodifiableSet(allErrors);`