PR graphql-java#217: Allow serialization of any Iterable collection a…

…s a GraphQLList
tinnou · Oct 25, 2016 · 02ab468 · 02ab468
1 parent 12212bf
commit 02ab468
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/src/main/java/graphql/execution/ExecutionStrategy.java b/src/main/java/graphql/execution/ExecutionStrategy.java
@@ -93,7 +93,7 @@ private ExecutionResult completeValueForList(ExecutionContext executionContext,
             result = Arrays.asList((Object[]) result);
         }
 
-        return completeValueForList(executionContext, fieldType, fields, (List<Object>) result);
+        return completeValueForList(executionContext, fieldType, fields, (Iterable<Object>) result);
     }
 
     protected GraphQLObjectType resolveType(GraphQLInterfaceType graphQLInterfaceType, Object value) {
@@ -126,7 +126,7 @@ protected ExecutionResult completeValueForScalar(GraphQLScalarType scalarType, O
         return new ExecutionResultImpl(serialized, null);
     }
 
-    protected ExecutionResult completeValueForList(ExecutionContext executionContext, GraphQLList fieldType, List<Field> fields, List<Object> result) {
+    protected ExecutionResult completeValueForList(ExecutionContext executionContext, GraphQLList fieldType, List<Field> fields, Iterable<Object> result) {
         List<Object> completedResults = new ArrayList<Object>();
         for (Object item : result) {
             ExecutionResult completedValue = completeValue(executionContext, fieldType.getWrappedType(), fields, item);

diff --git a/src/test/groovy/graphql/GraphQLTest.groovy b/src/test/groovy/graphql/GraphQLTest.groovy
@@ -1,10 +1,7 @@
 package graphql
 
 import graphql.language.SourceLocation
-import graphql.schema.GraphQLFieldDefinition
-import graphql.schema.GraphQLNonNull
-import graphql.schema.GraphQLObjectType
-import graphql.schema.GraphQLSchema
+import graphql.schema.*
 import graphql.validation.ValidationErrorType
 import spock.lang.Specification
 
@@ -149,4 +146,26 @@ class GraphQLTest extends Specification {
         errors[0].validationErrorType == ValidationErrorType.MissingFieldArgument
         errors[0].sourceLocations == [new SourceLocation(1, 3)]
     }
+
+    def "`Iterable` can be used as a `GraphQLList` field result"() {
+        given:
+        def set = new HashSet<String>()
+        set.add("One")
+        set.add("Two")
+
+        def schema = GraphQLSchema.newSchema()
+          .query(GraphQLObjectType.newObject()
+            .name("QueryType")
+            .field(GraphQLFieldDefinition.newFieldDefinition()
+              .name("set")
+              .type(new GraphQLList(GraphQLString))
+              .dataFetcher({ set })))
+          .build()
+
+        when:
+        def data = new GraphQL(schema).execute("query { set }").data
+
+        then:
+        data == [set: ['One', 'Two']]
+    }
 }