Skip to content

Commit

Permalink
add support for exclusiveMaximum keyword
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastian-toepfer committed Oct 3, 2023
1 parent baa8c46 commit 04ab20b
Show file tree
Hide file tree
Showing 4 changed files with 181 additions and 1 deletion.
6 changes: 6 additions & 0 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,12 @@
<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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ public BasicVocabulary() {
new PatternKeywordType(),
new MinimumKeywordType(),
new ExclusiveMinimumKeywordType(),
new MaximumKeywordType()
new MaximumKeywordType(),
new ExclusiveMaximumKeywordType()
);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
/*
* 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 io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
import jakarta.json.Json;
import jakarta.json.JsonValue;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

class ExclusiveMaximumKeywordTypeTest {

@Test
void should_know_his_name() {
final Keyword maximum = new ExclusiveMaximumKeywordType().createKeyword(Json.createValue(1));

assertThat(maximum.hasName("exclusiveMaximum"), is(true));
assertThat(maximum.hasName("test"), is(false));
}

@Test
void should_not_becreatable_with_non_number() {
final ExclusiveMaximumKeywordType keywordType = new ExclusiveMaximumKeywordType();
Assertions.assertThrows(IllegalArgumentException.class, () -> keywordType.createKeyword(JsonValue.FALSE));
}

@Test
void should_be_valid_for_non_number_values() {
assertThat(
new ExclusiveMaximumKeywordType()
.createKeyword(Json.createValue(1))
.asAssertion()
.isValidFor(JsonValue.EMPTY_JSON_OBJECT),
is(true)
);
}

@Test
void should_be_invalid_for_greater_numbers() {
assertThat(
new ExclusiveMaximumKeywordType()
.createKeyword(Json.createValue(10))
.asAssertion()
.isValidFor(Json.createValue(11)),
is(false)
);
}

@Test
void should_be_invalid_for_equals_numbers() {
assertThat(
new ExclusiveMaximumKeywordType()
.createKeyword(Json.createValue(10))
.asAssertion()
.isValidFor(Json.createValue(10)),
is(false)
);
}

@Test
void shhould_be_valid_for_smaller_numbers() {
assertThat(
new ExclusiveMaximumKeywordType()
.createKeyword(Json.createValue(10))
.asAssertion()
.isValidFor(Json.createValue(9)),
is(true)
);
}
}

0 comments on commit 04ab20b

Please sign in to comment.