Skip to content

Commit 7d1f503

Browse files
authored
Merge pull request #336 from graphql-java-kickstart/revert-330-trivial-dataloader
Revert "Add the TrivialDataFetcher interface to MethodFieldResolver so that i…"
2 parents 8495810 + 8622cdb commit 7d1f503

File tree

1 file changed

+1
-16
lines changed

1 file changed

+1
-16
lines changed

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

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.coxautodev.graphql.tools
33
import com.coxautodev.graphql.tools.SchemaParserOptions.GenericWrapper
44
import com.esotericsoftware.reflectasm.MethodAccess
55
import com.fasterxml.jackson.core.type.TypeReference
6-
import graphql.TrivialDataFetcher
76
import graphql.execution.batched.Batched
87
import graphql.language.FieldDefinition
98
import graphql.language.ListType
@@ -117,17 +116,7 @@ internal class MethodFieldResolver(field: FieldDefinition, search: FieldResolver
117116
return if (batched) {
118117
BatchedMethodFieldResolverDataFetcher(getSourceResolver(), this.method, args, options)
119118
} else {
120-
if (args.size == 0
121-
&& this.method.parameterCount == 0
122-
&& this.method.name.startsWith("get")
123-
&& this.search.type is java.lang.Class<*>
124-
&& (this.search.type as java.lang.Class<*>).getMethod(this.method.getName()) != null
125-
) {
126-
TrivialMethodFieldResolverDataFetcher(getSourceResolver(), this.method, args, options)
127-
} else {
128-
MethodFieldResolverDataFetcher(getSourceResolver(), this.method, args, options)
129-
}
130-
119+
MethodFieldResolverDataFetcher(getSourceResolver(), this.method, args, options)
131120
}
132121
}
133122

@@ -232,10 +221,6 @@ open class MethodFieldResolverDataFetcher(private val sourceResolver: SourceReso
232221
}
233222
}
234223

235-
open class TrivialMethodFieldResolverDataFetcher(private val sourceResolver: SourceResolver, method: Method, private val args: List<ArgumentPlaceholder>, private val options: SchemaParserOptions) : MethodFieldResolverDataFetcher(sourceResolver, method, args, options), TrivialDataFetcher<Any> {
236-
237-
}
238-
239224
private suspend inline fun MethodAccess.invokeSuspend(target: Any, methodIndex: Int, args: Array<Any?>): Any? {
240225
return suspendCoroutineUninterceptedOrReturn { continuation ->
241226
invoke(target, methodIndex, *args + continuation)

0 commit comments

Comments
 (0)