Fixed issue with root resolver extending generic class

Author: oliemansm

src/main/kotlin/com/coxautodev/graphql/tools/GenericType.kt

@@ -1,6 +1,7 @@
 package com.coxautodev.graphql.tools
 
 import com.google.common.primitives.Primitives
+import org.apache.commons.lang3.ClassUtils
 import org.apache.commons.lang3.reflect.TypeUtils
 import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl
 import sun.reflect.generics.reflectiveObjects.WildcardTypeImpl
@@ -96,11 +97,16 @@ internal open class GenericType(protected val mostSpecificType: JavaType, protec
                 }
                 is Class<*> -> if (type.isPrimitive) Primitives.wrap(type) else type
                 is TypeVariable<*> -> {
-                    if (declaringType !is ParameterizedType) {
-                        error("Could not resolve type variable '${TypeUtils.toLongString(type)}' because declaring type is not parameterized: ${TypeUtils.toString(declaringType)}")
-                    } else {
+                    if (declaringType is ParameterizedType) {
                         unwrapGenericType(TypeUtils.determineTypeArguments(getRawClass(mostSpecificType), declaringType)[type]
                                 ?: error("No type variable found for: ${TypeUtils.toLongString(type)}"))
+                    } else {
+                        val raw = TypeUtils.getRawType(type, declaringType)
+                        if (raw != null) {
+                            unwrapGenericType(raw)
+                        } else {
+                            error("Could not resolve type variable '${TypeUtils.toLongString(type)}' because declaring type is not parameterized: ${TypeUtils.toString(declaringType)}")
+                        }
                     }
                 }
                 is WildcardTypeImpl -> type.upperBounds.firstOrNull()
@@ -110,7 +116,7 @@ internal open class GenericType(protected val mostSpecificType: JavaType, protec
         }
 
         private fun replaceTypeVariable(type: JavaType): JavaType {
-            return when(type) {
+            return when (type) {
                 is ParameterizedType -> {
                     val actualTypeArguments = type.actualTypeArguments.map { replaceTypeVariable(it) }.toTypedArray()
                     ParameterizedTypeImpl.make(type.rawType as Class<*>?, actualTypeArguments, type.ownerType)
@@ -127,5 +133,10 @@ internal open class GenericType(protected val mostSpecificType: JavaType, protec
                 }
             }
         }
+
+        private fun parameterizedDeclaringType(): JavaType? {
+            return declaringType as? ParameterizedType
+                    ?: ClassUtils.getAllSuperclasses(declaringType.unwrap()).find { it is ParameterizedType }
+        }
     }
 }

src/main/kotlin/com/coxautodev/graphql/tools/MethodFieldResolver.kt

@@ -99,8 +99,6 @@ internal class MethodFieldResolver(field: FieldDefinition, search: FieldResolver
 
     override fun scanForMatches(): List<TypeClassMatcher.PotentialMatch> {
         val batched = isBatched(method, search)
-        // fixme: convert type variables
-//        val replacedGenericType = replaceTypeVariables(method.genericReturnType)
         val unwrappedGenericType = genericType.unwrapGenericType(method.genericReturnType)
         val returnValueMatch = TypeClassMatcher.PotentialMatch.returnValue(field.type, unwrappedGenericType, genericType, SchemaClassScanner.ReturnValueReference(method), batched)
 
@@ -109,14 +107,6 @@ internal class MethodFieldResolver(field: FieldDefinition, search: FieldResolver
         } + listOf(returnValueMatch)
     }
 
-//    private fun replaceTypeVariables(javaType: JavaType): JavaType {
-//        return when (javaType) {
-//            is ParameterizedType -> replaceTypeVariables(javaType.rawType)
-//            is TypeVariable<*> -> genericType.unwrapGenericType(javaType)
-//            else -> javaType
-//        }
-//    }
-
     private fun getIndexOffset(): Int {
         return if (resolverInfo is DataClassTypeResolverInfo && !method.declaringClass.isAssignableFrom(resolverInfo.dataClassType)) {
             1

src/test/groovy/com/coxautodev/graphql/tools/TypeClassMatcherSpec.groovy

@@ -63,7 +63,7 @@ class TypeClassMatcherSpec extends Specification {
         then:
             noExceptionThrown()
             match.type == customDefinition
-            match.clazz == CustomType
+            match.classEntry.clazz == CustomType
 
         where:
             methodName            | type