|
19 | 19 | import graphql.validation.ValidationErrorType; |
20 | 20 |
|
21 | 21 | import java.util.List; |
| 22 | +import java.util.EnumSet; |
22 | 23 |
|
23 | 24 | @Internal |
24 | 25 | public class KnownDirectives extends AbstractRule { |
@@ -46,21 +47,26 @@ public void checkDirective(Directive directive, List<Node> ancestors) { |
46 | 47 |
|
47 | 48 | @SuppressWarnings("deprecation") // the suppression stands because its deprecated but still in graphql spec |
48 | 49 | private boolean hasInvalidLocation(GraphQLDirective directive, Node ancestor) { |
| 50 | + EnumSet<DirectiveLocation> validLocations = directive.validLocations(); |
49 | 51 | if (ancestor instanceof OperationDefinition) { |
50 | 52 | Operation operation = ((OperationDefinition) ancestor).getOperation(); |
51 | | - return Operation.QUERY.equals(operation) ? |
52 | | - !(directive.validLocations().contains(DirectiveLocation.QUERY)) : |
53 | | - !(directive.validLocations().contains(DirectiveLocation.MUTATION)); |
| 53 | + if (Operation.QUERY.equals(operation)) { |
| 54 | + return !validLocations.contains(DirectiveLocation.QUERY); |
| 55 | + } else if (Operation.MUTATION.equals(operation)) { |
| 56 | + return !validLocations.contains(DirectiveLocation.MUTATION); |
| 57 | + } else if (Operation.SUBSCRIPTION.equals(operation)) { |
| 58 | + return !validLocations.contains(DirectiveLocation.SUBSCRIPTION); |
| 59 | + } |
54 | 60 | } else if (ancestor instanceof Field) { |
55 | | - return !(directive.validLocations().contains(DirectiveLocation.FIELD)); |
| 61 | + return !(validLocations.contains(DirectiveLocation.FIELD)); |
56 | 62 | } else if (ancestor instanceof FragmentSpread) { |
57 | | - return !(directive.validLocations().contains(DirectiveLocation.FRAGMENT_SPREAD)); |
| 63 | + return !(validLocations.contains(DirectiveLocation.FRAGMENT_SPREAD)); |
58 | 64 | } else if (ancestor instanceof FragmentDefinition) { |
59 | | - return !(directive.validLocations().contains(DirectiveLocation.FRAGMENT_DEFINITION)); |
| 65 | + return !(validLocations.contains(DirectiveLocation.FRAGMENT_DEFINITION)); |
60 | 66 | } else if (ancestor instanceof InlineFragment) { |
61 | | - return !(directive.validLocations().contains(DirectiveLocation.INLINE_FRAGMENT)); |
| 67 | + return !(validLocations.contains(DirectiveLocation.INLINE_FRAGMENT)); |
62 | 68 | } else if (ancestor instanceof VariableDefinition) { |
63 | | - return !(directive.validLocations().contains(DirectiveLocation.VARIABLE_DEFINITION)); |
| 69 | + return !(validLocations.contains(DirectiveLocation.VARIABLE_DEFINITION)); |
64 | 70 | } |
65 | 71 | return true; |
66 | 72 | } |
|
0 commit comments