Fix issue where java datafetcher methods were incorrectly called as Kotlin function #1694
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
berngp
approved these changes
Nov 5, 2023
srinivasankavitha
approved these changes
Nov 5, 2023
kilink
reviewed
Nov 6, 2023
| @@ -65,7 +65,7 @@ class DataFetcherInvoker internal constructor( | |||
| return ReflectionUtils.invokeMethod(bridgedMethod, dgsComponent) | |||
| } | |||
|
|
|||
| if (kotlinFunction != null) { | |||
| if (dgsComponent.javaClass.getDeclaredAnnotation(Metadata::class.java) != null && kotlinFunction != null) { | |||
There was a problem hiding this comment.
I think it'd be better to do this in the constructor to avoid having to check it every time. We can also use KotlinDetector from Spring. e.g.:
private val kotlinFunction: KFunction<*>? = if (KotlinDetector.isKotlinType(method.declaringClass)) bridgedMethod.kotlinFunction else nullThere was a problem hiding this comment.
Addressed in a separate PR: #1697
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request type
Changes in this PR
Java datafetcher methods with an argument were incorrectly called as being kotlin functions. While this mostly works, it causes an incorrect wrapping of InvocationException if an exception occurs.
The code was prepared for calling Java functions using regular Java Reflection, but the assumption was that
kotlinFunction != nullwould be false. This is not true (for reasons I don't understand, that's Kotlin internals).The correct check also verifies if the class has Kotlin metadata, which is the correct way to verify if we're dealing with Kotlin code.