Skip to content

Commit

Permalink
Merge pull request #24 from sebastian-toepfer/keyword_minItems
Browse files Browse the repository at this point in the history
add support for minItems keyword
  • Loading branch information
sebastian-toepfer authored Oct 5, 2023
2 parents 426ad47 + 74ba236 commit d535ff0
Show file tree
Hide file tree
Showing 4 changed files with 157 additions and 1 deletion.
1 change: 1 addition & 0 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
<!-- more than items keyword needed :(
<inculde>**/tests/draft2020-12/items.json</inculde>
-->
<inculde>**/tests/draft2020-12/minItems.json</inculde>
</includes>
</resource>
</resources>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
/*
* 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.validation;

import io.github.sebastiantoepfer.jsonschema.InstanceType;
import io.github.sebastiantoepfer.jsonschema.JsonSchema;
import io.github.sebastiantoepfer.jsonschema.keyword.Assertion;
import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
import io.github.sebastiantoepfer.jsonschema.keyword.KeywordType;
import jakarta.json.JsonNumber;
import jakarta.json.JsonValue;
import java.util.Objects;

final class MinItemsKeywordType implements KeywordType {

@Override
public String name() {
return "minItems";
}

@Override
public Keyword createKeyword(final JsonSchema schema, final JsonValue value) {
return new MinItemsKeyword((JsonNumber) value);
}

private class MinItemsKeyword implements Assertion {

private final int minItems;

public MinItemsKeyword(final JsonNumber minItems) {
this.minItems = minItems.intValue();
}

@Override
public boolean isValidFor(final JsonValue instance) {
return !InstanceType.ARRAY.isInstance(instance) || instance.asJsonArray().size() >= minItems;
}

@Override
public boolean hasName(final String name) {
return Objects.equals(name(), name);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ public ValidationVocabulary() {
new ExclusiveMinimumKeywordType(),
new MaximumKeywordType(),
new ExclusiveMaximumKeywordType(),
new MultipleOfKeywordType()
new MultipleOfKeywordType(),
new MinItemsKeywordType()
);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
/*
* 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.validation;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;

import io.github.sebastiantoepfer.jsonschema.core.DefaultJsonSchemaFactory;
import io.github.sebastiantoepfer.jsonschema.keyword.Keyword;
import jakarta.json.Json;
import jakarta.json.JsonValue;
import org.junit.jupiter.api.Test;

class MinItemsKeywordTypeTest {

@Test
void should_be_know_his_name() {
final Keyword minItems = new MinItemsKeywordType()
.createKeyword(new DefaultJsonSchemaFactory().create(JsonValue.TRUE), Json.createValue(1));

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

@Test
void should_be_valid_for_non_arrays() {
assertThat(
new MinItemsKeywordType()
.createKeyword(new DefaultJsonSchemaFactory().create(JsonValue.TRUE), Json.createValue(1))
.asAssertion()
.isValidFor(JsonValue.EMPTY_JSON_OBJECT),
is(true)
);
}

@Test
void should_be_valid_for_arrays_with_equals_size() {
assertThat(
new MinItemsKeywordType()
.createKeyword(new DefaultJsonSchemaFactory().create(JsonValue.TRUE), Json.createValue(1))
.asAssertion()
.isValidFor(Json.createArrayBuilder().add(1).build()),
is(true)
);
}

@Test
void should_be_valid_for_arrays_with_greater_size() {
assertThat(
new MinItemsKeywordType()
.createKeyword(new DefaultJsonSchemaFactory().create(JsonValue.TRUE), Json.createValue(1))
.asAssertion()
.isValidFor(Json.createArrayBuilder().add(1).add(2).build()),
is(true)
);
}

@Test
void should_be_invalid_for_arrays_with_smaller_size() {
assertThat(
new MinItemsKeywordType()
.createKeyword(new DefaultJsonSchemaFactory().create(JsonValue.TRUE), Json.createValue(1))
.asAssertion()
.isValidFor(Json.createArrayBuilder().build()),
is(false)
);
}
}

0 comments on commit d535ff0

Please sign in to comment.