hide ktor deprecation

* this API will be removed in Ktor 4.0
* possible replacement will be ready by Ktor 3.0 + kotlinx.io
* most of the public declarations will be replaced in coming changes

rsocket-core/api/rsocket-core.api

@@ -212,12 +212,14 @@ public final class io/rsocket/kotlin/core/RSocketConnector {
 public final class io/rsocket/kotlin/core/RSocketConnectorBuilder {
 	public final fun acceptor (Lio/rsocket/kotlin/ConnectionAcceptor;)V
 	public final fun connectionConfig (Lkotlin/jvm/functions/Function1;)V
+	public final fun getBufferPool ()Lio/ktor/utils/io/pool/ObjectPool;
 	public final fun getLoggerFactory ()Lio/rsocket/kotlin/logging/LoggerFactory;
 	public final fun getMaxFragmentSize ()I
 	public final fun interceptors (Lkotlin/jvm/functions/Function1;)V
 	public final fun reconnectable (JLkotlin/jvm/functions/Function2;)V
 	public final fun reconnectable (Lkotlin/jvm/functions/Function3;)V
 	public static synthetic fun reconnectable$default (Lio/rsocket/kotlin/core/RSocketConnectorBuilder;JLkotlin/jvm/functions/Function2;ILjava/lang/Object;)V
+	public final fun setBufferPool (Lio/ktor/utils/io/pool/ObjectPool;)V
 	public final fun setLoggerFactory (Lio/rsocket/kotlin/logging/LoggerFactory;)V
 	public final fun setMaxFragmentSize (I)V
 }
@@ -242,9 +244,11 @@ public final class io/rsocket/kotlin/core/RSocketServer {
 }
 
 public final class io/rsocket/kotlin/core/RSocketServerBuilder {
+	public final fun getBufferPool ()Lio/ktor/utils/io/pool/ObjectPool;
 	public final fun getLoggerFactory ()Lio/rsocket/kotlin/logging/LoggerFactory;
 	public final fun getMaxFragmentSize ()I
 	public final fun interceptors (Lkotlin/jvm/functions/Function1;)V
+	public final fun setBufferPool (Lio/ktor/utils/io/pool/ObjectPool;)V
 	public final fun setLoggerFactory (Lio/rsocket/kotlin/logging/LoggerFactory;)V
 	public final fun setMaxFragmentSize (I)V
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 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.
@@ -28,17 +28,21 @@ import kotlinx.coroutines.*
  */
 @TransportApi
 public interface Connection : CoroutineScope {
-    public val pool: ObjectPool<ChunkBuffer> get() = ChunkBuffer.Pool
+    @Suppress("DEPRECATION")
+    @Deprecated(DEPRECATED_IN_KTOR, level = DeprecationLevel.ERROR)
+    public val pool: ObjectPool<ChunkBuffer> get() = TODO("SHOULD NOT BE CALLED ANY MORE")
 
     public suspend fun send(packet: ByteReadPacket)
     public suspend fun receive(): ByteReadPacket
 }
 
+@Suppress("DEPRECATION")
 @OptIn(TransportApi::class)
-internal suspend inline fun <T> Connection.receiveFrame(block: (frame: Frame) -> T): T =
-    receive().readFrame(pool).closeOnError(block)
+internal suspend inline fun <T> Connection.receiveFrame(bufferPool: ObjectPool<ChunkBuffer>, block: (frame: Frame) -> T): T =
+    receive().readFrame(bufferPool).closeOnError(block)
 
+@Suppress("DEPRECATION")
 @OptIn(TransportApi::class)
-internal suspend fun Connection.sendFrame(frame: Frame) {
-    frame.toPacket(pool).closeOnError { send(it) }
+internal suspend fun Connection.sendFrame(bufferPool: ObjectPool<ChunkBuffer>, frame: Frame) {
+    frame.toPacket(bufferPool).closeOnError { send(it) }
 }

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

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015-2023 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.rsocket.kotlin
+
+internal const val DEPRECATED_IN_KTOR = "Deprecated in Ktor"

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 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.
@@ -16,6 +16,8 @@
 
 package io.rsocket.kotlin.core
 
+import io.ktor.utils.io.core.internal.*
+import io.ktor.utils.io.pool.*
 import io.rsocket.kotlin.*
 import io.rsocket.kotlin.frame.*
 import io.rsocket.kotlin.frame.io.*
@@ -32,6 +34,7 @@ public class RSocketConnector internal constructor(
     private val connectionConfigProvider: () -> ConnectionConfig,
     private val acceptor: ConnectionAcceptor,
     private val reconnectPredicate: ReconnectPredicate?,
+    @Suppress("DEPRECATION") private val bufferPool: ObjectPool<ChunkBuffer>,
 ) {
 
     public suspend fun connect(transport: ClientTransport): RSocket = when (reconnectPredicate) {
@@ -68,9 +71,10 @@ public class RSocketConnector internal constructor(
                 maxFragmentSize = maxFragmentSize,
                 interceptors = interceptors,
                 connectionConfig = connectionConfig,
-                acceptor = acceptor
+                acceptor = acceptor,
+                bufferPool = bufferPool
             )
-            connection.sendFrame(setupFrame)
+            connection.sendFrame(bufferPool, setupFrame)
             return requester
         } catch (cause: Throwable) {
             connectionConfig.setupPayload.close()

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 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.
@@ -16,6 +16,8 @@
 
 package io.rsocket.kotlin.core
 
+import io.ktor.utils.io.core.internal.*
+import io.ktor.utils.io.pool.*
 import io.rsocket.kotlin.*
 import io.rsocket.kotlin.internal.*
 import io.rsocket.kotlin.keepalive.*
@@ -35,6 +37,10 @@ public class RSocketConnectorBuilder internal constructor() {
             field = value
         }
 
+    @Suppress("DEPRECATION")
+    @Deprecated("Only for tests in rsocket", level = DeprecationLevel.ERROR)
+    public var bufferPool: ObjectPool<ChunkBuffer> = ChunkBuffer.Pool
+
     private val connectionConfig: ConnectionConfigBuilder = ConnectionConfigBuilder()
     private val interceptors: InterceptorsBuilder = InterceptorsBuilder()
     private var acceptor: ConnectionAcceptor? = null
@@ -101,14 +107,16 @@ public class RSocketConnectorBuilder internal constructor() {
         }
     }
 
+    @Suppress("DEPRECATION_ERROR")
     @OptIn(RSocketLoggingApi::class)
     internal fun build(): RSocketConnector = RSocketConnector(
         loggerFactory,
         maxFragmentSize,
         interceptors.build(),
         connectionConfig.producer(),
         acceptor ?: defaultAcceptor,
-        reconnectPredicate
+        reconnectPredicate,
+        bufferPool
     )
 
     private companion object {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 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.
@@ -16,6 +16,8 @@
 
 package io.rsocket.kotlin.core
 
+import io.ktor.utils.io.core.internal.*
+import io.ktor.utils.io.pool.*
 import io.rsocket.kotlin.*
 import io.rsocket.kotlin.frame.*
 import io.rsocket.kotlin.frame.io.*
@@ -29,6 +31,7 @@ public class RSocketServer internal constructor(
     private val loggerFactory: LoggerFactory,
     private val maxFragmentSize: Int,
     private val interceptors: Interceptors,
+    @Suppress("DEPRECATION") private val bufferPool: ObjectPool<ChunkBuffer>,
 ) {
 
     @DelicateCoroutinesApi
@@ -47,7 +50,7 @@ public class RSocketServer internal constructor(
         }
     }
 
-    private suspend fun Connection.bind(acceptor: ConnectionAcceptor): Job = receiveFrame { setupFrame ->
+    private suspend fun Connection.bind(acceptor: ConnectionAcceptor): Job = receiveFrame(bufferPool) { setupFrame ->
         when {
             setupFrame !is SetupFrame             -> failSetup(RSocketError.Setup.Invalid("Invalid setup frame: ${setupFrame.type}"))
             setupFrame.version != Version.Current -> failSetup(RSocketError.Setup.Unsupported("Unsupported version: ${setupFrame.version}"))
@@ -64,7 +67,8 @@ public class RSocketServer internal constructor(
                         payloadMimeType = setupFrame.payloadMimeType,
                         setupPayload = setupFrame.payload
                     ),
-                    acceptor = acceptor
+                    acceptor = acceptor,
+                    bufferPool = bufferPool
                 )
                 coroutineContext.job
             } catch (e: Throwable) {
@@ -75,7 +79,7 @@ public class RSocketServer internal constructor(
 
     @Suppress("SuspendFunctionOnCoroutineScope")
     private suspend fun Connection.failSetup(error: RSocketError.Setup): Nothing {
-        sendFrame(ErrorFrame(0, error))
+        sendFrame(bufferPool, ErrorFrame(0, error))
         cancel("Connection establishment failed", error)
         throw error
     }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 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.
@@ -16,6 +16,8 @@
 
 package io.rsocket.kotlin.core
 
+import io.ktor.utils.io.core.internal.*
+import io.ktor.utils.io.pool.*
 import io.rsocket.kotlin.*
 import io.rsocket.kotlin.logging.*
 
@@ -30,14 +32,19 @@ public class RSocketServerBuilder internal constructor() {
             field = value
         }
 
+    @Suppress("DEPRECATION")
+    @Deprecated("Only for tests in rsocket", level = DeprecationLevel.ERROR)
+    public var bufferPool: ObjectPool<ChunkBuffer> = ChunkBuffer.Pool
+
     private val interceptors: InterceptorsBuilder = InterceptorsBuilder()
 
     public fun interceptors(configure: InterceptorsBuilder.() -> Unit) {
         interceptors.configure()
     }
 
+    @Suppress("DEPRECATION_ERROR")
     @OptIn(RSocketLoggingApi::class)
-    internal fun build(): RSocketServer = RSocketServer(loggerFactory, maxFragmentSize, interceptors.build())
+    internal fun build(): RSocketServer = RSocketServer(loggerFactory, maxFragmentSize, interceptors.build(), bufferPool)
 }
 
 public fun RSocketServer(configure: RSocketServerBuilder.() -> Unit = {}): RSocketServer {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 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.
@@ -49,7 +49,11 @@ internal class ExtensionFrame(
     }
 }
 
-internal fun ByteReadPacket.readExtension(pool: ObjectPool<ChunkBuffer>, streamId: Int, flags: Int): ExtensionFrame {
+internal fun ByteReadPacket.readExtension(
+    @Suppress("DEPRECATION") pool: ObjectPool<ChunkBuffer>,
+    streamId: Int,
+    flags: Int,
+): ExtensionFrame {
     val extendedType = readInt()
     val payload = readPayload(pool, flags)
     return ExtensionFrame(streamId, extendedType, payload)

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 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.
@@ -33,7 +33,7 @@ internal sealed class Frame : Closeable {
     protected abstract fun StringBuilder.appendFlags()
     protected abstract fun StringBuilder.appendSelf()
 
-    internal fun toPacket(pool: ObjectPool<ChunkBuffer>): ByteReadPacket {
+    internal fun toPacket(@Suppress("DEPRECATION") pool: ObjectPool<ChunkBuffer>): ByteReadPacket {
         check(type.canHaveMetadata || !(flags check Flags.Metadata)) { "bad value for metadata flag" }
         return buildPacket(pool) {
             writeInt(streamId)
@@ -54,7 +54,7 @@ internal sealed class Frame : Closeable {
     }
 }
 
-internal fun ByteReadPacket.readFrame(pool: ObjectPool<ChunkBuffer>): Frame = use {
+internal fun ByteReadPacket.readFrame(@Suppress("DEPRECATION") pool: ObjectPool<ChunkBuffer>): Frame = use {
     val streamId = readInt()
     val typeAndFlags = readShort().toInt() and 0xFFFF
     val flags = typeAndFlags and FlagsMask

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 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.
@@ -51,7 +51,7 @@ internal class KeepAliveFrame(
     }
 }
 
-internal fun ByteReadPacket.readKeepAlive(pool: ObjectPool<ChunkBuffer>, flags: Int): KeepAliveFrame {
+internal fun ByteReadPacket.readKeepAlive(@Suppress("DEPRECATION") pool: ObjectPool<ChunkBuffer>, flags: Int): KeepAliveFrame {
     val respond = flags check RespondFlag
     val lastPosition = readLong()
     val data = readPacket(pool)

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 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.
@@ -50,7 +50,7 @@ internal class LeaseFrame(
     }
 }
 
-internal fun ByteReadPacket.readLease(pool: ObjectPool<ChunkBuffer>, flags: Int): LeaseFrame {
+internal fun ByteReadPacket.readLease(@Suppress("DEPRECATION") pool: ObjectPool<ChunkBuffer>, flags: Int): LeaseFrame {
     val ttl = readInt()
     val numberOfRequests = readInt()
     val metadata = if (flags check Flags.Metadata) readMetadata(pool) else null

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 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.
@@ -45,5 +45,5 @@ internal class MetadataPushFrame(
     }
 }
 
-internal fun ByteReadPacket.readMetadataPush(pool: ObjectPool<ChunkBuffer>): MetadataPushFrame =
+internal fun ByteReadPacket.readMetadataPush(@Suppress("DEPRECATION") pool: ObjectPool<ChunkBuffer>): MetadataPushFrame =
     MetadataPushFrame(readPacket(pool))

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 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.
@@ -66,11 +66,11 @@ internal class RequestFrame(
 }
 
 internal fun ByteReadPacket.readRequest(
-    pool: ObjectPool<ChunkBuffer>,
+    @Suppress("DEPRECATION") pool: ObjectPool<ChunkBuffer>,
     type: FrameType,
     streamId: Int,
     flags: Int,
-    withInitial: Boolean
+    withInitial: Boolean,
 ): RequestFrame {
     val fragmentFollows = flags check Flags.Follows
     val complete = flags check Flags.Complete

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 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.
@@ -50,7 +50,7 @@ internal class ResumeFrame(
     }
 }
 
-internal fun ByteReadPacket.readResume(pool: ObjectPool<ChunkBuffer>): ResumeFrame {
+internal fun ByteReadPacket.readResume(@Suppress("DEPRECATION") pool: ObjectPool<ChunkBuffer>): ResumeFrame {
     val version = readVersion()
     val resumeToken = readResumeToken(pool)
     val lastReceivedServerPosition = readLong()

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 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.
@@ -76,7 +76,7 @@ internal class SetupFrame(
     }
 }
 
-internal fun ByteReadPacket.readSetup(pool: ObjectPool<ChunkBuffer>, flags: Int): SetupFrame {
+internal fun ByteReadPacket.readSetup(@Suppress("DEPRECATION") pool: ObjectPool<ChunkBuffer>, flags: Int): SetupFrame {
     val version = readVersion()
     val keepAlive = run {
         val interval = readInt()