making MetaSchemaTest pass

Author: erosb

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

@@ -55,60 +55,6 @@
  */
 public class SchemaLoader {
 
-  private static final List<String> ARRAY_SCHEMA_PROPS = Arrays.asList("items", "additionalItems",
-      "minItems",
-      "maxItems",
-      "uniqueItems");
-
-  private static final List<String> OBJECT_SCHEMA_PROPS = Arrays.asList("properties", "required",
-      "minProperties",
-      "maxProperties",
-      "dependencies",
-      "patternProperties",
-      "additionalProperties");
-
-  private static final List<String> NUMBER_SCHEMA_PROPS = Arrays.asList("minimum", "maximum",
-      "minimumExclusive", "maximumExclusive", "multipleOf");
-
-  private static final List<String> STRING_SCHEMA_PROPS = Arrays.asList("minLength", "maxLength",
-      "pattern");
-
-  private static final Map<String, Function<Collection<Schema>, CombinedSchema.Builder>> //
-  COMBINED_SUBSCHEMA_PROVIDERS = new HashMap<>(3);
-
-  static {
-    COMBINED_SUBSCHEMA_PROVIDERS.put("allOf", CombinedSchema::allOf);
-    COMBINED_SUBSCHEMA_PROVIDERS.put("anyOf", CombinedSchema::anyOf);
-    COMBINED_SUBSCHEMA_PROVIDERS.put("oneOf", CombinedSchema::oneOf);
-  }
-
-  /**
-   * Loads a JSON schema to a schema validator using a {@link DefaultSchemaClient default HTTP
-   * client}.
-   *
-   * @param schemaJson
-   *          the JSON representation of the schema.
-   * @return the schema validator object
-   */
-  public static Schema load(final JSONObject schemaJson) {
-    return load(schemaJson, new DefaultSchemaClient());
-  }
-
-  /**
-   * Creates Schema instance from its JSON representation.
-   *
-   * @param schemaJson
-   *          the JSON representation of the schema.
-   * @param httpClient
-   *          the HTTP client to be used for resolving remote JSON references.
-   * @return the created schema
-   */
-  public static Schema load(final JSONObject schemaJson, final SchemaClient httpClient) {
-    String schemaId = schemaJson.optString("id");
-    return new SchemaLoader(schemaId, schemaJson, schemaJson, new HashMap<>(), httpClient)
-        .load().build();
-  }
-
   /**
    * Created and used by {@link TypeBasedMultiplexer} to set actions (consumers) for matching
    * classes.
@@ -136,26 +82,6 @@ interface OnTypeConsumer<E> {
    */
   class TypeBasedMultiplexer {
 
-    /**
-     * Default implementation of {@link OnTypeConsumer}, instantiated by
-     * {@link TypeBasedMultiplexer#ifIs(Class)}.
-     */
-    private class OnTypeConsumerImpl<E> implements OnTypeConsumer<E> {
-
-      protected final Class<?> key;
-
-      public OnTypeConsumerImpl(final Class<?> key) {
-        this.key = key;
-      }
-
-      @Override
-      public TypeBasedMultiplexer then(final Consumer<E> consumer) {
-        actions.put(key, consumer);
-        return TypeBasedMultiplexer.this;
-      }
-
-    }
-
     /**
      * An {@link OnTypeConsumer} implementation which wraps the action ({@code obj} consumer} set by
      * {@link #then(Consumer)} into an other consumer which maintains {@link SchemaLoader#id}.
@@ -189,12 +115,39 @@ public TypeBasedMultiplexer then(final Consumer<JSONObject> consumer) {
 
     }
 
+    /**
+     * Default implementation of {@link OnTypeConsumer}, instantiated by
+     * {@link TypeBasedMultiplexer#ifIs(Class)}.
+     */
+    private class OnTypeConsumerImpl<E> implements OnTypeConsumer<E> {
+
+      protected final Class<?> key;
+
+      public OnTypeConsumerImpl(final Class<?> key) {
+        this.key = key;
+      }
+
+      @Override
+      public TypeBasedMultiplexer then(final Consumer<E> consumer) {
+        actions.put(key, consumer);
+        return TypeBasedMultiplexer.this;
+      }
+
+    }
+
     private final String keyOfObj;
 
     private final Object obj;
 
     private final Map<Class<?>, Consumer<?>> actions = new HashMap<>();
 
+    /**
+     * Constructor with {@code null} {@code keyOfObj}.
+     */
+    public TypeBasedMultiplexer(final Object obj) {
+      this(null, obj);
+    }
+
     /**
      * Constructor.
      *
@@ -210,13 +163,6 @@ public TypeBasedMultiplexer(final String keyOfObj, final Object obj) {
       this.obj = obj;
     }
 
-    /**
-     * Constructor with {@code null} {@code keyOfObj}.
-     */
-    public TypeBasedMultiplexer(final Object obj) {
-      this(null, obj);
-    }
-
     /**
      * Creates a setter which will be invoked by {@link #orElse(Consumer)} or {@link #requireAny()}
      * if {@code obj} is an instance of {@code predicateClass}.
@@ -256,10 +202,10 @@ public OnTypeConsumer<JSONObject> ifObject() {
     public void orElse(final Consumer<Object> orElseConsumer) {
       @SuppressWarnings("unchecked")
       Consumer<Object> consumer = (Consumer<Object>) actions.keySet().stream()
-      .filter(clazz -> clazz.isAssignableFrom(obj.getClass()))
-      .findFirst()
-      .map(actions::get)
-      .orElse(orElseConsumer::accept);
+          .filter(clazz -> clazz.isAssignableFrom(obj.getClass()))
+          .findFirst()
+          .map(actions::get)
+          .orElse(orElseConsumer::accept);
       consumer.accept(obj);
 
     }
@@ -276,12 +222,58 @@ public void requireAny() {
     }
   }
 
-  TypeBasedMultiplexer typeMultiplexer(final Object obj) {
-    return new TypeBasedMultiplexer(obj);
+  private static final List<String> ARRAY_SCHEMA_PROPS = Arrays.asList("items", "additionalItems",
+      "minItems",
+      "maxItems",
+      "uniqueItems");
+
+  private static final List<String> OBJECT_SCHEMA_PROPS = Arrays.asList("properties", "required",
+      "minProperties",
+      "maxProperties",
+      "dependencies",
+      "patternProperties",
+      "additionalProperties");
+
+  private static final List<String> NUMBER_SCHEMA_PROPS = Arrays.asList("minimum", "maximum",
+      "minimumExclusive", "maximumExclusive", "multipleOf");
+
+  private static final List<String> STRING_SCHEMA_PROPS = Arrays.asList("minLength", "maxLength",
+      "pattern");
+
+  private static final Map<String, Function<Collection<Schema>, CombinedSchema.Builder>> //
+  COMBINED_SUBSCHEMA_PROVIDERS = new HashMap<>(3);
+
+  static {
+    COMBINED_SUBSCHEMA_PROVIDERS.put("allOf", CombinedSchema::allOf);
+    COMBINED_SUBSCHEMA_PROVIDERS.put("anyOf", CombinedSchema::anyOf);
+    COMBINED_SUBSCHEMA_PROVIDERS.put("oneOf", CombinedSchema::oneOf);
   }
 
-  TypeBasedMultiplexer typeMultiplexer(final String keyOfObj, final Object obj) {
-    return new TypeBasedMultiplexer(keyOfObj, obj);
+  /**
+   * Loads a JSON schema to a schema validator using a {@link DefaultSchemaClient default HTTP
+   * client}.
+   *
+   * @param schemaJson
+   *          the JSON representation of the schema.
+   * @return the schema validator object
+   */
+  public static Schema load(final JSONObject schemaJson) {
+    return load(schemaJson, new DefaultSchemaClient());
+  }
+
+  /**
+   * Creates Schema instance from its JSON representation.
+   *
+   * @param schemaJson
+   *          the JSON representation of the schema.
+   * @param httpClient
+   *          the HTTP client to be used for resolving remote JSON references.
+   * @return the created schema
+   */
+  public static Schema load(final JSONObject schemaJson, final SchemaClient httpClient) {
+    String schemaId = schemaJson.optString("id");
+    return new SchemaLoader(schemaId, schemaJson, schemaJson, new HashMap<>(), httpClient)
+        .load().build();
   }
 
   private String id = null;
@@ -309,19 +301,19 @@ TypeBasedMultiplexer typeMultiplexer(final String keyOfObj, final Object obj) {
 
   private void addDependencies(final Builder builder, final JSONObject deps) {
     Arrays.stream(JSONObject.getNames(deps))
-    .forEach(ifPresent -> addDependency(builder, ifPresent, deps.get(ifPresent)));
+        .forEach(ifPresent -> addDependency(builder, ifPresent, deps.get(ifPresent)));
   }
 
   private void addDependency(final Builder builder, final String ifPresent, final Object deps) {
     typeMultiplexer(deps)
-    .ifObject().then(obj -> {
-      builder.schemaDependency(ifPresent, loadChild(obj).build());
-    })
-    .ifIs(JSONArray.class).then(propNames -> {
-      IntStream.range(0, propNames.length())
+        .ifObject().then(obj -> {
+          builder.schemaDependency(ifPresent, loadChild(obj).build());
+        })
+        .ifIs(JSONArray.class).then(propNames -> {
+          IntStream.range(0, propNames.length())
               .mapToObj(i -> propNames.getString(i))
               .forEach(dependency -> builder.propertyDependency(ifPresent, dependency));
-    }).requireAny();
+        }).requireAny();
   }
 
   private CombinedSchema.Builder buildAnyOfSchemaForMultipleTypes() {
@@ -350,13 +342,22 @@ private ArraySchema.Builder buildArraySchema() {
     }
     if (schemaJson.has("items")) {
       typeMultiplexer("items", schemaJson.get("items"))
-      .ifObject().then(itemSchema -> builder.allItemSchema(loadChild(itemSchema).build()))
-      .ifIs(JSONArray.class).then(arr -> buildTupleSchema(builder, arr))
-      .requireAny();
+          .ifObject().then(itemSchema -> builder.allItemSchema(loadChild(itemSchema).build()))
+          .ifIs(JSONArray.class).then(arr -> buildTupleSchema(builder, arr))
+          .requireAny();
     }
     return builder;
   }
 
+  private EnumSchema.Builder buildEnumSchema() {
+    Set<Object> possibleValues = new HashSet<>();
+    JSONArray arr = schemaJson.getJSONArray("enum");
+    IntStream.range(0, arr.length())
+        .mapToObj(arr::get)
+        .forEach(possibleValues::add);
+    return EnumSchema.builder().possibleValues(possibleValues);
+  }
+
   private NotSchema.Builder buildNotSchema() {
     Schema mustNotMatch = loadChild(schemaJson.getJSONObject("not")).build();
     return NotSchema.builder().mustNotMatch(mustNotMatch);
@@ -379,8 +380,8 @@ private ObjectSchema.Builder buildObjectSchema() {
     if (schemaJson.has("properties")) {
       JSONObject propertyDefs = schemaJson.getJSONObject("properties");
       Arrays.stream(Optional.ofNullable(JSONObject.getNames(propertyDefs)).orElse(new String[0]))
-      .forEach(key -> builder.addPropertySchema(key,
-          loadChild(propertyDefs.getJSONObject(key)).build()));
+          .forEach(key -> builder.addPropertySchema(key,
+              loadChild(propertyDefs.getJSONObject(key)).build()));
     }
     if (schemaJson.has("additionalProperties")) {
       typeMultiplexer("additionalProperties", schemaJson.get("additionalProperties"))
@@ -391,8 +392,8 @@ private ObjectSchema.Builder buildObjectSchema() {
     if (schemaJson.has("required")) {
       JSONArray requiredJson = schemaJson.getJSONArray("required");
       IntStream.range(0, requiredJson.length())
-      .mapToObj(requiredJson::getString)
-      .forEach(builder::addRequiredProperty);
+          .mapToObj(requiredJson::getString)
+          .forEach(builder::addRequiredProperty);
     }
     if (schemaJson.has("patternProperties")) {
       JSONObject patternPropsJson = schemaJson.getJSONObject("patternProperties");
@@ -481,25 +482,6 @@ private Schema.Builder<?> load() {
     return builder;
   }
 
-  private Schema.Builder<?> loadForType(final Object type) {
-    if (type instanceof JSONArray) {
-      return buildAnyOfSchemaForMultipleTypes();
-    } else if (type instanceof String) {
-      return loadForExplicitType((String) type);
-    } else {
-      throw new SchemaException("type", Arrays.asList(JSONArray.class, String.class), type);
-    }
-  }
-
-  private EnumSchema.Builder buildEnumSchema() {
-    Set<Object> possibleValues = new HashSet<>();
-    JSONArray arr = schemaJson.getJSONArray("enum");
-    IntStream.range(0, arr.length())
-        .mapToObj(arr::get)
-        .forEach(possibleValues::add);
-    return EnumSchema.builder().possibleValues(possibleValues);
-  }
-
   private Schema.Builder<?> loadChild(final JSONObject childJson) {
     return new SchemaLoader(id, childJson, rootSchemaJson, pointerSchemas,
         httpClient).load();
@@ -526,6 +508,16 @@ private Schema.Builder<?> loadForExplicitType(final String typeString) {
     }
   }
 
+  private Schema.Builder<?> loadForType(final Object type) {
+    if (type instanceof JSONArray) {
+      return buildAnyOfSchemaForMultipleTypes();
+    } else if (type instanceof String) {
+      return loadForExplicitType((String) type);
+    } else {
+      throw new SchemaException("type", Arrays.asList(JSONArray.class, String.class), type);
+    }
+  }
+
   /**
    * Returns a schema builder instance after looking up the JSON pointer.
    */
@@ -547,11 +539,19 @@ private Schema.Builder<?> lookupReference(final String relPointerString) {
         return refBuilder;
       }
     } else {
+      if (pointerSchemas.containsKey(absPointerString)) {
+        return pointerSchemas.get(absPointerString);
+      }
+      ReferenceSchema.Builder refBuilder = ReferenceSchema.builder();
+      pointerSchemas.put(absPointerString, refBuilder);
       pointer = JSONPointer.forURL(httpClient, absPointerString);
+      QueryResult result = pointer.query();
+      SchemaLoader childLoader = new SchemaLoader(id, result.getQueryResult(),
+          result.getContainingDocument(), pointerSchemas, httpClient);
+      Schema referredSchema = childLoader.load().build();
+      refBuilder.build().setReferredSchema(referredSchema);
+      return refBuilder;
     }
-    QueryResult result = pointer.query();
-    return new SchemaLoader(id, result.getQueryResult(), result.getContainingDocument(),
-        pointerSchemas, httpClient).load();
   }
 
   private boolean schemaHasAnyOf(final Collection<String> propNames) {
@@ -603,4 +603,12 @@ private CombinedSchema.Builder tryCombinedSchema() {
       return null;
     }
   }
+
+  TypeBasedMultiplexer typeMultiplexer(final Object obj) {
+    return new TypeBasedMultiplexer(obj);
+  }
+
+  TypeBasedMultiplexer typeMultiplexer(final String keyOfObj, final Object obj) {
+    return new TypeBasedMultiplexer(keyOfObj, obj);
+  }
 }

core/src/main/java/org/everit/json/schema/loader/internal/JSONPointer.java

@@ -152,8 +152,9 @@ public QueryResult query() {
     if (fragment.isEmpty()) {
       return new QueryResult(document, document);
     }
+    System.out.println("\tquerying " + fragment);
     String[] path = fragment.split("/");
-    if ( path[0] == null || !path[0].startsWith("#")) {
+    if (path[0] == null || !path[0].startsWith("#")) {
       throw new IllegalArgumentException("JSON pointers must start with a '#'");
     }
     Object current = document;