fix issue with refs in other keywords (#137)

* fix issue with refs in other keywords
sebastian-toepfer · Jun 12, 2024 · 1001a5a · 1001a5a
1 parent d81242a
commit 1001a5a
Show file tree

Hide file tree

Showing 17 changed files with 173 additions and 43 deletions.
diff --git a/api/src/main/java/io/github/sebastiantoepfer/jsonschema/JsonSchema.java b/api/src/main/java/io/github/sebastiantoepfer/jsonschema/JsonSchema.java
@@ -25,15 +25,21 @@
 
 import io.github.sebastiantoepfer.ddd.common.Printable;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
+import jakarta.json.JsonPointer;
 import jakarta.json.JsonValue;
 import java.util.Optional;
+import java.util.stream.Stream;
 
 public interface JsonSchema extends JsonValue, Printable {
     Validator validator();
 
     Optional<Keyword> keywordByName(String name);
 
-    Optional<JsonSubSchema> asSubSchema(String name);
+    Optional<JsonSubSchema> subSchema(String name);
+
+    Stream<JsonSubSchema> subSchemas(String name);
+
+    Optional<JsonSubSchema> subSchema(JsonPointer pointer);
 
     default JsonSchema rootSchema() {
         return this;

diff --git a/api/src/test/java/io/github/sebastiantoepfer/jsonschema/FakeJsonSchemaFactory.java b/api/src/test/java/io/github/sebastiantoepfer/jsonschema/FakeJsonSchemaFactory.java
@@ -26,8 +26,10 @@
 import io.github.sebastiantoepfer.ddd.common.Media;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
 import io.github.sebastiantoepfer.jsonschema.spi.JsonSchemaFactory;
+import jakarta.json.JsonPointer;
 import jakarta.json.JsonValue;
 import java.util.Optional;
+import java.util.stream.Stream;
 
 public final class FakeJsonSchemaFactory implements JsonSchemaFactory {
 
@@ -54,7 +56,17 @@ public JsonValue.ValueType getValueType() {
         }
 
         @Override
-        public Optional<JsonSubSchema> asSubSchema(String name) {
+        public Optional<JsonSubSchema> subSchema(String name) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Stream<JsonSubSchema> subSchemas(String name) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Optional<JsonSubSchema> subSchema(JsonPointer pointer) {
             throw new UnsupportedOperationException("Not supported yet.");
         }
 

diff --git a/api/src/test/java/io/github/sebastiantoepfer/jsonschema/JsonSubSchemaTest.java b/api/src/test/java/io/github/sebastiantoepfer/jsonschema/JsonSubSchemaTest.java
@@ -29,8 +29,10 @@
 
 import io.github.sebastiantoepfer.ddd.common.Media;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
+import jakarta.json.JsonPointer;
 import jakarta.json.JsonValue;
 import java.util.Optional;
+import java.util.stream.Stream;
 import org.junit.jupiter.api.Test;
 
 class JsonSubSchemaTest {
@@ -61,7 +63,17 @@ public JsonValue.ValueType getValueType() {
                 }
 
                 @Override
-                public Optional<JsonSubSchema> asSubSchema(final String name) {
+                public Optional<JsonSubSchema> subSchema(final String name) {
+                    throw new UnsupportedOperationException("Not supported yet.");
+                }
+
+                @Override
+                public Stream<JsonSubSchema> subSchemas(String name) {
+                    throw new UnsupportedOperationException("Not supported yet.");
+                }
+
+                @Override
+                public Optional<JsonSubSchema> subSchema(JsonPointer pointer) {
                     throw new UnsupportedOperationException("Not supported yet.");
                 }
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -136,9 +136,7 @@
                     <!-- how to validate?
                     <include>**/tests/draft2020-12/id.json</include>
                     -->
-                    <!-- more than items keyword needed :(
                     <include>**/tests/draft2020-12/items.json</include>
-                    -->
                     <include>**/tests/draft2020-12/maxContains.json</include>
                     <include>**/tests/draft2020-12/maxItems.json</include>
                     <include>**/tests/draft2020-12/maxLength.json</include>

diff --git a/core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/DefaultJsonObjectSchema.java b/core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/DefaultJsonObjectSchema.java
@@ -31,6 +31,7 @@
 import io.github.sebastiantoepfer.jsonschema.Validator;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
 import jakarta.json.JsonObject;
+import jakarta.json.JsonPointer;
 import java.util.Optional;
 import java.util.stream.Stream;
 
@@ -61,9 +62,32 @@ private Stream<Keyword> keywords() {
     }
 
     @Override
-    public Optional<JsonSubSchema> asSubSchema(final String name) {
+    public Optional<JsonSubSchema> subSchema(final String name) {
         return Optional.ofNullable(asJsonObject().get(name))
             .flatMap(new DefaultJsonSchemaFactory()::tryToCreateSchemaFrom)
             .map(subSchema -> new DefaultJsonSubSchema(this, subSchema));
     }
+
+    @Override
+    public Stream<JsonSubSchema> subSchemas(final String name) {
+        return asJsonObject()
+            .getJsonArray(name)
+            .stream()
+            .map(new DefaultJsonSchemaFactory()::tryToCreateSchemaFrom)
+            .flatMap(Optional::stream)
+            .map(subSchema -> new DefaultJsonSubSchema(this, subSchema));
+    }
+
+    @Override
+    public Optional<JsonSubSchema> subSchema(final JsonPointer pointer) {
+        final Optional<JsonSubSchema> result;
+        if (pointer.containsValue(asJsonObject())) {
+            result = new DefaultJsonSchemaFactory()
+                .tryToCreateSchemaFrom(pointer.getValue(asJsonObject()))
+                .map(subSchema -> new DefaultJsonSubSchema(this, subSchema));
+        } else {
+            result = Optional.empty();
+        }
+        return result;
+    }
 }
diff --git a/core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/DefaultJsonSubSchema.java b/core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/DefaultJsonSubSchema.java
@@ -32,6 +32,7 @@
 import io.github.sebastiantoepfer.jsonschema.Validator;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
 import jakarta.json.JsonObject;
+import jakarta.json.JsonPointer;
 import jakarta.json.JsonValue;
 import java.util.Objects;
 import java.util.Optional;
@@ -92,10 +93,18 @@ private boolean isJsonObject() {
     }
 
     @Override
-    public Optional<JsonSubSchema> asSubSchema(final String name) {
-        return Optional.ofNullable(asJsonObject().get(name))
-            .flatMap(new DefaultJsonSchemaFactory()::tryToCreateSchemaFrom)
-            .map(subSchema -> new DefaultJsonSubSchema(this, subSchema));
+    public Optional<JsonSubSchema> subSchema(final String name) {
+        return schema.subSchema(name).map(sub -> new DefaultJsonSubSchema(this, sub));
+    }
+
+    @Override
+    public Stream<JsonSubSchema> subSchemas(final String name) {
+        return schema.subSchemas(name).map(sub -> new DefaultJsonSubSchema(this, sub));
+    }
+
+    @Override
+    public Optional<JsonSubSchema> subSchema(final JsonPointer pointer) {
+        return schema.subSchema(pointer).map(sub -> new DefaultJsonSubSchema(this, sub));
     }
 
     @Override

diff --git a/core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/EmptyJsonSchema.java b/core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/EmptyJsonSchema.java
@@ -28,8 +28,10 @@
 import io.github.sebastiantoepfer.jsonschema.JsonSubSchema;
 import io.github.sebastiantoepfer.jsonschema.Validator;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
+import jakarta.json.JsonPointer;
 import jakarta.json.JsonValue;
 import java.util.Optional;
+import java.util.stream.Stream;
 
 final class EmptyJsonSchema extends AbstractJsonValueSchema {
 
@@ -48,7 +50,17 @@ public Optional<Keyword> keywordByName(final String name) {
     }
 
     @Override
-    public Optional<JsonSubSchema> asSubSchema(final String name) {
+    public Optional<JsonSubSchema> subSchema(final String name) {
+        return Optional.empty();
+    }
+
+    @Override
+    public Stream<JsonSubSchema> subSchemas(final String name) {
+        return Stream.empty();
+    }
+
+    @Override
+    public Optional<JsonSubSchema> subSchema(final JsonPointer pointer) {
         return Optional.empty();
     }
 

diff --git a/core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/FalseJsonSchema.java b/core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/FalseJsonSchema.java
@@ -28,8 +28,10 @@
 import io.github.sebastiantoepfer.jsonschema.JsonSubSchema;
 import io.github.sebastiantoepfer.jsonschema.Validator;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
+import jakarta.json.JsonPointer;
 import jakarta.json.JsonValue;
 import java.util.Optional;
+import java.util.stream.Stream;
 
 final class FalseJsonSchema extends AbstractJsonValueSchema {
 
@@ -53,7 +55,17 @@ public Optional<Keyword> keywordByName(final String name) {
     }
 
     @Override
-    public Optional<JsonSubSchema> asSubSchema(final String name) {
+    public Optional<JsonSubSchema> subSchema(final String name) {
         return Optional.empty();
     }
+
+    @Override
+    public Stream<JsonSubSchema> subSchemas(final String name) {
+        return Stream.empty();
+    }
+
+    @Override
+    public Optional<JsonSubSchema> subSchema(final JsonPointer pointer) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
 }
diff --git a/core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/TrueJsonSchema.java b/core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/TrueJsonSchema.java
@@ -28,8 +28,10 @@
 import io.github.sebastiantoepfer.jsonschema.JsonSubSchema;
 import io.github.sebastiantoepfer.jsonschema.Validator;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
+import jakarta.json.JsonPointer;
 import jakarta.json.JsonValue;
 import java.util.Optional;
+import java.util.stream.Stream;
 
 final class TrueJsonSchema extends AbstractJsonValueSchema {
 
@@ -48,7 +50,17 @@ public Optional<Keyword> keywordByName(final String name) {
     }
 
     @Override
-    public Optional<JsonSubSchema> asSubSchema(final String name) {
+    public Optional<JsonSubSchema> subSchema(final String name) {
+        return Optional.empty();
+    }
+
+    @Override
+    public Stream<JsonSubSchema> subSchemas(final String name) {
+        return Stream.empty();
+    }
+
+    @Override
+    public Optional<JsonSubSchema> subSchema(final JsonPointer pointer) {
         return Optional.empty();
     }
 

diff --git a/...a/io/github/sebastiantoepfer/jsonschema/core/keyword/type/NamedJsonSchemaKeywordType.java b/...a/io/github/sebastiantoepfer/jsonschema/core/keyword/type/NamedJsonSchemaKeywordType.java
@@ -51,12 +51,12 @@ public String name() {
 
     @Override
     public Keyword createKeyword(final JsonSchema schema) {
-        final JsonSubSchema pseudoSchema = schema.asSubSchema(name).orElseThrow(IllegalArgumentException::new);
+        final JsonSubSchema pseudoSchema = schema.subSchema(name).orElseThrow(IllegalArgumentException::new);
         return pseudoSchema
             .asJsonObject()
             .keySet()
             .stream()
-            .map(n -> Map.entry(n, pseudoSchema.asSubSchema(n).orElseThrow(IllegalArgumentException::new)))
+            .map(n -> Map.entry(n, pseudoSchema.subSchema(n).orElseThrow(IllegalArgumentException::new)))
             .collect(
                 collectingAndThen(
                     toMap(Map.Entry::getKey, Map.Entry::getValue),

diff --git a/.../java/io/github/sebastiantoepfer/jsonschema/core/keyword/type/SchemaArrayKeywordType.java b/.../java/io/github/sebastiantoepfer/jsonschema/core/keyword/type/SchemaArrayKeywordType.java
@@ -27,7 +27,6 @@
 import static java.util.stream.Collectors.toList;
 
 import io.github.sebastiantoepfer.jsonschema.JsonSchema;
-import io.github.sebastiantoepfer.jsonschema.core.DefaultJsonSchemaFactory;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
 import io.github.sebastiantoepfer.jsonschema.keyword.KeywordType;
 import java.util.List;
@@ -51,11 +50,6 @@ public String name() {
 
     @Override
     public Keyword createKeyword(final JsonSchema schema) {
-        return schema
-            .asJsonObject()
-            .getJsonArray(name)
-            .stream()
-            .map(new DefaultJsonSchemaFactory()::create)
-            .collect(collectingAndThen(toList(), keywordCreator));
+        return schema.subSchemas(name).collect(collectingAndThen(toList(), keywordCreator));
     }
 }
diff --git a/...in/java/io/github/sebastiantoepfer/jsonschema/core/keyword/type/SubSchemaKeywordType.java b/...in/java/io/github/sebastiantoepfer/jsonschema/core/keyword/type/SubSchemaKeywordType.java
@@ -47,6 +47,6 @@ public String name() {
 
     @Override
     public Keyword createKeyword(final JsonSchema schema) {
-        return schema.asSubSchema(name()).map(keywordCreator).orElseThrow(IllegalArgumentException::new);
+        return schema.subSchema(name()).map(keywordCreator).orElseThrow(IllegalArgumentException::new);
     }
 }
diff --git a/core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/core/RefKeyword.java b/core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/core/RefKeyword.java
@@ -25,11 +25,9 @@
 
 import io.github.sebastiantoepfer.ddd.common.Media;
 import io.github.sebastiantoepfer.jsonschema.JsonSchema;
-import io.github.sebastiantoepfer.jsonschema.JsonSchemas;
 import io.github.sebastiantoepfer.jsonschema.keyword.Applicator;
 import jakarta.json.Json;
 import jakarta.json.JsonPointer;
-import jakarta.json.JsonStructure;
 import jakarta.json.JsonValue;
 import java.io.IOException;
 import java.net.URI;
@@ -82,23 +80,14 @@ private JsonSchema retrieveJsonSchema() {
             } else {
                 json = retrieveSchemaFromLocalSchema();
             }
-            return JsonSchemas.load(json);
+            return json;
         } catch (IOException ex) {
             throw new IllegalStateException("can not load schema!", ex);
         }
     }
 
     private JsonSchema retrieveSchemaFromLocalSchema() throws IOException {
-        final JsonPointer pointer = createPointer();
-        if (pointer.containsValue(searchAnchor())) {
-            return JsonSchemas.load(pointer.getValue(searchAnchor()));
-        } else {
-            throw new IOException("can not find referenced value.");
-        }
-    }
-
-    private JsonStructure searchAnchor() {
-        return schema.rootSchema().asJsonObject();
+        return schema.rootSchema().subSchema(createPointer()).orElseThrow();
     }
 
     private JsonPointer createPointer() {

diff --git a/...src/test/java/io/github/sebastiantoepfer/jsonschema/core/AbstractJsonValueSchemaTest.java b/...src/test/java/io/github/sebastiantoepfer/jsonschema/core/AbstractJsonValueSchemaTest.java
@@ -33,8 +33,10 @@
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
 import jakarta.json.JsonArray;
 import jakarta.json.JsonObject;
+import jakarta.json.JsonPointer;
 import jakarta.json.JsonValue;
 import java.util.Optional;
+import java.util.stream.Stream;
 import org.junit.jupiter.api.Test;
 
 class AbstractJsonValueSchemaTest {
@@ -81,7 +83,17 @@ public Optional<Keyword> keywordByName(final String name) {
         }
 
         @Override
-        public Optional<JsonSubSchema> asSubSchema(final String name) {
+        public Optional<JsonSubSchema> subSchema(final String name) {
+            return Optional.empty();
+        }
+
+        @Override
+        public Stream<JsonSubSchema> subSchemas(final String name) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public Optional<JsonSubSchema> subSchema(final JsonPointer pointer) {
             return Optional.empty();
         }
     }

diff --git a/...src/test/java/io/github/sebastiantoepfer/jsonschema/core/DefaultJsonObjectSchemaTest.java b/...src/test/java/io/github/sebastiantoepfer/jsonschema/core/DefaultJsonObjectSchemaTest.java
@@ -114,7 +114,7 @@ void should_return_empty_for_non_existing_keyword() {
     @Test
     void should_return_empty_if_non_subschema_exists_under_the_given_name() {
         assertThat(
-            new DefaultJsonObjectSchema(Json.createObjectBuilder().add("test", "hallo").build()).asSubSchema(
+            new DefaultJsonObjectSchema(Json.createObjectBuilder().add("test", "hallo").build()).subSchema(
                 "properties"
             ),
             isEmpty()
@@ -124,7 +124,7 @@ void should_return_empty_if_non_subschema_exists_under_the_given_name() {
     @Test
     void should_return_subschema_if_subschema_exists_under_the_given_name() {
         assertThat(
-            new DefaultJsonObjectSchema(Json.createObjectBuilder().add("test", JsonValue.FALSE).build()).asSubSchema(
+            new DefaultJsonObjectSchema(Json.createObjectBuilder().add("test", JsonValue.FALSE).build()).subSchema(
                 "test"
             ),
             isPresent()
@@ -136,7 +136,7 @@ void should_return_empty_if_given_name_not_resolve_to_a_valid_schematype() {
         assertThat(
             new DefaultJsonObjectSchema(
                 Json.createObjectBuilder().add("test", JsonValue.EMPTY_JSON_ARRAY).build()
-            ).asSubSchema("test"),
+            ).subSchema("test"),
             isEmpty()
         );
     }