Merge branch 'pull/266'

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;
@@ -41,6 +43,14 @@ 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() {
@@ -51,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
@@ -90,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 {
@@ -99,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
@@ -115,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;
@@ -293,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

@@ -745,4 +745,25 @@ public void commonPropsAreNotUnprocessedProps() {
         assertThat(new JSONObject(subject.toString()), sameJsonAs(schemaJson));
     }
 
+    @Test
+    public void unprocessedPropertiesAreLoadedForRefElement() {
+        SchemaLoader loader = SchemaLoader.builder()
+                .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());
+
+        assertEquals(ImmutableMap.of("unproc4", true, "unproc5", JSONObject.NULL),
+                actual.getPropertySchemas().get("prop2").getUnprocessedProperties());
+
+        assertEquals(ImmutableMap.of(
+                "unproc7", JSONObject.NULL
+        ), actual.getPropertySchemas().get("prop4").getUnprocessedProperties());
+    }
+
 }

core/src/test/resources/org/everit/jsonvalidator/testschemas.json

@@ -686,5 +686,43 @@
         "unproc6": false
       }
     }
+  },
+  "schemaRefWithUnprocessedProperties": {
+    "title": "ttt",
+    "description": "descr",
+    "$id": "http://example.org",
+    "default": 22,
+    "nullable": false,
+    "readOnly": false,
+    "writeOnly": false,
+    "definitions": {
+      "dateMonthDayYear": {
+        "description": "(MM/dd/yyyy)",
+        "type": "string",
+        "maxLength": 10,
+        "pattern": "^\\d{2}/\\d{2}/\\d{4}$",
+        "unproc8": false
+      }
+    },
+    "type": "object",
+    "unproc0": 1,
+    "unproc1": "asdasd",
+    "properties": {
+      "prop": {
+        "type": "string"
+      },
+      "prop2": {
+        "unproc4": true,
+        "unproc5": null
+      },
+      "prop3": {
+        "$ref": "#",
+        "unproc6": false
+      },
+      "prop4": {
+        "$ref": "#/definitions/dateMonthDayYear",
+        "unproc7": null
+      }
+    }
   }
 }