Merge branch 'master' into issue174

Author: erosb

core/src/main/java/org/everit/json/schema/loader/ReferenceLookup.java

@@ -115,13 +115,14 @@ private JsonObject lookupObjById(JsonValue val, String idAttrVal) {
     }
 
     private Schema.Builder<?> performQueryEvaluation(String mapKey, JsonPointerEvaluator pointerEvaluator) {
-        if (ls.pointerSchemas.containsKey(mapKey)) {
-            return ls.pointerSchemas.get(mapKey);
+        String absolutePointer = ReferenceResolver.resolve(ls.id, mapKey).toString();
+        if (ls.pointerSchemas.containsKey(absolutePointer)) {
+            return ls.pointerSchemas.get(absolutePointer);
         }
         JsonValue rawInternalReferenced = pointerEvaluator.query().getQueryResult();
         ReferenceSchema.Builder refBuilder = ReferenceSchema.builder()
                 .refValue(mapKey);
-        ls.pointerSchemas.put(mapKey, refBuilder);
+        ls.pointerSchemas.put(absolutePointer, refBuilder);
         Schema referredSchema = new SchemaLoader(rawInternalReferenced.ls).load().build();
         refBuilder.build().setReferredSchema(referredSchema);
         return refBuilder;

tests/src/test/resources/org/everit/json/schema/issues/issue182/remotes/schemaA.json

@@ -0,0 +1,12 @@
+{
+    "definitions": {
+        "str": {
+            "type": "string",
+            "enum": [
+                "valueA1",
+                "valueA2"
+            ]
+        }
+    },
+    "$ref": "#/definitions/str"
+}

tests/src/test/resources/org/everit/json/schema/issues/issue182/remotes/schemaB.json

@@ -0,0 +1,13 @@
+{
+    "definitions": {
+        "str": {
+            "type": "string",
+            "enum": [
+                "valueB1",
+                "valueB2"
+            ]
+        }
+    },
+    "$ref": "#/definitions/str"
+}
+

tests/src/test/resources/org/everit/json/schema/issues/issue182/remotes/schemaC.json

@@ -0,0 +1,13 @@
+{
+  "definitions": {
+    "str": {
+      "type": "string",
+      "enum": [
+        "valueC1",
+        "valueC2"
+      ]
+    }
+  },
+  "$ref": "#/definitions/str"
+}
+

tests/src/test/resources/org/everit/json/schema/issues/issue182/schema.json

@@ -0,0 +1,18 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "array",
+  "items": {
+    "$id": "http://localhost:1234/neverAccessed",
+    "oneOf": [
+      {
+        "$ref": "http://localhost:1234/schemaA.json#"
+      },
+      {
+        "$ref": "http://localhost:1234/schemaB.json#"
+      },
+      {
+        "$ref": "schemaC.json"
+      }
+    ]
+  }
+}

tests/src/test/resources/org/everit/json/schema/issues/issue182/subject-valid.json

@@ -0,0 +1,5 @@
+[
+  "valueA1",
+  "valueB1",
+  "valueC1"
+]

tests/src/test/resources/org/everit/json/schema/issues/issue36/remotes/geo

@@ -0,0 +1,10 @@
+{
+    "id": "http://json-schema.org/geo",
+    "$schema": "http://json-schema.org/draft-06/schema#",
+    "description": "A geographical coordinate",
+    "type": "object",
+    "properties": {
+        "latitude": { "type": "number" },
+        "longitude": { "type": "number" }
+    }
+}

tests/src/test/resources/org/everit/json/schema/issues/issue36/schema.json

@@ -47,7 +47,7 @@
       },
       "warehouseLocation": {
         "description": "Coordinates of the warehouse with the product",
-        "$ref": "http://json-schema.org/geo"
+        "$ref": "http://localhost:1234/geo"
       }
     },
     "required": [