Skip to content

Deprecate emitOrClose #294

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.

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 1 commit into from
Mar 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class WebSocketConnectionTest : SuspendTest {
flow {
var i = 0
while (true) {
emitOrClose(buildPayload { data((++i).toString()) })
emit(buildPayload { data((++i).toString()) })
delay(1000)
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2015-2024 the original author or authors.
* Copyright 2015-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -16,10 +16,8 @@

package io.rsocket.kotlin

import io.rsocket.kotlin.frame.io.*
import io.rsocket.kotlin.payload.*
import kotlinx.coroutines.*
import kotlinx.coroutines.channels.*
import kotlinx.coroutines.flow.*
import kotlinx.io.*

Expand Down Expand Up @@ -57,6 +55,11 @@ private fun notImplemented(operation: String): Nothing = throw NotImplementedErr
* Tries to emit [value], if emit failed, f.e. due cancellation, calls [Closeable.close] on [value].
* Better to use it instead of [FlowCollector.emit] with [Payload] or [ByteReadPacket] to avoid leaks of dropped elements.
*/
@Deprecated(
message = "Will be removed in next release",
level = DeprecationLevel.ERROR,
replaceWith = ReplaceWith("emit(value)")
)
public suspend fun <C : AutoCloseable> FlowCollector<C>.emitOrClose(value: C) {
try {
return emit(value)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2015-2024 the original author or authors.
* Copyright 2015-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -95,14 +95,14 @@ abstract class RSocketTest(
requestResponse { it }
requestStream {
it.close()
flow { repeat(10) { emitOrClose(payload("server got -> [$it]")) } }
flow { repeat(10) { emit(payload("server got -> [$it]")) } }
}
requestChannel { init, payloads ->
init.close()
flow {
coroutineScope {
payloads.onEach { it.close() }.launchIn(this)
repeat(10) { emitOrClose(payload("server got -> [$it]")) }
repeat(10) { emit(payload("server got -> [$it]")) }
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ abstract class TransportTest : SuspendTest {
@Test
fun requestChannel500NoLeak() = test {
val request = flow {
repeat(10_000) { emitOrClose(payload(3)) }
repeat(10_000) { emit(payload(3)) }
}
val count =
client
Expand Down Expand Up @@ -317,13 +317,13 @@ abstract class TransportTest : SuspendTest {
override fun requestStream(payload: Payload): Flow<Payload> = flow {
payload.close()
repeat(8192) {
emitOrClose(Payload(packet(responderData), packet(responderMetadata)))
emit(Payload(packet(responderData), packet(responderMetadata)))
}
}

override fun requestChannel(initPayload: Payload, payloads: Flow<Payload>): Flow<Payload> = flow {
initPayload.close()
payloads.collect { emitOrClose(it) }
payloads.collect { emit(it) }
}
}

Expand Down