From 578a91f1b50d17340f13f3d7dc6b754e93b451c6 Mon Sep 17 00:00:00 2001 From: Justin Tay <49700559+justin-tay@users.noreply.github.com> Date: Fri, 8 Nov 2024 21:23:52 +0800 Subject: [PATCH] Remove warning for exclusiveMinimum and exclusiveMaximum for Draft 4 (#1127) --- .../java/com/networknt/schema/Version4.java | 4 +- .../schema/ExclusiveMinimumValidatorTest.java | 96 +++++++++++++++++++ 2 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 src/test/java/com/networknt/schema/ExclusiveMinimumValidatorTest.java diff --git a/src/main/java/com/networknt/schema/Version4.java b/src/main/java/com/networknt/schema/Version4.java index 264062634..84ad7138a 100644 --- a/src/main/java/com/networknt/schema/Version4.java +++ b/src/main/java/com/networknt/schema/Version4.java @@ -26,7 +26,9 @@ private static class Holder { new AnnotationKeyword("default"), new NonValidationKeyword("definitions"), new NonValidationKeyword("additionalItems"), - new AnnotationKeyword("exampleSetFlag") + new AnnotationKeyword("exampleSetFlag"), + new NonValidationKeyword("exclusiveMinimum"), // exclusiveMinimum boolean handled by minimum validator + new NonValidationKeyword("exclusiveMaximum") // exclusiveMaximum boolean handled by maximum validator )) .build(); } diff --git a/src/test/java/com/networknt/schema/ExclusiveMinimumValidatorTest.java b/src/test/java/com/networknt/schema/ExclusiveMinimumValidatorTest.java new file mode 100644 index 000000000..331bdf144 --- /dev/null +++ b/src/test/java/com/networknt/schema/ExclusiveMinimumValidatorTest.java @@ -0,0 +1,96 @@ +/* + * Copyright (c) 2024 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.networknt.schema; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import java.util.Set; + +import org.junit.jupiter.api.Test; + +import com.networknt.schema.SpecVersion.VersionFlag; + +/** + * Test ExclusiveMinimumValidator validator. + */ +public class ExclusiveMinimumValidatorTest { + @Test + void draftV4ShouldHaveExclusiveMinimum() { + String schemaData = "{" + + " \"type\": \"object\"," + + " \"properties\": {" + + " \"value1\": {" + + " \"type\": \"number\"," + + " \"minimum\": 0," + + " \"exclusiveMinimum\": true" + + " }" + + " }" + + "}"; + JsonMetaSchema metaSchema = JsonMetaSchema.builder(JsonMetaSchema.getV4()) + .unknownKeywordFactory(DisallowUnknownKeywordFactory.getInstance()).build(); + JsonSchemaFactory factory = JsonSchemaFactory.getInstance(VersionFlag.V4, + builder -> builder.metaSchema(metaSchema)); + JsonSchema schema = factory.getSchema(schemaData); + String inputData = "{\"value1\":0}"; + String validData = "{\"value1\":0.1}"; + + Set messages = schema.validate(inputData, InputFormat.JSON); + assertEquals(1, messages.size()); + assertEquals(1, messages.stream().filter(m -> "minimum".equals(m.getType())).count()); + + messages = schema.validate(validData, InputFormat.JSON); + assertEquals(0, messages.size()); + } + + @Test + void draftV6ShouldNotAllowExclusiveMinimumBoolean() { + String schemaData = "{" + + " \"type\": \"object\"," + + " \"properties\": {" + + " \"value1\": {" + + " \"type\": \"number\"," + + " \"minimum\": 0," + + " \"exclusiveMinimum\": true" + + " }" + + " }" + + "}"; + JsonMetaSchema metaSchema = JsonMetaSchema.builder(JsonMetaSchema.getV6()) + .unknownKeywordFactory(DisallowUnknownKeywordFactory.getInstance()).build(); + JsonSchemaFactory factory = JsonSchemaFactory.getInstance(VersionFlag.V6, + builder -> builder.metaSchema(metaSchema)); + assertThrows(JsonSchemaException.class, () -> factory.getSchema(schemaData)); + } + + @Test + void draftV7ShouldNotAllowExclusiveMinimumBoolean() { + String schemaData = "{" + + " \"type\": \"object\"," + + " \"properties\": {" + + " \"value1\": {" + + " \"type\": \"number\"," + + " \"minimum\": 0," + + " \"exclusiveMinimum\": true" + + " }" + + " }" + + "}"; + JsonMetaSchema metaSchema = JsonMetaSchema.builder(JsonMetaSchema.getV7()) + .unknownKeywordFactory(DisallowUnknownKeywordFactory.getInstance()).build(); + JsonSchemaFactory factory = JsonSchemaFactory.getInstance(VersionFlag.V7, + builder -> builder.metaSchema(metaSchema)); + assertThrows(JsonSchemaException.class, () -> factory.getSchema(schemaData)); + } +}