Skip to content

Commit d83b2c7

Browse files
author
olme04
authored
сleanups of close/release inconsistency (#182)
remove Frame.release and Payload.release (use close instead) use close instead of release everywhere use sealed in composite and auth metadata Co-authored-by: olme04 <olme04>
1 parent 3ed0674 commit d83b2c7

File tree

47 files changed

+132
-135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+132
-135
lines changed

benchmarks/src/kotlinMain/kotlin/io/rsocket/kotlin/benchmarks/RSocketKotlinBenchmark.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ class RSocketKotlinBenchmark : RSocketBenchmark<Payload>() {
4343
val server = RSocketServer().bindIn(CoroutineScope(benchJob + Dispatchers.Unconfined), LocalServerTransport()) {
4444
RSocketRequestHandler {
4545
requestResponse {
46-
it.release()
46+
it.close()
4747
payloadCopy()
4848
}
4949
requestStream {
50-
it.release()
50+
it.close()
5151
payloadsFlow
5252
}
5353
requestChannel { init, payloads ->
54-
init.release()
54+
init.close()
5555
payloads.flowOn(requestStrategy)
5656
}
5757
}
@@ -74,7 +74,7 @@ class RSocketKotlinBenchmark : RSocketBenchmark<Payload>() {
7474
)
7575

7676
override fun releasePayload(payload: Payload) {
77-
payload.release()
77+
payload.close()
7878
}
7979

8080
override suspend fun doRequestResponse(): Payload = client.requestResponse(payloadCopy())

examples/multiplatform-chat/src/clientMain/kotlin/ChatApi.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ actual class ChatApi(private val rSocket: RSocket, private val proto: ProtoBuf)
3434
actual suspend fun delete(id: Int) {
3535
rSocket.requestResponse(
3636
proto.encodeToPayload(route = "chats.delete", DeleteChat(id))
37-
).release()
37+
).close()
3838
}
3939
}

rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/RSocket.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,27 @@ import kotlinx.coroutines.flow.*
2424
public interface RSocket : CoroutineScope {
2525

2626
public suspend fun metadataPush(metadata: ByteReadPacket) {
27-
metadata.release()
27+
metadata.close()
2828
notImplemented("Metadata Push")
2929
}
3030

3131
public suspend fun fireAndForget(payload: Payload) {
32-
payload.release()
32+
payload.close()
3333
notImplemented("Fire and Forget")
3434
}
3535

3636
public suspend fun requestResponse(payload: Payload): Payload {
37-
payload.release()
37+
payload.close()
3838
notImplemented("Request Response")
3939
}
4040

4141
public fun requestStream(payload: Payload): Flow<Payload> {
42-
payload.release()
42+
payload.close()
4343
notImplemented("Request Stream")
4444
}
4545

4646
public fun requestChannel(initPayload: Payload, payloads: Flow<Payload>): Flow<Payload> {
47-
initPayload.release()
47+
initPayload.close()
4848
notImplemented("Request Channel")
4949
}
5050
}

rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/core/RSocketConnector.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ public class RSocketConnector internal constructor(
7373
connection.sendFrame(setupFrame)
7474
return requester
7575
} catch (cause: Throwable) {
76-
connectionConfig.setupPayload.release()
77-
setupFrame.release()
76+
connectionConfig.setupPayload.close()
77+
setupFrame.close()
7878
connection.cancel("Connection establishment failed", cause)
7979
throw cause
8080
}

rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/core/RSocketConnectorBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public class RSocketConnectorBuilder internal constructor() {
113113

114114
private companion object {
115115
private val defaultAcceptor: ConnectionAcceptor = ConnectionAcceptor {
116-
config.setupPayload.release()
116+
config.setupPayload.close()
117117
EmptyRSocket()
118118
}
119119

rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/CancelFrame.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ internal class CancelFrame(
2424
override val type: FrameType get() = FrameType.Cancel
2525
override val flags: Int get() = 0
2626

27-
override fun release(): Unit = Unit
27+
override fun close(): Unit = Unit
2828

2929
override fun BytePacketBuilder.writeSelf(): Unit = Unit
3030

rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/ErrorFrame.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ internal class ErrorFrame(
2727
override val flags: Int get() = 0
2828
val errorCode get() = (throwable as? RSocketError)?.errorCode ?: ErrorCode.ApplicationError
2929

30-
override fun release(): Unit = Unit
30+
override fun close(): Unit = Unit
3131

3232
override fun BytePacketBuilder.writeSelf() {
3333
writeInt(errorCode)

rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/ExtensionFrame.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ internal class ExtensionFrame(
3030
override val type: FrameType get() = FrameType.Extension
3131
override val flags: Int get() = if (payload.metadata != null) Flags.Metadata else 0
3232

33-
override fun release() {
34-
payload.release()
33+
override fun close() {
34+
payload.close()
3535
}
3636

3737
override fun BytePacketBuilder.writeSelf() {

rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/Frame.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ public sealed class Frame : Closeable {
2929
public abstract val streamId: Int
3030
public abstract val flags: Int
3131

32-
internal abstract fun release()
33-
3432
protected abstract fun BytePacketBuilder.writeSelf()
3533
protected abstract fun StringBuilder.appendFlags()
3634
protected abstract fun StringBuilder.appendSelf()
@@ -54,10 +52,6 @@ public sealed class Frame : Closeable {
5452
append(flag)
5553
if (value) append(1) else append(0)
5654
}
57-
58-
override fun close() {
59-
release()
60-
}
6155
}
6256

6357
internal fun ByteReadPacket.readFrame(pool: ObjectPool<ChunkBuffer>): Frame = use {

rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/KeepAliveFrame.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ internal class KeepAliveFrame(
3232
override val streamId: Int get() = 0
3333
override val flags: Int get() = if (respond) RespondFlag else 0
3434

35-
override fun release() {
36-
data.release()
35+
override fun close() {
36+
data.close()
3737
}
3838

3939
override fun BytePacketBuilder.writeSelf() {

0 commit comments

Comments
 (0)