adding support for violated keyword reporting in ValidationExceptions thrown by CombinedSchemas

Author: erosb

core/src/main/java/org/everit/json/schema/CombinedSchema.java

@@ -82,8 +82,8 @@ public interface ValidationCriterion {
    */
   public static final ValidationCriterion ALL_CRITERION = (subschemaCount, matchingCount) -> {
     if (matchingCount < subschemaCount) {
-      throw new ValidationException(String.format("only %d subschema matches out of %d",
-          matchingCount, subschemaCount));
+      throw new ValidationException(null, String.format("only %d subschema matches out of %d",
+          matchingCount, subschemaCount), "allOf");
     }
   };
 
@@ -92,9 +92,9 @@ public interface ValidationCriterion {
    */
   public static final ValidationCriterion ANY_CRITERION = (subschemaCount, matchingCount) -> {
     if (matchingCount == 0) {
-      throw new ValidationException(String.format(
+      throw new ValidationException(null, String.format(
           "no subschema matched out of the total %d subschemas",
-          subschemaCount));
+          subschemaCount), "anyOf");
     }
   };
 
@@ -103,8 +103,8 @@ public interface ValidationCriterion {
    */
   public static final ValidationCriterion ONE_CRITERION = (subschemaCount, matchingCount) -> {
     if (matchingCount != 1) {
-      throw new ValidationException(String.format("%d subschemas matched instead of one",
-          matchingCount));
+      throw new ValidationException(null, String.format("%d subschemas matched instead of one",
+          matchingCount), "oneOf");
     }
   };
 
@@ -171,7 +171,11 @@ public void validate(final Object subject) {
     try {
       criterion.validate(subschemas.size(), matchingCount);
     } catch (ValidationException e) {
-      throw new ValidationException(this, e.getMessage(), failures);
+      throw new ValidationException(this,
+          new StringBuilder(e.getPointerToViolation()),
+          e.getMessage(),
+          failures,
+          e.getKeyword());
     }
   }
 }

core/src/test/java/org/everit/json/schema/CombinedSchemaTest.java

@@ -25,8 +25,7 @@ public class CombinedSchemaTest {
 
   private static final List<Schema> SUBSCHEMAS = Arrays.asList(
       NumberSchema.builder().multipleOf(10).build(),
-      NumberSchema.builder().multipleOf(3).build()
-      );
+      NumberSchema.builder().multipleOf(3).build());
 
   @Test(expected = ValidationException.class)
   public void allCriterionFailure() {
@@ -75,17 +74,26 @@ public void oneCriterionSuccess() {
 
   @Test
   public void validateAll() {
-    TestSupport.expectFailure(CombinedSchema.allOf(SUBSCHEMAS).build(), 20);
+    TestSupport.failureOf(CombinedSchema.allOf(SUBSCHEMAS).build())
+        .input(20)
+        .expectedKeyword("allOf")
+        .expect();
   }
 
   @Test
   public void validateAny() {
-    TestSupport.expectFailure(CombinedSchema.anyOf(SUBSCHEMAS).build(), 5);
+    TestSupport.failureOf(CombinedSchema.anyOf(SUBSCHEMAS).build())
+        .input(5)
+        .expectedKeyword("anyOf")
+        .expect();
   }
 
   @Test
   public void validateOne() {
-    TestSupport.expectFailure(CombinedSchema.oneOf(SUBSCHEMAS).build(), 30);
+    TestSupport.failureOf(CombinedSchema.oneOf(SUBSCHEMAS).build())
+        .input(30)
+        .expectedKeyword("oneOf")
+        .expect();
   }
 
   @Test