adding further event types and ValidationListener methods

Author: erosb

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

@@ -10,9 +10,9 @@
 import java.util.Collection;
 import java.util.List;
 
+import org.everit.json.schema.listener.SchemaReferencedEvent;
 import org.everit.json.schema.listener.SubschemaMatchEvent;
 import org.everit.json.schema.listener.SubschemaMismatchEvent;
-import org.everit.json.schema.listener.SchemaReferencedEvent;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -36,7 +36,7 @@ private static boolean isNull(Object obj) {
 
     protected Object subject;
 
-    private final SchemaVisitorListener schemaVisitorListener;
+    private final ValidationListener validationListener;
 
     private ValidationFailureReporter failureReporter;
 
@@ -51,14 +51,15 @@ void visit(Schema schema) {
         super.visit(schema);
     }
 
-    ValidatingVisitor(Object subject, ValidationFailureReporter failureReporter, ReadWriteValidator readWriteValidator, SchemaVisitorListener schemaVisitorListener) {
+    ValidatingVisitor(Object subject, ValidationFailureReporter failureReporter, ReadWriteValidator readWriteValidator,
+            ValidationListener validationListener) {
         if (subject != null && !VALIDATED_TYPES.stream().anyMatch(type -> type.isAssignableFrom(subject.getClass()))) {
             throw new IllegalArgumentException(format(TYPE_FAILURE_MSG, subject.getClass().getSimpleName()));
         }
         this.subject = subject;
         this.failureReporter = failureReporter;
         this.readWriteValidator = readWriteValidator;
-        this.schemaVisitorListener = schemaVisitorListener;
+        this.validationListener = validationListener;
     }
 
     @Override
@@ -131,7 +132,9 @@ void visitReferenceSchema(ReferenceSchema referenceSchema) {
         if (failure != null) {
             failureReporter.failure(failure);
         }
-        reportSchemaReferencedEvent(referenceSchema, failure);
+        if (validationListener != null) {
+            validationListener.schemaReferenced(new SchemaReferencedEvent(referenceSchema, subject, referredSchema));
+        }
     }
 
     @Override
@@ -175,21 +178,15 @@ void visitConditionalSchema(ConditionalSchema conditionalSchema) {
     }
 
     void reportSchemaMatchEvent(Schema schema, ValidationException rval) {
-        if (schemaVisitorListener != null) {
+        if (validationListener != null) {
             if (rval == null) {
-                schemaVisitorListener.subschemaMatch(new SubschemaMatchEvent(schema));
+                validationListener.subschemaMatch(new SubschemaMatchEvent(schema));
             } else {
-                schemaVisitorListener.subschemaMismatch(new SubschemaMismatchEvent(schema, rval));
+                validationListener.subschemaMismatch(new SubschemaMismatchEvent(schema, rval));
             }
         }
     }
 
-    void reportSchemaReferencedEvent(Schema schema, ValidationException rval) {
-        if (schemaVisitorListener != null) {
-            schemaVisitorListener.schemaReferenced(new SchemaReferencedEvent(schema, rval));
-        }
-    }
-
     ValidationException getFailureOfSchema(Schema schema, Object input) {
         Object origSubject = this.subject;
         this.subject = input;

core/src/main/java/org/everit/json/schema/SchemaVisitorListener.java renamed to core/src/main/java/org/everit/json/schema/ValidationListener.java

@@ -1,20 +1,32 @@
 package org.everit.json.schema;
 
-
 import org.everit.json.schema.listener.SchemaReferencedEvent;
 import org.everit.json.schema.listener.SubschemaMatchEvent;
 import org.everit.json.schema.listener.SubschemaMismatchEvent;
 
 /**
  * Interface to capture which schemas are matching against a specific event in the {@link ValidatingVisitor}.
  */
-public interface SchemaVisitorListener {
+public interface ValidationListener {
 
     void subschemaMatch(SubschemaMatchEvent matchEvent);
 
     void subschemaMismatch(SubschemaMismatchEvent mismatchEvent);
 
     void schemaReferenced(SchemaReferencedEvent referencedEvent);
 
+    // --
+
+    void ifSchemaMatch();
+
+    void ifSchemaMismatch();
+
+    void thenSchemaMatch();
+
+    void thenSchemaMismatch();
+
+    void elseSchemaMatch();
+
+    void elseSchemaMismatch();
 }
 

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

@@ -10,7 +10,7 @@ class ValidatorBuilder {
 
         private ReadWriteContext readWriteContext;
 
-        private SchemaVisitorListener schemaVisitorListener;
+        private ValidationListener validationListener;
 
         public ValidatorBuilder failEarly() {
             this.failEarly = true;
@@ -22,13 +22,13 @@ public ValidatorBuilder readWriteContext(ReadWriteContext readWriteContext) {
             return this;
         }
 
-        public ValidatorBuilder withListener(SchemaVisitorListener schemaVisitorListener) {
-            this.schemaVisitorListener = schemaVisitorListener;
+        public ValidatorBuilder withListener(ValidationListener validationListener) {
+            this.validationListener = validationListener;
             return this;
         }
 
         public Validator build() {
-            return new DefaultValidator(failEarly, readWriteContext, schemaVisitorListener);
+            return new DefaultValidator(failEarly, readWriteContext, validationListener);
         }
 
     }
@@ -48,22 +48,22 @@ class DefaultValidator implements Validator {
 
     private final ReadWriteContext readWriteContext;
 
-    private final SchemaVisitorListener schemaVisitorListener;
+    private final ValidationListener validationListener;
 
     DefaultValidator(boolean failEarly, ReadWriteContext readWriteContext) {
         this(failEarly, readWriteContext, null);
     }
 
-    DefaultValidator(boolean failEarly, ReadWriteContext readWriteContext, SchemaVisitorListener schemaVisitorListener) {
+    DefaultValidator(boolean failEarly, ReadWriteContext readWriteContext, ValidationListener validationListener) {
         this.failEarly = failEarly;
         this.readWriteContext = readWriteContext;
-        this.schemaVisitorListener = schemaVisitorListener;
+        this.validationListener = validationListener;
     }
 
     @Override public void performValidation(Schema schema, Object input) {
         ValidationFailureReporter failureReporter = createFailureReporter(schema);
         ReadWriteValidator readWriteValidator = ReadWriteValidator.createForContext(readWriteContext, failureReporter);
-        ValidatingVisitor visitor = new ValidatingVisitor(input, failureReporter, readWriteValidator, schemaVisitorListener);
+        ValidatingVisitor visitor = new ValidatingVisitor(input, failureReporter, readWriteValidator, validationListener);
         visitor.visit(schema);
         visitor.failIfErrorFound();
     }

core/src/main/java/org/everit/json/schema/listener/AbstractSchemaEvent.java

@@ -0,0 +1,18 @@
+package org.everit.json.schema.listener;
+
+import org.everit.json.schema.CombinedSchema;
+import org.everit.json.schema.ValidationException;
+
+public class CombinedSchemaMismatchEvent extends CombinedSchemaValidationEvent implements MismatchEvent {
+
+    private final ValidationException failure;
+
+    protected CombinedSchemaMismatchEvent(CombinedSchema schema, Object instance, ValidationException failure) {
+        super(schema, instance);
+        this.failure = failure;
+    }
+
+    @Override public ValidationException getFailure() {
+        return failure;
+    }
+}

core/src/main/java/org/everit/json/schema/listener/CombinedSchemaMismatchEvent.java

@@ -0,0 +1,11 @@
+package org.everit.json.schema.listener;
+
+import org.everit.json.schema.CombinedSchema;
+
+public class CombinedSchemaValidationEvent extends ValidationEvent<CombinedSchema> {
+
+    protected CombinedSchemaValidationEvent(CombinedSchema schema, Object instance) {
+        super(schema, instance);
+    }
+
+}

core/src/main/java/org/everit/json/schema/listener/CombinedSchemaValidationEvent.java

@@ -0,0 +1,18 @@
+package org.everit.json.schema.listener;
+
+import org.everit.json.schema.ConditionalSchema;
+import org.everit.json.schema.ValidationException;
+
+public class ConditionalSchemaMismatchEvent extends ConditionalSchemaValidationEvent implements MismatchEvent {
+
+    private final ValidationException failure;
+
+    protected ConditionalSchemaMismatchEvent(ConditionalSchema schema, Object instance, ValidationException failure) {
+        super(schema, instance);
+        this.failure = failure;
+    }
+
+    @Override public ValidationException getFailure() {
+        return failure;
+    }
+}

core/src/main/java/org/everit/json/schema/listener/ConditionalSchemaMismatchEvent.java

@@ -0,0 +1,11 @@
+package org.everit.json.schema.listener;
+
+import org.everit.json.schema.ConditionalSchema;
+
+public class ConditionalSchemaValidationEvent extends ValidationEvent<ConditionalSchema> {
+
+    protected ConditionalSchemaValidationEvent(ConditionalSchema schema, Object instance) {
+        super(schema, instance);
+    }
+
+}

core/src/main/java/org/everit/json/schema/listener/ConditionalSchemaValidationEvent.java

@@ -0,0 +1,9 @@
+package org.everit.json.schema.listener;
+
+import org.everit.json.schema.ValidationException;
+
+public interface MismatchEvent {
+
+    ValidationException getFailure();
+
+}

core/src/main/java/org/everit/json/schema/listener/MismatchEvent.java

@@ -1,12 +1,18 @@
 package org.everit.json.schema.listener;
 
+import org.everit.json.schema.ReferenceSchema;
 import org.everit.json.schema.Schema;
-import org.everit.json.schema.ValidationException;
 
-public class SchemaReferencedEvent extends AbstractSchemaEvent {
+public class SchemaReferencedEvent extends ValidationEvent<ReferenceSchema> {
 
-    public SchemaReferencedEvent(Schema schema, ValidationException rval) {
-        super(schema, rval);
+    private final Schema referredSchema;
+
+    public SchemaReferencedEvent(ReferenceSchema schema, Object instance, Schema referredSchema) {
+        super(schema, instance);
+        this.referredSchema = referredSchema;
     }
 
-}
+    public Schema getReferredSchema() {
+        return referredSchema;
+    }
+}