Skip to content

refactor: minor cleanups in the Kotlin module #2015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 27, 2025
+6 −6
Merged

refactor: minor cleanups in the Kotlin module #2015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90570cb
refactor: minor cleanups in the Kotlin module
jponge Nov 25, 2025
e728220
Merge branch 'main' into kotlin/cleanups-nov-25
heubeck Nov 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions kotlin/src/main/kotlin/io/smallrye/mutiny/coroutines/Multi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import io.smallrye.mutiny.subscription.MultiSubscriber
import java.util.concurrent.Flow.Subscription
import java.util.concurrent.atomic.AtomicReference
import kotlin.coroutines.cancellation.CancellationException
import kotlin.coroutines.coroutineContext
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.cancel
import kotlinx.coroutines.channels.BufferOverflow
import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.channels.trySendBlocking
import kotlinx.coroutines.currentCoroutineContext
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.buffer
import kotlinx.coroutines.flow.callbackFlow
Expand All @@ -32,7 +32,7 @@ import kotlinx.coroutines.launch
fun <T> Multi<T>.asFlow(
bufferCapacity: Int = Channel.UNLIMITED,
bufferOverflowStrategy: BufferOverflow = BufferOverflow.SUSPEND
): Flow<T> = callbackFlow<T> {
): Flow<T> = callbackFlow {
val parentCtx = coroutineContext

val subscriber = object : MultiSubscriber<T> {
Expand Down Expand Up @@ -77,7 +77,7 @@ fun <T> Multi<T>.asFlow(
* without respecting the requested amount of the subscriber.
*/
suspend fun <T> Flow<T>.asMulti(): Multi<T> {
val parentCtx = coroutineContext
val parentCtx = currentCoroutineContext()
return Multi.createFrom().emitter { em: MultiEmitter<in T> ->
val job = CoroutineScope(parentCtx).launch {
try {
Expand All @@ -101,4 +101,4 @@ suspend fun <T> Flow<T>.asMulti(): Multi<T> {
}
}

private class NonPropagatingCancellationException : kotlin.coroutines.cancellation.CancellationException()
private class NonPropagatingCancellationException : CancellationException()
2 changes: 1 addition & 1 deletion kotlin/src/main/kotlin/io/smallrye/mutiny/coroutines/Util.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ import kotlinx.coroutines.CancellationException
internal inline fun suppressCancellationException(block: () -> Unit) =
try {
block()
} catch (e: CancellationException) {
} catch (_: CancellationException) {
// CancellationExceptions are likely to happen if an emitter processes during cancellation/unsubscription.
}
2 changes: 1 addition & 1 deletion kotlin/src/test/kotlin/io/smallrye/mutiny/UniReplaceWithUnitTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class UniReplaceWithUnitTest {
@Test
fun `test an Uni that's already Void`() {
// Given
val uni = Uni.createFrom().voidItem();
val uni = Uni.createFrom().voidItem()

// When
val subscriber = UniAssertSubscriber.create<Any>()
Expand Down
Loading