Skip to content

Fix minimum maximum validators with type array #1227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stevehu merged 1 commit into from
Jan 21, 2026
Merged

Fix minimum maximum validators with type array #1227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions src/main/java/com/networknt/schema/keyword/BaseKeywordValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package com.networknt.schema.keyword;

import tools.jackson.databind.JsonNode;

import com.networknt.schema.ErrorMessages;
import com.networknt.schema.Schema;
import com.networknt.schema.MessageSourceError;
Expand Down Expand Up @@ -83,12 +84,23 @@ public Schema getParentSchema() {
return this.parentSchema;
}

protected String getNodeFieldType() {
protected boolean hasType(String type) {
JsonNode typeField = this.getParentSchema().getSchemaNode().get("type");
if (typeField != null) {
return typeField.asString();
switch (typeField.getNodeType()) {
case STRING:
return type.equals(typeField.stringValue());
case ARRAY:
for (JsonNode item : typeField.values()) {
if (item.isString() && type.equals(item.stringValue())) {
return true;
}
}
default:
return false;
}
}
return null;
return false;
}

protected void preloadSchemas(final Collection<Schema> schemas) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/networknt/schema/keyword/ExclusiveMaximumValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public ExclusiveMaximumValidator(SchemaLocation schemaLocation, final JsonNode s
throw new SchemaException("exclusiveMaximum value is not a number");
}
final String maximumText = schemaNode.asString();
if ((schemaNode.isLong() || schemaNode.isInt()) && (JsonType.INTEGER.toString().equals(getNodeFieldType()))) {
if ((schemaNode.isLong() || schemaNode.isInt()) && hasType(JsonType.INTEGER.toString())) {
// "integer", and within long range
final long lm = schemaNode.asLong();
typedMaximum = new ThresholdMixin() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/networknt/schema/keyword/ExclusiveMinimumValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public ExclusiveMinimumValidator(SchemaLocation schemaLocation, final JsonNode s
throw new SchemaException("exclusiveMinimum value is not a number");
}
final String minimumText = schemaNode.asString();
if ((schemaNode.isLong() || schemaNode.isInt()) && JsonType.INTEGER.toString().equals(getNodeFieldType())) {
if ((schemaNode.isLong() || schemaNode.isInt()) && hasType(JsonType.INTEGER.toString())) {
// "integer", and within long range
final long lmin = schemaNode.asLong();
typedMinimum = new ThresholdMixin() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/networknt/schema/keyword/MaximumValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public MaximumValidator(SchemaLocation schemaLocation, final JsonNode schemaNode
}

final String maximumText = schemaNode.asString();
if ((schemaNode.isLong() || schemaNode.isInt()) && (JsonType.INTEGER.toString().equals(getNodeFieldType()))) {
if ((schemaNode.isLong() || schemaNode.isInt()) && hasType(JsonType.INTEGER.toString())) {
// "integer", and within long range
final long lm = schemaNode.asLong();
this.typedMaximum = new ThresholdMixin() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/networknt/schema/keyword/MinimumValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public MinimumValidator(SchemaLocation schemaLocation, final JsonNode schemaNode
}

final String minimumText = schemaNode.asString();
if ((schemaNode.isLong() || schemaNode.isInt()) && JsonType.INTEGER.toString().equals(getNodeFieldType())) {
if ((schemaNode.isLong() || schemaNode.isInt()) && hasType(JsonType.INTEGER.toString())) {
// "integer", and within long range
final long lmin = schemaNode.asLong();
this.typedMinimum = new ThresholdMixin() {
Expand Down
40 changes: 40 additions & 0 deletions src/test/java/com/networknt/schema/ExclusiveMaximumValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*
* 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 org.junit.jupiter.api.Test;

import com.networknt.schema.dialect.Dialects;

/**
* Test ExclusiveMaximumValidator validator.
*/
class ExclusiveMaximumValidatorTest {
@Test
void exclusiveMaximum() {
final String schemaString = """
{
"$schema": "http://json-schema.org/draft-07/schema#",
"type": ["null", "integer"],
"exclusiveMaximum": 10
}
""";
final SchemaRegistry schemaRegistry = SchemaRegistry.withDialect(Dialects.getDraft7());
assertEquals(1, schemaRegistry.getSchema(schemaString).validate("10", InputFormat.JSON).size());
}
}
13 changes: 13 additions & 0 deletions src/test/java/com/networknt/schema/ExclusiveMinimumValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,17 @@ void draftV7ShouldNotAllowExclusiveMinimumBoolean() {
SchemaRegistry factory = SchemaRegistry.withDialect(dialect);
assertThrows(SchemaException.class, () -> factory.getSchema(schemaData));
}

@Test
void exclusiveMinimum() {
final String schemaString = """
{
"$schema": "http://json-schema.org/draft-07/schema#",
"type": ["null", "integer"],
"exclusiveMinimum": 10
}
""";
final SchemaRegistry schemaRegistry = SchemaRegistry.withDialect(Dialects.getDraft7());
assertEquals(1, schemaRegistry.getSchema(schemaString).validate("10", InputFormat.JSON).size());
}
}
16 changes: 16 additions & 0 deletions src/test/java/com/networknt/schema/MaximumValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@
import tools.jackson.databind.ObjectMapper;
import org.junit.jupiter.api.Test;

import com.networknt.schema.dialect.Dialects;

import java.io.IOException;
import java.math.BigDecimal;
import java.util.List;

import static java.lang.String.format;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

Expand Down Expand Up @@ -326,6 +329,19 @@ private static void expectSomeMessages(String[][] values, String schemaTemplate,
assertFalse(messages.isEmpty(), format(MaximumValidatorTest.NEGATIVE_TEST_CASE_TEMPLATE, value, maximum));
}
}

@Test
void maximumWithArrayType() {
final String schemaString = """
{
"$schema": "http://json-schema.org/draft-07/schema#",
"type": ["null", "integer"],
"maximum": 10
}
""";
final SchemaRegistry schemaRegistry = SchemaRegistry.withDialect(Dialects.getDraft7());
assertEquals(1, schemaRegistry.getSchema(schemaString).validate("11", InputFormat.JSON).size());
}
}


17 changes: 17 additions & 0 deletions src/test/java/com/networknt/schema/MinimumValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import static com.networknt.schema.MaximumValidatorTest.augmentWithQuotes;
import static java.lang.String.format;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

Expand All @@ -28,6 +29,8 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import com.networknt.schema.dialect.Dialects;

import tools.jackson.databind.DeserializationFeature;
import tools.jackson.databind.JsonNode;
import tools.jackson.databind.ObjectMapper;
Expand Down Expand Up @@ -298,6 +301,20 @@ private void expectNoMessages(String[][] values, String integer, ObjectMapper ma
assertTrue(messages.isEmpty(), format(MinimumValidatorTest.POSITIVT_MESSAGE_TEMPLATE, value, minimum));
}
}

@Test
void minimumWithArrayType() {
final String schemaString = """
{
"$schema": "http://json-schema.org/draft-07/schema#",
"type": ["null", "integer"],
"minimum": 10
}
""";
final SchemaRegistry schemaRegistry = SchemaRegistry.withDialect(Dialects.getDraft7());
assertEquals(1, schemaRegistry.getSchema(schemaString).validate("9", InputFormat.JSON).size());
}

}