Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.coxautodev.graphql.tools;

public class GuiceAopProxyHandler implements ProxyHandler {
@Override
public boolean canHandle(GraphQLResolver<?> resolver) {
return isGuiceProxy(resolver);
}

@Override
public Class<?> getTargetClass(GraphQLResolver<?> resolver) {
return resolver.getClass().getSuperclass();
}

private boolean isGuiceProxy(GraphQLResolver<?> resolver) {
return resolver.getClass().getName().contains("$$EnhancerByGuice$$");
}
}
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ data class SchemaParserOptions internal constructor(val genericWrappers: List<Ge
private var useDefaultGenericWrappers = true
private var allowUnimplementedResolvers = false
private var objectMapperConfigurer: ObjectMapperConfigurer = ObjectMapperConfigurer { _, _ -> }
private val proxyHandlers: MutableList<ProxyHandler> = mutableListOf(Spring4AopProxyHandler())
private val proxyHandlers: MutableList<ProxyHandler> = mutableListOf(Spring4AopProxyHandler(), GuiceAopProxyHandler())

fun genericWrappers(genericWrappers: List<GenericWrapper>) = this.apply {
this.genericWrappers.addAll(genericWrappers)
Expand Down