Stop reading the custom context class from the legacy context object

Author: oryan-block

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

@@ -20,7 +20,6 @@ import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.future.future
 import org.apache.commons.lang3.reflect.TypeUtils
 import org.reactivestreams.Publisher
-import org.slf4j.LoggerFactory
 import java.lang.reflect.InvocationTargetException
 import java.lang.reflect.Method
 import java.util.*
@@ -41,8 +40,6 @@ internal class MethodFieldResolver(
     private val scalarNames: Set<String>
 ) : FieldResolver(field, search, options) {
 
-    private val log = LoggerFactory.getLogger(javaClass)
-
     private val isSuspendFunction = method.isSuspendFunction()
     private val numberOfParameters = method.parameterCountWithoutContinuation()
 
@@ -105,21 +102,7 @@ internal class MethodFieldResolver(
         val firstTrailingParameter = field.inputValueDefinitions.size + search.firstArgumentIndex
         method.parameterTypes.slice(firstTrailingParameter until numberOfParameters).forEach { parameterType ->
             when (parameterType) {
-                options.contextClass -> args.add { environment ->
-                    val context: Any? = environment.graphQlContext[options.contextClass]
-                    if (context != null) {
-                        context
-                    } else {
-                        log.warn(
-                            "Generic context class has been deprecated by graphql-java. " +
-                                "To continue using a custom context class as the last parameter in resolver methods " +
-                                "please insert it into the GraphQLContext map when building the ExecutionInput. " +
-                                "This warning will become an error in the future."
-                        )
-                        @Suppress("DEPRECATION")
-                        environment.getContext() // TODO: remove deprecated use in next major release
-                    }
-                }
+                options.contextClass -> args.add { environment -> environment.graphQlContext[options.contextClass] }
 
                 GraphQLContext::class.java -> args.add { environment -> environment.graphQlContext }
                 else -> args.add { environment -> environment }

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

@@ -275,6 +275,18 @@ class MethodFieldResolverDataFetcherTest {
         assertEquals(resolver.get(createEnvironment(DataClass(), context = context)), true)
     }
 
+    @Test
+    fun `data fetcher does not read custom context from the legacy context object`() {
+        val options = SchemaParserOptions.newOptions().contextClass(ContextClass::class).build()
+        val resolver = createFetcher("active", options = options, resolver = object : GraphQLResolver<DataClass> {
+            fun isActive(dataClass: DataClass, ctx: ContextClass?): Boolean {
+                return ctx != null
+            }
+        })
+
+        assertEquals(resolver.get(createEnvironment(DataClass(), legacyContext = ContextClass())), false)
+    }
+
     @Test
     fun `data fetcher passes custom context and environment if method has both as extra arguments`() {
         val customContext = ContextClass()