renamed listener package to event

erosb · erosb · commit 2b1213148807 · 2018-12-10T20:57:27.000+01:00
diff --git a/core/src/main/java/org/everit/json/schema/ConditionalSchemaValidatingVisitor.java b/core/src/main/java/org/everit/json/schema/ConditionalSchemaValidatingVisitor.java
@@ -2,13 +2,13 @@
 
 import static java.util.Arrays.asList;
 import static java.util.Objects.requireNonNull;
-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.everit.json.schema.event.ConditionalSchemaValidationEvent.Keyword.ELSE;
+import static org.everit.json.schema.event.ConditionalSchemaValidationEvent.Keyword.IF;
+import static org.everit.json.schema.event.ConditionalSchemaValidationEvent.Keyword.THEN;
 
-import org.everit.json.schema.listener.ConditionalSchemaMatchEvent;
-import org.everit.json.schema.listener.ConditionalSchemaMismatchEvent;
-import org.everit.json.schema.listener.ConditionalSchemaValidationEvent;
+import org.everit.json.schema.event.ConditionalSchemaMatchEvent;
+import org.everit.json.schema.event.ConditionalSchemaMismatchEvent;
+import org.everit.json.schema.event.ConditionalSchemaValidationEvent;
 
 class ConditionalSchemaValidatingVisitor extends Visitor {
 
diff --git a/core/src/main/java/org/everit/json/schema/ValidatingVisitor.java b/core/src/main/java/org/everit/json/schema/ValidatingVisitor.java
@@ -10,10 +10,10 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.everit.json.schema.listener.CombinedSchemaMatchEvent;
-import org.everit.json.schema.listener.CombinedSchemaMismatchEvent;
-import org.everit.json.schema.listener.SchemaReferencedEvent;
-import org.everit.json.schema.listener.ValidationListener;
+import org.everit.json.schema.event.CombinedSchemaMatchEvent;
+import org.everit.json.schema.event.CombinedSchemaMismatchEvent;
+import org.everit.json.schema.event.SchemaReferencedEvent;
+import org.everit.json.schema.event.ValidationListener;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
diff --git a/core/src/main/java/org/everit/json/schema/Validator.java b/core/src/main/java/org/everit/json/schema/Validator.java
@@ -2,7 +2,7 @@
 
 import java.util.function.BiFunction;
 
-import org.everit.json.schema.listener.ValidationListener;
+import org.everit.json.schema.event.ValidationListener;
 
 public interface Validator {
 
diff --git a/core/src/main/java/org/everit/json/schema/event/CombinedSchemaMatchEvent.java b/core/src/main/java/org/everit/json/schema/event/CombinedSchemaMatchEvent.java
@@ -1,4 +1,4 @@
-package org.everit.json.schema.listener;
+package org.everit.json.schema.event;
 
 import org.everit.json.schema.CombinedSchema;
 import org.everit.json.schema.Schema;
diff --git a/core/src/main/java/org/everit/json/schema/event/CombinedSchemaMismatchEvent.java b/core/src/main/java/org/everit/json/schema/event/CombinedSchemaMismatchEvent.java
@@ -1,4 +1,4 @@
-package org.everit.json.schema.listener;
+package org.everit.json.schema.event;
 
 import java.util.Objects;
 
diff --git a/core/src/main/java/org/everit/json/schema/event/CombinedSchemaValidationEvent.java b/core/src/main/java/org/everit/json/schema/event/CombinedSchemaValidationEvent.java
@@ -1,4 +1,4 @@
-package org.everit.json.schema.listener;
+package org.everit.json.schema.event;
 
 import java.util.Objects;
 
diff --git a/core/src/main/java/org/everit/json/schema/event/ConditionalSchemaMatchEvent.java b/core/src/main/java/org/everit/json/schema/event/ConditionalSchemaMatchEvent.java
@@ -1,4 +1,4 @@
-package org.everit.json.schema.listener;
+package org.everit.json.schema.event;
 
 import org.everit.json.schema.ConditionalSchema;
 import org.json.JSONObject;
diff --git a/core/src/main/java/org/everit/json/schema/event/ConditionalSchemaMismatchEvent.java b/core/src/main/java/org/everit/json/schema/event/ConditionalSchemaMismatchEvent.java
@@ -1,4 +1,4 @@
-package org.everit.json.schema.listener;
+package org.everit.json.schema.event;
 
 import java.util.Objects;
 
diff --git a/core/src/main/java/org/everit/json/schema/event/ConditionalSchemaValidationEvent.java b/core/src/main/java/org/everit/json/schema/event/ConditionalSchemaValidationEvent.java
@@ -1,4 +1,4 @@
-package org.everit.json.schema.listener;
+package org.everit.json.schema.event;
 
 import java.util.Objects;
 
diff --git a/core/src/main/java/org/everit/json/schema/event/MismatchEvent.java b/core/src/main/java/org/everit/json/schema/event/MismatchEvent.java
@@ -1,4 +1,4 @@
-package org.everit.json.schema.listener;
+package org.everit.json.schema.event;
 
 import org.everit.json.schema.ValidationException;
 
diff --git a/core/src/main/java/org/everit/json/schema/event/SchemaReferencedEvent.java b/core/src/main/java/org/everit/json/schema/event/SchemaReferencedEvent.java
@@ -1,4 +1,4 @@
-package org.everit.json.schema.listener;
+package org.everit.json.schema.event;
 
 import java.util.Objects;
 
diff --git a/core/src/main/java/org/everit/json/schema/event/ValidationEvent.java b/core/src/main/java/org/everit/json/schema/event/ValidationEvent.java
@@ -1,4 +1,4 @@
-package org.everit.json.schema.listener;
+package org.everit.json.schema.event;
 
 import java.util.Objects;
 
diff --git a/core/src/main/java/org/everit/json/schema/event/ValidationListener.java b/core/src/main/java/org/everit/json/schema/event/ValidationListener.java
@@ -1,4 +1,4 @@
-package org.everit.json.schema.listener;
+package org.everit.json.schema.event;
 
 /**
  * Interface to capture which schemas are matching against a specific event in the {@code ValidatingVisitor}.
diff --git a/core/src/test/java/org/everit/json/schema/ConditionalSchemaEventsTest.java b/core/src/test/java/org/everit/json/schema/ConditionalSchemaEventsTest.java
@@ -3,15 +3,15 @@
 import static org.everit.json.schema.ConditionalSchemaTest.MAX_LENGTH_STRING_SCHEMA;
 import static org.everit.json.schema.ConditionalSchemaTest.MIN_LENGTH_STRING_SCHEMA;
 import static org.everit.json.schema.ConditionalSchemaTest.PATTERN_STRING_SCHEMA;
-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.everit.json.schema.event.ConditionalSchemaValidationEvent.Keyword.ELSE;
+import static org.everit.json.schema.event.ConditionalSchemaValidationEvent.Keyword.IF;
+import static org.everit.json.schema.event.ConditionalSchemaValidationEvent.Keyword.THEN;
 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.everit.json.schema.event.ConditionalSchemaMatchEvent;
+import org.everit.json.schema.event.ConditionalSchemaMismatchEvent;
+import org.everit.json.schema.event.ValidationListener;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/core/src/test/java/org/everit/json/schema/ValidatingVisitorTest.java b/core/src/test/java/org/everit/json/schema/ValidatingVisitorTest.java
@@ -10,9 +10,9 @@
 import java.math.BigInteger;
 import java.util.ArrayList;
 
-import org.everit.json.schema.listener.CombinedSchemaMatchEvent;
-import org.everit.json.schema.listener.CombinedSchemaMismatchEvent;
-import org.everit.json.schema.listener.ValidationListener;
+import org.everit.json.schema.event.CombinedSchemaMatchEvent;
+import org.everit.json.schema.event.CombinedSchemaMismatchEvent;
+import org.everit.json.schema.event.ValidationListener;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.junit.Before;
diff --git a/core/src/test/java/org/everit/json/schema/event/EventToStringTest.java b/core/src/test/java/org/everit/json/schema/event/EventToStringTest.java
@@ -1,8 +1,8 @@
-package org.everit.json.schema.listener;
+package org.everit.json.schema.event;
 
 import static java.util.Arrays.asList;
 import static org.everit.json.schema.JSONMatcher.sameJsonAs;
-import static org.everit.json.schema.listener.ConditionalSchemaValidationEvent.Keyword.IF;
+import static org.everit.json.schema.event.ConditionalSchemaValidationEvent.Keyword.IF;
 import static org.junit.Assert.assertThat;
 
 import org.everit.json.schema.CombinedSchema;
@@ -19,7 +19,7 @@
 
 public class EventToStringTest {
 
-    private static final ResourceLoader LOADER = new ResourceLoader("/org/everit/jsonvalidator/listener/");
+    private static final ResourceLoader LOADER = new ResourceLoader("/org/everit/jsonvalidator/event/");
 
     private static final ReferenceSchema REF_SCHEMA = ReferenceSchema.builder()
             .refValue("#/definitions/Stuff")
diff --git a/core/src/test/resources/org/everit/jsonvalidator/event/combined-schema-match.json b/core/src/test/resources/org/everit/jsonvalidator/event/combined-schema-match.json
diff --git a/core/src/test/resources/org/everit/jsonvalidator/event/combined-schema-mismatch.json b/core/src/test/resources/org/everit/jsonvalidator/event/combined-schema-mismatch.json
diff --git a/core/src/test/resources/org/everit/jsonvalidator/event/conditional-match-if.json b/core/src/test/resources/org/everit/jsonvalidator/event/conditional-match-if.json
diff --git a/core/src/test/resources/org/everit/jsonvalidator/event/conditional-match-then-boolean.json b/core/src/test/resources/org/everit/jsonvalidator/event/conditional-match-then-boolean.json
diff --git a/core/src/test/resources/org/everit/jsonvalidator/event/conditional-mismatch-if.json b/core/src/test/resources/org/everit/jsonvalidator/event/conditional-mismatch-if.json
diff --git a/core/src/test/resources/org/everit/jsonvalidator/event/reference-event-with-instance.json b/core/src/test/resources/org/everit/jsonvalidator/event/reference-event-with-instance.json
diff --git a/core/src/test/resources/org/everit/jsonvalidator/event/reference-event-with-schema.json b/core/src/test/resources/org/everit/jsonvalidator/event/reference-event-with-schema.json
diff --git a/core/src/test/resources/org/everit/jsonvalidator/event/reference-event.json b/core/src/test/resources/org/everit/jsonvalidator/event/reference-event.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.everit.json.schema.listener;`
	`1`	`+package org.everit.json.schema.event;`
`2`	`2`
`3`	`3`	`import org.everit.json.schema.CombinedSchema;`
`4`	`4`	`import org.everit.json.schema.Schema;`