Merge pull request #488 from ooga/list-of-datafetcherresult

Remove error when DataFetcherResult is not the root type

Author: vojtapol

src/main/kotlin/graphql/kickstart/tools/TypeClassMatcher.kt

@@ -32,10 +32,6 @@ internal class TypeClassMatcher(private val definitionsByName: Map<String, TypeD
                 throw error(potentialMatch, "${DataFetcherResult::class.java.name} can only be used as a return type")
             }
 
-            if (!root) {
-                throw error(potentialMatch, "${DataFetcherResult::class.java.name} can only be used at the top level of a return type")
-            }
-
             realType = potentialMatch.generic.unwrapGenericType(realType.actualTypeArguments.first())
 
             if (realType is ParameterizedType && potentialMatch.generic.isTypeAssignableFromRawClass(realType, DataFetcherResult::class.java)) {

src/test/kotlin/graphql/kickstart/tools/EndToEndSpecHelper.kt

@@ -76,6 +76,7 @@ type Query {
 
     propertyField: String!
     dataFetcherResult: Item!
+    dataFetcherResultItems: [Item!]!
 
     coroutineItems: [Item!]!
 
@@ -302,6 +303,10 @@ class Query : GraphQLQueryResolver, ListListResolver<String>() {
         return DataFetcherResult.newResult<Item>().data(items.first()).build()
     }
 
+    fun dataFetcherResultItems(): List<DataFetcherResult<Item>> {
+        return listOf(DataFetcherResult.newResult<Item>().data(items.first()).build())
+    }
+
     suspend fun coroutineItems(): List<Item> = CompletableDeferred(items).await()
 
     fun arrayItems() = items.toTypedArray()
@@ -329,7 +334,7 @@ class Mutation : GraphQLMutationResolver {
     }
 
     fun saveUser(userInput: UserInput): String {
-        return userInput.name + "/" + userInput.password;
+        return userInput.name + "/" + userInput.password
     }
 
     class UserInput {

src/test/kotlin/graphql/kickstart/tools/EndToEndTest.kt

@@ -532,6 +532,21 @@ class EndToEndTest {
         assertEquals(data["dataFetcherResult"], mapOf("name" to "item1"))
     }
 
+    @Test
+    fun `generated schema supports list of DataFetcherResult`() {
+        val data = assertNoGraphQlErrors(gql) {
+            """
+            {
+                dataFetcherResultItems {
+                    name
+                }
+            }
+            """
+        }
+
+        assertEquals(data["dataFetcherResultItems"], listOf(mapOf("name" to "item1")))
+    }
+
     @Test
     fun `generated schema supports Kotlin suspend functions`() {
         val data = assertNoGraphQlErrors(gql) {