migrating CombinedSchema to visitor model

Author: erosb

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

@@ -180,30 +180,8 @@ private ValidationException getFailure(final Schema schema, final Object subject
         }
     }
 
-    @Override
-    public void validate(final Object subject) {
-        List<ValidationException> failures = new ArrayList<>();
-        for (Schema subschema : subschemas) {
-            ValidationException exception = getFailure(subschema, subject);
-            if (null != exception) {
-                failures.add(exception);
-            }
-        }
-        int matchingCount = subschemas.size() - failures.size();
-        try {
-            criterion.validate(subschemas.size(), matchingCount);
-        } catch (ValidationException e) {
-            throw new ValidationException(this,
-                    new StringBuilder(e.getPointerToViolation()),
-                    e.getMessage(),
-                    failures,
-                    e.getKeyword(),
-                    getSchemaLocation());
-        }
-    }
-
     @Override void accept(Visitor visitor) {
-        throw new UnsupportedOperationException("not yet implemented");
+        visitor.visitCombinedSchema(this);
     }
 
     @Override

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

@@ -3,6 +3,10 @@
 import static java.lang.String.format;
 import static org.everit.json.schema.EnumSchema.toJavaValue;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 import org.json.JSONObject;
 
 class ValidatingVisitor extends Visitor {
@@ -91,6 +95,29 @@ private static boolean isNull(Object obj) {
         stringSchema.accept(new StringSchemaValidatingVisitor(subject, failureReporter));
     }
 
+    @Override void visitCombinedSchema(CombinedSchema combinedSchema) {
+        List<ValidationException> failures = new ArrayList<>();
+        Collection<Schema> subschemas = combinedSchema.getSubschemas();
+        CombinedSchema.ValidationCriterion criterion = combinedSchema.getCriterion();
+        for (Schema subschema : subschemas) {
+            ValidationException exception = getFailureOfSchema(subschema, subject);
+            if (null != exception) {
+                failures.add(exception);
+            }
+        }
+        int matchingCount = subschemas.size() - failures.size();
+        try {
+            criterion.validate(subschemas.size(), matchingCount);
+        } catch (ValidationException e) {
+            throw new ValidationException(combinedSchema,
+                    new StringBuilder(e.getPointerToViolation()),
+                    e.getMessage(),
+                    failures,
+                    e.getKeyword(),
+                    combinedSchema.getSchemaLocation());
+        }
+    }
+
     ValidationException getFailureOfSchema(Schema schema, Object input) {
         Object origSubject = this.subject;
         this.subject = input;

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

@@ -180,4 +180,7 @@ void visitMaxLength(Integer maxLength) {
 
     void visitMinLength(Integer minLength) {
     }
+
+    void visitCombinedSchema(CombinedSchema combinedSchema) {
+    }
 }

tests/src/test/java/org/everit/json/schema/InvalidObjectInArrayTest.java

@@ -16,7 +16,7 @@ private JSONObject readObject(final String fileName) {
     @Test
     public void test() {
         Schema schema = SchemaLoader.load(readObject("schema.json"));
-        Object subject = readObject("createSubject.json");
+        Object subject = readObject("subject.json");
         try {
             schema.validate(subject);
             Assert.fail("did not throw exception");