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

Allow min to equal max in range #216

Merged
merged 1 commit into from
Nov 26, 2019
Merged

Allow min to equal max in range #216

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
4 changes: 2 additions & 2 deletions ...src/main/java/software/amazon/smithy/model/validation/validators/RangeTraitValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ private List<ValidationEvent> validateRangeTrait(Model model, Shape shape, Range
// Makes sure that `min` is less than `max`
trait.getMin()
.flatMap(min -> trait.getMax().map(max -> Pair.of(min, max)))
.filter(pair -> pair.getLeft().compareTo(pair.getRight()) >= 0)
.filter(pair -> pair.getLeft().compareTo(pair.getRight()) > 0)
.map(pair -> error(shape, trait, "A range trait is applied with a `min` value greater than "
+ "or equal to its `max` value."))
+ "its `max` value."))
.map(events::add);

return events;
Expand Down
4 changes: 2 additions & 2 deletions .../src/test/resources/software/amazon/smithy/model/errorfiles/validators/range-trait.errors
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[ERROR] ns.foo#Invalid4: Shape `ns.foo#Invalid4` is marked with the `range` trait, but its `min` property is a decimal (0.5) when its shape (`long`) does not support decimals. | RangeTrait
[ERROR] ns.foo#Invalid5: Shape `ns.foo#Invalid5` is marked with the `range` trait, but its `max` property is a decimal (10.5) when its shape (`bigInteger`) does not support decimals. | RangeTrait
[ERROR] ns.foo#Invalid5: Shape `ns.foo#Invalid5` is marked with the `range` trait, but its `min` property is a decimal (0.5) when its shape (`bigInteger`) does not support decimals. | RangeTrait
[ERROR] ns.foo#Invalid6: A range trait is applied with a `min` value greater than or equal to its `max` value. | RangeTrait
[ERROR] ns.foo#Invalid6: A range trait is applied with a `min` value greater than its `max` value. | RangeTrait
[ERROR] ns.foo#Structure$InvalidMember1: Member `ns.foo#Structure$InvalidMember1` is marked with the `range` trait, but its `max` property is a decimal (10.5) when its target (`smithy.api#Byte`) does not support decimals. | RangeTrait
[ERROR] ns.foo#Structure$InvalidMember1: Member `ns.foo#Structure$InvalidMember1` is marked with the `range` trait, but its `min` property is a decimal (0.5) when its target (`smithy.api#Byte`) does not support decimals. | RangeTrait
[ERROR] ns.foo#Structure$InvalidMember2: Member `ns.foo#Structure$InvalidMember2` is marked with the `range` trait, but its `max` property is a decimal (10.5) when its target (`smithy.api#Short`) does not support decimals. | RangeTrait
Expand All @@ -19,4 +19,4 @@
[ERROR] ns.foo#Structure$InvalidMember4: Member `ns.foo#Structure$InvalidMember4` is marked with the `range` trait, but its `min` property is a decimal (0.5) when its target (`smithy.api#Long`) does not support decimals. | RangeTrait
[ERROR] ns.foo#Structure$InvalidMember5: Member `ns.foo#Structure$InvalidMember5` is marked with the `range` trait, but its `max` property is a decimal (10.5) when its target (`smithy.api#BigInteger`) does not support decimals. | RangeTrait
[ERROR] ns.foo#Structure$InvalidMember5: Member `ns.foo#Structure$InvalidMember5` is marked with the `range` trait, but its `min` property is a decimal (0.5) when its target (`smithy.api#BigInteger`) does not support decimals. | RangeTrait
[ERROR] ns.foo#Structure$InvalidMember6: A range trait is applied with a `min` value greater than or equal to its `max` value. | RangeTrait
[ERROR] ns.foo#Structure$InvalidMember6: A range trait is applied with a `min` value greater than its `max` value. | RangeTrait
14 changes: 14 additions & 0 deletions ...el/src/test/resources/software/amazon/smithy/model/errorfiles/validators/range-trait.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,13 @@
"max": 10.5e4
}
},
"ValidMember13": {
"target": "smithy.api#Integer",
"range": {
"min": 5,
"max": 5
}
},
"InvalidMember1": {
"target": "smithy.api#Byte",
"range": {
Expand Down Expand Up @@ -210,6 +217,13 @@
"max": 10.5
}
},
"Valid12": {
"type": "integer",
"range": {
"min": 5,
"max": 5
}
},
"Invalid1": {
"type": "byte",
"range": {
Expand Down