code cleanup before raising ValidationListener PR

Author: erosb

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

@@ -178,15 +178,11 @@ void visitConditionalSchema(ConditionalSchema conditionalSchema) {
         conditionalSchema.accept(new ConditionalSchemaValidatingVisitor(subject, this));
     }
 
-    void reportSchemaMatchEvent(CombinedSchema schema, Schema subschema, ValidationException failure) {
-        if (validationListener != null) {
-            if (failure == null) {
-                validationListener.combinedSchemaMatch(new CombinedSchemaMatchEvent(schema, subschema, subject));
-                //                validationListener.subschemaMatch(new SubschemaMatchEvent(schema));
-            } else {
-                validationListener.combinedSchemaMismatch(new CombinedSchemaMismatchEvent(schema, subschema, subject, failure));
-                //                validationListener.subschemaMismatch(new SubschemaMismatchEvent(schema, rval));
-            }
+    private void reportSchemaMatchEvent(CombinedSchema schema, Schema subschema, ValidationException failure) {
+        if (failure == null) {
+            validationListener.combinedSchemaMatch(new CombinedSchemaMatchEvent(schema, subschema, subject));
+        } else {
+            validationListener.combinedSchemaMismatch(new CombinedSchemaMismatchEvent(schema, subschema, subject, failure));
         }
     }
 

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

@@ -1,5 +1,7 @@
 package org.everit.json.schema.listener;
 
+import java.util.Objects;
+
 import org.everit.json.schema.ReferenceSchema;
 import org.everit.json.schema.Schema;
 import org.json.JSONObject;
@@ -21,4 +23,19 @@ void describeTo(JSONObject obj) {
     public Schema getReferredSchema() {
         return referredSchema;
     }
+
+    @Override public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof SchemaReferencedEvent))
+            return false;
+        if (!super.equals(o))
+            return false;
+        SchemaReferencedEvent that = (SchemaReferencedEvent) o;
+        return referredSchema.equals(that.referredSchema);
+    }
+
+    @Override public int hashCode() {
+        return Objects.hash(super.hashCode(), referredSchema);
+    }
 }

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

@@ -6,17 +6,16 @@
 import static org.everit.json.schema.listener.ConditionalSchemaValidationEvent.Keyword.ELSE;
 import static org.everit.json.schema.listener.ConditionalSchemaValidationEvent.Keyword.IF;
 import static org.everit.json.schema.listener.ConditionalSchemaValidationEvent.Keyword.THEN;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 import org.everit.json.schema.listener.ConditionalSchemaMatchEvent;
 import org.everit.json.schema.listener.ConditionalSchemaMismatchEvent;
 import org.everit.json.schema.listener.ValidationListener;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.Spy;
 import org.mockito.runners.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -29,8 +28,11 @@ public class ConditionalSchemaEventsTest {
     @Mock
     ValidationListener listener;
 
-    @Spy
-    ValidationFailureReporter reporter = spy(new CollectingFailureReporter(schema));
+    private ValidationFailureReporter reporter;
+
+    @Before public void before() {
+        reporter = new CollectingFailureReporter(schema);
+    }
 
     private void validateInstance(String instance) {
         new ValidatingVisitor(instance, reporter, ReadWriteValidator.NONE, listener).visit(schema);

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

@@ -3,7 +3,6 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
 
@@ -129,7 +128,7 @@ public void triggersCombinedSchemaEvents() {
                 .subschema(emptySchema)
                 .subschema(objectSchema)
                 .build();
-        ValidationFailureReporter reporter = spy(new CollectingFailureReporter(combinedSchema));
+        ValidationFailureReporter reporter = new CollectingFailureReporter(combinedSchema);
         JSONObject instance = new JSONObject();
 
         new ValidatingVisitor(instance, reporter, ReadWriteValidator.NONE, listener).visit(combinedSchema);