Skip to content

Fixes #107. #110

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 3 commits into from
Jan 16, 2018
Merged

Fixes #107. #110

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec749ff
Quick and dirty warning fix for Spring-proxies.
Jan 11, 2018
6579074
Fix for #107. There might be a better option to detect guice proxies.
Jan 16, 2018
e904419
#107 removed unnecessary second 'canHandle' check.
Jan 16, 2018
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Quick and dirty warning fix for Spring-proxies.
  • Loading branch information
Tobias Kammerer committed Jan 11, 2018
commit ec749ff566364e52ce63b9dd013118de95e81761
2 changes: 1 addition & 1 deletion src/main/kotlin/com/coxautodev/graphql/tools/ResolverInfo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import java.lang.reflect.ParameterizedType
internal abstract class ResolverInfo {
abstract fun getFieldSearches(): List<FieldResolverScanner.Search>

protected fun getRealResolverClass(resolver: GraphQLResolver<*>, options: SchemaParserOptions) =
fun getRealResolverClass(resolver: GraphQLResolver<*>, options: SchemaParserOptions) =
options.proxyHandlers.find { it.canHandle(resolver) }?.getTargetClass(resolver) ?: resolver.javaClass
}

Expand Down
3 changes: 1 addition & 2 deletions src/main/kotlin/com/coxautodev/graphql/tools/SchemaClassScanner.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,8 @@ internal class SchemaClassScanner(initialDictionary: BiMap<String, Class<*>>, al
}

val observedRootTypes = fieldResolvers.filter { it.resolverInfo is RootResolverInfo && it.resolverInfo == rootType.resolverInfo }.map { it.search.type }.toSet()

rootType.resolvers.forEach { resolver ->
if(resolver.javaClass !in observedRootTypes) {
if(rootType.resolverInfo.getRealResolverClass(resolver, options) !in observedRootTypes) {
log.warn("Root ${rootType.name} resolver was provided but no methods on it were used in data fetchers for GraphQL type '${rootType.type.name}'! Either remove the ${rootType.resolverInterface.name} interface from the resolver or remove the resolver entirely: $resolver")
}
}
Expand Down