removed ValidationException#multipleFailures() and replaced with ValidationException#throwFor(), tests added, ObjectSchema modified accordingly

Author: erosb

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

@@ -390,11 +390,7 @@ public void validate(final Object subject) {
       failures.addAll(testPropertyDependencies(objSubject));
       failures.addAll(testSchemaDependencies(objSubject));
       failures.addAll(testPatternProperties(objSubject));
-      if (failures.size() == 1) {
-        throw failures.get(0);
-      } else if (failures.size() > 1) {
-        throw ValidationException.multipleFailures(this, failures);
-      }
+      ValidationException.throwFor(this, failures);
     }
   }
 

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

@@ -26,9 +26,16 @@
 public class ValidationException extends RuntimeException {
   private static final long serialVersionUID = 6192047123024651924L;
 
-  public static final ValidationException multipleFailures(final Schema rootFailingSchema,
-      final List<ValidationException> causingExceptions) {
-    return new ValidationException(rootFailingSchema, new ArrayList<>(causingExceptions));
+  public static void throwFor(final Schema rootFailingSchema,
+      final List<ValidationException> failures) {
+    int failureCount = failures.size();
+    if (failureCount == 0) {
+      return;
+    } else if (failureCount == 1) {
+      throw failures.get(0);
+    } else {
+      throw new ValidationException(rootFailingSchema, new ArrayList<>(failures));
+    }
   }
 
   private final StringBuilder pointerToViolation;

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

@@ -15,11 +15,17 @@
  */
 package org.everit.json.schema;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 import org.junit.Assert;
 import org.junit.Test;
 
 public class ValidationExceptionTest {
 
+  private final Schema rootSchema = ObjectSchema.builder().build();
+
   @Test
   public void constructorNullSchema() {
     new ValidationException(null, Boolean.class, 2);
@@ -53,4 +59,37 @@ public void testConstructor() {
     Assert.assertEquals("#", exc.getPointerToViolation());
   }
 
+  @Test
+  public void throwForMultipleFailures() {
+    ValidationException input1 = new ValidationException(NullSchema.INSTANCE, "msg1");
+    ValidationException input2 = new ValidationException(BooleanSchema.INSTANCE, "msg2");
+    try {
+      ValidationException.throwFor(rootSchema, Arrays.asList(input1, input2));
+      Assert.fail("did not throw exception for 2 input exceptions");
+    } catch (ValidationException e) {
+      Assert.assertSame(rootSchema, e.getViolatedSchema());
+      Assert.assertEquals("2 schema violations found", e.getMessage());
+      List<ValidationException> causes = e.getCausingExceptions();
+      Assert.assertEquals(2, causes.size());
+      Assert.assertSame(input1, causes.get(0));
+      Assert.assertSame(input2, causes.get(1));
+    }
+  }
+
+  @Test
+  public void throwForNoFailure() {
+    ValidationException.throwFor(rootSchema, Collections.emptyList());
+  }
+
+  @Test
+  public void throwForSingleFailure() {
+    ValidationException input = new ValidationException(NullSchema.INSTANCE, "msg");
+    try {
+      ValidationException.throwFor(rootSchema, Arrays.asList(input));
+      Assert.fail("did not throw exception for single failure");
+    } catch (ValidationException actual) {
+      Assert.assertSame(input, actual);
+    }
+  }
+
 }