fixing #259 in an other way that doesn't break the mutability of the Schema class

Author: erosb

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

@@ -2,6 +2,8 @@
 
 import static java.util.Objects.requireNonNull;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Objects;
 
 import org.everit.json.schema.internal.JSONPrinter;
@@ -34,15 +36,21 @@ public ReferenceSchema build() {
             if (retval == null) {
                 retval = new ReferenceSchema(this);
             }
-            // adding unprocessed properties from the parent to the actual referenced schema
-            retval.appendUnprocessedProperties(new ReferenceSchema(this).getUnprocessedProperties());
             return retval;
         }
 
         public Builder refValue(String refValue) {
             this.refValue = refValue;
             return this;
         }
+
+        @Override public ReferenceSchema.Builder unprocessedProperties(Map<String, Object> unprocessedProperties) {
+            if (retval != null) {
+                retval.unprocessedProperties = new HashMap<>(unprocessedProperties);
+            }
+            super.unprocessedProperties(unprocessedProperties);
+            return this;
+        }
     }
 
     public static Builder builder() {
@@ -53,9 +61,12 @@ public static Builder builder() {
 
     private final String refValue;
 
+    private Map<String, Object> unprocessedProperties;
+
     public ReferenceSchema(final Builder builder) {
         super(builder);
         this.refValue = requireNonNull(builder.refValue, "refValue cannot be null");
+        this.unprocessedProperties = builder.unprocessedProperties;
     }
 
     @Override
@@ -92,6 +103,7 @@ public boolean equals(Object o) {
             ReferenceSchema that = (ReferenceSchema) o;
             return that.canEqual(this) &&
                     Objects.equals(refValue, that.refValue) &&
+                    Objects.equals(unprocessedProperties, that.unprocessedProperties) &&
                     Objects.equals(referredSchema, that.referredSchema) &&
                     super.equals(that);
         } else {
@@ -101,7 +113,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), referredSchema, refValue);
+        return Objects.hash(super.hashCode(), referredSchema, refValue, unprocessedProperties);
     }
 
     @Override
@@ -117,4 +129,8 @@ protected boolean canEqual(Object other) {
         writer.key("$ref");
         writer.value(refValue);
     }
+
+    @Override public Map<String, Object> getUnprocessedProperties() {
+        return unprocessedProperties;
+    }
 }

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

@@ -41,7 +41,7 @@ public abstract static class Builder<S extends Schema> {
 
         private Boolean writeOnly = null;
 
-        private Map<String, Object> unprocessedProperties = new HashMap<>(0);
+        public Map<String, Object> unprocessedProperties = new HashMap<>(0);
 
         public Builder<S> title(String title) {
             this.title = title;
@@ -272,14 +272,6 @@ public Map<String, Object> getUnprocessedProperties() {
         return unmodifiableMap(unprocessedProperties);
     }
 
-    /**
-     * Append properties to unprocessed properties.
-     * @param unprocessedProperties
-     */
-    public void appendUnprocessedProperties(Map<String, Object> unprocessedProperties){
-        this.unprocessedProperties.putAll(unprocessedProperties);
-    }
-
     /**
      * Describes the instance as a JSONObject to {@code writer}.
      * <p>
@@ -301,7 +293,7 @@ public void describeTo(JSONPrinter writer) {
         writer.ifPresent("readOnly", readOnly);
         writer.ifPresent("writeOnly", writeOnly);
         describePropertiesTo(writer);
-        unprocessedProperties.forEach((key, val) -> {
+        getUnprocessedProperties().forEach((key, val) -> {
             writer.key(key).value(val);
         });
         writer.endObject();

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

@@ -15,7 +15,9 @@
  */
 package org.everit.json.schema;
 
+import static java.util.Collections.emptyMap;
 import static org.everit.json.schema.TestSupport.buildWithLocation;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import org.everit.json.schema.ReferenceSchema.Builder;
@@ -24,11 +26,15 @@
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.google.common.collect.ImmutableMap;
+
 import nl.jqno.equalsverifier.EqualsVerifier;
 import nl.jqno.equalsverifier.Warning;
 
 public class ReferenceSchemaTest {
 
+    public static final ImmutableMap<String, Object> UNPROC_PROPS = ImmutableMap.of("unproc", true);
+
     @Test
     public void constructorMustRunOnlyOnce() {
         Builder builder = ReferenceSchema.builder();
@@ -77,11 +83,50 @@ public void equalsVerifier() {
                 .verify();
     }
 
+    @Test
+    public void unprocessedPropertiesBeforeSettingRefSchema() {
+        ReferenceSchema subject = ReferenceSchema.builder()
+                .unprocessedProperties(UNPROC_PROPS)
+                .refValue("#/pointer")
+                .build();
+        subject.setReferredSchema(EmptySchema.builder().build());
+        assertEquals(UNPROC_PROPS, subject.getUnprocessedProperties());
+    }
+
+    @Test
+    public void unprocessedPropertiesAfterSettingRefSchema() {
+        ReferenceSchema subject = ReferenceSchema.builder()
+                .refValue("#/pointer")
+                .unprocessedProperties(UNPROC_PROPS)
+                .build();
+        subject.setReferredSchema(EmptySchema.builder().build());
+        assertEquals(UNPROC_PROPS, subject.getUnprocessedProperties());
+    }
+
+    @Test
+    public void unprocessedPropertiesAfterBuild() {
+        Builder builder = ReferenceSchema.builder()
+                .refValue("#/pointer");
+        ReferenceSchema subject = builder
+                .build();
+        subject.setReferredSchema(EmptySchema.builder().build());
+        builder.unprocessedProperties(UNPROC_PROPS);
+        assertEquals(UNPROC_PROPS, subject.getUnprocessedProperties());
+    }
+
+    @Test
+    public void emptyUnprocessedProperties() {
+        ReferenceSchema subject = ReferenceSchema.builder()
+                .refValue("#/pointer")
+                .build();
+        subject.setReferredSchema(EmptySchema.builder().build());
+        assertEquals(emptyMap(), subject.getUnprocessedProperties());
+    }
+
     @Test
     public void toStringTest() {
         JSONObject rawSchemaJson = ResourceLoader.DEFAULT.readObj("tostring/ref.json");
         String actual = SchemaLoader.load(rawSchemaJson).toString();
-        System.out.println(actual);
         assertTrue(ObjectComparator.deepEquals(rawSchemaJson.query("/properties"),
                 new JSONObject(actual).query("/properties")));
     }

core/src/test/java/org/everit/json/schema/loader/SchemaLoaderTest.java

@@ -748,18 +748,21 @@ public void commonPropsAreNotUnprocessedProps() {
     @Test
     public void unprocessedPropertiesAreLoadedForRefElement() {
         SchemaLoader loader = SchemaLoader.builder()
-            .draftV7Support()
-            .useDefaults(true)
-            .schemaJson(get("schemaRefWithUnprocessedProperties"))
-            .build();
+                .draftV7Support()
+                .useDefaults(true)
+                .schemaJson(get("schemaRefWithUnprocessedProperties"))
+                .build();
         ObjectSchema actual = (ObjectSchema) loader.load().build();
 
         assertEquals(ImmutableMap.of(
-            "unproc8", false
-        ), ((ReferenceSchema)actual.getPropertySchemas().get("prop4")).getReferredSchema().getUnprocessedProperties());
+                "unproc8", false
+        ), ((ReferenceSchema) actual.getPropertySchemas().get("prop4")).getReferredSchema().getUnprocessedProperties());
+
+        assertEquals(ImmutableMap.of("unproc4", true, "unproc5", JSONObject.NULL),
+                actual.getPropertySchemas().get("prop2").getUnprocessedProperties());
 
         assertEquals(ImmutableMap.of(
-            "unproc7", JSONObject.NULL
+                "unproc7", JSONObject.NULL
         ), actual.getPropertySchemas().get("prop4").getUnprocessedProperties());
     }