Support non null types in batch resolver

smallrye · Oct 26, 2023 · 05fc82f · 05fc82f
1 parent b9e489d
commit 05fc82f
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/server/implementation/src/main/java/io/smallrye/graphql/bootstrap/FederationDataFetcher.java b/server/implementation/src/main/java/io/smallrye/graphql/bootstrap/FederationDataFetcher.java
@@ -19,6 +19,7 @@
 
 import graphql.execution.Async;
 import graphql.execution.DataFetcherResult;
+import graphql.language.NonNullType;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import graphql.schema.DelegatingDataFetchingEnvironment;
@@ -27,8 +28,10 @@
 import graphql.schema.GraphQLFieldDefinition;
 import graphql.schema.GraphQLList;
 import graphql.schema.GraphQLNamedSchemaElement;
+import graphql.schema.GraphQLNonNull;
 import graphql.schema.GraphQLObjectType;
 import graphql.schema.GraphQLOutputType;
+import graphql.schema.GraphQLType;
 import io.smallrye.graphql.spi.config.Config;
 
 class FederationDataFetcher implements DataFetcher<CompletableFuture<List<Object>>> {
@@ -116,7 +119,10 @@ private boolean matchesReturnType(GraphQLFieldDefinition field, String typename)
     }
 
     private boolean matchesReturnTypeList(GraphQLFieldDefinition field, String typename) {
-        GraphQLOutputType listType = field.getType();
+        GraphQLType listType = field.getType();
+        if(listType instanceof GraphQLNonNull){
+            listType = ((GraphQLNonNull) listType).getOriginalWrappedType();
+        }
         if (listType instanceof GraphQLList) {
             var returnType = ((GraphQLList) listType).getOriginalWrappedType();
             return returnType instanceof GraphQLNamedSchemaElement