Split JvmAndNative SdkBuffer back into Jvm and Native

Author: lauzadis

runtime/crt-util/jvm/src/aws/smithy/kotlin/runtime/crt/ReadChannelBodyStreamJvm.kt

@@ -7,6 +7,5 @@ package aws.smithy.kotlin.runtime.crt
 
 import aws.sdk.kotlin.crt.io.MutableBuffer
 import aws.smithy.kotlin.runtime.io.SdkBuffer
-import aws.smithy.kotlin.runtime.io.read
 
 internal actual fun transferRequestBody(outgoing: SdkBuffer, dest: MutableBuffer) = outgoing.read(dest.buffer)

runtime/runtime-core/api/runtime-core.api

@@ -871,10 +871,6 @@ public final class aws/smithy/kotlin/runtime/io/HashingSource : aws/smithy/kotli
 }
 
 public final class aws/smithy/kotlin/runtime/io/JavaIOKt {
-	public static final fun inputStream (Laws/smithy/kotlin/runtime/io/SdkBuffer;)Ljava/io/InputStream;
-	public static final fun isOpen (Laws/smithy/kotlin/runtime/io/SdkBuffer;)Z
-	public static final fun outputStream (Laws/smithy/kotlin/runtime/io/SdkBuffer;)Ljava/io/OutputStream;
-	public static final fun read (Laws/smithy/kotlin/runtime/io/SdkBuffer;Ljava/nio/ByteBuffer;)I
 	public static final fun sink (Ljava/io/File;)Laws/smithy/kotlin/runtime/io/SdkSink;
 	public static final fun sink (Ljava/io/OutputStream;)Laws/smithy/kotlin/runtime/io/SdkSink;
 	public static final fun sink (Ljava/nio/file/Path;)Laws/smithy/kotlin/runtime/io/SdkSink;
@@ -885,7 +881,6 @@ public final class aws/smithy/kotlin/runtime/io/JavaIOKt {
 	public static final fun source (Ljava/nio/file/Path;Lkotlin/ranges/LongRange;)Laws/smithy/kotlin/runtime/io/SdkSource;
 	public static synthetic fun source$default (Ljava/io/File;JJILjava/lang/Object;)Laws/smithy/kotlin/runtime/io/SdkSource;
 	public static synthetic fun source$default (Ljava/nio/file/Path;JJILjava/lang/Object;)Laws/smithy/kotlin/runtime/io/SdkSource;
-	public static final fun write (Laws/smithy/kotlin/runtime/io/SdkBuffer;Ljava/nio/ByteBuffer;)I
 }
 
 public final class aws/smithy/kotlin/runtime/io/SdkBuffer : aws/smithy/kotlin/runtime/io/SdkBufferedSink, aws/smithy/kotlin/runtime/io/SdkBufferedSource {
@@ -898,8 +893,12 @@ public final class aws/smithy/kotlin/runtime/io/SdkBuffer : aws/smithy/kotlin/ru
 	public fun getBuffer ()Laws/smithy/kotlin/runtime/io/SdkBuffer;
 	public final fun getSize ()J
 	public fun hashCode ()I
+	public fun inputStream ()Ljava/io/InputStream;
+	public fun isOpen ()Z
+	public fun outputStream ()Ljava/io/OutputStream;
 	public fun peek ()Laws/smithy/kotlin/runtime/io/SdkBufferedSource;
 	public fun read (Laws/smithy/kotlin/runtime/io/SdkBuffer;J)J
+	public fun read (Ljava/nio/ByteBuffer;)I
 	public fun read ([BII)I
 	public fun readAll (Laws/smithy/kotlin/runtime/io/SdkSink;)J
 	public fun readByte ()B
@@ -919,6 +918,7 @@ public final class aws/smithy/kotlin/runtime/io/SdkBuffer : aws/smithy/kotlin/ru
 	public fun toString ()Ljava/lang/String;
 	public fun write (Laws/smithy/kotlin/runtime/io/SdkBuffer;J)V
 	public fun write (Laws/smithy/kotlin/runtime/io/SdkSource;J)V
+	public fun write (Ljava/nio/ByteBuffer;)I
 	public fun write ([BII)V
 	public fun writeAll (Laws/smithy/kotlin/runtime/io/SdkSource;)J
 	public fun writeByte (B)V
@@ -931,9 +931,11 @@ public final class aws/smithy/kotlin/runtime/io/SdkBuffer : aws/smithy/kotlin/ru
 	public fun writeUtf8 (Ljava/lang/String;II)V
 }
 
-public abstract interface class aws/smithy/kotlin/runtime/io/SdkBufferedSink : aws/smithy/kotlin/runtime/io/SdkSink {
+public abstract interface class aws/smithy/kotlin/runtime/io/SdkBufferedSink : aws/smithy/kotlin/runtime/io/SdkSink, java/nio/channels/WritableByteChannel {
 	public abstract fun emit ()V
+	public abstract fun flush ()V
 	public abstract fun getBuffer ()Laws/smithy/kotlin/runtime/io/SdkBuffer;
+	public abstract fun outputStream ()Ljava/io/OutputStream;
 	public abstract fun write (Laws/smithy/kotlin/runtime/io/SdkSource;J)V
 	public abstract fun write ([BII)V
 	public static synthetic fun write$default (Laws/smithy/kotlin/runtime/io/SdkBufferedSink;[BIIILjava/lang/Object;)V
@@ -954,9 +956,10 @@ public final class aws/smithy/kotlin/runtime/io/SdkBufferedSink$DefaultImpls {
 	public static synthetic fun writeUtf8$default (Laws/smithy/kotlin/runtime/io/SdkBufferedSink;Ljava/lang/String;IIILjava/lang/Object;)V
 }
 
-public abstract interface class aws/smithy/kotlin/runtime/io/SdkBufferedSource : aws/smithy/kotlin/runtime/io/SdkSource {
+public abstract interface class aws/smithy/kotlin/runtime/io/SdkBufferedSource : aws/smithy/kotlin/runtime/io/SdkSource, java/nio/channels/ReadableByteChannel {
 	public abstract fun exhausted ()Z
 	public abstract fun getBuffer ()Laws/smithy/kotlin/runtime/io/SdkBuffer;
+	public abstract fun inputStream ()Ljava/io/InputStream;
 	public abstract fun peek ()Laws/smithy/kotlin/runtime/io/SdkBufferedSource;
 	public abstract fun read ([BII)I
 	public static synthetic fun read$default (Laws/smithy/kotlin/runtime/io/SdkBufferedSource;[BIIILjava/lang/Object;)I

runtime/runtime-core/jvm/src/aws/smithy/kotlin/runtime/io/BufferedSinkAdapterJVM.kt

@@ -0,0 +1,20 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package aws.smithy.kotlin.runtime.io
+
+import java.io.OutputStream
+import java.nio.ByteBuffer
+
+internal actual class BufferedSinkAdapter actual constructor(
+    sink: okio.BufferedSink,
+) : AbstractBufferedSinkAdapter(sink),
+    SdkBufferedSink {
+    override fun write(src: ByteBuffer): Int = delegate.write(src)
+
+    override fun isOpen(): Boolean = delegate.isOpen
+
+    override fun outputStream(): OutputStream = delegate.outputStream()
+}

runtime/runtime-core/jvm/src/aws/smithy/kotlin/runtime/io/BufferedSourceAdapterJVM.kt

@@ -0,0 +1,21 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package aws.smithy.kotlin.runtime.io
+
+import java.io.InputStream
+import java.nio.ByteBuffer
+
+internal actual class BufferedSourceAdapter actual constructor(
+    source: okio.BufferedSource,
+) : AbstractBufferedSourceAdapter(source),
+    SdkBufferedSource {
+
+    override fun read(dst: ByteBuffer): Int = delegate.read(dst)
+
+    override fun isOpen(): Boolean = delegate.isOpen
+
+    override fun inputStream(): InputStream = delegate.inputStream()
+}

runtime/runtime-core/jvm/src/aws/smithy/kotlin/runtime/io/JavaIO.kt

@@ -60,20 +60,3 @@ public fun InputStream.source(): SdkSource = okioSource().toSdk()
  * Create a new [SdkSource] that reads from this [InputStream]
  */
 public fun OutputStream.sink(): SdkSink = okioSink().toSdk()
-
-// BufferedSinkAdapter
-internal fun BufferedSinkAdapter.outputStream(): OutputStream = delegate.outputStream()
-internal fun BufferedSinkAdapter.write(src: ByteBuffer): Int = delegate.write(src)
-internal fun BufferedSinkAdapter.isOpen(): Boolean = delegate.isOpen
-
-// BufferedSourceAdapter
-internal fun BufferedSourceAdapter.read(dst: ByteBuffer): Int = delegate.read(dst)
-internal fun BufferedSourceAdapter.isOpen(): Boolean = delegate.isOpen
-internal fun BufferedSourceAdapter.inputStream(): InputStream = delegate.inputStream()
-
-// SdkBuffer
-public fun SdkBuffer.read(dst: ByteBuffer): Int = wrapOkio { inner.read(dst) }
-public fun SdkBuffer.write(src: ByteBuffer): Int = wrapOkio { inner.write(src) }
-public fun SdkBuffer.isOpen(): Boolean = inner.isOpen
-public fun SdkBuffer.inputStream(): InputStream = inner.inputStream()
-public fun SdkBuffer.outputStream(): OutputStream = inner.outputStream()

runtime/runtime-core/jvm/src/aws/smithy/kotlin/runtime/io/SdkBufferJVM.kt

@@ -0,0 +1,122 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package aws.smithy.kotlin.runtime.io
+
+import aws.smithy.kotlin.runtime.io.internal.*
+import java.io.InputStream
+import java.io.OutputStream
+import java.nio.ByteBuffer
+
+// FIXME Commonize with Native after removing WritableByteStream / ReadableByteStream in 1.6.x
+public actual class SdkBuffer :
+    SdkBufferedSource,
+    SdkBufferedSink {
+    public actual constructor() : this(okio.Buffer())
+
+    internal actual val inner: okio.Buffer
+
+    internal actual constructor(buffer: okio.Buffer) {
+        this.inner = buffer
+    }
+
+    public actual val size: Long
+        get() = inner.size
+
+    actual override val buffer: SdkBuffer
+        get() = this
+
+    override fun toString(): String = inner.toString()
+
+    override fun hashCode(): Int = inner.hashCode()
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is SdkBuffer) return false
+        return inner == other.inner
+    }
+
+    actual override fun skip(byteCount: Long): Unit = commonSkip(byteCount)
+
+    actual override fun readByte(): Byte = commonReadByte()
+
+    actual override fun readShort(): Short = commonReadShort()
+
+    actual override fun readShortLe(): Short = commonReadShortLe()
+
+    actual override fun readLong(): Long = commonReadLong()
+
+    actual override fun readLongLe(): Long = commonReadLongLe()
+
+    actual override fun readInt(): Int = commonReadInt()
+
+    actual override fun readIntLe(): Int = commonReadIntLe()
+
+    actual override fun readAll(sink: SdkSink): Long = commonReadAll(sink)
+
+    actual override fun read(sink: ByteArray, offset: Int, limit: Int): Int =
+        commonRead(sink, offset, limit)
+
+    actual override fun read(sink: SdkBuffer, limit: Long): Long =
+        commonRead(sink, limit)
+
+    override fun read(dst: ByteBuffer): Int = inner.read(dst)
+
+    actual override fun readByteArray(): ByteArray = commonReadByteArray()
+
+    actual override fun readByteArray(byteCount: Long): ByteArray = commonReadByteArray(byteCount)
+
+    actual override fun readUtf8(): String = commonReadUtf8()
+
+    actual override fun readUtf8(byteCount: Long): String = commonReadUtf8(byteCount)
+
+    actual override fun peek(): SdkBufferedSource = commonPeek()
+
+    actual override fun exhausted(): Boolean = commonExhausted()
+    actual override fun request(byteCount: Long): Boolean = commonRequest(byteCount)
+
+    actual override fun require(byteCount: Long): Unit = commonRequire(byteCount)
+
+    actual override fun write(source: ByteArray, offset: Int, limit: Int): Unit =
+        commonWrite(source, offset, limit)
+
+    actual override fun write(source: SdkSource, byteCount: Long): Unit =
+        commonWrite(source, byteCount)
+
+    actual override fun write(source: SdkBuffer, byteCount: Long): Unit =
+        commonWrite(source, byteCount)
+
+    override fun write(src: ByteBuffer): Int = inner.write(src)
+
+    actual override fun writeAll(source: SdkSource): Long = commonWriteAll(source)
+
+    actual override fun writeUtf8(string: String, start: Int, endExclusive: Int): Unit =
+        commonWriteUtf8(string, start, endExclusive)
+
+    actual override fun writeByte(x: Byte): Unit = commonWriteByte(x)
+
+    actual override fun writeShort(x: Short): Unit = commonWriteShort(x)
+
+    actual override fun writeShortLe(x: Short): Unit = commonWriteShortLe(x)
+
+    actual override fun writeInt(x: Int): Unit = commonWriteInt(x)
+
+    actual override fun writeIntLe(x: Int): Unit = commonWriteIntLe(x)
+
+    actual override fun writeLong(x: Long): Unit = commonWriteLong(x)
+
+    actual override fun writeLongLe(x: Long): Unit = commonWriteLongLe(x)
+
+    actual override fun flush(): Unit = commonFlush()
+
+    actual override fun emit() {
+        inner.emit()
+    }
+    actual override fun close(): Unit = commonClose()
+    override fun isOpen(): Boolean = inner.isOpen
+
+    override fun inputStream(): InputStream = inner.inputStream()
+    override fun outputStream(): OutputStream = inner.outputStream()
+}

runtime/runtime-core/jvm/src/aws/smithy/kotlin/runtime/io/SdkBufferedSinkJVM.kt

@@ -0,0 +1,109 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package aws.smithy.kotlin.runtime.io
+
+import java.io.OutputStream
+import java.nio.channels.WritableByteChannel
+import kotlin.jvm.Throws
+
+/**
+ * A sink that keeps a buffer internally so that callers can do small writes without
+ * a performance penalty.
+ */
+public actual sealed interface SdkBufferedSink :
+    SdkSink,
+    WritableByteChannel {
+    /**
+     * The underlying buffer for this sink
+     */
+    public actual val buffer: SdkBuffer
+
+    /**
+     * Write [limit] bytes from [source] starting at [offset]
+     */
+    @Throws(IOException::class)
+    public actual fun write(source: ByteArray, offset: Int, limit: Int): Unit
+
+    /**
+     * Write all bytes from [source] to this sink.
+     * @return the number of bytes read which will be 0 if [source] is exhausted
+     */
+    @Throws(IOException::class)
+    public actual fun writeAll(source: SdkSource): Long
+
+    /**
+     * Removes [byteCount] bytes from [source] and writes them to this sink.
+     */
+    @Throws(IOException::class)
+    public actual fun write(source: SdkSource, byteCount: Long): Unit
+
+    /**
+     * Write UTF8-bytes of [string] to this sink starting at [start] index up to [endExclusive] index.
+     */
+    @Throws(IOException::class)
+    public actual fun writeUtf8(string: String, start: Int, endExclusive: Int): Unit
+
+    /**
+     * Writes byte [x] to this sink
+     */
+    @Throws(IOException::class)
+    public actual fun writeByte(x: Byte): Unit
+
+    /**
+     * Writes short [x] as a big-endian bytes to this sink
+     */
+    @Throws(IOException::class)
+    public actual fun writeShort(x: Short): Unit
+
+    /**
+     * Writes short [x] as a little-endian bytes to this sink
+     */
+    @Throws(IOException::class)
+    public actual fun writeShortLe(x: Short): Unit
+
+    /**
+     * Writes int [x] as a big-endian bytes to this sink
+     */
+    @Throws(IOException::class)
+    public actual fun writeInt(x: Int): Unit
+
+    /**
+     * Writes int [x] as a little-endian bytes to this sink
+     */
+    @Throws(IOException::class)
+    public actual fun writeIntLe(x: Int): Unit
+
+    /**
+     * Writes long [x] as a big-endian bytes to this sink
+     */
+    @Throws(IOException::class)
+    public actual fun writeLong(x: Long): Unit
+
+    /**
+     * Writes long [x] as a little-endian bytes to this sink
+     */
+    @Throws(IOException::class)
+    public actual fun writeLongLe(x: Long): Unit
+
+    /**
+     * Return an output stream that writes to this sink
+     */
+    public fun outputStream(): OutputStream
+
+    /**
+     * Writes all buffered data to the underlying sink.
+     */
+    @Throws(IOException::class)
+    actual override fun flush(): Unit
+
+    /**
+     * Writes all buffered data to the underlying sink. Like flush, but weaker (ensures data is pushed to the
+     * underlying sink but not necessarily all the way down the chain like [flush] does). Call before this sink
+     * goes out of scope to ensure any buffered data eventually gets to its final destination
+     */
+    @Throws(IOException::class)
+    public actual fun emit(): Unit
+}