Skip to content

Commit

Permalink
Merge pull request #22 from sebastian-toepfer/offical_vocabularies
Browse files Browse the repository at this point in the history
reorginaze keywords to match JsonSchemaDocs
  • Loading branch information
sebastian-toepfer authored Oct 4, 2023
2 parents 330b79e + a14cfa8 commit 426ad47
Show file tree
Hide file tree
Showing 51 changed files with 966 additions and 195 deletions.
63 changes: 0 additions & 63 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,81 +101,18 @@
<resource>
<directory>${project.build.directory}/jsonschematests</directory>
<includes>
<inculde>**/tests/draft6/boolean_schema.json</inculde>
<inculde>**/tests/draft7/boolean_schema.json</inculde>
<inculde>**/tests/draft2019-09/boolean_schema.json</inculde>
<inculde>**/tests/draft2020-12/boolean_schema.json</inculde>
<inculde>**/tests/draft-next/boolean_schema.json</inculde>

<inculde>**/tests/draft4/type.json</inculde>
<inculde>**/tests/draft6/type.json</inculde>
<inculde>**/tests/draft7/type.json</inculde>
<inculde>**/tests/draft2019-09/type.json</inculde>
<inculde>**/tests/draft2020-12/type.json</inculde>
<inculde>**/tests/draft-next/type.json</inculde>

<inculde>**/tests/draft3/minLength.json</inculde>
<inculde>**/tests/draft4/minLength.json</inculde>
<inculde>**/tests/draft6/minLength.json</inculde>
<inculde>**/tests/draft7/minLength.json</inculde>
<inculde>**/tests/draft2019-09/minLength.json</inculde>
<inculde>**/tests/draft2020-12/minLength.json</inculde>
<inculde>**/tests/draft-next/minLength.json</inculde>

<inculde>**/tests/draft4/maxLength.json</inculde>
<inculde>**/tests/draft6/maxLength.json</inculde>
<inculde>**/tests/draft7/maxLength.json</inculde>
<inculde>**/tests/draft2019-09/maxLength.json</inculde>
<inculde>**/tests/draft2020-12/maxLength.json</inculde>
<inculde>**/tests/draft-next/maxLength.json</inculde>

<inculde>**/tests/draft3/pattern.json</inculde>
<inculde>**/tests/draft4/pattern.json</inculde>
<inculde>**/tests/draft6/pattern.json</inculde>
<inculde>**/tests/draft7/pattern.json</inculde>
<inculde>**/tests/draft2019-09/pattern.json</inculde>
<inculde>**/tests/draft2020-12/pattern.json</inculde>
<inculde>**/tests/draft-next/pattern.json</inculde>

<inculde>**/tests/draft6/minimum.json</inculde>
<inculde>**/tests/draft7/minimum.json</inculde>
<inculde>**/tests/draft2019-09/minimum.json</inculde>
<inculde>**/tests/draft2020-12/minimum.json</inculde>
<inculde>**/tests/draft-next/minimum.json</inculde>

<inculde>**/tests/draft6/exclusiveMinimum.json</inculde>
<inculde>**/tests/draft7/exclusiveMinimum.json</inculde>
<inculde>**/tests/draft2019-09/exclusiveMinimum.json</inculde>
<inculde>**/tests/draft2020-12/exclusiveMinimum.json</inculde>
<inculde>**/tests/draft-next/exclusiveMinimum.json</inculde>

<inculde>**/tests/draft6/maximum.json</inculde>
<inculde>**/tests/draft7/maximum.json</inculde>
<inculde>**/tests/draft2019-09/maximum.json</inculde>
<inculde>**/tests/draft2020-12/maximum.json</inculde>
<inculde>**/tests/draft-next/maximum.json</inculde>

<inculde>**/tests/draft6/exclusiveMaximum.json</inculde>
<inculde>**/tests/draft7/exclusiveMaximum.json</inculde>
<inculde>**/tests/draft2019-09/exclusiveMaximum.json</inculde>
<inculde>**/tests/draft2020-12/exclusiveMaximum.json</inculde>
<inculde>**/tests/draft-next/exclusiveMaximum.json</inculde>

<inculde>**/tests/draft4/multipleOf.json</inculde>
<inculde>**/tests/draft6/multipleOf.json</inculde>
<inculde>**/tests/draft7/multipleOf.json</inculde>
<inculde>**/tests/draft2019-09/multipleOf.json</inculde>
<inculde>**/tests/draft2020-12/multipleOf.json</inculde>
<inculde>**/tests/draft-next/multipleOf.json</inculde>

<!-- more than items keyword needed :(
<inculde>**/tests/draft3/items.json</inculde>
<inculde>**/tests/draft4/items.json</inculde>
<inculde>**/tests/draft6/items.json</inculde>
<inculde>**/tests/draft7/items.json</inculde>
<inculde>**/tests/draft2019-09/items.json</inculde>
<inculde>**/tests/draft2020-12/items.json</inculde>
<inculde>**/tests/draft-next/items.json</inculde>
-->
</includes>
</resource>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/*
* The MIT License
*
* Copyright 2023 sebastian.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package io.github.sebastiantoepfer.jsonschema.core;

import io.github.sebastiantoepfer.jsonschema.Vocabulary;
import io.github.sebastiantoepfer.jsonschema.keyword.KeywordType;
import java.net.URI;
import java.util.Optional;

final class BasicVocabulary implements Vocabulary {

@Override
public URI id() {
return URI.create("http://https://github.com/sebastian-toepfer/json-schema/basic");
}

@Override
public Optional<KeywordType> findKeywordTypeByName(final String name) {
return Optional.of(new UnknowKeywordType(name));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,23 @@
import static java.util.stream.Collectors.collectingAndThen;
import static java.util.stream.Collectors.toList;

import io.github.sebastiantoepfer.jsonschema.ConstraintViolation;
import io.github.sebastiantoepfer.jsonschema.Validator;
import io.github.sebastiantoepfer.jsonschema.core.constraint.AllOfConstraint;
import io.github.sebastiantoepfer.jsonschema.core.constraint.Constraint;
import io.github.sebastiantoepfer.jsonschema.core.vocab.core.VocabularyKeywordType;
import io.github.sebastiantoepfer.jsonschema.keyword.Applicator;
import io.github.sebastiantoepfer.jsonschema.keyword.Assertion;
import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
import io.github.sebastiantoepfer.jsonschema.vocabulary.spi.VocabularyDefinition;
import io.github.sebastiantoepfer.jsonschema.vocabulary.spi.VocabularyDefinitions;
import jakarta.json.JsonObject;
import jakarta.json.JsonValue;
import java.util.Collection;
import java.util.List;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Optional;

final class DefaultJsonSchema extends AbstractJsonValueSchema {

Expand All @@ -50,9 +58,8 @@ public Validator validator() {
return asJsonObject()
.entrySet()
.stream()
.map(keyword -> keywords.createKeywordFor(this, keyword))
.filter(Constraint.class::isInstance)
.map(k -> (Constraint<JsonValue>) k)
.map(this::asContraint)
.flatMap(Optional::stream)
.collect(
collectingAndThen(toList(), constraints -> new DefaultValidator(new AllOfConstraint<>(constraints)))
);
Expand All @@ -67,4 +74,57 @@ private Collection<VocabularyDefinition> vocabulary() {
.flatMap(VocabularyDefinitions::definitions)
.toList();
}

private Optional<Constraint<JsonValue>> asContraint(final Entry<String, JsonValue> property) {
final Keyword keyword = keywords.createKeywordFor(this, property);
final Constraint<JsonValue> result;
if (keyword.hasCategory(Keyword.KeywordCategory.ASSERTION)) {
result = new AssertionConstraint(keyword.asAssertion());
} else if (keyword.hasCategory(Keyword.KeywordCategory.APPLICATOR)) {
result = new ApplicatorConstaint(keyword.asApplicator());
} else {
result = null;
}
return Optional.ofNullable(result);
}

private static final class AssertionConstraint implements Constraint<JsonValue> {

private final Assertion assertion;

public AssertionConstraint(final Assertion assertion) {
this.assertion = Objects.requireNonNull(assertion);
}

@Override
public Collection<ConstraintViolation> violationsBy(final JsonValue value) {
final Collection<ConstraintViolation> result;
if (assertion.isValidFor(value)) {
result = List.of();
} else {
result = List.of(new ConstraintViolation());
}
return result;
}
}

private static final class ApplicatorConstaint implements Constraint<JsonValue> {

private final Applicator applicator;

public ApplicatorConstaint(final Applicator applicator) {
this.applicator = Objects.requireNonNull(applicator);
}

@Override
public Collection<ConstraintViolation> violationsBy(final JsonValue value) {
final Collection<ConstraintViolation> result;
if (applicator.applyTo(value)) {
result = List.of();
} else {
result = List.of(new ConstraintViolation());
}
return result;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@

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;
import io.github.sebastiantoepfer.jsonschema.core.vocab.applicator.ApplicatorVocabulary;
import io.github.sebastiantoepfer.jsonschema.core.vocab.core.CoreVocabulary;
import io.github.sebastiantoepfer.jsonschema.core.vocab.validation.ValidationVocabulary;
import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
import io.github.sebastiantoepfer.jsonschema.vocabulary.spi.VocabularyDefinition;
import jakarta.json.JsonValue;
Expand All @@ -46,13 +47,16 @@
final class Keywords {

private static final Map<URI, Vocabulary> MANDANTORY_VOCABS;
private static final Collection<Vocabulary> DEFAULT_VOCABS;

static {
MANDANTORY_VOCABS =
List
.of(new BasicVocabulary(), new CoreLazyVocabulary().vocab())
.of(new BasicVocabulary(), new CoreVocabulary())
.stream()
.collect(toMap(Vocabulary::id, Function.identity()));

DEFAULT_VOCABS = List.of(new ValidationVocabulary(), new ApplicatorVocabulary());
}

private final Collection<Vocabulary> vocabularies;
Expand All @@ -69,7 +73,7 @@ public Keywords(final Collection<VocabularyDefinition> vocabDefs) {
vocabularies =
Stream
.concat(
MANDANTORY_VOCABS.values().stream(),
Stream.concat(MANDANTORY_VOCABS.values().stream(), DEFAULT_VOCABS.stream()),
vocabDefs.stream().map(VocabularyDefinition::findVocabulary).flatMap(Optional::stream)
)
.collect(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package io.github.sebastiantoepfer.jsonschema.core.vocab.basic;
package io.github.sebastiantoepfer.jsonschema.core;

import io.github.sebastiantoepfer.jsonschema.JsonSchema;
import io.github.sebastiantoepfer.jsonschema.keyword.DefaultAnnotation;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
/*
* The MIT License
*
* Copyright 2023 sebastian.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package io.github.sebastiantoepfer.jsonschema.core.vocab;

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.FormatVocabulary;
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.vocabulary.spi.LazyVocabularies;
import java.net.URI;
import java.util.Collection;
import java.util.List;
import java.util.Optional;

public final class OfficialVocabularies implements LazyVocabularies {

private static final Collection<Vocabulary> OFFICEAL_VOCABS;

static {
OFFICEAL_VOCABS =
List.of(
new CoreVocabulary(),
new ApplicatorVocabulary(),
new ValidationVocabulary(),
new MetaDataVocabulary(),
new FormatVocabulary(),
new UnevaluatedVocabulary(),
new ContentVocabulary()
);
}

@Override
public Optional<Vocabulary> loadVocabularyWithId(final URI id) {
return OFFICEAL_VOCABS.stream().filter(vocab -> vocab.id().equals(id)).findFirst();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/*
* The MIT License
*
* Copyright 2023 sebastian.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package io.github.sebastiantoepfer.jsonschema.core.vocab.applicator;

import io.github.sebastiantoepfer.jsonschema.Vocabulary;
import io.github.sebastiantoepfer.jsonschema.keyword.KeywordType;
import io.github.sebastiantoepfer.jsonschema.vocabulary.spi.DefaultVocabulary;
import java.net.URI;
import java.util.Optional;

public final class ApplicatorVocabulary implements Vocabulary {

private final Vocabulary vocab;

public ApplicatorVocabulary() {
this.vocab =
new DefaultVocabulary(
URI.create("https://json-schema.org/draft/2020-12/vocab/applicator"),
new ItemsKeywordType()
);
}

@Override
public URI id() {
return vocab.id();
}

@Override
public Optional<KeywordType> findKeywordTypeByName(final String name) {
return vocab.findKeywordTypeByName(name);
}
}
Loading

0 comments on commit 426ad47

Please sign in to comment.