Simplify API

Author: pcasaes

extensions/arc/deployment/src/test/kotlin/io/quarkus/arc/kotlin/RequestContextCoroutineContextTest.kt

@@ -6,10 +6,12 @@ import jakarta.enterprise.context.RequestScoped
 import jakarta.inject.Inject
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.withContext
 import org.jboss.shrinkwrap.api.spec.JavaArchive
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Assertions
@@ -60,7 +62,7 @@ class RequestContextCoroutineContextTest {
 
         // WHEN we run a block
         runTest {
-            withPropagatedContext(Dispatchers.IO) {
+            withContext(Dispatchers.IO.withCdiContext()) {
                 // THEN the request context should not be active
                 Assertions.assertFalse(
                     Arc.container().requestContext().isActive,
@@ -83,7 +85,7 @@ class RequestContextCoroutineContextTest {
         // WHEN we run a block with async
         runTest {
             coroutineScope {
-                asyncWithPropagatedContext(Dispatchers.IO) {
+                async(Dispatchers.IO.withCdiContext()) {
                         // THEN the request context should not be active
                         Assertions.assertFalse(
                             Arc.container().requestContext().isActive,
@@ -115,7 +117,7 @@ class RequestContextCoroutineContextTest {
 
         // WHEN we run a block with the request context
         runTest {
-            withPropagatedContext(Dispatchers.IO) {
+            withContext(Dispatchers.IO.withCdiContext()) {
                 // THEN the request context should be active
                 Assertions.assertTrue(
                     Arc.container().requestContext().isActive,
@@ -169,7 +171,7 @@ class RequestContextCoroutineContextTest {
         // WHEN we run a block with async
         runTest {
             coroutineScope {
-                asyncWithPropagatedContext(Dispatchers.IO) {
+                async(Dispatchers.IO.withCdiContext()) {
                         // THEN the request context should be active
                         Assertions.assertTrue(
                             Arc.container().requestContext().isActive,
@@ -225,7 +227,7 @@ class RequestContextCoroutineContextTest {
         // WHEN we run a block with async
         runTest {
             coroutineScope {
-                asyncWithPropagatedContext(Dispatchers.IO) {
+                async(Dispatchers.IO.withCdiContext()) {
                         coroutineScope {
                             // THEN the request context should be active
                             Assertions.assertTrue(
@@ -289,7 +291,7 @@ class RequestContextCoroutineContextTest {
         // WHEN we run a block with async
         runTest {
             val job = launch {
-                asyncWithPropagatedContext(Dispatchers.IO) {
+                async(Dispatchers.IO.withCdiContext()) {
                         // THEN the request context should be active
                         Assertions.assertTrue(
                             Arc.container().requestContext().isActive,
@@ -368,7 +370,7 @@ class RequestContextCoroutineContextTest {
         runTest {
             val jobFirstRequest = launch {
                 Arc.container().requestContext().activate(firstRequestState)
-                asyncWithPropagatedContext(Dispatchers.IO) {
+                async(Dispatchers.IO.withCdiContext()) {
                         // THEN the request context should be active
                         Assertions.assertTrue(
                             Arc.container().requestContext().isActive,
@@ -402,7 +404,7 @@ class RequestContextCoroutineContextTest {
 
             val jobSecondRequest = launch {
                 Arc.container().requestContext().activate(secondRequestState)
-                asyncWithPropagatedContext(Dispatchers.IO) {
+                async(Dispatchers.IO.withCdiContext()) {
                         // THEN the request context should be active
                         Assertions.assertTrue(
                             Arc.container().requestContext().isActive,

extensions/arc/kotlin/src/main/kotlin/io/quarkus/arc/kotlin/RequestContextCoroutineContext.kt

@@ -4,62 +4,18 @@ import io.quarkus.arc.Arc
 import io.quarkus.arc.InjectableContext
 import io.quarkus.arc.ManagedContext
 import kotlin.coroutines.CoroutineContext
-import kotlin.coroutines.EmptyCoroutineContext
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.CoroutineStart
-import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.ThreadContextElement
-import kotlinx.coroutines.async
-import kotlinx.coroutines.withContext
 
 /**
- * A suspending function that executes a block of code within the Quarkus Request Context.
+ * This function extends the CoroutineContext to include the Quarkus Request Context if it is
+ * active.
  *
- * This function captures the current request context and ensures it is activated when the coroutine
- * resumes on a thread.
- *
- * If the request context is finalized before the block completes, it results in undefined behavior.
- *
- * Will not start a request context if there is none active at the time of invocation.
- *
- * @param context The CoroutineContext to use for the coroutine.
- * @param block The block of code to execute within the request context.
- * @return The result of the block execution.
- */
-suspend fun <T> withPropagatedContext(
-    context: CoroutineContext,
-    block: suspend CoroutineScope.() -> T,
-): T {
-    return withContext(context = context.appendRequestContextToCoroutineContext(), block = block)
-}
-
-/**
- * An async function that executes a block of code within the Quarkus Request Context.
- *
- * This function captures the current request context and ensures it is activated when the coroutine
- * resumes on a thread.
- *
- * If the caller finalizes the request context before the block is executed, results in undefined
+ * If the caller finalizes the request context before the coroutine resumes, it results in undefined
  * behavior.
  *
  * Will not start a request context if there is none active at the time of invocation.
- *
- * @param context The CoroutineContext to use for the coroutine.
- * @param block The block of code to execute within the request context.
  */
-fun <T> CoroutineScope.asyncWithPropagatedContext(
-    context: CoroutineContext = EmptyCoroutineContext,
-    start: CoroutineStart = CoroutineStart.DEFAULT,
-    block: suspend CoroutineScope.() -> T,
-): Deferred<T> {
-    return async(
-        context = context.appendRequestContextToCoroutineContext(),
-        start = start,
-        block = block,
-    )
-}
-
-fun CoroutineContext.appendRequestContextToCoroutineContext(): CoroutineContext {
+fun CoroutineContext.withCdiContext(): CoroutineContext {
     val requestContext: ManagedContext? = Arc.container()?.requestContext()
     return if (requestContext == null) {
         this