@@ -60,6 +60,7 @@ public abstract class ExecutionStrategy {
6060 * @param argumentValues the map of arguments
6161 * @param e the exception that occurred
6262 */
63+ @ SuppressWarnings ("unused" )
6364 protected void handleDataFetchingException (
6465 ExecutionContext executionContext ,
6566 GraphQLFieldDefinition fieldDef ,
@@ -113,11 +114,15 @@ protected ExecutionResult resolveField(ExecutionContext executionContext, Execut
113114 .build ();
114115
115116
117+ NonNullableFieldValidator nonNullableFieldValidator = new NonNullableFieldValidator (executionContext , fieldTypeInfo );
118+
116119 ExecutionParameters newParameters = ExecutionParameters .newParameters ()
117120 .typeInfo (fieldTypeInfo )
118121 .fields (parameters .fields ())
119122 .arguments (argumentValues )
120- .source (resolvedValue ).build ();
123+ .source (resolvedValue )
124+ .nonNullFieldValidator (nonNullableFieldValidator )
125+ .build ();
121126
122127 ExecutionResult result = completeValue (executionContext , newParameters , fields );
123128
@@ -131,19 +136,13 @@ protected ExecutionResult completeValue(ExecutionContext executionContext, Execu
131136 GraphQLType fieldType = parameters .typeInfo ().type ();
132137
133138 if (result == null ) {
134- if (typeInfo .typeIsNonNull ()) {
135- // see http://facebook.github.io/graphql/#sec-Errors-and-Non-Nullability
136- NonNullableFieldWasNullException nonNullException = new NonNullableFieldWasNullException (typeInfo );
137- executionContext .addError (nonNullException );
138- throw nonNullException ;
139- }
140- return null ;
139+ return parameters .nonNullFieldValidator ().validate (null );
141140 } else if (fieldType instanceof GraphQLList ) {
142141 return completeValueForList (executionContext , parameters , fields , toIterable (result ));
143142 } else if (fieldType instanceof GraphQLScalarType ) {
144- return completeValueForScalar ((GraphQLScalarType ) fieldType , result );
143+ return completeValueForScalar ((GraphQLScalarType ) fieldType , parameters , result );
145144 } else if (fieldType instanceof GraphQLEnumType ) {
146- return completeValueForEnum ((GraphQLEnumType ) fieldType , result );
145+ return completeValueForEnum ((GraphQLEnumType ) fieldType , parameters , result );
147146 }
148147
149148
@@ -179,9 +178,13 @@ protected ExecutionResult completeValue(ExecutionContext executionContext, Execu
179178
180179 Map <String , List <Field >> subFields = fieldCollector .collectFields (collectorParameters , fields );
181180
181+ TypeInfo newTypeInfo = typeInfo .asType (resolvedType );
182+ NonNullableFieldValidator nonNullableFieldValidator = new NonNullableFieldValidator (executionContext , newTypeInfo );
183+
182184 ExecutionParameters newParameters = ExecutionParameters .newParameters ()
183- .typeInfo (typeInfo . asType ( resolvedType ) )
185+ .typeInfo (newTypeInfo )
184186 .fields (subFields )
187+ .nonNullFieldValidator (nonNullableFieldValidator )
185188 .source (result ).build ();
186189
187190 // Calling this from the executionContext to ensure we shift back from mutation strategy to the query strategy.
@@ -215,16 +218,19 @@ protected GraphQLObjectType resolveTypeForUnion(TypeResolutionParameters params)
215218 return result ;
216219 }
217220
218- protected ExecutionResult completeValueForEnum (GraphQLEnumType enumType , Object result ) {
219- return new ExecutionResultImpl (enumType .getCoercing ().serialize (result ), null );
221+ protected ExecutionResult completeValueForEnum (GraphQLEnumType enumType , ExecutionParameters parameters , Object result ) {
222+ Object serialized = enumType .getCoercing ().serialize (result );
223+ serialized = parameters .nonNullFieldValidator ().validate (serialized );
224+ return new ExecutionResultImpl (serialized , null );
220225 }
221226
222- protected ExecutionResult completeValueForScalar (GraphQLScalarType scalarType , Object result ) {
227+ protected ExecutionResult completeValueForScalar (GraphQLScalarType scalarType , ExecutionParameters parameters , Object result ) {
223228 Object serialized = scalarType .getCoercing ().serialize (result );
224229 //6.6.1 http://facebook.github.io/graphql/#sec-Field-entries
225230 if (serialized instanceof Double && ((Double ) serialized ).isNaN ()) {
226231 serialized = null ;
227232 }
233+ serialized = parameters .nonNullFieldValidator ().validate (serialized );
228234 return new ExecutionResultImpl (serialized , null );
229235 }
230236
@@ -234,9 +240,13 @@ protected ExecutionResult completeValueForList(ExecutionContext executionContext
234240 GraphQLList fieldType = typeInfo .castType (GraphQLList .class );
235241 for (Object item : result ) {
236242
243+ TypeInfo wrappedTypeInfo = typeInfo .asType (fieldType .getWrappedType ());
244+ NonNullableFieldValidator nonNullableFieldValidator = new NonNullableFieldValidator (executionContext , wrappedTypeInfo );
245+
237246 ExecutionParameters newParameters = ExecutionParameters .newParameters ()
238- .typeInfo (typeInfo . asType ( fieldType . getWrappedType ()) )
247+ .typeInfo (wrappedTypeInfo )
239248 .fields (parameters .fields ())
249+ .nonNullFieldValidator (nonNullableFieldValidator )
240250 .source (item ).build ();
241251
242252 ExecutionResult completedValue = completeValue (executionContext , newParameters , fields );
0 commit comments