graphql: upgrade to graphql-kotlin 6.4.0.

wsleap · Apr 29, 2023 · e7cd841 · e7cd841
1 parent 2dd9754
commit e7cd841
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -8,7 +8,7 @@ protobuf = "3.22.3"
 grpc = "1.54.1"
 kotest = "5.6.1"
 jackson = "2.15.0"
-graphql-kotlin = "5.3.2"
+graphql-kotlin = "6.4.0"
 kotlin-logging = "3.0.5"
 logback = "1.4.7"
 slf4j = "2.0.7"

diff --git a/kert-graphql/src/main/kotlin/ws/leap/kert/graphql/ContextFunctionDataFetcher.kt b/kert-graphql/src/main/kotlin/ws/leap/kert/graphql/ContextFunctionDataFetcher.kt
@@ -2,33 +2,25 @@ package ws.leap.kert.graphql
 
 import com.expediagroup.graphql.generator.execution.FunctionDataFetcher
 import com.expediagroup.graphql.generator.execution.SimpleKotlinDataFetcherFactoryProvider
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import graphql.schema.DataFetcherFactory
 import graphql.schema.DataFetchingEnvironment
-import kotlin.coroutines.CoroutineContext
-import kotlin.coroutines.EmptyCoroutineContext
 import kotlin.reflect.KFunction
 import kotlin.reflect.full.instanceParameter
 
-open class ContextDataFetcherFactoryProvider(
-  private val objectMapper: ObjectMapper = jacksonObjectMapper()
-) : SimpleKotlinDataFetcherFactoryProvider(objectMapper) {
+open class ContextDataFetcherFactoryProvider : SimpleKotlinDataFetcherFactoryProvider() {
 
   override fun functionDataFetcherFactory(target: Any?, kFunction: KFunction<*>) = DataFetcherFactory {
     ContextFunctionDataFetcher(
       target = target,
-      fn = kFunction,
-      objectMapper = objectMapper
+      fn = kFunction
     )
   }
 }
 
 class ContextFunctionDataFetcher(
   private val target: Any?,
-  private val fn: KFunction<*>,
-  objectMapper: ObjectMapper = jacksonObjectMapper()
-) : FunctionDataFetcher(target, fn, objectMapper) {
+  private val fn: KFunction<*>
+) : FunctionDataFetcher(target, fn) {
   override fun get(environment: DataFetchingEnvironment): Any? {
     val instance: Any? = target ?: environment.getSource<Any?>()
     val instanceParameter = fn.instanceParameter
@@ -38,8 +30,7 @@ class ContextFunctionDataFetcher(
         .plus(instanceParameter to instance)
 
       if (fn.isSuspend) {
-        val context: CoroutineContext = environment.graphQlContext.getOrDefault("coroutine-context", EmptyCoroutineContext)
-        runSuspendingFunction(parameterValues, context)
+        runSuspendingFunction(environment, parameterValues)
       } else {
         runBlockingFunction(parameterValues)
       }

diff --git a/kert-graphql/src/test/kotlin/ws/leap/kert/graphql/Example.kt b/kert-graphql/src/test/kotlin/ws/leap/kert/graphql/Example.kt
@@ -68,5 +68,6 @@ fun main() {
 
   runBlocking {
     server.start()
+    println("Server started at http://localhost:8500/graphql")
   }
 }