Stop reading the CoroutineScope from the legacy context object

Author: oryan-block

src/main/kotlin/graphql/kickstart/tools/util/Utils.kt

@@ -9,8 +9,6 @@ import graphql.schema.idl.TypeUtil
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import org.apache.commons.lang3.reflect.TypeUtils
-import org.slf4j.LoggerFactory
-import java.lang.invoke.MethodHandles
 import java.lang.reflect.Method
 import java.lang.reflect.ParameterizedType
 import java.lang.reflect.Proxy
@@ -22,8 +20,6 @@ import kotlin.reflect.jvm.kotlinFunction
  * @author Andrew Potter
  */
 
-private val log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass())
-
 internal typealias GraphQLRootResolver = GraphQLResolver<Void>
 
 internal typealias JavaType = java.lang.reflect.Type
@@ -70,17 +66,6 @@ internal fun DataFetchingEnvironment.coroutineScope(): CoroutineScope {
         return scope
     }
 
-    @Suppress("DEPRECATION")
-    val context: Any? = this.getContext()
-    if (context is CoroutineScope) {
-        log.warn(
-            "Passing a CoroutineScope as the context object has been deprecated by graphql-java. " +
-                "Please insert it into the GraphQLContext map under the CoroutineScope class key when building the ExecutionInput. " +
-                "Support for the context object will be removed in the next major release."
-        )
-        return context
-    }
-
     return CoroutineScope(Dispatchers.Default)
 }
 

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

@@ -98,7 +98,7 @@ class MethodFieldResolverDataFetcherTest {
     }
 
     @Test
-    fun `data fetcher executes suspend function in CoroutineScope from legacy context`() {
+    fun `data fetcher does not execute suspend function in CoroutineScope from legacy context`() {
         // setup
         val scopeClass = ScopeClass()
 
@@ -107,7 +107,7 @@ class MethodFieldResolverDataFetcherTest {
         // expect
         @Suppress("UNCHECKED_CAST")
         val future = resolver.get(createEnvironment(DataClass(), legacyContext = scopeClass.scope)) as CompletableFuture<Boolean>
-        assert(future.get())
+        assertEquals(future.get(), false)
     }
 
     class ScopeClass : GraphQLResolver<DataClass> {
@@ -116,7 +116,7 @@ class MethodFieldResolverDataFetcherTest {
 
         @Suppress("UNUSED_PARAMETER")
         suspend fun isActive(data: DataClass): Boolean {
-            return coroutineContext[Job] == job.children.first()
+            return coroutineContext[Job] == job.children.firstOrNull()
         }
     }