id (scope) resolution

Author: erosb

core/src/main/java/org/everit/jsonvalidator/loader/JSONPointer.java

@@ -64,6 +64,7 @@ private static JSONObject executeWith(final HttpClient client, final String url)
     String resp = null;
     BufferedReader buffReader = null;
     InputStreamReader reader = null;
+    System.out.println("GET: " + url);
     try {
       HttpResponse response = client.execute(new HttpGet(url));
       InputStream content = response.getEntity().getContent();

core/src/main/java/org/everit/jsonvalidator/loader/SchemaLoader.java

@@ -82,7 +82,7 @@ public class SchemaLoader {
   }
 
   public static Schema load(final JSONObject schemaJson) {
-    return new SchemaLoader(schemaJson, schemaJson).load().build();
+    return new SchemaLoader(schemaJson.optString("id"), schemaJson, schemaJson).load().build();
 
   }
 
@@ -95,7 +95,7 @@ class TypeBasedMultiplexer {
 
     private class OnTypeConsumerImpl<E> implements OnTypeConsumer<E> {
 
-      private final Class<?> key;
+      protected final Class<?> key;
 
       public OnTypeConsumerImpl(final Class<?> key) {
         this.key = key;
@@ -109,6 +109,28 @@ public TypeBasedMultiplexer then(final Consumer<E> consumer) {
 
     }
 
+    private class IdModifyingTypeConsumerImpl extends OnTypeConsumerImpl<JSONObject> {
+
+      public IdModifyingTypeConsumerImpl(final Class<?> key) {
+        super(key);
+      }
+
+      @Override
+      public TypeBasedMultiplexer then(final Consumer<JSONObject> consumer) {
+        Consumer<JSONObject> wrapperConsumer = obj -> {
+          String origId = id;
+          if (obj.has("id")) {
+            id += obj.getString("id");
+          }
+          consumer.accept(obj);
+          id = origId;
+        };
+        actions.put(key, wrapperConsumer);
+        return TypeBasedMultiplexer.this;
+      }
+
+    }
+
     private final String keyOfObj;
 
     private final Object obj;
@@ -125,9 +147,16 @@ public TypeBasedMultiplexer(final Object obj) {
     }
 
     public <E> OnTypeConsumer<E> ifIs(final Class<E> predicateClass) {
+      if (predicateClass == JSONObject.class) {
+        throw new IllegalArgumentException("use ifObject() instead");
+      }
       return new OnTypeConsumerImpl<E>(predicateClass);
     }
 
+    public OnTypeConsumer<JSONObject> ifObject() {
+      return new IdModifyingTypeConsumerImpl(JSONObject.class);
+    }
+
     public void orElse(final Consumer<Object> orElseConsumer) {
       @SuppressWarnings("unchecked")
       Consumer<Object> consumer = (Consumer<Object>) actions.keySet().stream()
@@ -154,15 +183,17 @@ TypeBasedMultiplexer typeMultiplexer(final String keyOfObj, final Object obj) {
     return new TypeBasedMultiplexer(keyOfObj, obj);
   }
 
-  // TODO private final String id;
+  private String id = null;
 
   private final JSONObject schemaJson;
 
   private final JSONObject rootSchemaJson;
 
-  public SchemaLoader(final JSONObject schemaJson, final JSONObject rootSchemaJson) {
+  public SchemaLoader(final String id, final JSONObject schemaJson,
+      final JSONObject rootSchemaJson) {
     this.schemaJson = Objects.requireNonNull(schemaJson, "schemaJson cannot be null");
     this.rootSchemaJson = Objects.requireNonNull(rootSchemaJson, "rootSchemaJson cannot be null");
+    this.id = id;
   }
 
   private void addDependencies(final Builder builder, final JSONObject deps) {
@@ -172,7 +203,7 @@ private void addDependencies(final Builder builder, final JSONObject deps) {
 
   private void addDependency(final Builder builder, final String ifPresent, final Object deps) {
     typeMultiplexer(deps)
-    .ifIs(JSONObject.class).then(obj -> {
+    .ifObject().then(obj -> {
       builder.schemaDependency(ifPresent, loadChild(obj).build());
     })
     .ifIs(JSONArray.class).then(propNames -> {
@@ -203,14 +234,12 @@ private ArraySchema.Builder buildArraySchema() {
     if (schemaJson.has("additionalItems")) {
       typeMultiplexer("additionalItems", schemaJson.get("additionalItems"))
           .ifIs(Boolean.class).then(builder::additionalItems)
-          .ifIs(JSONObject.class)
-          .then(jsonObj -> builder.schemaOfAdditionalItems(loadChild(jsonObj).build()))
+          .ifObject().then(jsonObj -> builder.schemaOfAdditionalItems(loadChild(jsonObj).build()))
           .requireAny();
     }
     if (schemaJson.has("items")) {
       typeMultiplexer("items", schemaJson.get("items"))
-      .ifIs(JSONObject.class)
-      .then(itemSchema -> builder.allItemSchema(loadChild(itemSchema).build()))
+      .ifObject().then(itemSchema -> builder.allItemSchema(loadChild(itemSchema).build()))
       .ifIs(JSONArray.class).then(arr -> buildTupleSchema(builder, arr))
       .requireAny();
     }
@@ -245,8 +274,7 @@ private ObjectSchema.Builder buildObjectSchema() {
     if (schemaJson.has("additionalProperties")) {
       typeMultiplexer("additionalProperties", schemaJson.get("additionalProperties"))
           .ifIs(Boolean.class).then(builder::additionalProperties)
-          .ifIs(JSONObject.class)
-          .then(def -> builder.schemaOfAdditionalProperties(loadChild(def).build()))
+          .ifObject().then(def -> builder.schemaOfAdditionalProperties(loadChild(def).build()))
           .requireAny();
     }
     if (schemaJson.has("required")) {
@@ -297,7 +325,7 @@ private StringSchema.Builder buildStringSchema() {
   private void buildTupleSchema(final ArraySchema.Builder builder, final JSONArray itemSchema) {
     for (int i = 0; i < itemSchema.length(); ++i) {
       typeMultiplexer(itemSchema.get(i))
-          .ifIs(JSONObject.class).then(schema -> builder.addItemSchema(loadChild(schema).build()))
+          .ifObject().then(schema -> builder.addItemSchema(loadChild(schema).build()))
           .requireAny();
     }
   }
@@ -338,10 +366,6 @@ public Schema.Builder<?> load() {
   }
 
   private Schema.Builder<?> loadForType(final Object type) {
-    // typeMultiplexer(type)
-    // .ifIs(JSONArray.class).then(a -> buildAnyOfSchemaForMultipleTypes())
-    // .ifIs(String.class).then(this::loadForExplicitType)
-    // .requireAny();
     if (type instanceof JSONArray) {
       return buildAnyOfSchemaForMultipleTypes();
     } else if (type instanceof String) {
@@ -361,7 +385,7 @@ private EnumSchema.Builder buildEnumSchema() {
   }
 
   private Schema.Builder<?> loadChild(final JSONObject childJson) {
-    return new SchemaLoader(childJson, rootSchemaJson).load();
+    return new SchemaLoader(id, childJson, rootSchemaJson).load();
   }
 
   private Schema.Builder<?> loadForExplicitType(final String typeString) {
@@ -385,18 +409,19 @@ private Schema.Builder<?> loadForExplicitType(final String typeString) {
     }
   }
 
-  private Schema.Builder<?> lookupReference(final String pointerString) {
-    if (pointerString.equals("#")) {
+  private Schema.Builder<?> lookupReference(final String relPointerString) {
+    if (relPointerString.equals("#")) {
       throw new UnsupportedOperationException("recursive reference");
     }
     JSONPointer pointer;
-    if (pointerString.startsWith("#")) {
-      pointer = JSONPointer.forDocument(rootSchemaJson, pointerString);
+    String absPointerString = id + relPointerString;
+    if (absPointerString.startsWith("#")) {
+      pointer = JSONPointer.forDocument(rootSchemaJson, absPointerString);
     } else {
-      pointer = JSONPointer.forURL(HttpClients.createDefault(), pointerString);
+      pointer = JSONPointer.forURL(HttpClients.createDefault(), absPointerString);
     }
     QueryResult result = pointer.query();
-    return new SchemaLoader(result.getQueryResult(), result.getContainingDocument()).load();
+    return new SchemaLoader(id, result.getQueryResult(), result.getContainingDocument()).load();
   }
 
   private boolean schemaHasAnyOf(final Collection<String> propNames) {

core/src/test/java/org/everit/jsonvalidator/loader/SchemaLoaderTest.java

@@ -44,17 +44,17 @@ public class SchemaLoaderTest {
 
   @Test
   public void typeBasedMultiplexerTest() {
-    SchemaLoader loader = new SchemaLoader(new JSONObject(), new JSONObject());
+    SchemaLoader loader = new SchemaLoader(null, new JSONObject(), new JSONObject());
     loader.typeMultiplexer(new JSONObject())
-        .ifIs(JSONObject.class).then(jsonObj -> {
+        .ifObject().then(jsonObj -> {
         })
         .ifIs(JSONArray.class).then(jsonArr -> {
         })
         .orElse(obj -> {
         });
 
     loader.typeMultiplexer(new JSONObject())
-        .ifIs(JSONObject.class).then(jsonObj -> {
+        .ifObject().then(jsonObj -> {
         })
         .ifIs(JSONArray.class).then(jsonArr -> {
         })
@@ -63,9 +63,9 @@ public void typeBasedMultiplexerTest() {
 
   @Test(expected = SchemaException.class)
   public void typeBasedMultiplexerFailure() {
-    SchemaLoader loader = new SchemaLoader(new JSONObject(), new JSONObject());
+    SchemaLoader loader = new SchemaLoader(null, new JSONObject(), new JSONObject());
     loader.typeMultiplexer("foo")
-        .ifIs(JSONObject.class).then(o -> {
+        .ifObject().then(o -> {
         })
         .ifIs(JSONArray.class).then(o -> {
         })