Validate Listener with FailEarly mode too

Author: Albert Franzi

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

@@ -42,38 +42,38 @@ void visitIfSchema(Schema ifSchema) {
     void visitThenSchema(Schema thenSchema) {
         if (ifSchemaException == null) {
             ValidationException thenSchemaException = owner.getFailureOfSchema(thenSchema, subject);
-            ValidationException failure = null;
             if (thenSchemaException != null) {
-                failure = new ValidationException(conditionalSchema,
+                ValidationException failure = new ValidationException(conditionalSchema,
                         new StringBuilder(new StringBuilder("#")),
                         "input is invalid against the \"then\" schema",
                         Arrays.asList(thenSchemaException),
                         "then",
                         conditionalSchema.getSchemaLocation());
+
+                owner.reportSchemaMatchEvent(thenSchema, failure);
                 owner.failure(failure);
+            } else {
+                owner.reportSchemaMatchEvent(thenSchema, null);
             }
-            owner.reportSchemaMatchEvent(thenSchema, failure);
-        } else {
-            owner.reportSchemaMatchEvent(thenSchema, ifSchemaException);
         }
     }
 
     @Override
     void visitElseSchema(Schema elseSchema) {
         if (ifSchemaException != null) {
             ValidationException elseSchemaException = owner.getFailureOfSchema(elseSchema, subject);
-            ValidationException failure = null;
             if (elseSchemaException != null) {
-                failure = new ValidationException(conditionalSchema,
+                ValidationException failure = new ValidationException(conditionalSchema,
                         new StringBuilder(new StringBuilder("#")),
                         "input is invalid against both the \"if\" and \"else\" schema",
                         Arrays.asList(ifSchemaException, elseSchemaException),
                         "else",
                         conditionalSchema.getSchemaLocation());
-                owner.failure(failure);
 
+                owner.reportSchemaMatchEvent(elseSchema, failure);
+                owner.failure(failure);
             }
-            owner.reportSchemaMatchEvent(elseSchema, failure);
+            owner.reportSchemaMatchEvent(elseSchema, null);
         }
     }
 

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

@@ -1,7 +1,7 @@
 package org.everit.json.schema;
 
 
-import org.everit.json.schema.listener.SubschemaReferencedEvent;
+import org.everit.json.schema.listener.SchemaReferencedEvent;
 import org.everit.json.schema.listener.SubschemaMatchEvent;
 import org.everit.json.schema.listener.SubschemaMismatchEvent;
 
@@ -14,7 +14,7 @@ public interface SchemaVisitorListener {
 
     void subschemaMismatch(SubschemaMismatchEvent mismatchEvent);
 
-    void subschemaReferenced(SubschemaReferencedEvent referencedEvent);
+    void schemaReferenced(SchemaReferencedEvent referencedEvent);
 
 }
 

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

@@ -12,7 +12,7 @@
 
 import org.everit.json.schema.listener.SubschemaMatchEvent;
 import org.everit.json.schema.listener.SubschemaMismatchEvent;
-import org.everit.json.schema.listener.SubschemaReferencedEvent;
+import org.everit.json.schema.listener.SchemaReferencedEvent;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -186,7 +186,7 @@ void reportSchemaMatchEvent(Schema schema, ValidationException rval) {
 
     void reportSchemaReferencedEvent(Schema schema, ValidationException rval) {
         if (schemaVisitorListener != null) {
-            schemaVisitorListener.subschemaReferenced(new SubschemaReferencedEvent(schema, rval));
+            schemaVisitorListener.schemaReferenced(new SchemaReferencedEvent(schema, rval));
         }
     }
 

core/src/main/java/org/everit/json/schema/listener/SubschemaReferencedEvent.java renamed to core/src/main/java/org/everit/json/schema/listener/SchemaReferencedEvent.java

@@ -3,9 +3,9 @@
 import org.everit.json.schema.Schema;
 import org.everit.json.schema.ValidationException;
 
-public class SubschemaReferencedEvent extends AbstractSchemaEvent {
+public class SchemaReferencedEvent extends AbstractSchemaEvent {
 
-    public SubschemaReferencedEvent(Schema schema, ValidationException rval) {
+    public SchemaReferencedEvent(Schema schema, ValidationException rval) {
         super(schema, rval);
     }
 

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

@@ -3,7 +3,7 @@
 import org.everit.json.schema.listener.AbstractSchemaEvent;
 import org.everit.json.schema.listener.SubschemaMatchEvent;
 import org.everit.json.schema.listener.SubschemaMismatchEvent;
-import org.everit.json.schema.listener.SubschemaReferencedEvent;
+import org.everit.json.schema.listener.SchemaReferencedEvent;
 import org.json.JSONObject;
 import org.junit.Before;
 import org.junit.Test;
@@ -20,7 +20,7 @@ public class DummySchemaVisitorListener implements SchemaVisitorListener {
 
         private List<SubschemaMatchEvent> validSchemas = new ArrayList<>();
         private List<SubschemaMismatchEvent> invalidSchemas = new ArrayList<>();
-        private List<SubschemaReferencedEvent> referencedSchemas = new ArrayList<>();
+        private List<SchemaReferencedEvent> referencedSchemas = new ArrayList<>();
 
         @Override
         public void subschemaMatch(SubschemaMatchEvent matchEvent) {
@@ -33,7 +33,7 @@ public void subschemaMismatch(SubschemaMismatchEvent mismatchEvent) {
         }
 
         @Override
-        public void subschemaReferenced(SubschemaReferencedEvent referencedEvent) {
+        public void schemaReferenced(SchemaReferencedEvent referencedEvent) {
             referencedSchemas.add(referencedEvent);
         }
 
@@ -76,12 +76,17 @@ public String toString() {
             .withListener(schemaVisitorListener)
             .build();
 
+    private Validator validatorEarlyFailure = Validator.builder()
+            .failEarly()
+            .withListener(schemaVisitorListener)
+            .build();
+
     @Before
     public void cleanListener() {
         schemaVisitorListener.clear();
     }
 
-    private void testCase(String schemaPath, String eventPath, String expectedPath) {
+    private void testCase(Validator validator, String schemaPath, String eventPath, String expectedPath) {
         JSONObject schemaContent = resource.getJSONObject(schemaPath);
         Schema schema = TestSupport.loadAsV7(schemaContent);
 
@@ -98,6 +103,10 @@ private void testCase(String schemaPath, String eventPath, String expectedPath)
         schemaVisitorListener.clear();
     }
 
+    private void testCase(String schemaPath, String eventPath, String expectedPath) {
+        testCase(validator, schemaPath, eventPath, expectedPath);
+    }
+
     @Test
     public void refSchema() {
         testCase("refSchema1", "refExample1", "refExpected1");
@@ -120,4 +129,15 @@ public void ifThenElseSchema() {
         testCase("ifThenElseSchema", "ifThenElseExample4.3", "ifThenElseExpected4.3");
     }
 
+    @Test
+    public void testWithFailEarlyMode() {
+        testCase(validatorEarlyFailure, "refSchema1", "refExample1", "refExpected1");
+        testCase(validatorEarlyFailure, "combinedSchema2", "combinedExample2", "combinedExpected2FailEarly");
+        testCase(validatorEarlyFailure, "refSchema3", "refExample3", "refExpected3");
+
+        testCase(validatorEarlyFailure, "ifThenElseSchema", "ifThenElseExample4.1", "ifThenElseExpected4.1");
+        testCase(validatorEarlyFailure, "ifThenElseSchema", "ifThenElseExample4.2", "ifThenElseExpected4.2FailEarly");
+        testCase(validatorEarlyFailure, "ifThenElseSchema", "ifThenElseExample4.3", "ifThenElseExpected4.3");
+    }
+
 }

core/src/test/resources/org/everit/jsonvalidator/complex-combined-test-schemas.json

@@ -171,6 +171,35 @@
       }
     ]
   },
+  "combinedExpected2FailEarly": {
+    "valid": [
+      {
+        "schema": {
+          "$ref": "#/definitions/user"
+        },
+        "failures": "null",
+        "location": "null"
+      }
+    ],
+    "referenced": [
+      {
+        "schema": {
+          "$ref": "#/definitions/user"
+        },
+        "failures": "null",
+        "location": "null"
+      }
+    ],
+    "invalid": [
+      {
+        "schema": {
+          "$ref": "#/definitions/address"
+        },
+        "failures": "[#: required key [street_address] not found]",
+        "location": "null"
+      }
+    ]
+  },
   "refSchema3": {
     "definitions": {
       "address": {
@@ -313,15 +342,33 @@
         },
         "failures": "[#/power: 1000 is not greater or equal to 9000]",
         "location": "#/if"
-      },
+      }
+    ]
+  },
+  "ifThenElseExpected4.2FailEarly": {
+    "valid": [
       {
         "schema": {
           "required": [
-            "disbelief"
+            "confidence"
           ]
         },
+        "failures": "null",
+        "location": "#/else"
+      }
+    ],
+    "referenced": [],
+    "invalid": [
+      {
+        "schema": {
+          "properties": {
+            "power": {
+              "minimum": 9000
+            }
+          }
+        },
         "failures": "[#/power: 1000 is not greater or equal to 9000]",
-        "location": "#/then"
+        "location": "#/if"
       }
     ]
   },