Merge pull request #16 from sebastian-toepfer/assertion_length

add length keywords

core/pom.xml

@@ -113,6 +113,21 @@
                                         <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>
                                     </includes>
                                 </resource>
                             </resources>

core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/basic/BasicVocabulary.java

@@ -25,23 +25,31 @@
 
 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 BasicVocabulary implements Vocabulary {
 
+    private final DefaultVocabulary vocab;
+
+    public BasicVocabulary() {
+        this.vocab =
+            new DefaultVocabulary(
+                URI.create("http://https://github.com/sebastian-toepfer/json-schema/basic"),
+                new TypeKeywordType(),
+                new MinLengthKeywordType(),
+                new MaxLengthKeywordType()
+            );
+    }
+
     @Override
     public URI id() {
-        return URI.create("http://https://github.com/sebastian-toepfer/json-schema/basic");
+        return vocab.id();
     }
 
     @Override
     public Optional<KeywordType> findKeywordTypeByName(final String name) {
-        return Optional.of(
-            switch (name) {
-                case "type" -> new TypeKeywordType();
-                default -> new UnknowKeywordType(name);
-            }
-        );
+        return Optional.of(vocab.findKeywordTypeByName(name).orElseGet(() -> new UnknowKeywordType(name)));
     }
 }

core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/basic/MaxLengthKeywordType.java

@@ -0,0 +1,82 @@
+/*
+ * 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.basic;
+
+import io.github.sebastiantoepfer.jsonschema.ConstraintViolation;
+import io.github.sebastiantoepfer.jsonschema.InstanceType;
+import io.github.sebastiantoepfer.jsonschema.core.vocab.ConstraintAssertion;
+import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
+import io.github.sebastiantoepfer.jsonschema.keyword.KeywordType;
+import jakarta.json.JsonNumber;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+class MaxLengthKeywordType implements KeywordType {
+
+    @Override
+    public String name() {
+        return "maxLength";
+    }
+
+    @Override
+    public Keyword createKeyword(final JsonValue value) {
+        if (InstanceType.INTEGER.isInstance(value)) {
+            return new MaxLengthKeyword((JsonNumber) value);
+        } else {
+            throw new IllegalArgumentException("value must be a positiv integer!");
+        }
+    }
+
+    private class MaxLengthKeyword implements ConstraintAssertion {
+
+        private final JsonNumber value;
+
+        public MaxLengthKeyword(final JsonNumber value) {
+            this.value = value;
+        }
+
+        @Override
+        public boolean hasName(final String name) {
+            return Objects.equals(name(), name);
+        }
+
+        @Override
+        public Collection<ConstraintViolation> violationsBy(final JsonValue instance) {
+            final Collection<ConstraintViolation> result;
+            if (
+                !InstanceType.STRING.isInstance(instance) ||
+                ((JsonString) instance).getChars().codePoints().count() <= value.longValue()
+            ) {
+                result = Collections.emptyList();
+            } else {
+                result = List.of(new ConstraintViolation());
+            }
+            return result;
+        }
+    }
+}

core/src/main/java/io/github/sebastiantoepfer/jsonschema/core/vocab/basic/MinLengthKeywordType.java

@@ -0,0 +1,82 @@
+/*
+ * 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.basic;
+
+import io.github.sebastiantoepfer.jsonschema.ConstraintViolation;
+import io.github.sebastiantoepfer.jsonschema.InstanceType;
+import io.github.sebastiantoepfer.jsonschema.core.vocab.ConstraintAssertion;
+import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
+import io.github.sebastiantoepfer.jsonschema.keyword.KeywordType;
+import jakarta.json.JsonNumber;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+class MinLengthKeywordType implements KeywordType {
+
+    @Override
+    public String name() {
+        return "minLength";
+    }
+
+    @Override
+    public Keyword createKeyword(final JsonValue value) {
+        if (InstanceType.INTEGER.isInstance(value)) {
+            return new MinLengthKeyword((JsonNumber) value);
+        } else {
+            throw new IllegalArgumentException("value must be a positiv integer!");
+        }
+    }
+
+    private class MinLengthKeyword implements ConstraintAssertion {
+
+        private final JsonNumber value;
+
+        public MinLengthKeyword(final JsonNumber value) {
+            this.value = Objects.requireNonNull(value);
+        }
+
+        @Override
+        public boolean hasName(final String name) {
+            return Objects.equals(name(), name);
+        }
+
+        @Override
+        public Collection<ConstraintViolation> violationsBy(final JsonValue instance) {
+            final Collection<ConstraintViolation> result;
+            if (
+                !InstanceType.STRING.isInstance(instance) ||
+                ((JsonString) instance).getChars().codePoints().count() >= value.longValue()
+            ) {
+                result = Collections.emptyList();
+            } else {
+                result = List.of(new ConstraintViolation());
+            }
+            return result;
+        }
+    }
+}

core/src/test/java/io/github/sebastiantoepfer/jsonschema/core/vocab/basic/MaxLengthKeywordTypeTest.java

@@ -0,0 +1,96 @@
+/*
+ * 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.basic;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
+import jakarta.json.Json;
+import jakarta.json.JsonNumber;
+import jakarta.json.JsonValue;
+import org.junit.jupiter.api.Test;
+
+class MaxLengthKeywordTypeTest {
+
+    @Test
+    void should_not_be_createbale_with_non_integer() {
+        final JsonNumber value = Json.createValue(12.3);
+        final MinLengthKeywordType keywordType = new MinLengthKeywordType();
+        assertThrows(IllegalArgumentException.class, () -> keywordType.createKeyword(value));
+    }
+
+    @Test
+    void should_know_his_name() {
+        final Keyword keyword = new MaxLengthKeywordType().createKeyword(Json.createValue(1));
+
+        assertThat(keyword.hasName("test"), is(false));
+        assertThat(keyword.hasName("maxLength"), is(true));
+    }
+
+    @Test
+    void should_be_valid_for_non_string_values() {
+        assertThat(
+            new MaxLengthKeywordType()
+                .createKeyword(Json.createValue(2))
+                .asAssertion()
+                .isValidFor(JsonValue.EMPTY_JSON_ARRAY),
+            is(true)
+        );
+    }
+
+    @Test
+    void should_be_invalid_for_longer_string() {
+        assertThat(
+            new MaxLengthKeywordType()
+                .createKeyword(Json.createValue(2))
+                .asAssertion()
+                .isValidFor(Json.createValue("1234")),
+            is(false)
+        );
+    }
+
+    @Test
+    void should_be_valid_for_string_with_length_is_equal() {
+        assertThat(
+            new MaxLengthKeywordType()
+                .createKeyword(Json.createValue(2))
+                .asAssertion()
+                .isValidFor(Json.createValue("12")),
+            is(true)
+        );
+    }
+
+    @Test
+    void should_ne_valid_for_string_with_is_shorter() {
+        assertThat(
+            new MaxLengthKeywordType()
+                .createKeyword(Json.createValue(2))
+                .asAssertion()
+                .isValidFor(Json.createValue("1")),
+            is(true)
+        );
+    }
+}