Simplify and rename PlaceTest.kt

Author: vojtapol

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>graphql-java-tools</artifactId>
-    <version>5.7.3-SNAPSHOT</version>
+    <version>5.7.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>GraphQL Java Tools</name>

src/main/kotlin/graphql/kickstart/tools/GenericType.kt

@@ -124,9 +124,13 @@ internal open class GenericType(protected val mostSpecificType: JavaType, protec
         private fun unwrapGenericType(declaringType: ParameterizedType, type: TypeVariable<*>): JavaType {
             val rawClass = getRawClass(mostSpecificType)
             val arguments = TypeUtils.determineTypeArguments(rawClass, declaringType)
-            val t = arguments.filter { it.key.name == type.name }.values.firstOrNull()
+            val matchingType = arguments
+                    .filter { it.key.name == type.name }
+                    .values
+                    .firstOrNull()
                     ?: error("No type variable found for: ${TypeUtils.toLongString(type)}")
-            return unwrapGenericType(t)
+
+            return unwrapGenericType(matchingType)
         }
 
         private fun replaceTypeVariable(type: JavaType): JavaType {

src/test/kotlin/graphql/kickstart/tools/DeepGenericsHierarchyTest.kt

@@ -0,0 +1,55 @@
+package graphql.kickstart.tools
+
+import graphql.ExecutionInput
+import graphql.GraphQL
+import org.junit.Test
+
+class PlaceTest {
+
+    @Test
+    fun shouldHandleGenericsDeepHierarchy() {
+        val schema = SchemaParser.newParser()
+                .file("place.graphqls")
+                .resolvers(PlaceQuery())
+                .build().makeExecutableSchema()
+
+        val graphql = GraphQL.newGraphQL(schema).build()
+        val query = "query { places1 { id } places2 { id } }"
+        val executionInput = ExecutionInput.newExecutionInput().query(query).build()
+        val result = graphql.execute(executionInput)
+
+        assert(result.getData<Map<String, List<*>>>()["places1"]?.size == 3)
+        assert(result.getData<Map<String, List<*>>>()["places2"]?.size == 2)
+    }
+}
+
+private class PlaceQuery : GraphQLQueryResolver {
+
+    fun places1(): List<Place1> = listOf(Place1("1"), Place1("2"), Place1("3"))
+
+    fun places2(): List<Place2> = listOf(Place2("4"), Place2("5"))
+}
+
+private abstract class Entity(val id: String? = null)
+
+private abstract class OtherPlace<R : Review<*>>(id: String? = null) : Place<R>(id) {
+    val other: String? = null
+}
+
+private abstract class Place<R : Review<*>>(id: String? = null) : Entity(id) {
+    val name: String? = null
+    val reviews: MutableSet<R>? = null
+}
+
+private class Place1(id: String? = null) : OtherPlace<Review1>(id)
+
+private class Place2(id: String? = null) : OtherPlace<Review2>(id)
+
+private abstract class Review<T : Entity>(id: String? = null) : Entity(id) {
+    val rating: Int? = null
+    val content: T? = null
+}
+
+private class Review1(id: String? = null) : Review<Place1>(id)
+
+private class Review2(id: String? = null) : Review<Place2>(id)

src/test/kotlin/graphql/kickstart/tools/UtilsTest.kt

@@ -24,7 +24,7 @@ class UtilsTest {
     }
 
     @Test
-    fun `isTrivialDataFetcher`() {
+    fun isTrivialDataFetcher() {
         val clazz = Bean::class.java
 
         Assert.assertTrue(isTrivialDataFetcher(clazz.getMethod("getterValid")))