Fix code style

ktorio · Oct 29, 2021 · ce4871f · ce4871f
1 parent f8797f0
commit ce4871f
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/ktor-client/ktor-client-okhttp/jvm/src/io/ktor/client/engine/okhttp/OkHttpEngine.kt b/ktor-client/ktor-client-okhttp/jvm/src/io/ktor/client/engine/okhttp/OkHttpEngine.kt
@@ -17,7 +17,6 @@ import io.ktor.util.date.*
 import io.ktor.utils.io.*
 import kotlinx.coroutines.*
 import okhttp3.*
-import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.internal.http.HttpMethod
 import okio.*

diff --git a/ktor-network/ktor-network-tls/jvm/src/io/ktor/network/tls/TLSConfigBuilder.kt b/ktor-network/ktor-network-tls/jvm/src/io/ktor/network/tls/TLSConfigBuilder.kt
@@ -119,7 +119,7 @@ public fun TLSConfigBuilder.addKeyStore(store: KeyStore, password: CharArray?, a
     loop@ for (certAlias in aliases) {
         val chain: Array<Certificate>? = store.getCertificateChain(certAlias)
         checkNotNull(chain) { "Fail to get the certificate chain for this alias: $certAlias" }
-        
+
         val allX509 = chain.all { it is X509Certificate }
         check(allX509) { "Fail to add key store $store. Only X509 certificate format supported." }
 

diff --git a/ktor-server/ktor-server-core/jvm/src/io/ktor/features/CORS.kt b/ktor-server/ktor-server-core/jvm/src/io/ktor/features/CORS.kt
@@ -572,7 +572,6 @@ public class CORS(configuration: Configuration) {
         }
     }
 
-
     /**
      * Feature object for installation
      */

diff --git a/ktor-server/ktor-server-core/jvm/src/io/ktor/http/content/JarFileContent.kt b/ktor-server/ktor-server-core/jvm/src/io/ktor/http/content/JarFileContent.kt
@@ -5,7 +5,6 @@
 package io.ktor.http.content
 
 import io.ktor.http.*
-import io.ktor.http.content.*
 import io.ktor.util.cio.*
 import io.ktor.utils.io.*
 import io.ktor.utils.io.jvm.javaio.*

diff --git a/ktor-server/ktor-server-tests/jvm/test/io/ktor/tests/server/features/PartialContentTest.kt b/ktor-server/ktor-server-tests/jvm/test/io/ktor/tests/server/features/PartialContentTest.kt
@@ -49,7 +49,7 @@ class PartialContentTest {
             }
 
             test(File(basedir, localPath))
-        }
+        }.let { }
 
     @Test
     fun testCustomMaxRangeCountAccepted(): Unit = withRangeApplication(maxRangeCount = 10) {
@@ -332,7 +332,7 @@ class PartialContentTest {
         block(parts)
     }
 
-    private fun checkContentLength(result : TestApplicationCall) {
+    private fun checkContentLength(result: TestApplicationCall) {
         assertEquals(
             result.response.byteContent!!.size.toLong(),
             result.response.headers[HttpHeaders.ContentLength]!!.toLong()

diff --git a/ktor-test-dispatcher/macosArm64/src/TestMacosArm64.kt b/ktor-test-dispatcher/macosArm64/src/TestMacosArm64.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright 2014-2021 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
 @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 
 package io.ktor.test.dispatcher
-Original file line number
+Diff line change
@@ Expand Up / @@ -572,7 +572,6 @@ public class CORS(configuration: Configuration) { @@
             }
         }
         /**
          * Feature object for installation
          */
@@ Expand Down @@