Make UnsafeCursor implement Closable interface in multiplatform (Fixes …

…#1238) (#1239) * Promote UnsafeCursor Closable interface to multiplatform (#1238) * Make UnsafeCursor implement Closable interface in multiplatform (#1238)
square · Jun 17, 2023 · e817480 · e817480
1 parent 297db32
commit e817480
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/okio/src/commonMain/kotlin/okio/Buffer.kt b/okio/src/commonMain/kotlin/okio/Buffer.kt
@@ -340,7 +340,7 @@ expect class Buffer() : BufferedSource, BufferedSink {
    * You can reuse instances of this class if you like. Use the overloads of [Buffer.readUnsafe] and
    * [Buffer.readAndWriteUnsafe] that take a cursor and close it after use.
    */
-  class UnsafeCursor constructor() {
+  class UnsafeCursor constructor() : Closeable {
     @JvmField var buffer: Buffer?
 
     @JvmField var readWrite: Boolean
@@ -411,6 +411,6 @@ expect class Buffer() : BufferedSource, BufferedSink {
      */
     fun expandBuffer(minByteCount: Int): Long
 
-    fun close()
+    override fun close()
   }
 }
diff --git a/okio/src/commonTest/kotlin/okio/UnsafeCursorTest.kt b/okio/src/commonTest/kotlin/okio/UnsafeCursorTest.kt
@@ -17,6 +17,7 @@ package okio
 
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertTrue
 
 class UnsafeCursorTest {
   @Test fun acquireForRead() {
@@ -84,4 +85,8 @@ class UnsafeCursorTest {
 
     assertEquals("z".repeat(100), buffer.readUtf8())
   }
+
+  @Test fun testUnsafeCursorIsClosable() {
+    assertTrue(Closeable::class.isInstance(Buffer.UnsafeCursor()))
+  }
 }
diff --git a/okio/src/nonJvmMain/kotlin/okio/Buffer.kt b/okio/src/nonJvmMain/kotlin/okio/Buffer.kt
@@ -297,7 +297,7 @@ actual class Buffer : BufferedSource, BufferedSink {
   actual fun readAndWriteUnsafe(unsafeCursor: UnsafeCursor): UnsafeCursor =
     commonReadAndWriteUnsafe(unsafeCursor)
 
-  actual class UnsafeCursor {
+  actual class UnsafeCursor : Closeable {
     actual var buffer: Buffer? = null
     actual var readWrite: Boolean = false
 
@@ -315,7 +315,7 @@ actual class Buffer : BufferedSource, BufferedSink {
 
     actual fun expandBuffer(minByteCount: Int): Long = commonExpandBuffer(minByteCount)
 
-    actual fun close() {
+    actual override fun close() {
       commonClose()
     }
   }