Added MultiResolverInfo in check for setting indexOffset fix (#171)

graphql-java-kickstart · Sep 22, 2018 · ed2a35c · ed2a35c
1 parent feff47c
commit ed2a35c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/kotlin/com/coxautodev/graphql/tools/MethodFieldResolver.kt b/src/main/kotlin/com/coxautodev/graphql/tools/MethodFieldResolver.kt
@@ -108,7 +108,7 @@ internal class MethodFieldResolver(field: FieldDefinition, search: FieldResolver
         } + listOf(returnValueMatch)
     }
 
-    private fun getIndexOffset() = if (resolverInfo is NormalResolverInfo) 1 else 0
+    private fun getIndexOffset() = if (resolverInfo is NormalResolverInfo || resolverInfo is MultiResolverInfo) 1 else 0
     private fun getJavaMethodParameterIndex(index: Int) = index + getIndexOffset()
 
     private fun getJavaMethodParameterType(index: Int): JavaType? {
@@ -147,8 +147,8 @@ open class MethodFieldResolverDataFetcher(private val sourceResolver: SourceReso
         return if (result == null) {
             result
         } else {
-            val wrapper = options
-                    .genericWrappers
+            val wrapper = options.genericWrappers
+                    .asSequence()
                     .filter { it.type.isInstance(result) }
                     .sortedWith(CompareGenericWrappers)
                     .firstOrNull()

diff --git a/src/test/groovy/com/coxautodev/graphql/tools/MultiResolverSpec.groovy b/src/test/groovy/com/coxautodev/graphql/tools/MultiResolverSpec.groovy
@@ -25,7 +25,7 @@ class MultiResolverSpec extends Specification {
                         type Friend {
                             name: String!
                         }
-                    ''')
+                    '''.stripIndent())
                 .resolvers(new QueryWithPersonResolver(), new PersonFriendResolver(), new PersonNameResolver())
                 .build()
                 .makeExecutableSchema()