From 91438c51229c336a8288edb016b951fa334828c4 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 1 Jun 2022 09:58:52 +0200 Subject: [PATCH] [jOOQ/jOOQ#9335] The Unit vs T specialisation isn't necessary in kotlin --- .../kotlin/coroutines/CoroutineExtensions.kt | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/jOOQ-kotlin-coroutines/src/main/kotlin/org/jooq/kotlin/coroutines/CoroutineExtensions.kt b/jOOQ-kotlin-coroutines/src/main/kotlin/org/jooq/kotlin/coroutines/CoroutineExtensions.kt index 6086231b08..35ea77dd01 100644 --- a/jOOQ-kotlin-coroutines/src/main/kotlin/org/jooq/kotlin/coroutines/CoroutineExtensions.kt +++ b/jOOQ-kotlin-coroutines/src/main/kotlin/org/jooq/kotlin/coroutines/CoroutineExtensions.kt @@ -1,25 +1,15 @@ package org.jooq.kotlin.coroutines import kotlinx.coroutines.reactive.awaitFirst -import kotlinx.coroutines.reactive.awaitFirstOrNull import kotlinx.coroutines.reactor.mono -import org.jooq.* -import org.jooq.impl.DSL.* -import java.util.stream.Collector +import org.jooq.Configuration +import org.jooq.DSLContext // ---------------------------------------------------------------------------- // Extensions to bridge between the reactive-streams and the coroutine world // ---------------------------------------------------------------------------- -suspend fun DSLContext.transactionCoroutine(transactional: suspend (Configuration) -> Unit) { - transactionPublisher { c -> - mono { - transactional.invoke(c) - } - }.awaitFirst() -} - -suspend fun DSLContext.transactionCoroutineResult(transactional: suspend (Configuration) -> T): T { +suspend fun DSLContext.transactionCoroutine(transactional: suspend (Configuration) -> T): T { return transactionPublisher { c -> mono { transactional.invoke(c)