Buffer implementation

Author: lauzadis

runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/Canonicalizer.kt

@@ -12,14 +12,15 @@ import aws.smithy.kotlin.runtime.http.request.HttpRequest
 import aws.smithy.kotlin.runtime.http.request.HttpRequestBuilder
 import aws.smithy.kotlin.runtime.http.request.toBuilder
 import aws.smithy.kotlin.runtime.io.*
-import aws.smithy.kotlin.runtime.io.internal.SdkDispatchers
 import aws.smithy.kotlin.runtime.net.url.QueryParameters
 import aws.smithy.kotlin.runtime.net.url.Url
 import aws.smithy.kotlin.runtime.net.url.UrlPath
 import aws.smithy.kotlin.runtime.text.encoding.Encodable
 import aws.smithy.kotlin.runtime.text.encoding.PercentEncoding
 import aws.smithy.kotlin.runtime.text.encoding.encodeToHex
 import aws.smithy.kotlin.runtime.time.TimestampFormat
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.IO
 import kotlinx.coroutines.withContext
 
 /**
@@ -162,7 +163,7 @@ internal class DefaultCanonicalizer(private val sha256Supplier: HashSupplier = :
             }
             is HttpBody.SourceContent -> {
                 val source = readFrom()
-                withContext(SdkDispatchers.IO) {
+                withContext(Dispatchers.IO) {
                     source.sha256().encodeToHex()
                 }
             }

runtime/protocol/http-client-engines/http-client-engine-crt/jvmAndNative/src/aws/smithy/kotlin/runtime/http/engine/crt/CrtHttpEngine.kt

@@ -11,7 +11,6 @@ import aws.smithy.kotlin.runtime.http.engine.HttpClientEngine
 import aws.smithy.kotlin.runtime.http.engine.HttpClientEngineBase
 import aws.smithy.kotlin.runtime.http.engine.callContext
 import aws.smithy.kotlin.runtime.http.request.HttpRequest
-import aws.smithy.kotlin.runtime.io.internal.SdkDispatchers
 import aws.smithy.kotlin.runtime.operation.ExecutionContext
 import aws.smithy.kotlin.runtime.telemetry.logging.logger
 import aws.smithy.kotlin.runtime.time.Instant
@@ -84,7 +83,7 @@ public class CrtHttpEngine(public override val config: CrtHttpEngineConfig) : Ht
         }
 
         if (request.isChunked) {
-            withContext(SdkDispatchers.IO) {
+            withContext(Dispatchers.IO) {
                 stream.sendChunkedBody(request.body)
             }
         }

runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/content/ByteStream.kt

@@ -5,8 +5,9 @@
 package aws.smithy.kotlin.runtime.content
 
 import aws.smithy.kotlin.runtime.io.*
-import aws.smithy.kotlin.runtime.io.internal.SdkDispatchers
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.IO
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 
@@ -119,7 +120,7 @@ public fun ByteStream.cancel() {
 public fun ByteStream.toFlow(bufferSize: Long = 8192): Flow<ByteArray> = when (this) {
     is ByteStream.Buffer -> flowOf(bytes())
     is ByteStream.ChannelStream -> readFrom().toFlow(bufferSize)
-    is ByteStream.SourceStream -> readFrom().toFlow(bufferSize).flowOn(SdkDispatchers.IO)
+    is ByteStream.SourceStream -> readFrom().toFlow(bufferSize).flowOn(Dispatchers.IO)
 }
 
 /**

runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/io/SdkByteReadChannel.kt

@@ -4,7 +4,8 @@
  */
 package aws.smithy.kotlin.runtime.io
 
-import aws.smithy.kotlin.runtime.io.internal.SdkDispatchers
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.IO
 import kotlinx.coroutines.withContext
 
 /**
@@ -104,7 +105,7 @@ public suspend fun SdkByteReadChannel.readToBuffer(): SdkBuffer {
 /**
  * Read all bytes from this channel into [sink]. Returns the total number of bytes written.
  */
-public suspend fun SdkByteReadChannel.readAll(sink: SdkSink): Long = withContext(SdkDispatchers.IO) {
+public suspend fun SdkByteReadChannel.readAll(sink: SdkSink): Long = withContext(Dispatchers.IO) {
     val bufferedSink = sink.buffer()
     var totalWritten = 0L
     while (true) {
@@ -120,7 +121,7 @@ public suspend fun SdkByteReadChannel.readAll(sink: SdkSink): Long = withContext
 /**
  * Removes all bytes from [source] and writes them to this channel. Returns the total number of bytes read.
  */
-public suspend fun SdkByteWriteChannel.writeAll(source: SdkSource): Long = withContext(SdkDispatchers.IO) {
+public suspend fun SdkByteWriteChannel.writeAll(source: SdkSource): Long = withContext(Dispatchers.IO) {
     val buffer = SdkBuffer()
     var totalRead = 0L
     while (true) {

runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/io/internal/SdkDispatchers.kt

@@ -4,4 +4,6 @@
  */
 package aws.smithy.kotlin.runtime.io
 
-internal actual class BufferedSinkAdapter actual constructor(sink: okio.BufferedSink) : SdkBufferedSink, AbstractBufferedSinkAdapter(sink)
+internal actual class BufferedSinkAdapter actual constructor(sink: okio.BufferedSink) :
+    AbstractBufferedSinkAdapter(sink),
+    SdkBufferedSink

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

@@ -4,4 +4,6 @@
  */
 package aws.smithy.kotlin.runtime.io
 
-internal actual class BufferedSourceAdapter actual constructor(source: okio.BufferedSource) : SdkBufferedSource, AbstractBufferedSourceAdapter(source)
+internal actual class BufferedSourceAdapter actual constructor(source: okio.BufferedSource) :
+    AbstractBufferedSourceAdapter(source),
+    SdkBufferedSource

runtime/runtime-core/native/src/aws/smithy/kotlin/runtime/io/BufferedSinkAdapterNative.kt

@@ -59,7 +59,9 @@ public actual class SdkBuffer :
 
     actual override fun flush(): Unit = commonFlush()
 
-    actual override fun emit() { inner.emit() }
+    actual override fun emit() {
+        inner.emit()
+    }
 
     actual override fun skip(byteCount: Long): Unit = commonSkip(byteCount)