changing ArraySchemaValidatingVisitor to stop referencing both owner visitor and failureReporter

Author: erosb

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

@@ -16,8 +16,6 @@ class ArraySchemaValidatingVisitor extends Visitor {
 
     private final Object subject;
 
-    private final FailureReporter failureReporter;
-
     private final ValidatingVisitor owner;
 
     private JSONArray arraySubject;
@@ -26,16 +24,15 @@ class ArraySchemaValidatingVisitor extends Visitor {
 
     private int subjectLength;
 
-    public ArraySchemaValidatingVisitor(Object subject, ValidatingVisitor owner, FailureReporter failureReporter) {
+    public ArraySchemaValidatingVisitor(Object subject, ValidatingVisitor owner) {
         this.subject = subject;
         this.owner = requireNonNull(owner, "owner cannot be null");
-        this.failureReporter = requireNonNull(failureReporter, "failureReporter cannot be null");
     }
 
     @Override void visitArraySchema(ArraySchema arraySchema) {
         if (!(subject instanceof JSONArray)) {
             if (arraySchema.requiresArray()) {
-                failureReporter.failure(JSONArray.class, subject);
+                owner.failure(JSONArray.class, subject);
             }
         } else {
             this.arraySubject = (JSONArray) subject;
@@ -47,13 +44,13 @@ public ArraySchemaValidatingVisitor(Object subject, ValidatingVisitor owner, Fai
 
     @Override void visitMinItems(Integer minItems) {
         if (minItems != null && subjectLength < minItems) {
-            failureReporter.failure("expected minimum item count: " + minItems + ", found: " + subjectLength, "minItems");
+            owner.failure("expected minimum item count: " + minItems + ", found: " + subjectLength, "minItems");
         }
     }
 
     @Override void visitMaxItems(Integer maxItems) {
         if (maxItems != null && maxItems < subjectLength) {
-            failureReporter.failure("expected maximum item count: " + maxItems + ", found: " + subjectLength, "maxItems");
+            owner.failure("expected maximum item count: " + maxItems + ", found: " + subjectLength, "maxItems");
         }
     }
 
@@ -66,7 +63,7 @@ public ArraySchemaValidatingVisitor(Object subject, ValidatingVisitor owner, Fai
             Object item = arraySubject.get(i);
             for (Object contained : uniques) {
                 if (ObjectComparator.deepEquals(contained, item)) {
-                    failureReporter.failure("array items are not unique", "uniqueItems");
+                    owner.failure("array items are not unique", "uniqueItems");
                     return;
                 }
             }
@@ -88,14 +85,14 @@ public ArraySchemaValidatingVisitor(Object subject, ValidatingVisitor owner, Fai
         String idx = String.valueOf(index);
         ifFails(itemSchema, subject)
                 .map(exc -> exc.prepend(idx))
-                .ifPresent(failureReporter::failure);
+                .ifPresent(owner::failure);
     }
 
     @Override void visitAdditionalItems(boolean additionalItems) {
         List<Schema> itemSchemas = arraySchema.getItemSchemas();
         int itemSchemaCount = itemSchemas == null ? 0 : itemSchemas.size();
         if (itemSchemas != null && !additionalItems && subjectLength > itemSchemaCount) {
-            failureReporter.failure(format("expected: [%d] array items, found: [%d]", itemSchemaCount, subjectLength), "items");
+            owner.failure(format("expected: [%d] array items, found: [%d]", itemSchemaCount, subjectLength), "items");
         }
     }
 
@@ -116,7 +113,7 @@ private void validateItemsAgainstSchema(IntStream indices, IntFunction<Schema> s
             String copyOfI = String.valueOf(i); // i is not effectively final so we copy it
             ifFails(schemaForIndex.apply(i), arraySubject.get(i))
                     .map(exc -> exc.prepend(copyOfI))
-                    .ifPresent(failureReporter::failure);
+                    .ifPresent(owner::failure);
         }
     }
 
@@ -134,6 +131,6 @@ private Optional<ValidationException> ifFails(Schema schema, Object input) {
                 return;
             }
         }
-        failureReporter.failure("expected at least one array item to match 'contains' schema", "contains");
+        owner.failure("expected at least one array item to match 'contains' schema", "contains");
     }
 }

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

@@ -25,7 +25,7 @@ private static boolean isNull(Object obj) {
     }
 
     @Override void visitArraySchema(ArraySchema arraySchema) {
-        arraySchema.accept(new ArraySchemaValidatingVisitor(subject, this, failureReporter));
+        arraySchema.accept(new ArraySchemaValidatingVisitor(subject, this));
     }
 
     @Override void visitBooleanSchema(BooleanSchema schema) {
@@ -83,6 +83,10 @@ private static boolean isNull(Object obj) {
         }
     }
 
+    @Override void visitObjectSchema(ObjectSchema objectSchema) {
+        super.visitObjectSchema(objectSchema);
+    }
+
     ValidationException getFailureOfSchema(Schema schema, Object input) {
         Object origSubject = this.subject;
         this.subject = input;
@@ -96,4 +100,16 @@ void failIfErrorFound() {
         failureReporter.throwExceptionIfFailureFound();
     }
 
+    void failure(String message, String keyword) {
+        failureReporter.failure(message, keyword);
+    }
+
+    void failure(Class<?> expectedType, Object actualValue) {
+        failureReporter.failure(expectedType, actualValue);
+    }
+
+    void failure(ValidationException exc) {
+        failureReporter.failure(exc);
+    }
+
 }