@@ -116,22 +116,23 @@ public TraversalControl visitGraphQLFieldDefinition(
116
116
GraphQLFieldsContainer parent = (GraphQLFieldsContainer ) context .getParentNode ();
117
117
DataFetcher <?> dataFetcher = codeRegistry .getDataFetcher (parent , fieldDefinition );
118
118
119
- if (skipDataFetcher (dataFetcher )) {
120
- return TraversalControl .CONTINUE ;
119
+ if (applyDecorator (dataFetcher )) {
120
+ boolean handlesSubscription = parent .getName ().equals ("Subscription" );
121
+ dataFetcher = new ContextDataFetcherDecorator (dataFetcher , handlesSubscription , compositeResolver );
122
+ codeRegistry .dataFetcher (parent , fieldDefinition , dataFetcher );
121
123
}
122
124
123
- boolean handlesSubscription = parent .getName ().equals ("Subscription" );
124
- dataFetcher = new ContextDataFetcherDecorator (dataFetcher , handlesSubscription , compositeResolver );
125
- codeRegistry .dataFetcher (parent , fieldDefinition , dataFetcher );
126
125
return TraversalControl .CONTINUE ;
127
126
}
128
127
129
- private boolean skipDataFetcher (DataFetcher <?> dataFetcher ) {
128
+ private boolean applyDecorator (DataFetcher <?> dataFetcher ) {
130
129
Class <?> type = dataFetcher .getClass ();
131
- if (type .getPackage ().getName ().startsWith ("graphql." )) {
132
- return !type .getSimpleName ().startsWith ("DataFetcherFactories" );
130
+ String packageName = type .getPackage ().getName ();
131
+ if (packageName .startsWith ("graphql." )) {
132
+ return (type .getSimpleName ().startsWith ("DataFetcherFactories" ) ||
133
+ packageName .startsWith ("graphql.validation" ));
133
134
}
134
- return false ;
135
+ return true ;
135
136
}
136
137
};
137
138
}
0 commit comments