changing readOnly and writeOnly from boolean to Boolean, and supporting them in Schema#toString()

Author: erosb

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

@@ -33,9 +33,9 @@ public abstract static class Builder<S extends Schema> {
 
         private Boolean nullable = null;
 
-        private boolean readOnly = false;
+        private Boolean readOnly = null;
 
-        private boolean writeOnly = false;
+        private Boolean writeOnly = null;
 
         public Builder<S> title(String title) {
             this.title = title;
@@ -67,12 +67,12 @@ public Builder<S> nullable(Boolean nullable) {
             return this;
         }
 
-        public Builder<S> readOnly(boolean readOnly) {
+        public Builder<S> readOnly(Boolean readOnly) {
             this.readOnly = readOnly;
             return this;
         }
 
-        public Builder<S> writeOnly(boolean writeOnly) {
+        public Builder<S> writeOnly(Boolean writeOnly) {
             this.writeOnly = writeOnly;
             return this;
         }
@@ -93,9 +93,9 @@ public Builder<S> writeOnly(boolean writeOnly) {
 
     private final Boolean nullable;
 
-    private final boolean readOnly;
+    private final Boolean readOnly;
 
-    private final boolean writeOnly;
+    private final Boolean writeOnly;
 
     /**
      * Constructor.
@@ -186,8 +186,8 @@ public boolean equals(Object o) {
                     Objects.equals(description, schema.description) &&
                     Objects.equals(id, schema.id) &&
                     Objects.equals(nullable, schema.nullable) &&
-                    readOnly == schema.readOnly &&
-                    writeOnly == schema.writeOnly;
+                    Objects.equals(readOnly, schema.readOnly) &&
+                    Objects.equals(writeOnly, schema.writeOnly);
         } else {
             return false;
         }
@@ -252,6 +252,8 @@ public void describeTo(JSONPrinter writer) {
         writer.ifPresent("id", id);
         writer.ifPresent("default", defaultValue);
         writer.ifPresent("nullable", nullable);
+        writer.ifPresent("readOnly", readOnly);
+        writer.ifPresent("writeOnly", writeOnly);
         describePropertiesTo(writer);
         writer.endObject();
     }

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

@@ -15,17 +15,19 @@
  */
 package org.everit.json.schema;
 
-import nl.jqno.equalsverifier.EqualsVerifier;
-import nl.jqno.equalsverifier.Warning;
+import static org.everit.json.schema.ObjectComparator.deepEquals;
+import static org.everit.json.schema.TestSupport.buildWithLocation;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Optional;
+
 import org.everit.json.schema.loader.SchemaLoader;
 import org.json.JSONObject;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.Optional;
-
-import static org.everit.json.schema.TestSupport.buildWithLocation;
-import static org.junit.Assert.assertTrue;
+import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
 
 public class StringSchemaTest {
 
@@ -124,39 +126,48 @@ public void equalsVerifier() {
     public void toStringTest() {
         JSONObject rawSchemaJson = ResourceLoader.DEFAULT.readObj("tostring/stringschema.json");
         String actual = SchemaLoader.load(rawSchemaJson).toString();
-        assertTrue(ObjectComparator.deepEquals(rawSchemaJson, new JSONObject(actual)));
+        assertTrue(deepEquals(rawSchemaJson, new JSONObject(actual)));
     }
 
     @Test
     public void toStringWithNullableTrueTest() {
         JSONObject rawSchemaJson = ResourceLoader.DEFAULT.readObj("tostring/stringschema.json");
         rawSchemaJson.put("nullable", true);
         String actual = loadWithNullableSupport(rawSchemaJson).toString();
-        assertTrue(ObjectComparator.deepEquals(rawSchemaJson, new JSONObject(actual)));
+        assertTrue(deepEquals(rawSchemaJson, new JSONObject(actual)));
     }
 
     @Test
     public void toStringWithNullableFalseTest() {
         JSONObject rawSchemaJson = ResourceLoader.DEFAULT.readObj("tostring/stringschema.json");
         rawSchemaJson.put("nullable", false);
         String actual = loadWithNullableSupport(rawSchemaJson).toString();
-        assertTrue(ObjectComparator.deepEquals(rawSchemaJson, new JSONObject(actual)));
+        assertTrue(deepEquals(rawSchemaJson, new JSONObject(actual)));
     }
 
     @Test
     public void toStringNoFormat() {
         JSONObject rawSchemaJson = ResourceLoader.DEFAULT.readObj("tostring/stringschema.json");
         rawSchemaJson.remove("format");
         String actual = SchemaLoader.load(rawSchemaJson).toString();
-        assertTrue(ObjectComparator.deepEquals(rawSchemaJson, new JSONObject(actual)));
+        assertTrue(deepEquals(rawSchemaJson, new JSONObject(actual)));
     }
 
     @Test
     public void toStringNoExplicitType() {
         JSONObject rawSchemaJson = ResourceLoader.DEFAULT.readObj("tostring/stringschema.json");
         rawSchemaJson.remove("type");
         String actual = SchemaLoader.load(rawSchemaJson).toString();
-        assertTrue(ObjectComparator.deepEquals(rawSchemaJson, new JSONObject(actual)));
+        assertTrue(deepEquals(rawSchemaJson, new JSONObject(actual)));
+    }
+
+    @Test
+    public void toString_ReadOnlyWriteOnly() {
+        Schema subject = StringSchema.builder().readOnly(true).writeOnly(false).build();
+        JSONObject actual = new JSONObject(subject.toString());
+
+        JSONObject expected = ResourceLoader.DEFAULT.readObj("tostring/stringschema-readonly-true-writeonly-false.json");
+        assertTrue(deepEquals(actual, expected));
     }
 
     @Test

core/src/test/resources/org/everit/jsonvalidator/tostring/stringschema-readonly-true-writeonly-false.json

@@ -0,0 +1,5 @@
+{
+  "type": "string",
+  "readOnly": true,
+  "writeOnly": false
+}