Skip to content

Feature/support list element validation for all constraints #48

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
merged 23 commits into from
Nov 26, 2021
Merged

Feature/support list element validation for all constraints #48

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
7ad838d
fix schema wiring
pelletier197 Sep 29, 2020
7864fd4
Merge branch 'master' of github.com:graphql-java/graphql-java-extende…
pelletier197 Jul 12, 2021
00c9e36
refactor validation rules
pelletier197 Jul 13, 2021
e6aa822
merge with original
pelletier197 Jul 21, 2021
a885fa6
refactor a little
pelletier197 Jul 21, 2021
1a6bece
continue
pelletier197 Jul 21, 2021
1d2844e
simplify all constraints
pelletier197 Jul 22, 2021
b9e3fd1
fix constraints
pelletier197 Jul 22, 2021
e6f9e67
add support for list elements for every type of constraint
pelletier197 Jul 24, 2021
b73b0d3
test
pelletier197 Jul 24, 2021
84226ec
it works
pelletier197 Jul 24, 2021
23e952d
fix tests
pelletier197 Jul 24, 2021
520e02b
fix stuff
pelletier197 Jul 25, 2021
b59a369
add tests
pelletier197 Jul 25, 2021
a3be90a
revert small change
pelletier197 Jul 25, 2021
59787c5
add more tests
pelletier197 Jul 25, 2021
d19b9ec
fix all
pelletier197 Jul 25, 2021
50424e8
update
pelletier197 Jul 25, 2021
83ca52b
update readme with new constraints
pelletier197 Jul 25, 2021
213406a
final reade update
pelletier197 Jul 25, 2021
753d4b9
Delete AbstractListElementValidatorConstraint.java
pelletier197 Aug 28, 2021
1486470
update readme
pelletier197 Sep 15, 2021
c1c3459
revert readme change
pelletier197 Oct 30, 2021
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
Prev Previous commit
Next Next commit
add more tests
  • Loading branch information
@pelletier197
pelletier197 committed Jul 25, 2021
commit 59787c5473f0eaab54abef5c9ca7b04f6f675a6c
3 changes: 2 additions & 1 deletion src/main/java/graphql/validation/constraints/GraphQLListElementValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;

public class GraphQLListElementValidator {
public boolean appliesToType(GraphQLInputType inputType, Function<GraphQLInputType, Boolean> appliesToTypeOrListElement) {
Expand All @@ -26,7 +27,7 @@ public List<GraphQLError> runConstraintOnListElements(ValidationEnvironment vali
final AtomicInteger index = new AtomicInteger(0);
return ((Collection<?>) validatedValue)
.stream()
.flatMap((item) -> runConstraintOnElement.apply(validationEnvironment.transform((environment) -> {
.flatMap((item) -> item == null ? Stream.empty() : runConstraintOnElement.apply(validationEnvironment.transform((environment) -> {
environment
.validatedValue(item)
.validatedPath(validationEnvironment.getValidatedPath().segment(index.getAndIncrement()))
Expand Down
30 changes: 20 additions & 10 deletions src/test/groovy/graphql/validation/constraints/standard/AssertTrueFalseConstraintTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,19 @@ class AssertTrueFalseConstraintTest extends BaseConstraintTestSupport {

where:

fieldDeclaration | argVal | expectedMessage
'field( arg : Boolean @AssertTrue ) : ID' | false | 'AssertTrue;path=/arg;val:false;\t'
'field( arg : Boolean @AssertTrue ): ID' | true | ''
fieldDeclaration | argVal | expectedMessage
'field( arg : Boolean @AssertTrue ) : ID' | false | 'AssertTrue;path=/arg;val:false;\t'
'field( arg : Boolean @AssertTrue ): ID' | true | ''

'field( arg : Boolean @AssertTrue(message : "custom")) : ID' | false | 'custom;path=/arg;val:false;\t'
'field( arg : Boolean @AssertTrue(message : "custom")) : ID' | false | 'custom;path=/arg;val:false;\t'

// nulls are valid
'field( arg : Boolean @AssertTrue ) : ID' | null | ''
'field( arg : Boolean @AssertTrue ) : ID' | null | ''

// Lists
'field( arg : [Boolean] @AssertTrue ) : ID' | [true, true] | ''
'field( arg : [Boolean] @AssertTrue ) : ID' | [true, false] | 'AssertTrue;path=/arg[1];val:false;\t'
'field( arg : [Boolean] @AssertTrue ) : ID' | [null] | ''
}

@Unroll
Expand All @@ -41,13 +46,18 @@ class AssertTrueFalseConstraintTest extends BaseConstraintTestSupport {

where:

fieldDeclaration | argVal | expectedMessage
'field( arg : Boolean @AssertFalse ) : ID' | true | 'AssertFalse;path=/arg;val:true;\t'
'field( arg : Boolean @AssertFalse ): ID' | false | ''
fieldDeclaration | argVal | expectedMessage
'field( arg : Boolean @AssertFalse ) : ID' | true | 'AssertFalse;path=/arg;val:true;\t'
'field( arg : Boolean @AssertFalse ): ID' | false | ''

'field( arg : Boolean @AssertFalse(message : "custom")) : ID' | true | 'custom;path=/arg;val:true;\t'
'field( arg : Boolean @AssertFalse(message : "custom")) : ID' | true | 'custom;path=/arg;val:true;\t'

// nulls are valid
'field( arg : Boolean @AssertFalse ) : ID' | null | ''
'field( arg : Boolean @AssertFalse ) : ID' | null | ''

// Lists
'field( arg : [Boolean] @AssertFalse ) : ID' | [false, false] | ''
'field( arg : [Boolean] @AssertFalse ) : ID' | [false, true] | 'AssertFalse;path=/arg[1];val:true;\t'
'field( arg : [Boolean] @AssertFalse ) : ID' | [null] | ''
}
}
31 changes: 20 additions & 11 deletions src/test/groovy/graphql/validation/constraints/standard/DecimalMinMaxConstraintTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ class DecimalMinMaxConstraintTest extends BaseConstraintTestSupport {

// nulls are valid
'field( arg : Int @DecimalMin(value : "50" inclusive:false) ) : ID' | null | ''

// Lists
'field( arg : [Int] @DecimalMin( value: "50", inclusive: false ) ) : ID' | [50] | 'DecimalMin;path=/arg[0];val:50;\t'
'field( arg : [Int] @DecimalMin( value: "50", inclusive: false ) ) : ID' | [51, 52] | ''
'field( arg : [Int] @DecimalMin( value: "50", inclusive: false ) ) : ID' | [null] | ''
}

@Unroll
Expand All @@ -68,24 +73,28 @@ class DecimalMinMaxConstraintTest extends BaseConstraintTestSupport {

where:

fieldDeclaration | argVal | expectedMessage
'field( arg : Int @DecimalMax(value : "100") ) : ID' | 150 | 'DecimalMax;path=/arg;val:150;\t'
'field( arg : Int @DecimalMax(value : "100") ) : ID' | 50 | ''
fieldDeclaration | argVal | expectedMessage
'field( arg : Int @DecimalMax(value : "100") ) : ID' | 150 | 'DecimalMax;path=/arg;val:150;\t'
'field( arg : Int @DecimalMax(value : "100") ) : ID' | 50 | ''

'field( arg : Int @DecimalMax(value : "100", message : "custom") ) : ID' | 150 | 'custom;path=/arg;val:150;\t'
'field( arg : Int @DecimalMax(value : "100", message : "custom") ) : ID' | 150 | 'custom;path=/arg;val:150;\t'
// edge case
'field( arg : Int @DecimalMax(value : "50") ) : ID' | 51 | 'DecimalMax;path=/arg;val:51;\t'
'field( arg : Int @DecimalMax(value : "50") ) : ID' | 50 | ''
'field( arg : Int @DecimalMax(value : "50") ) : ID' | 49 | ''
'field( arg : Int @DecimalMax(value : "50") ) : ID' | 51 | 'DecimalMax;path=/arg;val:51;\t'
'field( arg : Int @DecimalMax(value : "50") ) : ID' | 50 | ''
'field( arg : Int @DecimalMax(value : "50") ) : ID' | 49 | ''

// exclusive
'field( arg : Int @DecimalMax(value : "50" inclusive:false) ) : ID' | 50 | 'DecimalMax;path=/arg;val:50;\t'
'field( arg : Int @DecimalMax(value : "50" inclusive:false) ) : ID' | 51 | 'DecimalMax;path=/arg;val:51;\t'
'field( arg : Int @DecimalMax(value : "50" inclusive:false) ) : ID' | 49 | ''
'field( arg : Int @DecimalMax(value : "50" inclusive:false) ) : ID' | 50 | 'DecimalMax;path=/arg;val:50;\t'
'field( arg : Int @DecimalMax(value : "50" inclusive:false) ) : ID' | 51 | 'DecimalMax;path=/arg;val:51;\t'
'field( arg : Int @DecimalMax(value : "50" inclusive:false) ) : ID' | 49 | ''

// nulls are valid
'field( arg : Int @DecimalMax(value : "50" inclusive:false) ) : ID' | null | ''
'field( arg : Int @DecimalMax(value : "50" inclusive:false) ) : ID' | null | ''

// Lists
'field( arg : [Int] @DecimalMax( value: "50", inclusive: false ) ) : ID' | [50] | 'DecimalMax;path=/arg[0];val:50;\t'
'field( arg : [Int] @DecimalMax( value: "50", inclusive: false ) ) : ID' | [48, 49] | ''
'field( arg : [Int] @DecimalMax( value: "50", inclusive: false ) ) : ID' | [null] | ''
}

}
48 changes: 27 additions & 21 deletions src/test/groovy/graphql/validation/constraints/standard/DigitsConstraintTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,33 +19,39 @@ class DigitsConstraintTest extends BaseConstraintTestSupport {

where:

fieldDeclaration | argVal | expectedMessage
'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | null | ''
'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | Byte.valueOf("0") | ''
'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | Double.valueOf("500.2") | ''
fieldDeclaration | argVal | expectedMessage
'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | null | ''
'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | Byte.valueOf("0") | ''
'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | Double.valueOf("500.2") | ''

'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | new BigDecimal("-12345.12") | ''
'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | new BigDecimal("-123456.12") | 'Digits;path=/arg;val:-123456.12;\t'
'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | new BigDecimal("-123456.123") | 'Digits;path=/arg;val:-123456.123;\t'
'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | new BigDecimal("-12345.123") | 'Digits;path=/arg;val:-12345.123;\t'
'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | new BigDecimal("12345.123") | 'Digits;path=/arg;val:12345.123;\t'
'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | new BigDecimal("-12345.12") | ''
'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | new BigDecimal("-123456.12") | 'Digits;path=/arg;val:-123456.12;\t'
'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | new BigDecimal("-123456.123") | 'Digits;path=/arg;val:-123456.123;\t'
'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | new BigDecimal("-12345.123") | 'Digits;path=/arg;val:-12345.123;\t'
'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | new BigDecimal("12345.123") | 'Digits;path=/arg;val:12345.123;\t'

'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | Float.valueOf("-000000000.22") | ''
'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | Float.valueOf("-000000000.22") | ''

'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | Integer.valueOf("256874") | 'Digits;path=/arg;val:256874;\t'
'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | Double.valueOf("12.0001") | 'Digits;path=/arg;val:12.0001;\t'
'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | Integer.valueOf("256874") | 'Digits;path=/arg;val:256874;\t'
'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | Double.valueOf("12.0001") | 'Digits;path=/arg;val:12.0001;\t'

// zero length
'field( arg : String @Digits(integer : 0, fraction : 0) ) : ID' | null | ''
'field( arg : String @Digits(integer : 0, fraction : 0) ) : ID' | Byte.valueOf("0") | 'Digits;path=/arg;val:0;\t'
'field( arg : String @Digits(integer : 0, fraction : 0) ) : ID' | Double.valueOf("0") | 'Digits;path=/arg;val:0.0;\t'
'field( arg : String @Digits(integer : 0, fraction : 0) ) : ID' | new BigDecimal(0) | 'Digits;path=/arg;val:0;\t'
'field( arg : String @Digits(integer : 0, fraction : 0) ) : ID' | 0 | 'Digits;path=/arg;val:0;\t'
'field( arg : String @Digits(integer : 0, fraction : 0) ) : ID' | 0L | 'Digits;path=/arg;val:0;\t'
'field( arg : String @Digits(integer : 0, fraction : 0) ) : ID' | null | ''
'field( arg : String @Digits(integer : 0, fraction : 0) ) : ID' | Byte.valueOf("0") | 'Digits;path=/arg;val:0;\t'
'field( arg : String @Digits(integer : 0, fraction : 0) ) : ID' | Double.valueOf("0") | 'Digits;path=/arg;val:0.0;\t'
'field( arg : String @Digits(integer : 0, fraction : 0) ) : ID' | new BigDecimal(0) | 'Digits;path=/arg;val:0;\t'
'field( arg : String @Digits(integer : 0, fraction : 0) ) : ID' | 0 | 'Digits;path=/arg;val:0;\t'
'field( arg : String @Digits(integer : 0, fraction : 0) ) : ID' | 0L | 'Digits;path=/arg;val:0;\t'

// zeroes are trimmed
'field( arg : String @Digits(integer : 12, fraction : 3) ) : ID' | 0.001d | ''
'field( arg : String @Digits(integer : 12, fraction : 3) ) : ID' | 0.00100d | ''
'field( arg : String @Digits(integer : 12, fraction : 3) ) : ID' | 0.0001d | 'Digits;path=/arg;val:1.0E-4;\t'
'field( arg : String @Digits(integer : 12, fraction : 3) ) : ID' | 0.001d | ''
'field( arg : String @Digits(integer : 12, fraction : 3) ) : ID' | 0.00100d | ''
'field( arg : String @Digits(integer : 12, fraction : 3) ) : ID' | 0.0001d | 'Digits;path=/arg;val:1.0E-4;\t'


// Lists
'field( arg : [String] @Digits( integer : 5, fraction : 2 ) ) : ID' | ["500.2", "343.2343"] | 'Digits;path=/arg[1];val:343.2343;\t'
'field( arg : [String] @Digits( integer : 5, fraction : 2 ) ) : ID' | ["500.2", "343.2"] | ''
'field( arg : [String] @Digits( integer : 5, fraction : 2 ) ) : ID' | [null] | ''
}
}
41 changes: 25 additions & 16 deletions src/test/groovy/graphql/validation/constraints/standard/MinMaxConstraintTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,23 @@ class MinMaxConstraintTest extends BaseConstraintTestSupport {

where:

fieldDeclaration | argVal | expectedMessage
"field( arg : Int @Min(value : 100) ) : ID" | 50 | "Min;path=/arg;val:50;\t"
"field( arg : Int @Min(value : 10) ) : ID" | 50 | ""
fieldDeclaration | argVal | expectedMessage
"field( arg : Int @Min(value : 100) ) : ID" | 50 | "Min;path=/arg;val:50;\t"
"field( arg : Int @Min(value : 10) ) : ID" | 50 | ""

'field( arg : Int @Min(value : 100, message : "custom") ) : ID' | 50 | "custom;path=/arg;val:50;\t"
'field( arg : Int @Min(value : 100, message : "custom") ) : ID' | 50 | "custom;path=/arg;val:50;\t"
// edge case
"field( arg : Int @Min(value : 50) ) : ID" | 49 | "Min;path=/arg;val:49;\t"
"field( arg : Int @Min(value : 50) ) : ID" | 50 | ""
"field( arg : Int @Min(value : 50) ) : ID" | 51 | ""
"field( arg : Int @Min(value : 50) ) : ID" | 49 | "Min;path=/arg;val:49;\t"
"field( arg : Int @Min(value : 50) ) : ID" | 50 | ""
"field( arg : Int @Min(value : 50) ) : ID" | 51 | ""

// nulls are valid
'field( arg : Int @Min(value : 50) ) : ID' | null | ''
'field( arg : Int @Min(value : 50) ) : ID' | null | ''

// Lists
'field( arg : [Int] @Min( value : 50 ) ) : ID' | [50, 49] | 'Min;path=/arg[1];val:49;\t'
'field( arg : [Int] @Min( value : 50 ) ) : ID' | [50, 51] | ''
'field( arg : [Int] @Min( value : 50 ) ) : ID' | [null] | ''
}

@Unroll
Expand All @@ -46,17 +50,22 @@ class MinMaxConstraintTest extends BaseConstraintTestSupport {

where:

fieldDeclaration | argVal | expectedMessage
"field( arg : Int @Max(value : 100) ) : ID" | 150 | "Max;path=/arg;val:150;\t"
"field( arg : Int @Max(value : 100) ) : ID" | 50 | ""
fieldDeclaration | argVal | expectedMessage
"field( arg : Int @Max(value : 100) ) : ID" | 150 | "Max;path=/arg;val:150;\t"
"field( arg : Int @Max(value : 100) ) : ID" | 50 | ""

'field( arg : Int @Max(value : 100, message : "custom") ) : ID' | 150 | "custom;path=/arg;val:150;\t"
'field( arg : Int @Max(value : 100, message : "custom") ) : ID' | 150 | "custom;path=/arg;val:150;\t"
// edge case
"field( arg : Int @Max(value : 50) ) : ID" | 51 | "Max;path=/arg;val:51;\t"
"field( arg : Int @Max(value : 50) ) : ID" | 50 | ""
"field( arg : Int @Max(value : 50) ) : ID" | 49 | ""
"field( arg : Int @Max(value : 50) ) : ID" | 51 | "Max;path=/arg;val:51;\t"
"field( arg : Int @Max(value : 50) ) : ID" | 50 | ""
"field( arg : Int @Max(value : 50) ) : ID" | 49 | ""

// nulls are valid
'field( arg : Int @Max(value : 50) ) : ID' | null | ''
'field( arg : Int @Max(value : 50) ) : ID' | null | ''

// Lists
'field( arg : [Int] @Max( value : 50 ) ) : ID' | [50, 51] | 'Max;path=/arg[1];val:51;\t'
'field( arg : [Int] @Max( value : 50 ) ) : ID' | [50, 49] | ''
'field( arg : [Int] @Max( value : 50 ) ) : ID' | [null] | ''
}
}
Loading