Add polish to coroutine support in RESTEasy Reactive

quarkusio · May 8, 2021 · e91bc43 · e91bc43
1 parent 0d46d8e
commit e91bc43
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/...ain/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/ApplicationCoroutineScope.kt b/...ain/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/ApplicationCoroutineScope.kt
@@ -24,7 +24,7 @@ class ApplicationCoroutineScope : CoroutineScope, AutoCloseable {
 }
 
 /**
- * Dispatches the coroutine in a worker thread from Vertx.
+ * Dispatches the coroutine in Vertx IO thread.
  */
 class VertxDispatcher(private val vertxContext: Context) : CoroutineDispatcher() {
     override fun dispatch(context: CoroutineContext, block: Runnable) {
@@ -33,4 +33,4 @@ class VertxDispatcher(private val vertxContext: Context) : CoroutineDispatcher()
             block.run()
         }
     }
-}
+}
diff --git a/...main/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/CoroutineEndpointInvoker.kt b/...main/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/CoroutineEndpointInvoker.kt
@@ -5,8 +5,10 @@ import org.jboss.resteasy.reactive.server.spi.EndpointInvoker
 /**
  * Base interface implemented by the synthetic beans that represent suspending rest endpoints.
  *
- * @see [KotlinCoroutineIntegrationProcessor]
  * @see [EndpointInvoker]
+ *
+ * Also see io.quarkus.resteasy.reactive.server.deployment.KotlinCoroutineIntegrationProcessor for the build-time part
+ * of coroutine support
  */
 interface CoroutineEndpointInvoker: EndpointInvoker {
     /**

diff --git a/...in/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/CoroutineInvocationHandler.kt b/...in/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/CoroutineInvocationHandler.kt
@@ -27,7 +27,7 @@ class CoroutineInvocationHandler(private val invoker: EndpointInvoker,
         val dispatcher: CoroutineDispatcher = Vertx.currentContext()?.let(::VertxDispatcher)
                 ?: throw IllegalStateException("No Vertx context found")
 
-        logger.debug("Handling request with dispatcher {}", dispatcher)
+        logger.trace("Handling request with dispatcher {}", dispatcher)
 
         requestContext.requireCDIRequestScope()
         requestContext.suspend()

diff --git a/...in/org/jboss/resteasy/reactive/server/runtime/kotlin/CoroutineInvocationHandlerFactory.kt b/...in/org/jboss/resteasy/reactive/server/runtime/kotlin/CoroutineInvocationHandlerFactory.kt
@@ -1,18 +1,19 @@
 package org.jboss.resteasy.reactive.server.runtime.kotlin
 
+import io.quarkus.arc.Unremovable
 import org.jboss.resteasy.reactive.server.spi.EndpointInvoker
 import org.jboss.resteasy.reactive.server.spi.ServerRestHandler
 import javax.enterprise.context.ApplicationScoped
 import javax.inject.Inject
+import javax.inject.Singleton
 
 /**
  * Factory for the [CoroutineInvocationHandler] that is already part of the CDI container
  */
-@ApplicationScoped
-class CoroutineInvocationHandlerFactory @Inject constructor(
-        private val applicationCoroutineScope: ApplicationCoroutineScope
-) {
+@Singleton
+@Unremovable
+class CoroutineInvocationHandlerFactory(private val applicationCoroutineScope: ApplicationCoroutineScope) {
     fun createHandler(invoker: EndpointInvoker): ServerRestHandler {
         return CoroutineInvocationHandler(invoker, applicationCoroutineScope)
     }
-}
+}