Skip to content

Revert "Add the TrivialDataFetcher interface to MethodFieldResolver so that i…" #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 16, 2019
Merged

Revert "Add the TrivialDataFetcher interface to MethodFieldResolver so that i…" #336

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions src/main/kotlin/com/coxautodev/graphql/tools/MethodFieldResolver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Copy link
Member Author

@oliemansm oliemansm Nov 16, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cliedeman This line throws a NoSuchMethodException for methods with package private scope therefore breaking backwards compatibility. Can you add unit tests to ensure it's working properly including the package private use case? Once all that's working I can merge it again.

) {
TrivialMethodFieldResolverDataFetcher(getSourceResolver(), this.method, args, options)
} else {
MethodFieldResolverDataFetcher(getSourceResolver(), this.method, args, options)
}

MethodFieldResolverDataFetcher(getSourceResolver(), this.method, args, options)
}
}

Expand Down Expand Up @@ -232,10 +221,6 @@ open class MethodFieldResolverDataFetcher(private val sourceResolver: SourceReso
}
}

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> {

}

private suspend inline fun MethodAccess.invokeSuspend(target: Any, methodIndex: Int, args: Array<Any?>): Any? {
return suspendCoroutineUninterceptedOrReturn { continuation ->
invoke(target, methodIndex, *args + continuation)
Expand Down