From 8622cdb77896703c232a42b484993662599e6877 Mon Sep 17 00:00:00 2001 From: Michiel Oliemans Date: Sat, 16 Nov 2019 14:54:16 +0100 Subject: [PATCH] =?UTF-8?q?Revert=20"Add=20the=20TrivialDataFetcher=20inte?= =?UTF-8?q?rface=20to=20MethodFieldResolver=20so=20that=20i=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../graphql/tools/MethodFieldResolver.kt | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/main/kotlin/com/coxautodev/graphql/tools/MethodFieldResolver.kt b/src/main/kotlin/com/coxautodev/graphql/tools/MethodFieldResolver.kt index 57ac61d8..89465f33 100644 --- a/src/main/kotlin/com/coxautodev/graphql/tools/MethodFieldResolver.kt +++ b/src/main/kotlin/com/coxautodev/graphql/tools/MethodFieldResolver.kt @@ -3,7 +3,6 @@ package com.coxautodev.graphql.tools import com.coxautodev.graphql.tools.SchemaParserOptions.GenericWrapper import com.esotericsoftware.reflectasm.MethodAccess import com.fasterxml.jackson.core.type.TypeReference -import graphql.TrivialDataFetcher import graphql.execution.batched.Batched import graphql.language.FieldDefinition import graphql.language.ListType @@ -117,17 +116,7 @@ internal class MethodFieldResolver(field: FieldDefinition, search: FieldResolver return if (batched) { BatchedMethodFieldResolverDataFetcher(getSourceResolver(), this.method, args, options) } else { - if (args.size == 0 - && this.method.parameterCount == 0 - && this.method.name.startsWith("get") - && this.search.type is java.lang.Class<*> - && (this.search.type as java.lang.Class<*>).getMethod(this.method.getName()) != null - ) { - TrivialMethodFieldResolverDataFetcher(getSourceResolver(), this.method, args, options) - } else { - MethodFieldResolverDataFetcher(getSourceResolver(), this.method, args, options) - } - + MethodFieldResolverDataFetcher(getSourceResolver(), this.method, args, options) } } @@ -232,10 +221,6 @@ open class MethodFieldResolverDataFetcher(private val sourceResolver: SourceReso } } -open class TrivialMethodFieldResolverDataFetcher(private val sourceResolver: SourceResolver, method: Method, private val args: List, private val options: SchemaParserOptions) : MethodFieldResolverDataFetcher(sourceResolver, method, args, options), TrivialDataFetcher { - -} - private suspend inline fun MethodAccess.invokeSuspend(target: Any, methodIndex: Int, args: Array): Any? { return suspendCoroutineUninterceptedOrReturn { continuation -> invoke(target, methodIndex, *args + continuation)