Update ktlint version (#3657)

* KTOR-5957 Update kotlinter version to 3.15.0

.editorconfig

@@ -1,10 +1,19 @@
 [*]
-charset=utf-8
-end_of_line=lf
-insert_final_newline=true
-indent_style=space
-indent_size=4
-max_line_length=120
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+max_line_length = 120
 
 [*.json]
-indent_size=2
+indent_size = 2
+
+[*.{kt,kts}]
+ktlint_standard_no-wildcard-imports = disabled
+ktlint_standard_trailing-comma-on-call-site = disabled
+ktlint_standard_trailing-comma-on-declaration-site = disabled
+ktlint_standard_filename = disabled
+ktlint_standard_class-naming = disabled
+ktlint_standard_annotation = disabled
+ktlint_standard_comment-wrapping = disabled

buildSrc/src/main/kotlin/Codestyle.kt

@@ -2,18 +2,20 @@
  * Copyright 2014-2021 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 import org.gradle.api.*
+import org.gradle.api.tasks.*
 import org.gradle.kotlin.dsl.*
+import org.jmailen.gradle.kotlinter.tasks.*
 
 fun Project.configureCodestyle() {
  apply(plugin = "org.jmailen.kotlinter")
 
  kotlinter.apply {
  ignoreFailures = true
  reporters = arrayOf("checkstyle", "plain")
-  experimentalRules = false
- disabledRules = arrayOf(
-  "no-wildcard-imports",
-  "indent"
- )
+ }
+
+ val editorconfigFile = rootProject.file(".editorconfig")
+ tasks.withType<LintTask> {
+ inputs.file(editorconfigFile).withPathSensitivity(PathSensitivity.RELATIVE)
  }
 }

gradle/libs.versions.toml

@@ -5,7 +5,7 @@ coroutines-version = "1.7.1"
 atomicfu-version = "0.18.5"
 serialization-version = "1.5.1"
 validator-version = "0.8.0"
-ktlint-version = "3.10.0"
+ktlint-version = "3.15.0"
 
 netty-version = "4.1.92.Final"
 netty-tcnative-version = "2.0.61.Final"

ktor-client/ktor-client-apache5/jvm/src/io/ktor/client/engine/apache5/ApacheRequestProducer.kt

@@ -55,8 +55,11 @@ internal fun ApacheRequestProducer(
 
  return BasicRequestProducer(
  setupRequest(requestData, config),
- if (!hasContent && isGetOrHead) null
- else ApacheRequestEntityProducer(requestData, callContext, contentLength, type, isChunked)
+ if (!hasContent && isGetOrHead) {
+ null
+ } else {
+ ApacheRequestEntityProducer(requestData, callContext, contentLength, type, isChunked)
+ }
  )
 }
 

ktor-client/ktor-client-cio/jvm/src/io/ktor/client/plugins/websocket/cio/buildersCio.kt

@@ -35,8 +35,9 @@ public suspend fun HttpClient.webSocketRawSession(
  val sessionCompleted = CompletableDeferred<Unit>()
  result.complete(session)
  session.outgoing.invokeOnClose {
- if (it != null) sessionCompleted.completeExceptionally(it)
- else sessionCompleted.complete(Unit)
+ if (it != null) {
+ sessionCompleted.completeExceptionally(it)
+ } else sessionCompleted.complete(Unit)
  }
  sessionCompleted.await()
  }

ktor-client/ktor-client-core/common/src/io/ktor/client/plugins/HttpRequestRetry.kt

@@ -337,8 +337,9 @@ public class HttpRequestRetry internal constructor(configuration: Configuration)
  val subRequest = HttpRequestBuilder().takeFrom(request)
  request.executionContext.invokeOnCompletion { cause ->
  val subRequestJob = subRequest.executionContext as CompletableJob
- if (cause == null) subRequestJob.complete()
- else subRequestJob.completeExceptionally(cause)
+ if (cause == null) {
+ subRequestJob.complete()
+ } else subRequestJob.completeExceptionally(cause)
  }
  return subRequest
  }

ktor-client/ktor-client-core/common/src/io/ktor/client/plugins/api/KtorCallContexts.kt

@@ -62,11 +62,13 @@ internal object ResponseHook :
 }
 
 internal object TransformRequestBodyHook :
- ClientHook<suspend TransformRequestBodyContext.(
- request: HttpRequestBuilder,
- content: Any,
- bodyType: TypeInfo?
- ) -> OutgoingContent?> {
+ ClientHook<
+ suspend TransformRequestBodyContext.(
+ request: HttpRequestBuilder,
+ content: Any,
+ bodyType: TypeInfo?
+ ) -> OutgoingContent?
+ > {
 
  override fun install(
  client: HttpClient,
@@ -84,11 +86,13 @@ internal object TransformRequestBodyHook :
 }
 
 internal object TransformResponseBodyHook :
- ClientHook<suspend TransformResponseBodyContext.(
- response: HttpResponse,
- content: ByteReadChannel,
- requestedType: TypeInfo
- ) -> Any?> {
+ ClientHook<
+ suspend TransformResponseBodyContext.(
+ response: HttpResponse,
+ content: ByteReadChannel,
+ requestedType: TypeInfo
+ ) -> Any?
+ > {
 
  override fun install(
  client: HttpClient,

ktor-client/ktor-client-core/common/src/io/ktor/client/plugins/cookies/CookiesStorage.kt

@@ -52,7 +52,9 @@ internal fun Cookie.matches(requestUrl: Url): Boolean {
  if (path != "/" &&
  requestPath != path &&
  !requestPath.startsWith(path)
- ) return false
+ ) {
+ return false
+ }
 
  return !(secure && !requestUrl.protocol.isSecure())
 }

ktor-client/ktor-client-core/common/src/io/ktor/client/plugins/websocket/WebSockets.kt

@@ -183,7 +183,9 @@ public class WebSockets internal constructor(
 
  val negotiated = if (extensionsSupported) {
  plugin.completeNegotiation(context)
- } else emptyList()
+ } else {
+ emptyList()
+ }
 
  clientSession.apply {
  start(negotiated)

ktor-client/ktor-client-core/common/src/io/ktor/client/plugins/websocket/builders.kt

@@ -42,8 +42,9 @@ public suspend fun HttpClient.webSocketSession(
  val sessionCompleted = CompletableDeferred<Unit>()
  sessionDeferred.complete(session)
  session.outgoing.invokeOnClose {
- if (it != null) sessionCompleted.completeExceptionally(it)
- else sessionCompleted.complete(Unit)
+ if (it != null) {
+ sessionCompleted.completeExceptionally(it)
+ } else sessionCompleted.complete(Unit)
  }
  sessionCompleted.await()
  }

ktor-client/ktor-client-core/common/src/io/ktor/client/request/HttpRequest.kt

@@ -85,6 +85,7 @@ public class HttpRequestBuilder : HttpMessageBuilder {
  */
  public var bodyType: TypeInfo?
  get() = attributes.getOrNull(BodyTypeAttributeKey)
+
  @InternalAPI set(value) {
  if (value != null) {
  attributes.put(BodyTypeAttributeKey, value)

ktor-client/ktor-client-core/common/test/CacheExpiresTest.kt

@@ -128,6 +128,7 @@ class CacheExpiresTest {
  get() = error("Shouldn't be used")
  override val responseTime: GMTDate
  get() = error("Shouldn't be used")
+
  @OptIn(InternalAPI::class)
  override val content: ByteReadChannel
  get() = error("Shouldn't be used")

ktor-client/ktor-client-core/common/test/ClientPluginsTest.kt

@@ -144,9 +144,9 @@ class ClientPluginsTest {
  fun testCustomHook() = testSuspend {
  var hookCalled = false
  val plugin = createClientPlugin("F") {
- on(CustomHook) {
- hookCalled = true
- }
+  on(CustomHook) {
+  hookCalled = true
+  }
  }
 
  val client = HttpClient(MockEngine) {
@@ -166,11 +166,11 @@ class ClientPluginsTest {
  @Test
  fun testSendHook() = testSuspend {
  val plugin = createClientPlugin("F") {
- on(Send) {
- val call = proceed(it)
- assertEquals("temp response", call.response.bodyAsText())
- proceed(it)
- }
+  on(Send) {
+  val call = proceed(it)
+  assertEquals("temp response", call.response.bodyAsText())
+  proceed(it)
+  }
  }
 
  val client = HttpClient(MockEngine) {

ktor-client/ktor-client-curl/desktop/src/io/ktor/client/engine/curl/internal/CurlMultiApiHandler.kt

@@ -28,8 +28,9 @@ internal class CurlMultiApiHandler : Closeable {
 
  private val cancelledHandles = mutableSetOf<Pair<EasyHandle, Throwable>>()
 
+ @Suppress("DEPRECATION")
  private val multiHandle: MultiHandle = curl_multi_init()
- ?: @Suppress("DEPRECATION") throw CurlRuntimeException("Could not initialize curl multi handle")
+ ?: throw CurlRuntimeException("Could not initialize curl multi handle")
 
  private val easyHandlesToUnpauseLock = SynchronizedObject()
  private val easyHandlesToUnpause = mutableListOf<EasyHandle>()
@@ -47,7 +48,9 @@ internal class CurlMultiApiHandler : Closeable {
 
  fun scheduleRequest(request: CurlRequestData, deferred: CompletableDeferred<CurlSuccess>): EasyHandle {
  val easyHandle = curl_easy_init()
- ?: throw @Suppress("DEPRECATION") CurlIllegalStateException("Could not initialize an easy handle")
+ ?: throw
+ @Suppress("DEPRECATION")
+ CurlIllegalStateException("Could not initialize an easy handle")
 
  val bodyStartedReceiving = CompletableDeferred<Unit>()
  val responseData = CurlResponseBuilder(request)
@@ -207,9 +210,9 @@ internal class CurlMultiApiHandler : Closeable {
  val messagePtr = curl_multi_info_read(multiHandle, messagesLeft.ptr)
  val message = messagePtr?.pointed ?: continue
 
+ @Suppress("DEPRECATION")
  val easyHandle = message.easy_handle
- ?: @Suppress("DEPRECATION")
- throw CurlIllegalStateException("Got a null easy handle from the message")
+ ?: throw CurlIllegalStateException("Got a null easy handle from the message")
 
  try {
  val result = processCompletedEasyHandle(message.msg, easyHandle, message.data.result)

ktor-client/ktor-client-darwin/darwin/src/io/ktor/client/engine/darwin/internal/DarwinWebsocketSession.kt

@@ -89,17 +89,19 @@ internal class DarwinWebsocketSession(
  FrameType.TEXT -> {
  suspendCancellableCoroutine<Unit> { continuation ->
  task.sendMessage(NSURLSessionWebSocketMessage(String(frame.data))) { error ->
- if (error == null) continuation.resume(Unit)
- else continuation.resumeWithException(DarwinHttpRequestException(error))
+ if (error == null) {
+ continuation.resume(Unit)
+ } else continuation.resumeWithException(DarwinHttpRequestException(error))
  }
  }
  }
 
  FrameType.BINARY -> {
  suspendCancellableCoroutine<Unit> { continuation ->
  task.sendMessage(NSURLSessionWebSocketMessage(frame.data.toNSData())) { error ->
- if (error == null) continuation.resume(Unit)
- else continuation.resumeWithException(DarwinHttpRequestException(error))
+ if (error == null) {
+ continuation.resume(Unit)
+ } else continuation.resumeWithException(DarwinHttpRequestException(error))
  }
  }
  }

ktor-client/ktor-client-okhttp/jvm/src/io/ktor/client/engine/okhttp/OkHttpEngine.kt

@@ -194,7 +194,9 @@ private fun HttpRequestData.convertToOkHttpRequest(callContext: CoroutineContext
 
  val bodyBytes = if (HttpMethod.permitsRequestBody(method.value)) {
  body.convertToOkHttpBody(callContext)
- } else null
+ } else {
+ null
+ }
 
  method(method.value, bodyBytes)
  }

ktor-client/ktor-client-plugins/ktor-client-auth/common/test/io/ktor/client/plugins/auth/AuthTest.kt

@@ -329,8 +329,11 @@ class AuthTest : ClientLoader() {
  engine {
  addHandler { request ->
  fun respond(): HttpResponseData {
- return if (request.headers[HttpHeaders.Authorization] != "Bearer initial") respond("OK")
- else respond("Error", HttpStatusCode.Unauthorized, headersOf("WWW-Authenticate", "Bearer"))
+ return if (request.headers[HttpHeaders.Authorization] != "Bearer initial") {
+ respond("OK")
+ } else {
+ respond("Error", HttpStatusCode.Unauthorized, headersOf("WWW-Authenticate", "Bearer"))
+ }
  }
 
  when (request.url.encodedPath) {
@@ -483,7 +486,6 @@ class AuthTest : ClientLoader() {
  }
  }
 
-
  @Suppress("JoinDeclarationAndAssignment")
  @Test
  fun testRefreshWithSameClient() = clientTests {

ktor-client/ktor-client-plugins/ktor-client-auth/common/test/io/ktor/client/plugins/auth/AuthTokenHolderTest.kt

@@ -71,7 +71,6 @@ class AuthTokenHolderTest {
 
  var clearTokenCalled = false
  val holder = AuthTokenHolder {
-
  // suspend until clearToken is called
  while (!clearTokenCalled) {
  delay(10)

ktor-client/ktor-client-plugins/ktor-client-json/ktor-client-serialization/jvm/test/KotlinxSerializerTest.kt

@@ -50,7 +50,9 @@ data class TestEntry(val a: String, val b: Int)
 inline fun <reified T> indexListUnwrapper() =
  object : JsonTransformingSerializer<List<T>>(ListSerializer<T>(serializer<T>())) {
  override fun transformDeserialize(element: JsonElement): JsonElement {
- return if (element is JsonArray) element else element.jsonObject.values.firstOrNull { it is JsonArray }
+ return if (element is JsonArray) {
+ element
+ } else element.jsonObject.values.firstOrNull { it is JsonArray }
  ?: error("Collection not found in json")
  }
  }

ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/ContentTest.kt

@@ -333,8 +333,8 @@ class ContentTest : ClientLoader(5 * 60) {
  }
  }
 
- @Test
  // NSUrlSession buffers first 512 bytes
+ @Test
  fun testDownloadStream() = clientTests(listOf("Darwin", "DarwinLegacy")) {
  test { client ->
  client.prepareGet("$TEST_SERVER/content/stream?delay=100").execute {

ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/MockedTests.kt

@@ -57,9 +57,11 @@ class MockedTests {
  val responseHeaders = headersOf("Content-Type" to listOf(ContentType.Application.Json.toString()))
 
  addHandler { request ->
- if (request.url.host == "localhost") when (request.url.encodedPath) {
- "/long.json" -> return@addHandler respond(longJSONString, headers = responseHeaders)
- "/longer.json" -> return@addHandler respond(longerJSONString, headers = responseHeaders)
+ if (request.url.host == "localhost") {
+ when (request.url.encodedPath) {
+ "/long.json" -> return@addHandler respond(longJSONString, headers = responseHeaders)
+ "/longer.json" -> return@addHandler respond(longerJSONString, headers = responseHeaders)
+ }
  }
  error("${request.url} should not be requested")
  }

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

@@ -10,8 +10,10 @@ package io.ktor.client.engine.winhttp.internal
 internal enum class WinHttpChunkedMode {
  // Do not encode body
  Disabled,
+
  // Encode body
  Enabled,
+
  // Use native encoder
  Automatic
 }

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

@@ -45,7 +45,10 @@ internal suspend inline fun <T> Closeable.closeableCoroutine(
  try {
  block(continuation)
  } catch (cause: Throwable) {
- if (continuation.isActive) continuation.resumeWithException(cause)
- else close()
+ if (continuation.isActive) {
+ continuation.resumeWithException(cause)
+ } else {
+ close()
+ }
  }
 }

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

@@ -103,7 +103,9 @@ private fun formatMessage(errorCode: UInt, moduleHandle: HMODULE? = null): Strin
  return try {
  if (readChars > 0u) {
  bufferPtr.value?.toKStringFromUtf16(readChars.convert())
- } else null
+ } else {
+ null
+ }
  } finally {
  @Suppress("INFERRED_TYPE_VARIABLE_INTO_EMPTY_INTERSECTION_ERROR")
  LocalFree(bufferPtr.reinterpret())

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

@@ -237,7 +237,9 @@ internal class WinHttpRequest(
  val notifications = WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS.convert<UInt>()
  val callback = if (enable) {
  staticCFunction(::winHttpCallback)
- } else null
+ } else {
+ null
+ }
 
  val oldStatusCallback = WinHttpSetStatusCallback(hRequest, callback, notifications, 0)
  if (oldStatusCallback?.rawValue?.toLong() == WINHTTP_INVALID_STATUS_CALLBACK) {