KTOR-7606 Make Closable implement AutoCloseable

ktor-client/ktor-client-cio/jvmAndPosix/src/io/ktor/client/engine/cio/utils.kt

@@ -1,6 +1,6 @@
 /*
-* Copyright 2014-2021 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
-*/
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
 
 package io.ktor.client.engine.cio
 
@@ -14,8 +14,6 @@ import io.ktor.http.content.*
 import io.ktor.util.date.*
 import io.ktor.utils.io.*
 import io.ktor.utils.io.CancellationException
-import io.ktor.utils.io.core.*
-import io.ktor.utils.io.errors.*
 import io.ktor.websocket.*
 import kotlinx.coroutines.*
 import kotlinx.io.IOException

ktor-client/ktor-client-cio/jvmAndPosix/test/CIOEngineTest.kt

@@ -1,8 +1,10 @@
 /*
- * Copyright 2014-2022 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
+
+package io.ktor.client.engine.cio
+
 import io.ktor.client.*
-import io.ktor.client.engine.cio.*
 import io.ktor.client.plugins.sse.*
 import io.ktor.client.plugins.websocket.*
 import io.ktor.client.request.*
@@ -11,7 +13,6 @@ import io.ktor.http.*
 import io.ktor.network.selector.*
 import io.ktor.network.sockets.*
 import io.ktor.utils.io.*
-import io.ktor.utils.io.core.*
 import io.ktor.websocket.*
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*

ktor-client/ktor-client-cio/jvmAndPosix/test/ConnectionFactoryTest.kt

@@ -1,10 +1,11 @@
 /*
- * Copyright 2014-2023 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
-import io.ktor.client.engine.cio.*
+
+package io.ktor.client.engine.cio
+
 import io.ktor.network.selector.*
 import io.ktor.network.sockets.*
-import io.ktor.utils.io.core.*
 import kotlinx.coroutines.*
 import kotlin.test.*
 

ktor-client/ktor-client-core/common/src/io/ktor/client/HttpClient.kt

@@ -1,6 +1,6 @@
 /*
-* Copyright 2014-2021 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
-*/
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
 
 package io.ktor.client
 
@@ -225,7 +225,7 @@ public class HttpClient(
             @Suppress("UNCHECKED_CAST")
             val plugin = installedFeatures[key as AttributeKey<Any>]
 
-            if (plugin is Closeable) {
+            if (plugin is AutoCloseable) {
                 plugin.close()
             }
         }

ktor-client/ktor-client-core/common/src/io/ktor/client/engine/HttpClientEngineBase.kt

@@ -1,11 +1,10 @@
 /*
-* Copyright 2014-2021 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
-*/
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
 
 package io.ktor.client.engine
 
 import io.ktor.util.*
-import io.ktor.utils.io.core.*
 import kotlinx.atomicfu.*
 import kotlinx.coroutines.*
 import kotlin.coroutines.*
@@ -39,19 +38,4 @@ public abstract class HttpClientEngineBase(private val engineName: String) : Htt
 public class ClientEngineClosedException(override val cause: Throwable? = null) :
     IllegalStateException("Client already closed")
 
-/**
- * Closes [CoroutineDispatcher] if it's [CloseableCoroutineDispatcher] or [Closeable].
- */
-@OptIn(ExperimentalCoroutinesApi::class)
-private fun CoroutineDispatcher.close() {
-    try {
-        when (this) {
-            is CloseableCoroutineDispatcher -> close()
-            is Closeable -> close()
-        }
-    } catch (ignore: Throwable) {
-        // Some closeable dispatchers like Dispatchers.IO can't be closed.
-    }
-}
-
 internal expect fun ioDispatcher(): CoroutineDispatcher

ktor-client/ktor-client-core/jvm/src/io/ktor/client/plugins/cache/storage/FileCacheStorage.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package io.ktor.client.plugins.cache.storage
@@ -10,7 +10,6 @@ import io.ktor.util.*
 import io.ktor.util.collections.*
 import io.ktor.util.date.*
 import io.ktor.utils.io.*
-import io.ktor.utils.io.core.*
 import io.ktor.utils.io.jvm.javaio.*
 import kotlinx.coroutines.*
 import kotlinx.coroutines.sync.*

ktor-client/ktor-client-curl/desktop/test/io/ktor/client/engine/curl/test/CurlNativeTests.kt

@@ -1,6 +1,6 @@
 /*
-* Copyright 2014-2021 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
-*/
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
 
 package io.ktor.client.engine.curl.test
 
@@ -9,9 +9,7 @@ import io.ktor.client.call.*
 import io.ktor.client.engine.curl.*
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
-import io.ktor.utils.io.core.*
 import kotlinx.coroutines.*
-import kotlin.native.concurrent.*
 import kotlin.test.*
 
 class CurlNativeTests {

ktor-client/ktor-client-curl/desktop/test/io/ktor/client/engine/curl/test/CurlProxyTest.kt

@@ -1,6 +1,6 @@
 /*
-* Copyright 2014-2021 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
-*/
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
 
 package io.ktor.client.engine.curl.test
 
@@ -11,7 +11,6 @@ import io.ktor.client.engine.curl.*
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
-import io.ktor.utils.io.core.*
 import kotlinx.coroutines.*
 import kotlin.test.*
 

ktor-client/ktor-client-tests/common/src/io/ktor/client/tests/utils/CommonClientTestUtils.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 @file:Suppress("NO_EXPLICIT_RETURN_TYPE_IN_API_MODE_WARNING", "KDocMissingDocumentation")
@@ -8,7 +8,6 @@ package io.ktor.client.tests.utils
 
 import io.ktor.client.*
 import io.ktor.client.engine.*
-import io.ktor.utils.io.core.*
 import kotlinx.coroutines.*
 import kotlinx.coroutines.test.*
 import kotlin.time.Duration.Companion.milliseconds

ktor-client/ktor-client-winhttp/windows/src/io/ktor/client/engine/winhttp/internal/WinHttpResponseData.kt

@@ -1,16 +1,14 @@
 /*
- * Copyright 2014-2022 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package io.ktor.client.engine.winhttp.internal
 
-import io.ktor.client.plugins.sse.*
 import io.ktor.client.request.*
 import io.ktor.http.*
 import io.ktor.http.cio.*
 import io.ktor.util.date.*
 import io.ktor.utils.io.*
-import io.ktor.utils.io.core.*
 import kotlin.coroutines.*
 
 internal class WinHttpResponseData(

ktor-client/ktor-client-winhttp/windows/test/io/ktor/client/engine/winhttp/WinHttpProxyTest.kt

@@ -1,14 +1,13 @@
 /*
-* Copyright 2014-2022 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
-*/
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
 
 package io.ktor.client.engine.winhttp
 
 import io.ktor.client.*
 import io.ktor.client.call.*
 import io.ktor.client.engine.*
 import io.ktor.client.request.*
-import io.ktor.utils.io.core.*
 import kotlinx.coroutines.*
 import kotlin.test.*
 

ktor-io/api/ktor-io.klib.api

@@ -53,7 +53,7 @@ abstract interface <#A: kotlin/Any> io.ktor.utils.io.pool/ObjectPool : kotlin/Au
     open fun close() // io.ktor.utils.io.pool/ObjectPool.close|close(){}[0]
 }
 
-abstract interface io.ktor.utils.io.core/Closeable { // io.ktor.utils.io.core/Closeable|null[0]
+abstract interface io.ktor.utils.io.core/Closeable : kotlin/AutoCloseable { // io.ktor.utils.io.core/Closeable|null[0]
     abstract fun close() // io.ktor.utils.io.core/Closeable.close|close(){}[0]
 }
 

ktor-io/common/src/io/ktor/utils/io/core/Closeable.kt

@@ -4,25 +4,9 @@
 
 package io.ktor.utils.io.core
 
-public expect interface Closeable {
-    public fun close()
-}
+import kotlin.use as stdlibUse
 
-public inline fun <T : Closeable?, R> T.use(block: (T) -> R): R {
-    var closed = false
-    try {
-        return block(this)
-    } catch (cause: Throwable) {
-        closed = true
-        try {
-            this?.close()
-        } catch (closeException: Throwable) {
-            cause.addSuppressed(closeException)
-        }
-        throw cause
-    } finally {
-        if (!closed) {
-            this?.close()
-        }
-    }
-}
+public expect interface Closeable : AutoCloseable
+
+@Deprecated("Use stdlib implementation instead. Remove import of this function", ReplaceWith("stdlibUse(block)"))
+public inline fun <T : Closeable?, R> T.use(block: (T) -> R): R = stdlibUse(block)

ktor-io/js/src/io/ktor/utils/io/core/Closeable.js.kt

@@ -4,6 +4,6 @@
 
 package io.ktor.utils.io.core
 
-public actual interface Closeable {
-    public actual fun close()
+public actual interface Closeable : AutoCloseable {
+    override fun close()
 }

ktor-io/posix/src/io/ktor/utils/io/core/Closeable.posix.kt

@@ -4,6 +4,6 @@
 
 package io.ktor.utils.io.core
 
-public actual interface Closeable {
-    public actual fun close()
+public actual interface Closeable : AutoCloseable {
+    override fun close()
 }

ktor-io/wasmJs/src/io/ktor/utils/io/core/Closeable.wasmJs.kt

@@ -4,6 +4,6 @@
 
 package io.ktor.utils.io.core
 
-public actual interface Closeable {
-    public actual fun close()
+public actual interface Closeable : AutoCloseable {
+    override fun close()
 }

ktor-network/jvmAndPosix/test/io/ktor/network/sockets/tests/TCPSocketTest.kt

@@ -1,13 +1,12 @@
 /*
- * Copyright 2014-2021 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package io.ktor.network.sockets.tests
 
 import io.ktor.network.sockets.*
 import io.ktor.utils.io.*
 import io.ktor.utils.io.CancellationException
-import io.ktor.utils.io.core.*
 import kotlinx.coroutines.*
 import kotlinx.io.*
 import kotlin.test.*

ktor-network/jvmAndPosix/test/io/ktor/network/sockets/tests/TestUtils.kt

@@ -1,13 +1,12 @@
 /*
- * Copyright 2014-2021 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package io.ktor.network.sockets.tests
 
 import io.ktor.network.selector.*
 import io.ktor.test.dispatcher.*
 import io.ktor.util.*
-import io.ktor.utils.io.core.*
 import kotlinx.coroutines.*
 import kotlin.time.*
 import kotlin.time.Duration.Companion.seconds

ktor-network/jvmAndPosix/test/io/ktor/network/sockets/tests/UDPSocketTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package io.ktor.network.sockets.tests
@@ -11,6 +11,7 @@ import kotlinx.coroutines.*
 import kotlinx.io.*
 import kotlin.random.*
 import kotlin.test.*
+import kotlin.use
 
 class UDPSocketTest {
 

ktor-network/ktor-network-tls/jvm/src/io/ktor/network/tls/TLSClientHandshake.kt

@@ -1,6 +1,6 @@
 /*
-* Copyright 2014-2021 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
-*/
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
 
 package io.ktor.network.tls
 
@@ -21,6 +21,7 @@ import javax.crypto.*
 import javax.crypto.spec.*
 import javax.security.auth.x500.*
 import kotlin.coroutines.*
+import kotlin.use
 
 internal class TLSClientHandshake(
     rawInput: ByteReadChannel,

ktor-network/ktor-network-tls/ktor-network-tls-certificates/jvm/src/io/ktor/network/tls/certificates/Certificates.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package io.ktor.network.tls.certificates
@@ -23,6 +23,7 @@ import javax.security.auth.x500.*
 import kotlin.time.*
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.days
+import kotlin.use
 
 internal val DEFAULT_PRINCIPAL = X500Principal("CN=localhost, OU=Kotlin, O=JetBrains, C=RU")
 private val DEFAULT_CA_PRINCIPAL = X500Principal("CN=localhostCA, OU=Kotlin, O=JetBrains, C=RU")

ktor-network/ktor-network-tls/ktor-network-tls-certificates/jvm/src/io/ktor/network/tls/certificates/builders.kt

@@ -1,13 +1,12 @@
 /*
- * Copyright 2014-2019 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package io.ktor.network.tls.certificates
 
 import io.ktor.network.tls.*
 import io.ktor.network.tls.extensions.*
 import io.ktor.util.*
-import io.ktor.utils.io.core.*
 import java.io.*
 import java.net.*
 import java.security.*

ktor-server/ktor-server-cio/build.gradle.kts

@@ -1,3 +1,7 @@
+/*
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
 description = ""
 
 kotlin.sourceSets {
@@ -14,11 +18,11 @@ kotlin.sourceSets {
             api(project(":ktor-server:ktor-server-core"))
             api(project(":ktor-client:ktor-client-cio"))
             api(project(":ktor-server:ktor-server-test-suites"))
+            api(project(":ktor-server:ktor-server-test-base"))
         }
     }
     jvmTest {
         dependencies {
-            api(project(":ktor-server:ktor-server-test-base"))
             api(project(":ktor-server:ktor-server-core", configuration = "testOutput"))
             api(libs.logback.classic)
         }