6.x.x revert context switching (#2030)

Co-authored-by: Samuel Vazquez <samvazquez@expediagroup.com>
ExpediaGroup · Aug 15, 2024 · d05d13e · d05d13e
1 parent 2388c4a
commit d05d13e
Showing 1 changed file with 11 additions and 15 deletions.
diff --git a/...-kotlin-server/src/main/kotlin/com/expediagroup/graphql/server/execution/GraphQLServer.kt b/...-kotlin-server/src/main/kotlin/com/expediagroup/graphql/server/execution/GraphQLServer.kt
@@ -19,10 +19,8 @@ package com.expediagroup.graphql.server.execution
 import com.expediagroup.graphql.server.types.GraphQLResponse
 import com.expediagroup.graphql.server.types.GraphQLServerResponse
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.withContext
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
 
@@ -48,21 +46,19 @@ open class GraphQLServer<Request>(
     ): GraphQLServerResponse? =
         coroutineScope {
             requestParser.parseRequest(request)?.let { graphQLRequest ->
-                withContext(Dispatchers.Default) {
-                    val deprecatedContext = contextFactory.generateContext(request)
-                    val contextMap = contextFactory.generateContextMap(request)
+                val deprecatedContext = contextFactory.generateContext(request)
+                val contextMap = contextFactory.generateContextMap(request)
 
-                    val customCoroutineContext = (deprecatedContext?.graphQLCoroutineContext() ?: EmptyCoroutineContext) +
-                        (contextMap[CoroutineContext::class] as? CoroutineContext ?: EmptyCoroutineContext)
-                    val graphQLExecutionScope = CoroutineScope(
-                        coroutineContext + customCoroutineContext + SupervisorJob()
-                    )
-                    val graphQLContext = contextMap + mapOf(
-                        CoroutineScope::class to graphQLExecutionScope
-                    )
+                val customCoroutineContext = (deprecatedContext?.graphQLCoroutineContext() ?: EmptyCoroutineContext) +
+                    (contextMap[CoroutineContext::class] as? CoroutineContext ?: EmptyCoroutineContext)
+                val graphQLExecutionScope = CoroutineScope(
+                    coroutineContext + customCoroutineContext + SupervisorJob()
+                )
+                val graphQLContext = contextMap + mapOf(
+                    CoroutineScope::class to graphQLExecutionScope
+                )
 
-                    requestHandler.executeRequest(graphQLRequest, deprecatedContext, graphQLContext)
-                }
+                requestHandler.executeRequest(graphQLRequest, deprecatedContext, graphQLContext)
             }
         }
 }