From ae796059c487ad53daaaa3b9552c65bc6628ac9a Mon Sep 17 00:00:00 2001 From: Oleg Yukhnevich Date: Wed, 22 May 2024 00:33:48 +0300 Subject: [PATCH] Move `BufferPool` to `internal` package of `core` module because of its exposure in metadata API --- rsocket-core/api/rsocket-core.api | 91 +++++++++++-------- .../kotlin/io/rsocket/kotlin/Connection.kt | 1 - .../rsocket/kotlin/core/RSocketConnector.kt | 1 - .../kotlin/core/RSocketConnectorBuilder.kt | 1 - .../io/rsocket/kotlin/core/RSocketServer.kt | 1 - .../kotlin/core/RSocketServerBuilder.kt | 2 +- .../io/rsocket/kotlin/frame/ExtensionFrame.kt | 2 +- .../kotlin/io/rsocket/kotlin/frame/Frame.kt | 2 +- .../io/rsocket/kotlin/frame/KeepAliveFrame.kt | 2 +- .../io/rsocket/kotlin/frame/LeaseFrame.kt | 2 +- .../rsocket/kotlin/frame/MetadataPushFrame.kt | 2 +- .../io/rsocket/kotlin/frame/RequestFrame.kt | 2 +- .../io/rsocket/kotlin/frame/ResumeFrame.kt | 2 +- .../io/rsocket/kotlin/frame/SetupFrame.kt | 2 +- .../io/rsocket/kotlin/frame/io/payload.kt | 1 + .../kotlin/io/rsocket/kotlin/frame/io/util.kt | 2 +- .../io/rsocket/kotlin/internal}/BufferPool.kt | 2 +- .../io/rsocket/kotlin/internal/Connect.kt | 1 - .../io/rsocket/kotlin/internal/FrameSender.kt | 1 - .../kotlin/internal/LoggingConnection.kt | 1 - .../kotlin/metadata/CompositeMetadata.kt | 1 + .../metadata/CompositeMetadataExtensions.kt | 2 +- .../io/rsocket/kotlin/metadata/Metadata.kt | 2 +- ...erStreamAcceptableDataMimeTypesMetadata.kt | 2 +- .../metadata/PerStreamDataMimeTypeMetadata.kt | 2 +- .../io/rsocket/kotlin/metadata/RawMetadata.kt | 2 +- .../kotlin/metadata/RoutingMetadata.kt | 2 +- .../kotlin/metadata/ZipkinTracingMetadata.kt | 2 +- .../kotlin/metadata/security/AuthMetadata.kt | 2 +- .../metadata/security/BearerAuthMetadata.kt | 2 +- .../metadata/security/RawAuthMetadata.kt | 2 +- .../metadata/security/SimpleAuthMetadata.kt | 2 +- .../api/rsocket-internal-io.api | 19 ---- .../rsocket/kotlin/test/InUseTrackingPool.kt | 2 +- 34 files changed, 80 insertions(+), 85 deletions(-) rename {rsocket-internal-io/src/commonMain/kotlin/io/rsocket/kotlin/internal/io => rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/internal}/BufferPool.kt (97%) diff --git a/rsocket-core/api/rsocket-core.api b/rsocket-core/api/rsocket-core.api index d1a9ac27..4f94cee3 100644 --- a/rsocket-core/api/rsocket-core.api +++ b/rsocket-core/api/rsocket-core.api @@ -199,14 +199,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-ulmh1bs ()Lio/ktor/utils/io/pool/ObjectPool; + public final fun getBufferPool-7b3xaDw ()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-nnChvZA (Lio/ktor/utils/io/pool/ObjectPool;)V + public final fun setBufferPool-vHF7wRk (Lio/ktor/utils/io/pool/ObjectPool;)V public final fun setLoggerFactory (Lio/rsocket/kotlin/logging/LoggerFactory;)V public final fun setMaxFragmentSize (I)V } @@ -231,11 +231,11 @@ public final class io/rsocket/kotlin/core/RSocketServer { } public final class io/rsocket/kotlin/core/RSocketServerBuilder { - public final fun getBufferPool-ulmh1bs ()Lio/ktor/utils/io/pool/ObjectPool; + public final fun getBufferPool-7b3xaDw ()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-nnChvZA (Lio/ktor/utils/io/pool/ObjectPool;)V + public final fun setBufferPool-vHF7wRk (Lio/ktor/utils/io/pool/ObjectPool;)V public final fun setLoggerFactory (Lio/rsocket/kotlin/logging/LoggerFactory;)V public final fun setMaxFragmentSize (I)V } @@ -320,6 +320,25 @@ public final class io/rsocket/kotlin/core/WellKnownMimeType$Companion { public final fun invoke (Ljava/lang/String;)Lio/rsocket/kotlin/core/WellKnownMimeType; } +public final class io/rsocket/kotlin/internal/BufferPool { + public static final field Companion Lio/rsocket/kotlin/internal/BufferPool$Companion; + public static final synthetic fun box-impl (Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/internal/BufferPool; + public static final fun buildPacket-impl (Lio/ktor/utils/io/pool/ObjectPool;Lkotlin/jvm/functions/Function1;)Lio/ktor/utils/io/core/ByteReadPacket; + public static fun constructor-impl (Lio/ktor/utils/io/pool/ObjectPool;)Lio/ktor/utils/io/pool/ObjectPool; + public fun equals (Ljava/lang/Object;)Z + public static fun equals-impl (Lio/ktor/utils/io/pool/ObjectPool;Ljava/lang/Object;)Z + public static final fun equals-impl0 (Lio/ktor/utils/io/pool/ObjectPool;Lio/ktor/utils/io/pool/ObjectPool;)Z + public fun hashCode ()I + public static fun hashCode-impl (Lio/ktor/utils/io/pool/ObjectPool;)I + public fun toString ()Ljava/lang/String; + public static fun toString-impl (Lio/ktor/utils/io/pool/ObjectPool;)Ljava/lang/String; + public final synthetic fun unbox-impl ()Lio/ktor/utils/io/pool/ObjectPool; +} + +public final class io/rsocket/kotlin/internal/BufferPool$Companion { + public final fun getDefault-7b3xaDw ()Lio/ktor/utils/io/pool/ObjectPool; +} + public final class io/rsocket/kotlin/keepalive/KeepAlive { public fun ()V public fun (II)V @@ -420,8 +439,8 @@ public final class io/rsocket/kotlin/metadata/CompositeMetadata$Entry { public final class io/rsocket/kotlin/metadata/CompositeMetadata$Reader : io/rsocket/kotlin/metadata/MetadataReader { public fun getMimeType ()Lio/rsocket/kotlin/core/MimeType; - public fun read-sXCisgc (Lio/ktor/utils/io/core/ByteReadPacket;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/CompositeMetadata; - public synthetic fun read-sXCisgc (Lio/ktor/utils/io/core/ByteReadPacket;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/Metadata; + public fun read-B471DwU (Lio/ktor/utils/io/core/ByteReadPacket;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/CompositeMetadata; + public synthetic fun read-B471DwU (Lio/ktor/utils/io/core/ByteReadPacket;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/Metadata; } public abstract interface class io/rsocket/kotlin/metadata/CompositeMetadataBuilder : java/io/Closeable { @@ -444,10 +463,10 @@ public final class io/rsocket/kotlin/metadata/CompositeMetadataExtensionsKt { public static final fun hasMimeTypeOf (Lio/rsocket/kotlin/metadata/CompositeMetadata$Entry;Lio/rsocket/kotlin/metadata/MetadataReader;)Z public static final fun list (Lio/rsocket/kotlin/metadata/CompositeMetadata;Lio/rsocket/kotlin/core/MimeType;)Ljava/util/List; public static final fun list (Lio/rsocket/kotlin/metadata/CompositeMetadata;Lio/rsocket/kotlin/metadata/MetadataReader;)Ljava/util/List; - public static final fun read-FTxoUho (Lio/rsocket/kotlin/metadata/CompositeMetadata$Entry;Lio/rsocket/kotlin/metadata/MetadataReader;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/Metadata; - public static synthetic fun read-FTxoUho$default (Lio/rsocket/kotlin/metadata/CompositeMetadata$Entry;Lio/rsocket/kotlin/metadata/MetadataReader;Lio/ktor/utils/io/pool/ObjectPool;ILjava/lang/Object;)Lio/rsocket/kotlin/metadata/Metadata; - public static final fun readOrNull-FTxoUho (Lio/rsocket/kotlin/metadata/CompositeMetadata$Entry;Lio/rsocket/kotlin/metadata/MetadataReader;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/Metadata; - public static synthetic fun readOrNull-FTxoUho$default (Lio/rsocket/kotlin/metadata/CompositeMetadata$Entry;Lio/rsocket/kotlin/metadata/MetadataReader;Lio/ktor/utils/io/pool/ObjectPool;ILjava/lang/Object;)Lio/rsocket/kotlin/metadata/Metadata; + public static final fun read-jfyA9PI (Lio/rsocket/kotlin/metadata/CompositeMetadata$Entry;Lio/rsocket/kotlin/metadata/MetadataReader;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/Metadata; + public static synthetic fun read-jfyA9PI$default (Lio/rsocket/kotlin/metadata/CompositeMetadata$Entry;Lio/rsocket/kotlin/metadata/MetadataReader;Lio/ktor/utils/io/pool/ObjectPool;ILjava/lang/Object;)Lio/rsocket/kotlin/metadata/Metadata; + public static final fun readOrNull-jfyA9PI (Lio/rsocket/kotlin/metadata/CompositeMetadata$Entry;Lio/rsocket/kotlin/metadata/MetadataReader;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/Metadata; + public static synthetic fun readOrNull-jfyA9PI$default (Lio/rsocket/kotlin/metadata/CompositeMetadata$Entry;Lio/rsocket/kotlin/metadata/MetadataReader;Lio/ktor/utils/io/pool/ObjectPool;ILjava/lang/Object;)Lio/rsocket/kotlin/metadata/Metadata; } public final class io/rsocket/kotlin/metadata/CompositeMetadataFromBuilder : io/rsocket/kotlin/metadata/CompositeMetadata, io/rsocket/kotlin/metadata/CompositeMetadataBuilder { @@ -469,15 +488,15 @@ public abstract interface class io/rsocket/kotlin/metadata/Metadata : java/io/Cl public final class io/rsocket/kotlin/metadata/MetadataKt { public static final fun metadata (Lio/rsocket/kotlin/payload/PayloadBuilder;Lio/rsocket/kotlin/metadata/Metadata;)V - public static final fun read-FTxoUho (Lio/ktor/utils/io/core/ByteReadPacket;Lio/rsocket/kotlin/metadata/MetadataReader;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/Metadata; - public static synthetic fun read-FTxoUho$default (Lio/ktor/utils/io/core/ByteReadPacket;Lio/rsocket/kotlin/metadata/MetadataReader;Lio/ktor/utils/io/pool/ObjectPool;ILjava/lang/Object;)Lio/rsocket/kotlin/metadata/Metadata; - public static final fun toPacket-sXCisgc (Lio/rsocket/kotlin/metadata/Metadata;Lio/ktor/utils/io/pool/ObjectPool;)Lio/ktor/utils/io/core/ByteReadPacket; - public static synthetic fun toPacket-sXCisgc$default (Lio/rsocket/kotlin/metadata/Metadata;Lio/ktor/utils/io/pool/ObjectPool;ILjava/lang/Object;)Lio/ktor/utils/io/core/ByteReadPacket; + public static final fun read-jfyA9PI (Lio/ktor/utils/io/core/ByteReadPacket;Lio/rsocket/kotlin/metadata/MetadataReader;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/Metadata; + public static synthetic fun read-jfyA9PI$default (Lio/ktor/utils/io/core/ByteReadPacket;Lio/rsocket/kotlin/metadata/MetadataReader;Lio/ktor/utils/io/pool/ObjectPool;ILjava/lang/Object;)Lio/rsocket/kotlin/metadata/Metadata; + public static final fun toPacket-B471DwU (Lio/rsocket/kotlin/metadata/Metadata;Lio/ktor/utils/io/pool/ObjectPool;)Lio/ktor/utils/io/core/ByteReadPacket; + public static synthetic fun toPacket-B471DwU$default (Lio/rsocket/kotlin/metadata/Metadata;Lio/ktor/utils/io/pool/ObjectPool;ILjava/lang/Object;)Lio/ktor/utils/io/core/ByteReadPacket; } public abstract interface class io/rsocket/kotlin/metadata/MetadataReader { public abstract fun getMimeType ()Lio/rsocket/kotlin/core/MimeType; - public abstract fun read-sXCisgc (Lio/ktor/utils/io/core/ByteReadPacket;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/Metadata; + public abstract fun read-B471DwU (Lio/ktor/utils/io/core/ByteReadPacket;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/Metadata; } public final class io/rsocket/kotlin/metadata/PerStreamAcceptableDataMimeTypesMetadata : io/rsocket/kotlin/metadata/Metadata { @@ -491,8 +510,8 @@ public final class io/rsocket/kotlin/metadata/PerStreamAcceptableDataMimeTypesMe public final class io/rsocket/kotlin/metadata/PerStreamAcceptableDataMimeTypesMetadata$Reader : io/rsocket/kotlin/metadata/MetadataReader { public fun getMimeType ()Lio/rsocket/kotlin/core/MimeType; - public synthetic fun read-sXCisgc (Lio/ktor/utils/io/core/ByteReadPacket;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/Metadata; - public fun read-sXCisgc (Lio/ktor/utils/io/core/ByteReadPacket;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/PerStreamAcceptableDataMimeTypesMetadata; + public synthetic fun read-B471DwU (Lio/ktor/utils/io/core/ByteReadPacket;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/Metadata; + public fun read-B471DwU (Lio/ktor/utils/io/core/ByteReadPacket;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/PerStreamAcceptableDataMimeTypesMetadata; } public final class io/rsocket/kotlin/metadata/PerStreamAcceptableDataMimeTypesMetadataKt { @@ -510,8 +529,8 @@ public final class io/rsocket/kotlin/metadata/PerStreamDataMimeTypeMetadata : io public final class io/rsocket/kotlin/metadata/PerStreamDataMimeTypeMetadata$Reader : io/rsocket/kotlin/metadata/MetadataReader { public fun getMimeType ()Lio/rsocket/kotlin/core/MimeType; - public synthetic fun read-sXCisgc (Lio/ktor/utils/io/core/ByteReadPacket;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/Metadata; - public fun read-sXCisgc (Lio/ktor/utils/io/core/ByteReadPacket;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/PerStreamDataMimeTypeMetadata; + public synthetic fun read-B471DwU (Lio/ktor/utils/io/core/ByteReadPacket;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/Metadata; + public fun read-B471DwU (Lio/ktor/utils/io/core/ByteReadPacket;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/PerStreamDataMimeTypeMetadata; } public final class io/rsocket/kotlin/metadata/RawMetadata : io/rsocket/kotlin/metadata/Metadata { @@ -538,8 +557,8 @@ public final class io/rsocket/kotlin/metadata/RoutingMetadata : io/rsocket/kotli public final class io/rsocket/kotlin/metadata/RoutingMetadata$Reader : io/rsocket/kotlin/metadata/MetadataReader { public fun getMimeType ()Lio/rsocket/kotlin/core/MimeType; - public synthetic fun read-sXCisgc (Lio/ktor/utils/io/core/ByteReadPacket;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/Metadata; - public fun read-sXCisgc (Lio/ktor/utils/io/core/ByteReadPacket;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/RoutingMetadata; + public synthetic fun read-B471DwU (Lio/ktor/utils/io/core/ByteReadPacket;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/Metadata; + public fun read-B471DwU (Lio/ktor/utils/io/core/ByteReadPacket;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/RoutingMetadata; } public final class io/rsocket/kotlin/metadata/RoutingMetadataKt { @@ -573,8 +592,8 @@ public final class io/rsocket/kotlin/metadata/ZipkinTracingMetadata$Kind : java/ public final class io/rsocket/kotlin/metadata/ZipkinTracingMetadata$Reader : io/rsocket/kotlin/metadata/MetadataReader { public fun getMimeType ()Lio/rsocket/kotlin/core/MimeType; - public synthetic fun read-sXCisgc (Lio/ktor/utils/io/core/ByteReadPacket;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/Metadata; - public fun read-sXCisgc (Lio/ktor/utils/io/core/ByteReadPacket;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/ZipkinTracingMetadata; + public synthetic fun read-B471DwU (Lio/ktor/utils/io/core/ByteReadPacket;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/Metadata; + public fun read-B471DwU (Lio/ktor/utils/io/core/ByteReadPacket;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/ZipkinTracingMetadata; } public final class io/rsocket/kotlin/metadata/ZipkinTracingMetadataKt { @@ -594,9 +613,9 @@ public abstract interface class io/rsocket/kotlin/metadata/security/AuthMetadata public abstract interface class io/rsocket/kotlin/metadata/security/AuthMetadataReader : io/rsocket/kotlin/metadata/MetadataReader { public fun getMimeType ()Lio/rsocket/kotlin/core/MimeType; - public synthetic fun read-sXCisgc (Lio/ktor/utils/io/core/ByteReadPacket;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/Metadata; - public fun read-sXCisgc (Lio/ktor/utils/io/core/ByteReadPacket;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/security/AuthMetadata; - public abstract fun readContent-FTxoUho (Lio/ktor/utils/io/core/ByteReadPacket;Lio/rsocket/kotlin/metadata/security/AuthType;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/security/AuthMetadata; + public synthetic fun read-B471DwU (Lio/ktor/utils/io/core/ByteReadPacket;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/Metadata; + public fun read-B471DwU (Lio/ktor/utils/io/core/ByteReadPacket;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/security/AuthMetadata; + public abstract fun readContent-jfyA9PI (Lio/ktor/utils/io/core/ByteReadPacket;Lio/rsocket/kotlin/metadata/security/AuthType;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/security/AuthMetadata; } public abstract interface class io/rsocket/kotlin/metadata/security/AuthType { @@ -620,8 +639,8 @@ public final class io/rsocket/kotlin/metadata/security/BearerAuthMetadata : io/r } public final class io/rsocket/kotlin/metadata/security/BearerAuthMetadata$Reader : io/rsocket/kotlin/metadata/security/AuthMetadataReader { - public synthetic fun readContent-FTxoUho (Lio/ktor/utils/io/core/ByteReadPacket;Lio/rsocket/kotlin/metadata/security/AuthType;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/security/AuthMetadata; - public fun readContent-FTxoUho (Lio/ktor/utils/io/core/ByteReadPacket;Lio/rsocket/kotlin/metadata/security/AuthType;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/security/BearerAuthMetadata; + public synthetic fun readContent-jfyA9PI (Lio/ktor/utils/io/core/ByteReadPacket;Lio/rsocket/kotlin/metadata/security/AuthType;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/security/AuthMetadata; + public fun readContent-jfyA9PI (Lio/ktor/utils/io/core/ByteReadPacket;Lio/rsocket/kotlin/metadata/security/AuthType;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/security/BearerAuthMetadata; } public final class io/rsocket/kotlin/metadata/security/CustomAuthType : io/rsocket/kotlin/metadata/security/AuthTypeWithName { @@ -645,16 +664,16 @@ public final class io/rsocket/kotlin/metadata/security/RawAuthMetadata : io/rsoc } public final class io/rsocket/kotlin/metadata/security/RawAuthMetadata$Reader : io/rsocket/kotlin/metadata/security/AuthMetadataReader { - public synthetic fun readContent-FTxoUho (Lio/ktor/utils/io/core/ByteReadPacket;Lio/rsocket/kotlin/metadata/security/AuthType;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/security/AuthMetadata; - public fun readContent-FTxoUho (Lio/ktor/utils/io/core/ByteReadPacket;Lio/rsocket/kotlin/metadata/security/AuthType;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/security/RawAuthMetadata; + public synthetic fun readContent-jfyA9PI (Lio/ktor/utils/io/core/ByteReadPacket;Lio/rsocket/kotlin/metadata/security/AuthType;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/security/AuthMetadata; + public fun readContent-jfyA9PI (Lio/ktor/utils/io/core/ByteReadPacket;Lio/rsocket/kotlin/metadata/security/AuthType;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/security/RawAuthMetadata; } public final class io/rsocket/kotlin/metadata/security/RawAuthMetadataKt { public static final fun hasAuthTypeOf (Lio/rsocket/kotlin/metadata/security/RawAuthMetadata;Lio/rsocket/kotlin/metadata/security/AuthMetadataReader;)Z - public static final fun read-FTxoUho (Lio/rsocket/kotlin/metadata/security/RawAuthMetadata;Lio/rsocket/kotlin/metadata/security/AuthMetadataReader;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/security/AuthMetadata; - public static synthetic fun read-FTxoUho$default (Lio/rsocket/kotlin/metadata/security/RawAuthMetadata;Lio/rsocket/kotlin/metadata/security/AuthMetadataReader;Lio/ktor/utils/io/pool/ObjectPool;ILjava/lang/Object;)Lio/rsocket/kotlin/metadata/security/AuthMetadata; - public static final fun readOrNull-FTxoUho (Lio/rsocket/kotlin/metadata/security/RawAuthMetadata;Lio/rsocket/kotlin/metadata/security/AuthMetadataReader;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/security/AuthMetadata; - public static synthetic fun readOrNull-FTxoUho$default (Lio/rsocket/kotlin/metadata/security/RawAuthMetadata;Lio/rsocket/kotlin/metadata/security/AuthMetadataReader;Lio/ktor/utils/io/pool/ObjectPool;ILjava/lang/Object;)Lio/rsocket/kotlin/metadata/security/AuthMetadata; + public static final fun read-jfyA9PI (Lio/rsocket/kotlin/metadata/security/RawAuthMetadata;Lio/rsocket/kotlin/metadata/security/AuthMetadataReader;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/security/AuthMetadata; + public static synthetic fun read-jfyA9PI$default (Lio/rsocket/kotlin/metadata/security/RawAuthMetadata;Lio/rsocket/kotlin/metadata/security/AuthMetadataReader;Lio/ktor/utils/io/pool/ObjectPool;ILjava/lang/Object;)Lio/rsocket/kotlin/metadata/security/AuthMetadata; + public static final fun readOrNull-jfyA9PI (Lio/rsocket/kotlin/metadata/security/RawAuthMetadata;Lio/rsocket/kotlin/metadata/security/AuthMetadataReader;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/security/AuthMetadata; + public static synthetic fun readOrNull-jfyA9PI$default (Lio/rsocket/kotlin/metadata/security/RawAuthMetadata;Lio/rsocket/kotlin/metadata/security/AuthMetadataReader;Lio/ktor/utils/io/pool/ObjectPool;ILjava/lang/Object;)Lio/rsocket/kotlin/metadata/security/AuthMetadata; } public final class io/rsocket/kotlin/metadata/security/ReservedAuthType : io/rsocket/kotlin/metadata/security/AuthTypeWithId { @@ -679,8 +698,8 @@ public final class io/rsocket/kotlin/metadata/security/SimpleAuthMetadata : io/r } public final class io/rsocket/kotlin/metadata/security/SimpleAuthMetadata$Reader : io/rsocket/kotlin/metadata/security/AuthMetadataReader { - public synthetic fun readContent-FTxoUho (Lio/ktor/utils/io/core/ByteReadPacket;Lio/rsocket/kotlin/metadata/security/AuthType;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/security/AuthMetadata; - public fun readContent-FTxoUho (Lio/ktor/utils/io/core/ByteReadPacket;Lio/rsocket/kotlin/metadata/security/AuthType;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/security/SimpleAuthMetadata; + public synthetic fun readContent-jfyA9PI (Lio/ktor/utils/io/core/ByteReadPacket;Lio/rsocket/kotlin/metadata/security/AuthType;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/security/AuthMetadata; + public fun readContent-jfyA9PI (Lio/ktor/utils/io/core/ByteReadPacket;Lio/rsocket/kotlin/metadata/security/AuthType;Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/metadata/security/SimpleAuthMetadata; } public final class io/rsocket/kotlin/metadata/security/WellKnowAuthType : java/lang/Enum, io/rsocket/kotlin/metadata/security/AuthTypeWithId, io/rsocket/kotlin/metadata/security/AuthTypeWithName { diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/Connection.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/Connection.kt index 8cb03268..145e5ab0 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/Connection.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/Connection.kt @@ -19,7 +19,6 @@ package io.rsocket.kotlin import io.ktor.utils.io.core.* import io.rsocket.kotlin.frame.* import io.rsocket.kotlin.internal.* -import io.rsocket.kotlin.internal.io.* import kotlinx.coroutines.* /** diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/core/RSocketConnector.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/core/RSocketConnector.kt index de4858c0..83e49ef4 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/core/RSocketConnector.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/core/RSocketConnector.kt @@ -20,7 +20,6 @@ import io.rsocket.kotlin.* import io.rsocket.kotlin.frame.* import io.rsocket.kotlin.frame.io.* import io.rsocket.kotlin.internal.* -import io.rsocket.kotlin.internal.io.* import io.rsocket.kotlin.logging.* import io.rsocket.kotlin.transport.* import kotlinx.coroutines.* diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/core/RSocketConnectorBuilder.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/core/RSocketConnectorBuilder.kt index 6adb1ccc..cef8884b 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/core/RSocketConnectorBuilder.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/core/RSocketConnectorBuilder.kt @@ -18,7 +18,6 @@ package io.rsocket.kotlin.core import io.rsocket.kotlin.* import io.rsocket.kotlin.internal.* -import io.rsocket.kotlin.internal.io.* import io.rsocket.kotlin.keepalive.* import io.rsocket.kotlin.logging.* import io.rsocket.kotlin.payload.* diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/core/RSocketServer.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/core/RSocketServer.kt index 0641d839..9d8247ae 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/core/RSocketServer.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/core/RSocketServer.kt @@ -20,7 +20,6 @@ import io.rsocket.kotlin.* import io.rsocket.kotlin.frame.* import io.rsocket.kotlin.frame.io.* import io.rsocket.kotlin.internal.* -import io.rsocket.kotlin.internal.io.* import io.rsocket.kotlin.logging.* import io.rsocket.kotlin.transport.* import kotlinx.coroutines.* diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/core/RSocketServerBuilder.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/core/RSocketServerBuilder.kt index f79538e7..2cb1c527 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/core/RSocketServerBuilder.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/core/RSocketServerBuilder.kt @@ -17,7 +17,7 @@ package io.rsocket.kotlin.core import io.rsocket.kotlin.* -import io.rsocket.kotlin.internal.io.* +import io.rsocket.kotlin.internal.* import io.rsocket.kotlin.logging.* public class RSocketServerBuilder internal constructor() { diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/ExtensionFrame.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/ExtensionFrame.kt index 427fa9be..1cd7d6a4 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/ExtensionFrame.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/ExtensionFrame.kt @@ -18,7 +18,7 @@ package io.rsocket.kotlin.frame import io.ktor.utils.io.core.* import io.rsocket.kotlin.frame.io.* -import io.rsocket.kotlin.internal.io.* +import io.rsocket.kotlin.internal.* import io.rsocket.kotlin.payload.* internal class ExtensionFrame( diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/Frame.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/Frame.kt index 53b3f95c..a24f2a4b 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/Frame.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/Frame.kt @@ -18,7 +18,7 @@ package io.rsocket.kotlin.frame import io.ktor.utils.io.core.* import io.rsocket.kotlin.frame.io.* -import io.rsocket.kotlin.internal.io.* +import io.rsocket.kotlin.internal.* private const val FlagsMask: Int = 1023 private const val FrameTypeShift: Int = 10 diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/KeepAliveFrame.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/KeepAliveFrame.kt index 06d44a77..585d268a 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/KeepAliveFrame.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/KeepAliveFrame.kt @@ -18,7 +18,7 @@ package io.rsocket.kotlin.frame import io.ktor.utils.io.core.* import io.rsocket.kotlin.frame.io.* -import io.rsocket.kotlin.internal.io.* +import io.rsocket.kotlin.internal.* private const val RespondFlag = 128 diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/LeaseFrame.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/LeaseFrame.kt index ab20e34a..478d1f36 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/LeaseFrame.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/LeaseFrame.kt @@ -18,7 +18,7 @@ package io.rsocket.kotlin.frame import io.ktor.utils.io.core.* import io.rsocket.kotlin.frame.io.* -import io.rsocket.kotlin.internal.io.* +import io.rsocket.kotlin.internal.* internal class LeaseFrame( val ttl: Int, diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/MetadataPushFrame.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/MetadataPushFrame.kt index 87dab899..b57d29d6 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/MetadataPushFrame.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/MetadataPushFrame.kt @@ -18,7 +18,7 @@ package io.rsocket.kotlin.frame import io.ktor.utils.io.core.* import io.rsocket.kotlin.frame.io.* -import io.rsocket.kotlin.internal.io.* +import io.rsocket.kotlin.internal.* internal class MetadataPushFrame( val metadata: ByteReadPacket, diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/RequestFrame.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/RequestFrame.kt index 8bc70164..2a3e7c76 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/RequestFrame.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/RequestFrame.kt @@ -20,7 +20,7 @@ package io.rsocket.kotlin.frame import io.ktor.utils.io.core.* import io.rsocket.kotlin.frame.io.* -import io.rsocket.kotlin.internal.io.* +import io.rsocket.kotlin.internal.* import io.rsocket.kotlin.payload.* internal class RequestFrame( diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/ResumeFrame.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/ResumeFrame.kt index 414b86f4..1002eab9 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/ResumeFrame.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/ResumeFrame.kt @@ -18,7 +18,7 @@ package io.rsocket.kotlin.frame import io.ktor.utils.io.core.* import io.rsocket.kotlin.frame.io.* -import io.rsocket.kotlin.internal.io.* +import io.rsocket.kotlin.internal.* internal class ResumeFrame( val version: Version, diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/SetupFrame.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/SetupFrame.kt index 2345226d..36984e25 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/SetupFrame.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/SetupFrame.kt @@ -18,7 +18,7 @@ package io.rsocket.kotlin.frame import io.ktor.utils.io.core.* import io.rsocket.kotlin.frame.io.* -import io.rsocket.kotlin.internal.io.* +import io.rsocket.kotlin.internal.* import io.rsocket.kotlin.keepalive.* import io.rsocket.kotlin.payload.* diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/io/payload.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/io/payload.kt index 289cac11..6c9df70e 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/io/payload.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/io/payload.kt @@ -17,6 +17,7 @@ package io.rsocket.kotlin.frame.io import io.ktor.utils.io.core.* +import io.rsocket.kotlin.internal.* import io.rsocket.kotlin.internal.io.* import io.rsocket.kotlin.payload.* diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/io/util.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/io/util.kt index 377e7dd6..f106c3a8 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/io/util.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/frame/io/util.kt @@ -17,7 +17,7 @@ package io.rsocket.kotlin.frame.io import io.ktor.utils.io.core.* -import io.rsocket.kotlin.internal.io.* +import io.rsocket.kotlin.internal.* internal fun ByteReadPacket.readResumeToken(pool: BufferPool): ByteReadPacket { val length = readShort().toInt() and 0xFFFF diff --git a/rsocket-internal-io/src/commonMain/kotlin/io/rsocket/kotlin/internal/io/BufferPool.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/internal/BufferPool.kt similarity index 97% rename from rsocket-internal-io/src/commonMain/kotlin/io/rsocket/kotlin/internal/io/BufferPool.kt rename to rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/internal/BufferPool.kt index ff5f10c2..c191360f 100644 --- a/rsocket-internal-io/src/commonMain/kotlin/io/rsocket/kotlin/internal/io/BufferPool.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/internal/BufferPool.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.rsocket.kotlin.internal.io +package io.rsocket.kotlin.internal import io.ktor.utils.io.core.* import io.ktor.utils.io.core.internal.* diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/internal/Connect.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/internal/Connect.kt index 3d2ece0a..f4e9f7a0 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/internal/Connect.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/internal/Connect.kt @@ -19,7 +19,6 @@ package io.rsocket.kotlin.internal import io.rsocket.kotlin.* import io.rsocket.kotlin.core.* import io.rsocket.kotlin.frame.* -import io.rsocket.kotlin.internal.io.* import kotlinx.coroutines.* @OptIn(TransportApi::class) diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/internal/FrameSender.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/internal/FrameSender.kt index 240936bb..4bb5cfe6 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/internal/FrameSender.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/internal/FrameSender.kt @@ -19,7 +19,6 @@ package io.rsocket.kotlin.internal import io.ktor.utils.io.core.* import io.rsocket.kotlin.frame.* import io.rsocket.kotlin.frame.io.* -import io.rsocket.kotlin.internal.io.* import io.rsocket.kotlin.payload.* import kotlinx.coroutines.* import kotlin.math.* diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/internal/LoggingConnection.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/internal/LoggingConnection.kt index 0ac632b8..5f5fcbd1 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/internal/LoggingConnection.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/internal/LoggingConnection.kt @@ -21,7 +21,6 @@ package io.rsocket.kotlin.internal import io.ktor.utils.io.core.* import io.rsocket.kotlin.* import io.rsocket.kotlin.frame.* -import io.rsocket.kotlin.internal.io.* import io.rsocket.kotlin.logging.* internal fun Connection.logging(logger: Logger, bufferPool: BufferPool): Connection = diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/CompositeMetadata.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/CompositeMetadata.kt index 1e2b75a5..8bed39b4 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/CompositeMetadata.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/CompositeMetadata.kt @@ -20,6 +20,7 @@ import io.ktor.utils.io.core.* import io.rsocket.kotlin.* import io.rsocket.kotlin.core.* import io.rsocket.kotlin.frame.io.* +import io.rsocket.kotlin.internal.* import io.rsocket.kotlin.internal.io.* @ExperimentalMetadataApi diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/CompositeMetadataExtensions.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/CompositeMetadataExtensions.kt index 18c480fe..37343e4a 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/CompositeMetadataExtensions.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/CompositeMetadataExtensions.kt @@ -19,7 +19,7 @@ package io.rsocket.kotlin.metadata import io.ktor.utils.io.core.* import io.rsocket.kotlin.* import io.rsocket.kotlin.core.* -import io.rsocket.kotlin.internal.io.* +import io.rsocket.kotlin.internal.* @ExperimentalMetadataApi public fun CompositeMetadata.Entry.hasMimeTypeOf(reader: MetadataReader<*>): Boolean = mimeType == reader.mimeType diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/Metadata.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/Metadata.kt index 11085933..2b4d8326 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/Metadata.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/Metadata.kt @@ -19,7 +19,7 @@ package io.rsocket.kotlin.metadata import io.ktor.utils.io.core.* import io.rsocket.kotlin.* import io.rsocket.kotlin.core.* -import io.rsocket.kotlin.internal.io.* +import io.rsocket.kotlin.internal.* import io.rsocket.kotlin.payload.* @ExperimentalMetadataApi diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/PerStreamAcceptableDataMimeTypesMetadata.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/PerStreamAcceptableDataMimeTypesMetadata.kt index c3de0e13..f0a9029a 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/PerStreamAcceptableDataMimeTypesMetadata.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/PerStreamAcceptableDataMimeTypesMetadata.kt @@ -20,7 +20,7 @@ import io.ktor.utils.io.core.* import io.rsocket.kotlin.* import io.rsocket.kotlin.core.* import io.rsocket.kotlin.frame.io.* -import io.rsocket.kotlin.internal.io.* +import io.rsocket.kotlin.internal.* @ExperimentalMetadataApi public fun PerStreamAcceptableDataMimeTypesMetadata(vararg tags: MimeType): PerStreamAcceptableDataMimeTypesMetadata = diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/PerStreamDataMimeTypeMetadata.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/PerStreamDataMimeTypeMetadata.kt index b28c5efc..78a41fbd 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/PerStreamDataMimeTypeMetadata.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/PerStreamDataMimeTypeMetadata.kt @@ -20,7 +20,7 @@ import io.ktor.utils.io.core.* import io.rsocket.kotlin.* import io.rsocket.kotlin.core.* import io.rsocket.kotlin.frame.io.* -import io.rsocket.kotlin.internal.io.* +import io.rsocket.kotlin.internal.* @ExperimentalMetadataApi public class PerStreamDataMimeTypeMetadata(public val type: MimeType) : Metadata { diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/RawMetadata.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/RawMetadata.kt index 366d8008..92c6acb2 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/RawMetadata.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/RawMetadata.kt @@ -20,7 +20,7 @@ import io.ktor.utils.io.core.* import io.rsocket.kotlin.* import io.rsocket.kotlin.core.* import io.rsocket.kotlin.frame.io.* -import io.rsocket.kotlin.internal.io.* +import io.rsocket.kotlin.internal.* @ExperimentalMetadataApi public class RawMetadata( diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/RoutingMetadata.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/RoutingMetadata.kt index da1913d0..8b1770a6 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/RoutingMetadata.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/RoutingMetadata.kt @@ -19,7 +19,7 @@ package io.rsocket.kotlin.metadata import io.ktor.utils.io.core.* import io.rsocket.kotlin.* import io.rsocket.kotlin.core.* -import io.rsocket.kotlin.internal.io.* +import io.rsocket.kotlin.internal.* @ExperimentalMetadataApi public fun RoutingMetadata(vararg tags: String): RoutingMetadata = RoutingMetadata(tags.toList()) diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/ZipkinTracingMetadata.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/ZipkinTracingMetadata.kt index 7787f9c2..b1b9818d 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/ZipkinTracingMetadata.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/ZipkinTracingMetadata.kt @@ -20,7 +20,7 @@ import io.ktor.utils.io.core.* import io.rsocket.kotlin.* import io.rsocket.kotlin.core.* import io.rsocket.kotlin.frame.io.* -import io.rsocket.kotlin.internal.io.* +import io.rsocket.kotlin.internal.* import kotlin.experimental.* @ExperimentalMetadataApi diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/security/AuthMetadata.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/security/AuthMetadata.kt index a02c7cf5..9a68432f 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/security/AuthMetadata.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/security/AuthMetadata.kt @@ -20,7 +20,7 @@ import io.ktor.utils.io.core.* import io.rsocket.kotlin.* import io.rsocket.kotlin.core.* import io.rsocket.kotlin.frame.io.* -import io.rsocket.kotlin.internal.io.* +import io.rsocket.kotlin.internal.* import io.rsocket.kotlin.metadata.* @ExperimentalMetadataApi diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/security/BearerAuthMetadata.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/security/BearerAuthMetadata.kt index bd59a815..5c3b4fa1 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/security/BearerAuthMetadata.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/security/BearerAuthMetadata.kt @@ -18,7 +18,7 @@ package io.rsocket.kotlin.metadata.security import io.ktor.utils.io.core.* import io.rsocket.kotlin.* -import io.rsocket.kotlin.internal.io.* +import io.rsocket.kotlin.internal.* @ExperimentalMetadataApi public class BearerAuthMetadata( diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/security/RawAuthMetadata.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/security/RawAuthMetadata.kt index 2dfa8075..a7f909df 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/security/RawAuthMetadata.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/security/RawAuthMetadata.kt @@ -19,7 +19,7 @@ package io.rsocket.kotlin.metadata.security import io.ktor.utils.io.core.* import io.rsocket.kotlin.* import io.rsocket.kotlin.frame.io.* -import io.rsocket.kotlin.internal.io.* +import io.rsocket.kotlin.internal.* @ExperimentalMetadataApi public class RawAuthMetadata( diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/security/SimpleAuthMetadata.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/security/SimpleAuthMetadata.kt index 8a3be020..8cbc16c0 100644 --- a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/security/SimpleAuthMetadata.kt +++ b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/metadata/security/SimpleAuthMetadata.kt @@ -18,7 +18,7 @@ package io.rsocket.kotlin.metadata.security import io.ktor.utils.io.core.* import io.rsocket.kotlin.* -import io.rsocket.kotlin.internal.io.* +import io.rsocket.kotlin.internal.* @ExperimentalMetadataApi public class SimpleAuthMetadata( diff --git a/rsocket-internal-io/api/rsocket-internal-io.api b/rsocket-internal-io/api/rsocket-internal-io.api index 2245d547..b51a5afd 100644 --- a/rsocket-internal-io/api/rsocket-internal-io.api +++ b/rsocket-internal-io/api/rsocket-internal-io.api @@ -1,22 +1,3 @@ -public final class io/rsocket/kotlin/internal/io/BufferPool { - public static final field Companion Lio/rsocket/kotlin/internal/io/BufferPool$Companion; - public static final synthetic fun box-impl (Lio/ktor/utils/io/pool/ObjectPool;)Lio/rsocket/kotlin/internal/io/BufferPool; - public static final fun buildPacket-impl (Lio/ktor/utils/io/pool/ObjectPool;Lkotlin/jvm/functions/Function1;)Lio/ktor/utils/io/core/ByteReadPacket; - public static fun constructor-impl (Lio/ktor/utils/io/pool/ObjectPool;)Lio/ktor/utils/io/pool/ObjectPool; - public fun equals (Ljava/lang/Object;)Z - public static fun equals-impl (Lio/ktor/utils/io/pool/ObjectPool;Ljava/lang/Object;)Z - public static final fun equals-impl0 (Lio/ktor/utils/io/pool/ObjectPool;Lio/ktor/utils/io/pool/ObjectPool;)Z - public fun hashCode ()I - public static fun hashCode-impl (Lio/ktor/utils/io/pool/ObjectPool;)I - public fun toString ()Ljava/lang/String; - public static fun toString-impl (Lio/ktor/utils/io/pool/ObjectPool;)Ljava/lang/String; - public final synthetic fun unbox-impl ()Lio/ktor/utils/io/pool/ObjectPool; -} - -public final class io/rsocket/kotlin/internal/io/BufferPool$Companion { - public final fun getDefault-ulmh1bs ()Lio/ktor/utils/io/pool/ObjectPool; -} - public final class io/rsocket/kotlin/internal/io/ChannelsKt { public static final fun cancelWithCause (Lkotlinx/coroutines/channels/Channel;Ljava/lang/Throwable;)V public static final fun channelForCloseable (I)Lkotlinx/coroutines/channels/Channel; diff --git a/rsocket-test/src/commonMain/kotlin/io/rsocket/kotlin/test/InUseTrackingPool.kt b/rsocket-test/src/commonMain/kotlin/io/rsocket/kotlin/test/InUseTrackingPool.kt index 7a4dbc56..86cb1c65 100644 --- a/rsocket-test/src/commonMain/kotlin/io/rsocket/kotlin/test/InUseTrackingPool.kt +++ b/rsocket-test/src/commonMain/kotlin/io/rsocket/kotlin/test/InUseTrackingPool.kt @@ -20,7 +20,7 @@ import io.ktor.utils.io.bits.* import io.ktor.utils.io.core.* import io.ktor.utils.io.core.internal.* import io.ktor.utils.io.pool.* -import io.rsocket.kotlin.internal.io.* +import io.rsocket.kotlin.internal.* import kotlinx.atomicfu.locks.* import kotlin.test.*