migrated CombinedSchema to new ViolationException constructor

Author: erosb

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

@@ -33,6 +33,11 @@ public static class Builder extends Schema.Builder<CombinedSchema> {
 
     private Collection<Schema> subschemas = new ArrayList<>();
 
+    @Override
+    public CombinedSchema build() {
+      return new CombinedSchema(this);
+    }
+
     public Builder criterion(final ValidationCriterion criterion) {
       this.criterion = criterion;
       return this;
@@ -48,19 +53,6 @@ public Builder subschemas(final Collection<Schema> subschemas) {
       return this;
     }
 
-    @Override
-    public CombinedSchema build() {
-      return new CombinedSchema(this);
-    }
-
-  }
-
-  public static Builder builder() {
-    return new Builder();
-  }
-
-  public static Builder builder(final Collection<Schema> subschemas) {
-    return new Builder().subschemas(subschemas);
   }
 
   /**
@@ -122,6 +114,14 @@ public static Builder anyOf(final Collection<Schema> schemas) {
     return builder(schemas).criterion(ANY_CRITERION);
   }
 
+  public static Builder builder() {
+    return new Builder();
+  }
+
+  public static Builder builder(final Collection<Schema> subschemas) {
+    return new Builder().subschemas(subschemas);
+  }
+
   public static Builder oneOf(final Collection<Schema> schemas) {
     return builder(schemas).criterion(ONE_CRITERION);
   }
@@ -164,7 +164,11 @@ public void validate(final Object subject) {
     int matchingCount = (int) subschemas.stream()
         .filter(schema -> succeeds(schema, subject))
         .count();
-    criterion.validate(subschemas.size(), matchingCount);
+    try {
+      criterion.validate(subschemas.size(), matchingCount);
+    } catch (ValidationException e) {
+      throw new ValidationException(this, e.getMessage());
+    }
   }
 
 }

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

@@ -18,21 +18,18 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.everit.json.schema.BooleanSchema;
-import org.everit.json.schema.CombinedSchema;
-import org.everit.json.schema.NumberSchema;
-import org.everit.json.schema.Schema;
-import org.everit.json.schema.StringSchema;
-import org.everit.json.schema.ValidationException;
 import org.junit.Test;
 
 public class CombinedSchemaTest {
 
-  @Test
-  public void factories() {
-    CombinedSchema.allOf(Arrays.asList(BooleanSchema.INSTANCE));
-    CombinedSchema.anyOf(Arrays.asList(BooleanSchema.INSTANCE));
-    CombinedSchema.oneOf(Arrays.asList(BooleanSchema.INSTANCE));
+  private static final List<Schema> SUBSCHEMAS = Arrays.asList(
+      NumberSchema.builder().multipleOf(10).build(),
+      NumberSchema.builder().multipleOf(3).build()
+      );
+
+  @Test(expected = ValidationException.class)
+  public void allCriterionFailure() {
+    CombinedSchema.ALL_CRITERION.validate(10, 1);
   }
 
   @Test
@@ -41,8 +38,8 @@ public void allCriterionSuccess() {
   }
 
   @Test(expected = ValidationException.class)
-  public void allCriterionFailure() {
-    CombinedSchema.ALL_CRITERION.validate(10, 1);
+  public void anyCriterionFailure() {
+    CombinedSchema.ANY_CRITERION.validate(10, 0);
   }
 
   @Test
@@ -51,49 +48,43 @@ public void anyCriterionSuccess() {
   }
 
   @Test(expected = ValidationException.class)
-  public void anyCriterionFailure() {
-    CombinedSchema.ANY_CRITERION.validate(10, 0);
+  public void anyOfInvalid() {
+    CombinedSchema.anyOf(Arrays.asList(
+        StringSchema.builder().maxLength(2).build(),
+        StringSchema.builder().minLength(4).build()))
+        .build().validate("foo");
   }
 
   @Test
-  public void oneCriterionSuccess() {
-    CombinedSchema.ONE_CRITERION.validate(10, 1);
+  public void factories() {
+    CombinedSchema.allOf(Arrays.asList(BooleanSchema.INSTANCE));
+    CombinedSchema.anyOf(Arrays.asList(BooleanSchema.INSTANCE));
+    CombinedSchema.oneOf(Arrays.asList(BooleanSchema.INSTANCE));
   }
 
   @Test(expected = ValidationException.class)
   public void oneCriterionFailure() {
     CombinedSchema.ONE_CRITERION.validate(10, 2);
   }
 
-  private static final List<Schema> SUBSCHEMAS = Arrays.asList(
-      NumberSchema.builder().multipleOf(10).build(),
-      NumberSchema.builder().multipleOf(3).build()
-      );
+  @Test
+  public void oneCriterionSuccess() {
+    CombinedSchema.ONE_CRITERION.validate(10, 1);
+  }
 
-  @Test(expected = ValidationException.class)
+  @Test
   public void validateAll() {
-    CombinedSchema.allOf(SUBSCHEMAS).build()
-    .validate(20);
+    TestSupport.exceptFailure(CombinedSchema.allOf(SUBSCHEMAS).build(), 20);
   }
 
-  @Test(expected = ValidationException.class)
+  @Test
   public void validateAny() {
-    CombinedSchema.anyOf(SUBSCHEMAS).build()
-    .validate(5);
+    TestSupport.exceptFailure(CombinedSchema.anyOf(SUBSCHEMAS).build(), 5);
   }
 
-  @Test(expected = ValidationException.class)
+  @Test
   public void validateOne() {
-    CombinedSchema.oneOf(SUBSCHEMAS).build()
-    .validate(30);
-  }
-
-  @Test(expected = ValidationException.class)
-  public void anyOfInvalid() {
-    CombinedSchema.anyOf(Arrays.asList(
-        StringSchema.builder().maxLength(2).build(),
-        StringSchema.builder().minLength(4).build()))
-        .build().validate("foo");
+    TestSupport.exceptFailure(CombinedSchema.oneOf(SUBSCHEMAS).build(), 30);
   }
 
 }