Merge pull request #20 from sebastian-toepfer/keyword_ranges

add support for ranges keyword

core/pom.xml

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

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

@@ -40,7 +40,12 @@ public BasicVocabulary() {
                 new TypeKeywordType(),
                 new MinLengthKeywordType(),
                 new MaxLengthKeywordType(),
-                new PatternKeywordType()
+                new PatternKeywordType(),
+                new PatternKeywordType(),
+                new MinimumKeywordType(),
+                new ExclusiveMinimumKeywordType(),
+                new MaximumKeywordType(),
+                new ExclusiveMaximumKeywordType()
             );
     }
 

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

@@ -0,0 +1,79 @@
+/*
+ * 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.JsonValue;
+import java.math.BigDecimal;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+final class ExclusiveMaximumKeywordType implements KeywordType {
+
+    @Override
+    public String name() {
+        return "exclusiveMaximum";
+    }
+
+    @Override
+    public Keyword createKeyword(final JsonValue value) {
+        if (InstanceType.NUMBER.isInstance(value)) {
+            return new ExclusiveMaximumKeyword((JsonNumber) value);
+        } else {
+            throw new IllegalArgumentException("must be a number!");
+        }
+    }
+
+    private class ExclusiveMaximumKeyword implements ConstraintAssertion {
+
+        private final BigDecimal max;
+
+        private ExclusiveMaximumKeyword(final JsonNumber max) {
+            this.max = max.bigDecimalValue();
+        }
+
+        @Override
+        public boolean hasName(final String name) {
+            return Objects.equals(name(), name);
+        }
+
+        @Override
+        public Collection<ConstraintViolation> violationsBy(final JsonValue value) {
+            final Collection<ConstraintViolation> result;
+            if (!InstanceType.NUMBER.isInstance(value) || max.compareTo(((JsonNumber) value).bigDecimalValue()) > 0) {
+                result = Collections.emptyList();
+            } else {
+                result = List.of(new ConstraintViolation());
+            }
+            return result;
+        }
+    }
+}

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

@@ -0,0 +1,79 @@
+/*
+ * 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.JsonValue;
+import java.math.BigDecimal;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+final class ExclusiveMinimumKeywordType implements KeywordType {
+
+    @Override
+    public String name() {
+        return "exclusiveMinimum";
+    }
+
+    @Override
+    public Keyword createKeyword(final JsonValue value) {
+        if (InstanceType.NUMBER.isInstance(value)) {
+            return new ExclusiveMinimumKeyword((JsonNumber) value);
+        } else {
+            throw new IllegalArgumentException("must be a number!");
+        }
+    }
+
+    private class ExclusiveMinimumKeyword implements ConstraintAssertion {
+
+        private final BigDecimal min;
+
+        public ExclusiveMinimumKeyword(final JsonNumber min) {
+            this.min = min.bigDecimalValue();
+        }
+
+        @Override
+        public boolean hasName(final String name) {
+            return Objects.equals(name(), name);
+        }
+
+        @Override
+        public Collection<ConstraintViolation> violationsBy(final JsonValue value) {
+            final Collection<ConstraintViolation> result;
+            if (!InstanceType.NUMBER.isInstance(value) || min.compareTo(((JsonNumber) value).bigDecimalValue()) < 0) {
+                result = Collections.emptyList();
+            } else {
+                result = List.of(new ConstraintViolation());
+            }
+            return result;
+        }
+    }
+}

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

@@ -0,0 +1,79 @@
+/*
+ * 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.JsonValue;
+import java.math.BigDecimal;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+final class MaximumKeywordType implements KeywordType {
+
+    @Override
+    public String name() {
+        return "maximum";
+    }
+
+    @Override
+    public Keyword createKeyword(final JsonValue value) {
+        if (InstanceType.NUMBER.isInstance(value)) {
+            return new MaximumKeyword((JsonNumber) value);
+        } else {
+            throw new IllegalArgumentException("must be a number!");
+        }
+    }
+
+    private class MaximumKeyword implements ConstraintAssertion {
+
+        private final BigDecimal max;
+
+        public MaximumKeyword(final JsonNumber max) {
+            this.max = max.bigDecimalValue();
+        }
+
+        @Override
+        public boolean hasName(final String name) {
+            return Objects.equals(name(), name);
+        }
+
+        @Override
+        public Collection<ConstraintViolation> violationsBy(final JsonValue value) {
+            final Collection<ConstraintViolation> result;
+            if (!InstanceType.NUMBER.isInstance(value) || max.compareTo(((JsonNumber) value).bigDecimalValue()) >= 0) {
+                result = Collections.emptyList();
+            } else {
+                result = List.of(new ConstraintViolation());
+            }
+            return result;
+        }
+    }
+}

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

@@ -0,0 +1,79 @@
+/*
+ * 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.JsonValue;
+import java.math.BigDecimal;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+final class MinimumKeywordType implements KeywordType {
+
+    @Override
+    public String name() {
+        return "minimum";
+    }
+
+    @Override
+    public Keyword createKeyword(final JsonValue value) {
+        if (InstanceType.NUMBER.isInstance(value)) {
+            return new MinimumKeyword((JsonNumber) value);
+        } else {
+            throw new IllegalArgumentException("must be a number");
+        }
+    }
+
+    private class MinimumKeyword implements ConstraintAssertion {
+
+        private final BigDecimal min;
+
+        public MinimumKeyword(final JsonNumber min) {
+            this.min = min.bigDecimalValue();
+        }
+
+        @Override
+        public boolean hasName(final String name) {
+            return Objects.equals(name(), name);
+        }
+
+        @Override
+        public Collection<ConstraintViolation> violationsBy(final JsonValue value) {
+            final Collection<ConstraintViolation> result;
+            if (!InstanceType.NUMBER.isInstance(value) || min.compareTo(((JsonNumber) value).bigDecimalValue()) <= 0) {
+                result = Collections.emptyList();
+            } else {
+                result = List.of(new ConstraintViolation());
+            }
+            return result;
+        }
+    }
+}