Scan for resolvers that have a supertype of the data class #638
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
oryan-block
requested changes
Mar 11, 2022
| val resolverInfoList = this.resolverInfos.filter { it.dataClassType == item.clazz } | ||
| val resolverInfo: ResolverInfo = (if (resolverInfoList.size > 1) { | ||
| MultiResolverInfo(resolverInfoList) | ||
| val resolverInfoList = this.resolverInfos.filter { it.dataClassType.unwrap().isAssignableFrom(item.clazz.unwrap()) } |
There was a problem hiding this comment.
Lets extract item.clazz.unwrap() to a variable.
| * Checks if all `ResolverInfo` instances are related to the same data type | ||
| */ | ||
| private fun findDataClass(): Class<out Any> { | ||
| val dataClass = resolverInfoList.asSequence().map { it.dataClassType }.distinct().singleOrNull() |
There was a problem hiding this comment.
Can we fix this to find the correct type instead of deleting it?
| @@ -394,6 +395,10 @@ class ItemResolver : GraphQLResolver<Item> { | |||
| } | |||
| } | |||
|
|
|||
| class ItemInterfaceResolver : GraphQLResolver<ItemInterface> { | |||
There was a problem hiding this comment.
Mind creating a separate test class with an example closer to the original issue instead of adding to this one?
| } else { | ||
| if (item.clazz == Object::class.java) { | ||
| getResolverInfoFromTypeDictionary(item.type.name) | ||
| } else { | ||
| resolverInfosByDataClass[item.clazz] ?: DataClassResolverInfo(item.clazz) | ||
| if (resolverInfoList.size == 1) { | ||
| MultiResolverInfo(resolverInfoList, item.clazz.unwrap()) |
There was a problem hiding this comment.
Why multi if there's only one?
| @@ -127,7 +127,8 @@ internal class FieldResolverScanner(val options: SchemaParserOptions) { | |||
| private fun verifyMethodArguments(method: Method, requiredCount: Int, search: Search): Boolean { | |||
| val appropriateFirstParameter = if (search.requiredFirstParameterType != null) { | |||
| method.genericParameterTypes.firstOrNull()?.let { | |||
| it == search.requiredFirstParameterType || method.declaringClass.typeParameters.contains(it) | |||
| it == search.requiredFirstParameterType || (it is Class<*> && it.unwrap().isAssignableFrom(search.requiredFirstParameterType)) | |||
There was a problem hiding this comment.
Do we need the cast to Class here?
|
I'm going to redo this some other time. |
|
Hi is there any progress on this? |
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.
Fixes #497
Checklist
Description
Made necessary changes to class scanning logic to support using supertypes in resolvers.