fix codestyle, run apiDump, add test

ktorio · Nov 18, 2024 · 5324ecd · 5324ecd
1 parent 4e022e4
commit 5324ecd
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 8 deletions.
diff --git a/ktor-http/ktor-http-cio/api/ktor-http-cio.api b/ktor-http/ktor-http-cio/api/ktor-http-cio.api
@@ -142,6 +142,10 @@ public final class io/ktor/http/cio/Response : io/ktor/http/cio/HttpMessage {
 	public final fun getVersion ()Ljava/lang/CharSequence;
 }
 
+public final class io/ktor/http/cio/UnsupportedMediaTypeExceptionCIO : java/io/IOException {
+	public fun <init> (Ljava/lang/String;)V
+}
+
 public final class io/ktor/http/cio/internals/CharsKt {
 	public static final fun parseDecLong (Ljava/lang/CharSequence;)J
 }

diff --git a/ktor-http/ktor-http-cio/jvm/src/io/ktor/http/cio/Multipart.kt b/ktor-http/ktor-http-cio/jvm/src/io/ktor/http/cio/Multipart.kt
@@ -138,7 +138,9 @@ public fun CoroutineScope.parseMultipart(
     headers: HttpHeadersMap,
     maxPartSize: Long = Long.MAX_VALUE
 ): ReceiveChannel<MultipartEvent> {
-    val contentType = headers["Content-Type"] ?: throw UnsupportedMediaTypeExceptionCIO("Failed to parse multipart: no Content-Type header")
+    val contentType = headers["Content-Type"] ?: throw UnsupportedMediaTypeExceptionCIO(
+        "Failed to parse multipart: no Content-Type header"
+    )
     val contentLength = headers["Content-Length"]?.parseDecLong()
 
     return parseMultipart(input, contentType, contentLength, maxPartSize)
@@ -154,7 +156,9 @@ public fun CoroutineScope.parseMultipart(
     maxPartSize: Long = Long.MAX_VALUE,
 ): ReceiveChannel<MultipartEvent> {
     if (!contentType.startsWith("multipart/", ignoreCase = true)) {
-        throw UnsupportedMediaTypeExceptionCIO("Failed to parse multipart: Content-Type should be multipart/* but it is $contentType")
+        throw UnsupportedMediaTypeExceptionCIO(
+            "Failed to parse multipart: Content-Type should be multipart/* but it is $contentType"
+        )
     }
     val boundaryByteBuffer = parseBoundaryInternal(contentType)
     val boundaryBytes = ByteString(boundaryByteBuffer)

diff --git a/ktor-server/ktor-server-core/api/ktor-server-core.klib.api b/ktor-server/ktor-server-core/api/ktor-server-core.klib.api
@@ -697,7 +697,7 @@ final class io.ktor.server.plugins/PayloadTooLargeException : io.ktor.server.plu
 }
 
 final class io.ktor.server.plugins/UnsupportedMediaTypeException : io.ktor.server.plugins/ContentTransformationException, kotlinx.coroutines/CopyableThrowable<io.ktor.server.plugins/UnsupportedMediaTypeException> { // io.ktor.server.plugins/UnsupportedMediaTypeException|null[0]
-    constructor <init>(io.ktor.http/ContentType) // io.ktor.server.plugins/UnsupportedMediaTypeException.<init>|<init>(io.ktor.http.ContentType){}[0]
+    constructor <init>(io.ktor.http/ContentType?) // io.ktor.server.plugins/UnsupportedMediaTypeException.<init>|<init>(io.ktor.http.ContentType?){}[0]
 
     final fun createCopy(): io.ktor.server.plugins/UnsupportedMediaTypeException // io.ktor.server.plugins/UnsupportedMediaTypeException.createCopy|createCopy(){}[0]
 }

diff --git a/ktor-server/ktor-server-core/common/src/io/ktor/server/plugins/Errors.kt b/ktor-server/ktor-server-core/common/src/io/ktor/server/plugins/Errors.kt
@@ -89,7 +89,8 @@ public class UnsupportedMediaTypeException(
 ) : ContentTransformationException(
     contentType?.let { "Content type $it is not supported" }
         ?: "Content-Type header is required"
-), CopyableThrowable<UnsupportedMediaTypeException> {
+),
+    CopyableThrowable<UnsupportedMediaTypeException> {
 
     override fun createCopy(): UnsupportedMediaTypeException = UnsupportedMediaTypeException(contentType).also {
         it.initCauseBridge(this)

diff --git a/ktor-server/ktor-server-core/jvm/test/io/ktor/tests/server/engine/MultiPartDataTest.kt b/ktor-server/ktor-server-core/jvm/test/io/ktor/tests/server/engine/MultiPartDataTest.kt
@@ -4,17 +4,20 @@
 
 package io.ktor.tests.server.engine
 
+import io.ktor.client.request.*
 import io.ktor.http.*
 import io.ktor.server.application.*
-import io.ktor.server.engine.multiPartData
-import io.ktor.server.plugins.UnsupportedMediaTypeException
+import io.ktor.server.engine.*
+import io.ktor.server.plugins.*
 import io.ktor.server.request.*
+import io.ktor.server.response.*
+import io.ktor.server.routing.*
+import io.ktor.server.testing.*
 import io.ktor.util.pipeline.*
 import io.ktor.utils.io.*
 import io.mockk.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.test.TestScope
-import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.test.*
 import kotlin.test.*
 
 class MultiPartDataTest {
@@ -52,4 +55,24 @@ class MultiPartDataTest {
             }
         }
     }
+
+    @Test
+    fun testUnsupportedMediaTypeStatusCode() = testApplication {
+        routing {
+            post {
+                call.receiveMultipart()
+                call.respond(HttpStatusCode.OK)
+            }
+        }
+
+        client.post {
+            accept(ContentType.Text.Plain)
+        }.apply {
+            assertEquals(HttpStatusCode.UnsupportedMediaType, status)
+        }
+
+        client.post {}.apply {
+            assertEquals(HttpStatusCode.UnsupportedMediaType, status)
+        }
+    }
 }