Fix tests

Author: vojtapol

pom.xml

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

src/main/kotlin/graphql/kickstart/tools/resolver/FieldResolver.kt

@@ -31,14 +31,18 @@ internal abstract class FieldResolver(
      */
     protected fun createSourceResolver(): SourceResolver {
         return if (this.search.source != null) {
-            // environment object is ignored and can be null in this case
-            SourceResolver { _ -> this.search.source }
+            SourceResolver { _, _ -> this.search.source }
         } else {
-            SourceResolver { environment ->
-                val nonNullEnvironment = environment
-                    ?: throw ResolverError("Expected environment object to not be null!")
-                val source = nonNullEnvironment.getSource<Any>()
-                    ?: throw ResolverError("Expected source object to not be null!")
+            SourceResolver { environment, sourceObject ->
+                val source = if (sourceObject != null) {
+                    // if source object is known environment is null as an optimization (LightDataFetcher)
+                    sourceObject
+                } else {
+                    environment
+                        ?: throw ResolverError("Expected DataFetchingEnvironment to not be null!")
+                    environment.getSource<Any>()
+                        ?: throw ResolverError("Expected source object to not be null!")
+                }
 
                 if (!this.genericType.isAssignableFrom(source.javaClass)) {
                     throw ResolverError("Expected source object to be an instance of '${this.genericType.getRawClass().name}' but instead got '${source.javaClass.name}'")
@@ -52,5 +56,5 @@ internal abstract class FieldResolver(
 
 fun interface SourceResolver {
 
-    fun resolve(environment: DataFetchingEnvironment?): Any
+    fun resolve(environment: DataFetchingEnvironment?, source: Any?): Any
 }

src/main/kotlin/graphql/kickstart/tools/resolver/MapFieldResolver.kt

@@ -64,6 +64,6 @@ internal class MapFieldResolverDataFetcher(
     }
 
     override fun get(environment: DataFetchingEnvironment): Any? {
-        throw UnsupportedOperationException("This method should not be called as this is a LightDataFetcher.")
+        return get(environment.fieldDefinition, sourceResolver.resolve(environment, null), { environment })
     }
 }

src/main/kotlin/graphql/kickstart/tools/resolver/MethodFieldResolver.kt

@@ -206,7 +206,7 @@ internal open class MethodFieldResolverDataFetcher(
     }
 
     override fun get(environment: DataFetchingEnvironment): Any? {
-        val source = sourceResolver.resolve(environment)
+        val source = sourceResolver.resolve(environment, null)
         val args = this.args.map { it(environment) }.toTypedArray()
 
         return if (isSuspendFunction) {
@@ -233,7 +233,7 @@ internal open class MethodFieldResolverDataFetcher(
      */
     @Suppress("unused")
     open fun getWrappedFetchingObject(environment: DataFetchingEnvironment): Any {
-        return sourceResolver.resolve(environment)
+        return sourceResolver.resolve(environment, null)
     }
 }
 
@@ -255,15 +255,20 @@ internal class LightMethodFieldResolverDataFetcher(
     }
 
     override fun get(fieldDefinition: GraphQLFieldDefinition, sourceObject: Any, environmentSupplier: Supplier<DataFetchingEnvironment>): Any? {
+        val source = sourceResolver.resolve(null, sourceObject)
         return if (isSuspendFunction) {
             environmentSupplier.get().coroutineScope().future(options.coroutineContextProvider.provide()) {
-                invokeSuspend(sourceObject, resolverMethod, emptyArray())?.transformWithGenericWrapper(environmentSupplier)
+                invokeSuspend(source, resolverMethod, emptyArray())?.transformWithGenericWrapper(environmentSupplier)
             }
         } else {
-            invoke(resolverMethod, sourceObject, emptyArray())?.transformWithGenericWrapper(environmentSupplier)
+            invoke(resolverMethod, source, emptyArray())?.transformWithGenericWrapper(environmentSupplier)
         }
     }
 
+    override fun get(environment: DataFetchingEnvironment): Any? {
+        return get(environment.fieldDefinition, sourceResolver.resolve(environment, null), { environment })
+    }
+
     private fun Any.transformWithGenericWrapper(environment: Supplier<DataFetchingEnvironment>): Any? {
         return options.genericWrappers
             .asSequence()
@@ -272,10 +277,6 @@ internal class LightMethodFieldResolverDataFetcher(
             .firstOrNull()
             ?.transformer?.invoke(this, environment.get()) ?: this
     }
-
-    override fun get(environment: DataFetchingEnvironment): Any? {
-        throw UnsupportedOperationException("This method should not be called as this is a LightDataFetcher.")
-    }
 }
 
 private class CompareGenericWrappers {

src/main/kotlin/graphql/kickstart/tools/resolver/PropertyFieldResolver.kt

@@ -45,10 +45,10 @@ internal class PropertyFieldResolverDataFetcher(
 ) : LightDataFetcher<Any> {
 
     override fun get(fieldDefinition: GraphQLFieldDefinition, sourceObject: Any, environmentSupplier: Supplier<DataFetchingEnvironment>): Any? {
-        return field.get(sourceResolver.resolve(null))
+        return field.get(sourceResolver.resolve(null, sourceObject))
     }
 
     override fun get(environment: DataFetchingEnvironment): Any? {
-        throw UnsupportedOperationException("This method should not be called as this is a LightDataFetcher.")
+        return get(environment.fieldDefinition, sourceResolver.resolve(environment, null), { environment })
     }
 }

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

@@ -10,6 +10,7 @@ import graphql.schema.idl.SchemaDirectiveWiringEnvironment
 import org.junit.Test
 
 class DirectiveTest {
+
     @Test
     fun `should apply @uppercase directive on field`() {
         val schema = SchemaParser.newParser()

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

@@ -13,6 +13,8 @@ import graphql.language.TypeName
 import graphql.schema.DataFetcher
 import graphql.schema.DataFetchingEnvironment
 import graphql.schema.DataFetchingEnvironmentImpl
+import graphql.schema.GraphQLFieldDefinition
+import graphql.schema.GraphQLObjectType
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.Job
@@ -299,6 +301,12 @@ class MethodFieldResolverDataFetcherTest {
     private fun createEnvironment(source: Any = Object(), arguments: Map<String, Any> = emptyMap(), context: GraphQLContext? = null): DataFetchingEnvironment {
         return DataFetchingEnvironmentImpl.newDataFetchingEnvironment(buildExecutionContext())
             .source(source)
+            .fieldDefinition(
+                GraphQLFieldDefinition.newFieldDefinition()
+                    .name("ignored")
+                    .type(GraphQLObjectType.newObject().name("ignored").build())
+                    .build()
+            )
             .arguments(arguments)
             .graphQLContext(context)
             .build()

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

@@ -7,14 +7,16 @@ import graphql.GraphQL
 private val mapper = ObjectMapper()
 
 fun assertNoGraphQlErrors(gql: GraphQL, args: Map<String, Any> = mapOf(), context: Map<Any, Any> = mapOf(), closure: () -> String): Map<String, Any> {
-    val result = gql.execute(ExecutionInput.newExecutionInput()
-        .query(closure.invoke())
-        .graphQLContext(context)
-        .root(context)
-        .variables(args))
+    val result = gql.execute(
+        ExecutionInput.newExecutionInput()
+            .query(closure.invoke())
+            .graphQLContext(context)
+            .root(context)
+            .variables(args)
+    )
 
     if (result.errors.isNotEmpty()) {
-        throw AssertionError("GraphQL result contained errors!\n${result.errors.map { mapper.writeValueAsString(it) }.joinToString { "\n" }}")
+        throw AssertionError("GraphQL result contained errors!\n${result.errors.map { it.message }.joinToString("\n")}")
     }
 
     return result.getData() as Map<String, Any>