implement items as subschema

sebastian-toepfer · Oct 3, 2023 · 0849b17 · 0849b17
1 parent 4212c42
commit 0849b17
Show file tree

Hide file tree

Showing 38 changed files with 287 additions and 90 deletions.
diff --git a/core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/DefaultJsonSchema.java b/core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/DefaultJsonSchema.java
@@ -50,7 +50,7 @@ public Validator validator() {
         return asJsonObject()
             .entrySet()
             .stream()
-            .map(keywords::createKeywordFor)
+            .map(keyword -> keywords.createKeywordFor(this, keyword))
             .filter(Constraint.class::isInstance)
             .map(k -> (Constraint<JsonValue>) k)
             .collect(
@@ -60,7 +60,7 @@ public Validator validator() {
 
     private Collection<VocabularyDefinition> vocabulary() {
         return new KeywordSearch(new VocabularyKeywordType())
-            .searchForKeywordIn(asJsonObject())
+            .searchForKeywordIn(this)
             .filter(VocabularyDefinitions.class::isInstance)
             .map(VocabularyDefinitions.class::cast)
             .stream()

diff --git a/core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/KeywordSearch.java b/core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/KeywordSearch.java
@@ -23,9 +23,9 @@
  */
 package io.github.sebastiantoepfer.jsonschema.core;
 
+import io.github.sebastiantoepfer.jsonschema.JsonSchema;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
 import io.github.sebastiantoepfer.jsonschema.keyword.KeywordType;
-import jakarta.json.JsonObject;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -37,7 +37,9 @@ public KeywordSearch(final KeywordType keywordType) {
         this.keywordType = Objects.requireNonNull(keywordType);
     }
 
-    public Optional<Keyword> searchForKeywordIn(final JsonObject schema) {
-        return Optional.ofNullable(schema.get(keywordType.name())).map(keywordType::createKeyword);
+    public Optional<Keyword> searchForKeywordIn(final JsonSchema schema) {
+        return Optional
+            .ofNullable(schema.asJsonObject().get(keywordType.name()))
+            .map(keywordValue -> keywordType.createKeyword(schema, keywordValue));
     }
 }
diff --git a/core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/Keywords.java b/core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/Keywords.java
@@ -26,6 +26,7 @@
 import static java.util.function.Predicate.not;
 import static java.util.stream.Collectors.toMap;
 
+import io.github.sebastiantoepfer.jsonschema.JsonSchema;
 import io.github.sebastiantoepfer.jsonschema.Vocabulary;
 import io.github.sebastiantoepfer.jsonschema.core.vocab.basic.BasicVocabulary;
 import io.github.sebastiantoepfer.jsonschema.core.vocab.core.CoreLazyVocabulary;
@@ -80,13 +81,13 @@ public Keywords(final Collection<VocabularyDefinition> vocabDefs) {
                 );
     }
 
-    public Keyword createKeywordFor(final Map.Entry<String, JsonValue> property) {
+    public Keyword createKeywordFor(final JsonSchema schema, final Map.Entry<String, JsonValue> property) {
         return vocabularies
             .stream()
             .map(vocab -> vocab.findKeywordTypeByName(property.getKey()))
             .flatMap(Optional::stream)
             .findFirst()
-            .map(keywordType -> keywordType.createKeyword(property.getValue()))
+            .map(keywordType -> keywordType.createKeyword(schema, property.getValue()))
             .orElseThrow();
     }
 }
diff --git a/...a/io/github/sebastiantoepfer/jsonschema/core/vocab/basic/ExclusiveMaximumKeywordType.java b/...a/io/github/sebastiantoepfer/jsonschema/core/vocab/basic/ExclusiveMaximumKeywordType.java
@@ -25,6 +25,7 @@
 
 import io.github.sebastiantoepfer.jsonschema.ConstraintViolation;
 import io.github.sebastiantoepfer.jsonschema.InstanceType;
+import io.github.sebastiantoepfer.jsonschema.JsonSchema;
 import io.github.sebastiantoepfer.jsonschema.core.vocab.ConstraintAssertion;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
 import io.github.sebastiantoepfer.jsonschema.keyword.KeywordType;
@@ -44,7 +45,7 @@ public String name() {
     }
 
     @Override
-    public Keyword createKeyword(final JsonValue value) {
+    public Keyword createKeyword(final JsonSchema schema, final JsonValue value) {
         if (InstanceType.NUMBER.isInstance(value)) {
             return new ExclusiveMaximumKeyword((JsonNumber) value);
         } else {

diff --git a/...a/io/github/sebastiantoepfer/jsonschema/core/vocab/basic/ExclusiveMinimumKeywordType.java b/...a/io/github/sebastiantoepfer/jsonschema/core/vocab/basic/ExclusiveMinimumKeywordType.java
@@ -25,6 +25,7 @@
 
 import io.github.sebastiantoepfer.jsonschema.ConstraintViolation;
 import io.github.sebastiantoepfer.jsonschema.InstanceType;
+import io.github.sebastiantoepfer.jsonschema.JsonSchema;
 import io.github.sebastiantoepfer.jsonschema.core.vocab.ConstraintAssertion;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
 import io.github.sebastiantoepfer.jsonschema.keyword.KeywordType;
@@ -44,7 +45,7 @@ public String name() {
     }
 
     @Override
-    public Keyword createKeyword(final JsonValue value) {
+    public Keyword createKeyword(final JsonSchema schema, final JsonValue value) {
         if (InstanceType.NUMBER.isInstance(value)) {
             return new ExclusiveMinimumKeyword((JsonNumber) value);
         } else {

diff --git a/...rc/main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/basic/ItemsKeywordType.java b/...rc/main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/basic/ItemsKeywordType.java
@@ -27,6 +27,7 @@
 import io.github.sebastiantoepfer.jsonschema.InstanceType;
 import io.github.sebastiantoepfer.jsonschema.JsonSchema;
 import io.github.sebastiantoepfer.jsonschema.JsonSchemas;
+import io.github.sebastiantoepfer.jsonschema.JsonSubSchema;
 import io.github.sebastiantoepfer.jsonschema.Validator;
 import io.github.sebastiantoepfer.jsonschema.core.vocab.ConstraintAssertion;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
@@ -46,16 +47,33 @@ public String name() {
     }
 
     @Override
-    public Keyword createKeyword(final JsonValue value) {
-        return new ItemsKeyword(JsonSchemas.load(value));
+    public Keyword createKeyword(final JsonSchema schema, final JsonValue value) {
+        return new ItemsKeyword(schema, JsonSchemas.load(value));
     }
 
-    private class ItemsKeyword implements ConstraintAssertion {
+    private class ItemsKeyword implements ConstraintAssertion, JsonSubSchema {
 
+        private final JsonSchema owner;
         private final JsonSchema schema;
 
-        public ItemsKeyword(final JsonSchema schema) {
-            this.schema = schema;
+        public ItemsKeyword(final JsonSchema owner, final JsonSchema schema) {
+            this.owner = Objects.requireNonNull(owner);
+            this.schema = Objects.requireNonNull(schema);
+        }
+
+        @Override
+        public JsonSchema owner() {
+            return owner;
+        }
+
+        @Override
+        public Validator validator() {
+            return schema.validator();
+        }
+
+        @Override
+        public ValueType getValueType() {
+            return schema.getValueType();
         }
 
         @Override
@@ -75,7 +93,7 @@ public Collection<ConstraintViolation> violationsBy(final JsonValue value) {
         }
 
         private boolean matchesSchema(final JsonArray items) {
-            final Validator itemValidator = schema.validator();
+            final Validator itemValidator = validator();
             return items.stream().map(itemValidator::validate).allMatch(Collection::isEmpty);
         }
     }

diff --git a/...ain/java/io/github/sebastiantoepfer/jsonschema/core/vocab/basic/MaxLengthKeywordType.java b/...ain/java/io/github/sebastiantoepfer/jsonschema/core/vocab/basic/MaxLengthKeywordType.java
@@ -25,6 +25,7 @@
 
 import io.github.sebastiantoepfer.jsonschema.ConstraintViolation;
 import io.github.sebastiantoepfer.jsonschema.InstanceType;
+import io.github.sebastiantoepfer.jsonschema.JsonSchema;
 import io.github.sebastiantoepfer.jsonschema.core.vocab.ConstraintAssertion;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
 import io.github.sebastiantoepfer.jsonschema.keyword.KeywordType;
@@ -44,7 +45,7 @@ public String name() {
     }
 
     @Override
-    public Keyword createKeyword(final JsonValue value) {
+    public Keyword createKeyword(final JsonSchema schema, final JsonValue value) {
         if (InstanceType.INTEGER.isInstance(value)) {
             return new MaxLengthKeyword((JsonNumber) value);
         } else {

diff --git a/.../main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/basic/MaximumKeywordType.java b/.../main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/basic/MaximumKeywordType.java
@@ -25,6 +25,7 @@
 
 import io.github.sebastiantoepfer.jsonschema.ConstraintViolation;
 import io.github.sebastiantoepfer.jsonschema.InstanceType;
+import io.github.sebastiantoepfer.jsonschema.JsonSchema;
 import io.github.sebastiantoepfer.jsonschema.core.vocab.ConstraintAssertion;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
 import io.github.sebastiantoepfer.jsonschema.keyword.KeywordType;
@@ -44,7 +45,7 @@ public String name() {
     }
 
     @Override
-    public Keyword createKeyword(final JsonValue value) {
+    public Keyword createKeyword(final JsonSchema schema, final JsonValue value) {
         if (InstanceType.NUMBER.isInstance(value)) {
             return new MaximumKeyword((JsonNumber) value);
         } else {

diff --git a/...ain/java/io/github/sebastiantoepfer/jsonschema/core/vocab/basic/MinLengthKeywordType.java b/...ain/java/io/github/sebastiantoepfer/jsonschema/core/vocab/basic/MinLengthKeywordType.java
@@ -25,6 +25,7 @@
 
 import io.github.sebastiantoepfer.jsonschema.ConstraintViolation;
 import io.github.sebastiantoepfer.jsonschema.InstanceType;
+import io.github.sebastiantoepfer.jsonschema.JsonSchema;
 import io.github.sebastiantoepfer.jsonschema.core.vocab.ConstraintAssertion;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
 import io.github.sebastiantoepfer.jsonschema.keyword.KeywordType;
@@ -44,7 +45,7 @@ public String name() {
     }
 
     @Override
-    public Keyword createKeyword(final JsonValue value) {
+    public Keyword createKeyword(final JsonSchema schema, final JsonValue value) {
         if (InstanceType.INTEGER.isInstance(value)) {
             return new MinLengthKeyword((JsonNumber) value);
         } else {

diff --git a/.../main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/basic/MinimumKeywordType.java b/.../main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/basic/MinimumKeywordType.java
@@ -25,6 +25,7 @@
 
 import io.github.sebastiantoepfer.jsonschema.ConstraintViolation;
 import io.github.sebastiantoepfer.jsonschema.InstanceType;
+import io.github.sebastiantoepfer.jsonschema.JsonSchema;
 import io.github.sebastiantoepfer.jsonschema.core.vocab.ConstraintAssertion;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
 import io.github.sebastiantoepfer.jsonschema.keyword.KeywordType;
@@ -44,7 +45,7 @@ public String name() {
     }
 
     @Override
-    public Keyword createKeyword(final JsonValue value) {
+    public Keyword createKeyword(final JsonSchema schema, final JsonValue value) {
         if (InstanceType.NUMBER.isInstance(value)) {
             return new MinimumKeyword((JsonNumber) value);
         } else {

diff --git a/.../main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/basic/PatternKeywordType.java b/.../main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/basic/PatternKeywordType.java
@@ -25,6 +25,7 @@
 
 import io.github.sebastiantoepfer.jsonschema.ConstraintViolation;
 import io.github.sebastiantoepfer.jsonschema.InstanceType;
+import io.github.sebastiantoepfer.jsonschema.JsonSchema;
 import io.github.sebastiantoepfer.jsonschema.core.vocab.ConstraintAssertion;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
 import io.github.sebastiantoepfer.jsonschema.keyword.KeywordType;
@@ -44,7 +45,7 @@ public String name() {
     }
 
     @Override
-    public Keyword createKeyword(final JsonValue value) {
+    public Keyword createKeyword(final JsonSchema schema, final JsonValue value) {
         if (InstanceType.STRING.isInstance(value)) {
             return new PatternKeyword((JsonString) value);
         } else {

diff --git a/...src/main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/basic/TypeKeywordType.java b/...src/main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/basic/TypeKeywordType.java
@@ -28,6 +28,7 @@
 
 import io.github.sebastiantoepfer.jsonschema.ConstraintViolation;
 import io.github.sebastiantoepfer.jsonschema.InstanceType;
+import io.github.sebastiantoepfer.jsonschema.JsonSchema;
 import io.github.sebastiantoepfer.jsonschema.core.constraint.AnyConstraint;
 import io.github.sebastiantoepfer.jsonschema.core.constraint.Constraint;
 import io.github.sebastiantoepfer.jsonschema.core.vocab.ConstraintAssertion;
@@ -52,7 +53,7 @@ public String name() {
     }
 
     @Override
-    public Keyword createKeyword(final JsonValue value) {
+    public Keyword createKeyword(final JsonSchema schema, final JsonValue value) {
         return new TypeKeyword(value);
     }
 

diff --git a/...c/main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/basic/UnknowKeywordType.java b/...c/main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/basic/UnknowKeywordType.java
@@ -23,6 +23,7 @@
  */
 package io.github.sebastiantoepfer.jsonschema.core.vocab.basic;
 
+import io.github.sebastiantoepfer.jsonschema.JsonSchema;
 import io.github.sebastiantoepfer.jsonschema.keyword.DefaultAnnotation;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
 import io.github.sebastiantoepfer.jsonschema.keyword.KeywordType;
@@ -43,7 +44,7 @@ public String name() {
     }
 
     @Override
-    public Keyword createKeyword(final JsonValue value) {
+    public Keyword createKeyword(final JsonSchema schema, final JsonValue value) {
         return new DefaultAnnotation(name(), value);
     }
 }
diff --git a/...c/main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/core/CommentKeywordType.java b/...c/main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/core/CommentKeywordType.java
@@ -23,6 +23,7 @@
  */
 package io.github.sebastiantoepfer.jsonschema.core.vocab.core;
 
+import io.github.sebastiantoepfer.jsonschema.JsonSchema;
 import io.github.sebastiantoepfer.jsonschema.keyword.DefaultAnnotation;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
 import io.github.sebastiantoepfer.jsonschema.keyword.KeywordType;
@@ -40,7 +41,7 @@ public String name() {
     }
 
     @Override
-    public Keyword createKeyword(final JsonValue value) {
+    public Keyword createKeyword(final JsonSchema schema, final JsonValue value) {
         return new DefaultAnnotation(name(), value);
     }
 }
diff --git a/.../src/main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/core/DefsKeywordType.java b/.../src/main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/core/DefsKeywordType.java
@@ -23,6 +23,7 @@
  */
 package io.github.sebastiantoepfer.jsonschema.core.vocab.core;
 
+import io.github.sebastiantoepfer.jsonschema.JsonSchema;
 import io.github.sebastiantoepfer.jsonschema.keyword.DefaultAnnotation;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
 import io.github.sebastiantoepfer.jsonschema.keyword.KeywordType;
@@ -40,7 +41,7 @@ public String name() {
     }
 
     @Override
-    public Keyword createKeyword(final JsonValue value) {
+    public Keyword createKeyword(final JsonSchema schema, final JsonValue value) {
         return new DefaultAnnotation(name(), value);
     }
 }
diff --git a/...ain/java/io/github/sebastiantoepfer/jsonschema/core/vocab/core/DynamicRefKeywordType.java b/...ain/java/io/github/sebastiantoepfer/jsonschema/core/vocab/core/DynamicRefKeywordType.java
@@ -23,6 +23,7 @@
  */
 package io.github.sebastiantoepfer.jsonschema.core.vocab.core;
 
+import io.github.sebastiantoepfer.jsonschema.JsonSchema;
 import io.github.sebastiantoepfer.jsonschema.keyword.Applicator;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
 import io.github.sebastiantoepfer.jsonschema.keyword.KeywordType;
@@ -41,7 +42,7 @@ public String name() {
     }
 
     @Override
-    public Keyword createKeyword(final JsonValue value) {
+    public Keyword createKeyword(final JsonSchema schema, final JsonValue value) {
         return new Applicator() {
             @Override
             public boolean applyTo(final JsonValue instance) {

diff --git a/core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/core/IdKeywordType.java b/core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/core/IdKeywordType.java
@@ -23,6 +23,7 @@
  */
 package io.github.sebastiantoepfer.jsonschema.core.vocab.core;
 
+import io.github.sebastiantoepfer.jsonschema.JsonSchema;
 import io.github.sebastiantoepfer.jsonschema.keyword.DefaultAnnotation;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
 import io.github.sebastiantoepfer.jsonschema.keyword.KeywordType;
@@ -40,7 +41,7 @@ public String name() {
     }
 
     @Override
-    public Keyword createKeyword(final JsonValue value) {
+    public Keyword createKeyword(final JsonSchema schema, final JsonValue value) {
         return new DefaultAnnotation(name(), value);
     }
 }
diff --git a/core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/core/RefKeywordType.java b/core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/core/RefKeywordType.java
@@ -23,6 +23,7 @@
  */
 package io.github.sebastiantoepfer.jsonschema.core.vocab.core;
 
+import io.github.sebastiantoepfer.jsonschema.JsonSchema;
 import io.github.sebastiantoepfer.jsonschema.keyword.Applicator;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
 import io.github.sebastiantoepfer.jsonschema.keyword.KeywordType;
@@ -41,7 +42,7 @@ public String name() {
     }
 
     @Override
-    public Keyword createKeyword(final JsonValue value) {
+    public Keyword createKeyword(final JsonSchema schema, final JsonValue value) {
         return new Applicator() {
             @Override
             public boolean applyTo(final JsonValue instance) {

diff --git a/...rc/main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/core/SchemaKeywordType.java b/...rc/main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/core/SchemaKeywordType.java
@@ -23,6 +23,7 @@
  */
 package io.github.sebastiantoepfer.jsonschema.core.vocab.core;
 
+import io.github.sebastiantoepfer.jsonschema.JsonSchema;
 import io.github.sebastiantoepfer.jsonschema.keyword.DefaultAnnotation;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
 import io.github.sebastiantoepfer.jsonschema.keyword.KeywordType;
@@ -40,7 +41,7 @@ public String name() {
     }
 
     @Override
-    public Keyword createKeyword(final JsonValue value) {
+    public Keyword createKeyword(final JsonSchema schema, final JsonValue value) {
         return new DefaultAnnotation(name(), value);
     }
 }
diff --git a/...ain/java/io/github/sebastiantoepfer/jsonschema/core/vocab/core/VocabularyKeywordType.java b/...ain/java/io/github/sebastiantoepfer/jsonschema/core/vocab/core/VocabularyKeywordType.java
@@ -24,6 +24,7 @@
 package io.github.sebastiantoepfer.jsonschema.core.vocab.core;
 
 import io.github.sebastiantoepfer.jsonschema.InstanceType;
+import io.github.sebastiantoepfer.jsonschema.JsonSchema;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
 import io.github.sebastiantoepfer.jsonschema.keyword.KeywordType;
 import io.github.sebastiantoepfer.jsonschema.vocabulary.spi.VocabularyDefinition;
@@ -47,7 +48,7 @@ public String name() {
     }
 
     @Override
-    public Keyword createKeyword(final JsonValue value) {
+    public Keyword createKeyword(final JsonSchema schema, final JsonValue value) {
         final Keyword result;
         if (InstanceType.OBJECT.isInstance(value)) {
             result = new VocabularyKeyword(value);