enable all default schemas at default :)

sebastian-toepfer · Jun 6, 2024 · 8504d12 · 8504d12
1 parent b52da05
commit 8504d12
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/AbstractJsonValueSchema.java b/core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/AbstractJsonValueSchema.java
@@ -51,4 +51,9 @@ public final JsonObject asJsonObject() {
     public final JsonArray asJsonArray() {
         return value.asJsonArray();
     }
+
+    @Override
+    public String toString() {
+        return value.toString();
+    }
 }
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
@@ -107,4 +107,9 @@ public ValueType getValueType() {
     public JsonObject asJsonObject() {
         return schema.asJsonObject();
     }
+
+    @Override
+    public String toString() {
+        return schema.toString();
+    }
 }
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
@@ -29,7 +29,11 @@
 import io.github.sebastiantoepfer.jsonschema.JsonSchema;
 import io.github.sebastiantoepfer.jsonschema.Vocabulary;
 import io.github.sebastiantoepfer.jsonschema.core.vocab.applicator.ApplicatorVocabulary;
+import io.github.sebastiantoepfer.jsonschema.core.vocab.content.ContentVocabulary;
 import io.github.sebastiantoepfer.jsonschema.core.vocab.core.CoreVocabulary;
+import io.github.sebastiantoepfer.jsonschema.core.vocab.format.FormatAnnotationVocabulary;
+import io.github.sebastiantoepfer.jsonschema.core.vocab.meta.MetaDataVocabulary;
+import io.github.sebastiantoepfer.jsonschema.core.vocab.unevaluated.UnevaluatedVocabulary;
 import io.github.sebastiantoepfer.jsonschema.core.vocab.validation.ValidationVocabulary;
 import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
 import io.github.sebastiantoepfer.jsonschema.vocabulary.spi.VocabularyDefinition;
@@ -54,7 +58,14 @@ final class Keywords {
             .stream()
             .collect(toMap(Vocabulary::id, Function.identity()));
 
-        DEFAULT_VOCABS = List.of(new ValidationVocabulary(JsonProvider.provider()), new ApplicatorVocabulary());
+        DEFAULT_VOCABS = List.of(
+            new ApplicatorVocabulary(),
+            new ValidationVocabulary(JsonProvider.provider()),
+            new MetaDataVocabulary(),
+            new FormatAnnotationVocabulary(),
+            new UnevaluatedVocabulary(),
+            new ContentVocabulary()
+        );
     }
 
     private final Collection<Vocabulary> vocabularies;

diff --git a/.../src/main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/OfficialVocabularies.java b/.../src/main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/OfficialVocabularies.java
@@ -27,7 +27,7 @@
 import io.github.sebastiantoepfer.jsonschema.core.vocab.applicator.ApplicatorVocabulary;
 import io.github.sebastiantoepfer.jsonschema.core.vocab.content.ContentVocabulary;
 import io.github.sebastiantoepfer.jsonschema.core.vocab.core.CoreVocabulary;
-import io.github.sebastiantoepfer.jsonschema.core.vocab.format.FormatVocabulary;
+import io.github.sebastiantoepfer.jsonschema.core.vocab.format.FormatAnnotationVocabulary;
 import io.github.sebastiantoepfer.jsonschema.core.vocab.meta.MetaDataVocabulary;
 import io.github.sebastiantoepfer.jsonschema.core.vocab.unevaluated.UnevaluatedVocabulary;
 import io.github.sebastiantoepfer.jsonschema.core.vocab.validation.ValidationVocabulary;
@@ -49,7 +49,7 @@ public final class OfficialVocabularies implements LazyVocabularies {
             new ApplicatorVocabulary(),
             new ValidationVocabulary(JSONP),
             new MetaDataVocabulary(),
-            new FormatVocabulary(),
+            new FormatAnnotationVocabulary(),
             new UnevaluatedVocabulary(),
             new ContentVocabulary()
         );

diff --git a/...a/core/vocab/format/FormatVocabulary.java → ...ab/format/FormatAnnotationVocabulary.java b/...a/core/vocab/format/FormatVocabulary.java → ...ab/format/FormatAnnotationVocabulary.java
@@ -36,11 +36,11 @@
  * source: https://www.learnjsonschema.com/2020-12/format-annotation/
  * spec: https://json-schema.org/draft/2020-12/json-schema-validation.html#section-7.2.1
  */
-public final class FormatVocabulary implements Vocabulary {
+public final class FormatAnnotationVocabulary implements Vocabulary {
 
     private final Vocabulary vocab;
 
-    public FormatVocabulary() {
+    public FormatAnnotationVocabulary() {
         this.vocab = new DefaultVocabulary(URI.create("https://json-schema.org/draft/2020-12/vocab/format-annotation"));
     }