moving readOnly and writeOnly validation into separate classes

Author: erosb

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

@@ -0,0 +1,51 @@
+package org.everit.json.schema;
+
+interface ReadWriteValidator {
+
+    static ReadWriteValidator createForContext(ReadWriteContext context, ValidationFailureReporter failureReporter) {
+        if (context == null) {
+            return NONE;
+        } else if (context == ReadWriteContext.READ) {
+            return new WriteOnlyValidator(failureReporter);
+        } else if (context == ReadWriteContext.WRITE) {
+            return new ReadOnlyValidator(failureReporter);
+        }
+        throw new IllegalArgumentException("unknown ReadWriteContext: " + context);
+    }
+
+    ReadWriteValidator NONE = (schema, subject) -> {
+    };
+
+    void validate(Schema schema, Object subject);
+
+}
+
+class ReadOnlyValidator implements ReadWriteValidator {
+
+    private final ValidationFailureReporter failureReporter;
+
+    ReadOnlyValidator(ValidationFailureReporter failureReporter) {
+        this.failureReporter = failureReporter;
+    }
+
+    @Override public void validate(Schema schema, Object subject) {
+        if (schema.isReadOnly() == Boolean.TRUE && subject != null) {
+            failureReporter.failure("value is read-only", "readOnly");
+        }
+    }
+}
+
+class WriteOnlyValidator implements ReadWriteValidator {
+
+    private final ValidationFailureReporter failureReporter;
+
+    WriteOnlyValidator(ValidationFailureReporter failureReporter) {
+        this.failureReporter = failureReporter;
+    }
+
+    @Override public void validate(Schema schema, Object subject) {
+        if (schema.isWriteOnly() == Boolean.TRUE && subject != null) {
+            failureReporter.failure("value is write-only", "writeOnly");
+        }
+    }
+}

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

@@ -19,29 +19,21 @@ private static boolean isNull(Object obj) {
 
     private ValidationFailureReporter failureReporter;
 
-    private final ReadWriteContext readWriteContext;
+    private final ReadWriteValidator readWriteValidator;
 
     @Override
     void visit(Schema schema) {
         if (schema.isNullable() == Boolean.FALSE && isNull(subject)) {
             failureReporter.failure("value cannot be null", "nullable");
         }
-        if (readWriteContext == ReadWriteContext.READ
-                && schema.isWriteOnly() == Boolean.TRUE
-                && subject != null) {
-            failureReporter.failure("value is write-only", "writeOnly");
-        } else if (readWriteContext == ReadWriteContext.WRITE
-                && schema.isReadOnly() == Boolean.TRUE
-                && subject != null) {
-            failureReporter.failure("value is read-only", "readOnly");
-        }
+        readWriteValidator.validate(schema, subject);
         super.visit(schema);
     }
 
-    ValidatingVisitor(Object subject, ValidationFailureReporter failureReporter, ReadWriteContext readWriteContext) {
+    ValidatingVisitor(Object subject, ValidationFailureReporter failureReporter, ReadWriteValidator readWriteValidator) {
         this.subject = subject;
         this.failureReporter = failureReporter;
-        this.readWriteContext = readWriteContext;
+        this.readWriteValidator = readWriteValidator;
     }
 
     @Override void visitNumberSchema(NumberSchema numberSchema) {

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

@@ -48,7 +48,8 @@ class DefaultValidator implements Validator {
 
     @Override public void performValidation(Schema schema, Object input) {
         ValidationFailureReporter failureReporter = createFailureReporter(schema);
-        ValidatingVisitor visitor = new ValidatingVisitor(input, failureReporter, readWriteContext);
+        ReadWriteValidator readWriteValidator = ReadWriteValidator.createForContext(readWriteContext, failureReporter);
+        ValidatingVisitor visitor = new ValidatingVisitor(input, failureReporter, readWriteValidator);
         visitor.visit(schema);
         visitor.failIfErrorFound();
     }