Add flush() and close() to Sink and Source

xhcom-ui · Apr 4, 2019 · 6fe6a01 · 6fe6a01
1 parent 9d009c1
commit 6fe6a01
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 5 deletions.
diff --git a/okio/js/src/main/kotlin/okio/Buffer.kt b/okio/js/src/main/kotlin/okio/Buffer.kt
@@ -151,5 +151,13 @@ actual class Buffer : BufferedSource, BufferedSink {
     byteCount: Int
   ): Boolean = throw UnsupportedOperationException()
 
+  actual override fun flush() {
+    throw UnsupportedOperationException()
+  }
+
+  actual override fun close() {
+    throw UnsupportedOperationException()
+  }
+
   actual override fun timeout(): Timeout = throw UnsupportedOperationException()
 }
diff --git a/okio/js/src/main/kotlin/okio/Sink.kt b/okio/js/src/main/kotlin/okio/Sink.kt
@@ -18,5 +18,9 @@ package okio
 actual interface Sink {
   actual fun write(source: Buffer, byteCount: Long)
 
+  actual fun flush()
+
   actual fun timeout(): Timeout
+
+  actual fun close()
 }
diff --git a/okio/js/src/main/kotlin/okio/Source.kt b/okio/js/src/main/kotlin/okio/Source.kt
@@ -19,4 +19,6 @@ actual interface Source {
   actual fun read(sink: Buffer, byteCount: Long): Long
 
   actual fun timeout(): Timeout
+
+  actual fun close()
 }
diff --git a/okio/jvm/src/main/java/okio/Buffer.kt b/okio/jvm/src/main/java/okio/Buffer.kt
@@ -1614,11 +1614,11 @@ actual class Buffer : BufferedSource, BufferedSink, Cloneable, ByteChannel {
     return true
   }
 
-  override fun flush() {}
+  actual override fun flush() {}
 
   override fun isOpen() = true
 
-  override fun close() {}
+  actual override fun close() {}
 
   actual override fun timeout() = Timeout.NONE
 

diff --git a/okio/jvm/src/main/java/okio/Sink.kt b/okio/jvm/src/main/java/okio/Sink.kt
@@ -53,7 +53,7 @@ actual interface Sink : Closeable, Flushable {
 
   /** Pushes all buffered bytes to their final destination.  */
   @Throws(IOException::class)
-  override fun flush()
+  actual override fun flush()
 
   /** Returns the timeout for this sink.  */
   actual fun timeout(): Timeout
@@ -63,5 +63,5 @@ actual interface Sink : Closeable, Flushable {
    * sink. It is an error to write a closed sink. It is safe to close a sink more than once.
    */
   @Throws(IOException::class)
-  override fun close()
+  actual override fun close()
 }
diff --git a/okio/jvm/src/main/java/okio/Source.kt b/okio/jvm/src/main/java/okio/Source.kt
@@ -69,5 +69,5 @@ actual interface Source : Closeable {
    * closed source. It is safe to close a source more than once.
    */
   @Throws(IOException::class)
-  override fun close()
+  actual override fun close()
 }
diff --git a/okio/native/src/main/kotlin/okio/Buffer.kt b/okio/native/src/main/kotlin/okio/Buffer.kt
@@ -151,5 +151,13 @@ actual class Buffer : BufferedSource, BufferedSink {
     byteCount: Int
   ): Boolean = throw UnsupportedOperationException()
 
+  actual override fun flush() {
+    throw UnsupportedOperationException()
+  }
+
+  actual override fun close() {
+    throw UnsupportedOperationException()
+  }
+
   actual override fun timeout(): Timeout = throw UnsupportedOperationException()
 }
diff --git a/okio/native/src/main/kotlin/okio/Sink.kt b/okio/native/src/main/kotlin/okio/Sink.kt
@@ -18,5 +18,9 @@ package okio
 actual interface Sink {
   actual fun write(source: Buffer, byteCount: Long)
 
+  actual fun flush()
+
   actual fun timeout(): Timeout
+
+  actual fun close()
 }
diff --git a/okio/native/src/main/kotlin/okio/Source.kt b/okio/native/src/main/kotlin/okio/Source.kt
@@ -19,4 +19,6 @@ actual interface Source {
   actual fun read(sink: Buffer, byteCount: Long): Long
 
   actual fun timeout(): Timeout
+
+  actual fun close()
 }
diff --git a/okio/src/main/kotlin/okio/Buffer.kt b/okio/src/main/kotlin/okio/Buffer.kt
@@ -141,5 +141,9 @@ expect class Buffer : BufferedSource, BufferedSink {
     byteCount: Int
   ): Boolean
 
+  override fun flush()
+
+  override fun close()
+
   override fun timeout(): Timeout
 }
diff --git a/okio/src/main/kotlin/okio/Sink.kt b/okio/src/main/kotlin/okio/Sink.kt
@@ -18,5 +18,9 @@ package okio
 expect interface Sink {
   fun write(source: Buffer, byteCount: Long)
 
+  fun flush()
+
   fun timeout(): Timeout
+
+  fun close()
 }
diff --git a/okio/src/main/kotlin/okio/Source.kt b/okio/src/main/kotlin/okio/Source.kt
@@ -19,4 +19,6 @@ expect interface Source {
   fun read(sink: Buffer, byteCount: Long): Long
 
   fun timeout(): Timeout
+
+  fun close()
 }