Skip to content

Commit ed2a35c

Browse files
committed
Added MultiResolverInfo in check for setting indexOffset fix (#171)
1 parent feff47c commit ed2a35c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/main/kotlin/com/coxautodev/graphql/tools/MethodFieldResolver.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ internal class MethodFieldResolver(field: FieldDefinition, search: FieldResolver
108108
} + listOf(returnValueMatch)
109109
}
110110

111-
private fun getIndexOffset() = if (resolverInfo is NormalResolverInfo) 1 else 0
111+
private fun getIndexOffset() = if (resolverInfo is NormalResolverInfo || resolverInfo is MultiResolverInfo) 1 else 0
112112
private fun getJavaMethodParameterIndex(index: Int) = index + getIndexOffset()
113113

114114
private fun getJavaMethodParameterType(index: Int): JavaType? {
@@ -147,8 +147,8 @@ open class MethodFieldResolverDataFetcher(private val sourceResolver: SourceReso
147147
return if (result == null) {
148148
result
149149
} else {
150-
val wrapper = options
151-
.genericWrappers
150+
val wrapper = options.genericWrappers
151+
.asSequence()
152152
.filter { it.type.isInstance(result) }
153153
.sortedWith(CompareGenericWrappers)
154154
.firstOrNull()

src/test/groovy/com/coxautodev/graphql/tools/MultiResolverSpec.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class MultiResolverSpec extends Specification {
2525
type Friend {
2626
name: String!
2727
}
28-
''')
28+
'''.stripIndent())
2929
.resolvers(new QueryWithPersonResolver(), new PersonFriendResolver(), new PersonNameResolver())
3030
.build()
3131
.makeExecutableSchema()

0 commit comments

Comments
 (0)