Fix ConditionalSchema

Use ValidatingVisitor#getFailureOfSchema(Schema, Object) method instead of try-catch
Treat schema as valid if "if" schema is invalid but there is no "else" schema

Author: zgyorffi

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

@@ -32,27 +32,32 @@ void visit(Schema schema) {
         this.failureReporter = failureReporter;
     }
 
-    @Override void visitNumberSchema(NumberSchema numberSchema) {
+    @Override
+    void visitNumberSchema(NumberSchema numberSchema) {
         numberSchema.accept(new NumberSchemaValidatingVisitor(subject, this));
     }
 
-    @Override void visitArraySchema(ArraySchema arraySchema) {
+    @Override
+    void visitArraySchema(ArraySchema arraySchema) {
         arraySchema.accept(new ArraySchemaValidatingVisitor(subject, this));
     }
 
-    @Override void visitBooleanSchema(BooleanSchema schema) {
+    @Override
+    void visitBooleanSchema(BooleanSchema schema) {
         if (!(subject instanceof Boolean)) {
             failureReporter.failure(Boolean.class, subject);
         }
     }
 
-    @Override void visitNullSchema(NullSchema nullSchema) {
+    @Override
+    void visitNullSchema(NullSchema nullSchema) {
         if (!(subject == null || subject == JSONObject.NULL)) {
             failureReporter.failure("expected: null, found: " + subject.getClass().getSimpleName(), "type");
         }
     }
 
-    @Override void visitConstSchema(ConstSchema constSchema) {
+    @Override
+    void visitConstSchema(ConstSchema constSchema) {
         if (isNull(subject) && isNull(constSchema.getPermittedValue())) {
             return;
         }
@@ -62,7 +67,8 @@ void visit(Schema schema) {
         }
     }
 
-    @Override void visitEnumSchema(EnumSchema enumSchema) {
+    @Override
+    void visitEnumSchema(EnumSchema enumSchema) {
         Object effectiveSubject = toJavaValue(subject);
         for (Object possibleValue : enumSchema.getPossibleValues()) {
             if (ObjectComparator.deepEquals(possibleValue, effectiveSubject)) {
@@ -72,19 +78,22 @@ void visit(Schema schema) {
         failureReporter.failure(format("%s is not a valid enum value", subject), "enum");
     }
 
-    @Override void visitFalseSchema(FalseSchema falseSchema) {
+    @Override
+    void visitFalseSchema(FalseSchema falseSchema) {
         failureReporter.failure("false schema always fails", "false");
     }
 
-    @Override void visitNotSchema(NotSchema notSchema) {
+    @Override
+    void visitNotSchema(NotSchema notSchema) {
         Schema mustNotMatch = notSchema.getMustNotMatch();
         ValidationException failure = getFailureOfSchema(mustNotMatch, subject);
         if (failure == null) {
             failureReporter.failure("subject must not be valid against schema " + mustNotMatch, "not");
         }
     }
 
-    @Override void visitReferenceSchema(ReferenceSchema referenceSchema) {
+    @Override
+    void visitReferenceSchema(ReferenceSchema referenceSchema) {
         Schema referredSchema = referenceSchema.getReferredSchema();
         if (referredSchema == null) {
             throw new IllegalStateException("referredSchema must be injected before validation");
@@ -95,15 +104,18 @@ void visit(Schema schema) {
         }
     }
 
-    @Override void visitObjectSchema(ObjectSchema objectSchema) {
+    @Override
+    void visitObjectSchema(ObjectSchema objectSchema) {
         objectSchema.accept(new ObjectSchemaValidatingVisitor(subject, this));
     }
 
-    @Override void visitStringSchema(StringSchema stringSchema) {
+    @Override
+    void visitStringSchema(StringSchema stringSchema) {
         stringSchema.accept(new StringSchemaValidatingVisitor(subject, this));
     }
 
-    @Override void visitCombinedSchema(CombinedSchema combinedSchema) {
+    @Override
+    void visitCombinedSchema(CombinedSchema combinedSchema) {
         List<ValidationException> failures = new ArrayList<>();
         Collection<Schema> subschemas = combinedSchema.getSubschemas();
         CombinedSchema.ValidationCriterion criterion = combinedSchema.getCriterion();
@@ -132,11 +144,9 @@ void visitConditionalSchema(ConditionalSchema conditionalSchema) {
                 (!conditionalSchema.getThenSchema().isPresent() && !conditionalSchema.getElseSchema().isPresent())) {
             return;
         }
-        try {
-            conditionalSchema.getIfSchema().get().validate(subject);
-        } catch (ValidationException ifSchemaValidationException) {
-            Schema elseSchema = conditionalSchema.getElseSchema().orElseThrow(() -> ifSchemaValidationException);
-            elseSchema.validate(subject);
+        ValidationException exception = getFailureOfSchema(conditionalSchema.getIfSchema().get(), subject);
+        if (exception != null) {
+            conditionalSchema.getElseSchema().ifPresent(elseSchema -> elseSchema.validate(subject));
             return;
         }
         conditionalSchema.getThenSchema().ifPresent(schema -> schema.validate(subject));

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

@@ -51,7 +51,7 @@ public void ifSubschemaSuccessThenSubschemaFailure() {
         ConditionalSchema.builder().ifSchema(MAX_LENGTH_STRING_SCHEMA).thenSchema(PATTERN_STRING_SCHEMA).build().validate("bar");
     }
 
-    @Test(expected = ValidationException.class)
+    @Test
     public void ifSubschemaFailureThenSubschemaFailure() {
         ConditionalSchema.builder().ifSchema(PATTERN_STRING_SCHEMA).thenSchema(MAX_LENGTH_STRING_SCHEMA).build().validate("barbar");
     }
@@ -61,7 +61,7 @@ public void ifSubschemaSuccessThenSubschemaSuccess() {
         ConditionalSchema.builder().ifSchema(PATTERN_STRING_SCHEMA).thenSchema(MAX_LENGTH_STRING_SCHEMA).build().validate("foo");
     }
 
-    @Test(expected = ValidationException.class)
+    @Test
     public void ifSubschemaFailureThenSubschemaSuccess() {
         ConditionalSchema.builder().ifSchema(PATTERN_STRING_SCHEMA).thenSchema(MAX_LENGTH_STRING_SCHEMA).build().validate("bar");
     }