Skip to content
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

Jump to bottom

changed from isIntegralNumber to canConvertToExactIntegral to support… #450

Merged
merged 1 commit into from
Sep 18, 2021
Merged

changed from isIntegralNumber to canConvertToExactIntegral to support… #450

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
2 changes: 1 addition & 1 deletion src/main/java/com/networknt/schema/MaxItemsValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class MaxItemsValidator extends BaseJsonValidator implements JsonValidato

public MaxItemsValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) {
super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.MAX_ITEMS, validationContext);
if (schemaNode.isIntegralNumber()) {
if (schemaNode.canConvertToExactIntegral()) {
max = schemaNode.intValue();
}
this.validationContext = validationContext;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/networknt/schema/MaxLengthValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class MaxLengthValidator extends BaseJsonValidator implements JsonValidat
public MaxLengthValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) {
super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.MAX_LENGTH, validationContext);
maxLength = Integer.MAX_VALUE;
if (schemaNode != null && schemaNode.isIntegralNumber()) {
if (schemaNode != null && schemaNode.canConvertToExactIntegral()) {
maxLength = schemaNode.intValue();
}
this.validationContext = validationContext;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/networknt/schema/MaxPropertiesValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class MaxPropertiesValidator extends BaseJsonValidator implements JsonVal
public MaxPropertiesValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema,
ValidationContext validationContext) {
super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.MAX_PROPERTIES, validationContext);
if (schemaNode.isIntegralNumber()) {
if (schemaNode.canConvertToExactIntegral()) {
max = schemaNode.intValue();
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/networknt/schema/MinItemsValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class MinItemsValidator extends BaseJsonValidator implements JsonValidato

public MinItemsValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) {
super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.MIN_ITEMS, validationContext);
if (schemaNode.isIntegralNumber()) {
if (schemaNode.canConvertToExactIntegral()) {
min = schemaNode.intValue();
}
this.validationContext = validationContext;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/networknt/schema/MinLengthValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class MinLengthValidator extends BaseJsonValidator implements JsonValidat
public MinLengthValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) {
super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.MIN_LENGTH, validationContext);
minLength = Integer.MIN_VALUE;
if (schemaNode != null && schemaNode.isIntegralNumber()) {
if (schemaNode != null && schemaNode.canConvertToExactIntegral()) {
minLength = schemaNode.intValue();
}
this.validationContext = validationContext;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/networknt/schema/MinPropertiesValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class MinPropertiesValidator extends BaseJsonValidator implements JsonVal
public MinPropertiesValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema,
ValidationContext validationContext) {
super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.MIN_PROPERTIES, validationContext);
if (schemaNode.isIntegralNumber()) {
if (schemaNode.canConvertToExactIntegral()) {
min = schemaNode.intValue();
}

Expand Down
37 changes: 37 additions & 0 deletions src/test/resources/draft7/maxItems.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,42 @@
"valid": true
}
]
},
{
"description": "maxItems decimal validation",
"schema": {
"maxItems": 2.0
},
"tests": [
{
"description": "shorter is valid",
"data": [
1
],
"valid": true
},
{
"description": "exact length is valid",
"data": [
1,
2
],
"valid": true
},
{
"description": "too long is invalid",
"data": [
1,
2,
3
],
"valid": false
},
{
"description": "ignores non-arrays",
"data": "foobar",
"valid": true
}
]
}
]
33 changes: 33 additions & 0 deletions src/test/resources/draft7/maxLength.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,38 @@
"valid": true
}
]
},
{
"description": "maxLength decimal validation",
"schema": {
"maxLength": 2.0
},
"tests": [
{
"description": "shorter is valid",
"data": "f",
"valid": true
},
{
"description": "exact length is valid",
"data": "fo",
"valid": true
},
{
"description": "too long is invalid",
"data": "foo",
"valid": false
},
{
"description": "ignores non-strings",
"data": 100,
"valid": true
},
{
"description": "two supplementary Unicode code points is long enough",
"data": "\uD83D\uDCA9\uD83D\uDCA9",
"valid": true
}
]
}
]
51 changes: 51 additions & 0 deletions src/test/resources/draft7/maxProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,56 @@
"valid": true
}
]
},
{
"description": "maxProperties decimal validation",
"schema": {
"maxProperties": 2.0
},
"tests": [
{
"description": "shorter is valid",
"data": {
"foo": 1
},
"valid": true
},
{
"description": "exact length is valid",
"data": {
"foo": 1,
"bar": 2
},
"valid": true
},
{
"description": "too long is invalid",
"data": {
"foo": 1,
"bar": 2,
"baz": 3
},
"valid": false
},
{
"description": "ignores arrays",
"data": [
1,
2,
3
],
"valid": true
},
{
"description": "ignores strings",
"data": "foobar",
"valid": true
},
{
"description": "ignores other non-objects",
"data": 12,
"valid": true
}
]
}
]
33 changes: 33 additions & 0 deletions src/test/resources/draft7/minItems.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,38 @@
"valid": true
}
]
},
{
"description": "minItems decimal validation",
"schema": {
"minItems": 1.0
},
"tests": [
{
"description": "longer is valid",
"data": [
1,
2
],
"valid": true
},
{
"description": "exact length is valid",
"data": [
1
],
"valid": true
},
{
"description": "too short is invalid",
"data": [],
"valid": false
},
{
"description": "ignores non-arrays",
"data": "",
"valid": true
}
]
}
]
33 changes: 33 additions & 0 deletions src/test/resources/draft7/minLength.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,38 @@
"valid": false
}
]
},
{
"description": "minLength decimal validation",
"schema": {
"minLength": 2.0
},
"tests": [
{
"description": "longer is valid",
"data": "foo",
"valid": true
},
{
"description": "exact length is valid",
"data": "fo",
"valid": true
},
{
"description": "too short is invalid",
"data": "f",
"valid": false
},
{
"description": "ignores non-strings",
"data": 1,
"valid": true
},
{
"description": "one supplementary Unicode code point is not long enough",
"data": "\uD83D\uDCA9",
"valid": false
}
]
}
]
43 changes: 43 additions & 0 deletions src/test/resources/draft7/minProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,48 @@
"valid": true
}
]
},
{
"description": "minProperties decimal validation",
"schema": {
"minProperties": 1.0
},
"tests": [
{
"description": "longer is valid",
"data": {
"foo": 1,
"bar": 2
},
"valid": true
},
{
"description": "exact length is valid",
"data": {
"foo": 1
},
"valid": true
},
{
"description": "too short is invalid",
"data": {},
"valid": false
},
{
"description": "ignores arrays",
"data": [],
"valid": true
},
{
"description": "ignores strings",
"data": "",
"valid": true
},
{
"description": "ignores other non-objects",
"data": 12,
"valid": true
}
]
}
]