Merge branch 'fix-multpart-body-issues' into release

Author: SMILEY4

gradle.properties

@@ -3,7 +3,7 @@ kotlin.code.style=official
 # project id
 projectGroupId=io.github.smiley4
 projectArtifactIdBase=ktor-swagger-ui
-projectVersion=4.1.5
+projectVersion=4.1.6
 
 # publishing information
 projectNameBase=Ktor Swagger UI

ktor-swagger-ui/src/main/kotlin/io/github/smiley4/ktorswaggerui/builder/openapi/ContentBuilder.kt

@@ -72,6 +72,7 @@ class ContentBuilder(
                         props[part.name] = schemaContext.getSchema(part.type)
                     }
                 }
+                schema.required = body.parts.filter { it.required }.map { it.name }
             }
             mediaType.encoding = buildMultipartEncoding(body)
         }

ktor-swagger-ui/src/main/kotlin/io/github/smiley4/ktorswaggerui/builder/schema/SchemaContextImpl.kt

@@ -120,6 +120,9 @@ class SchemaContextImpl(private val schemaConfig: SchemaConfigData) : SchemaCont
                             is OpenApiMultipartBodyData -> {
                                 body.parts.forEach { part ->
                                     descriptors.add(part.type)
+                                    part.headers.forEach { (_, header) ->
+                                        header.type?.also { descriptors.add(it) }
+                                    }
                                 }
                             }
                         }

ktor-swagger-ui/src/main/kotlin/io/github/smiley4/ktorswaggerui/data/OpenApiMultipartPartData.kt

@@ -8,6 +8,7 @@ import io.ktor.http.ContentType
 data class OpenApiMultipartPartData(
     val name: String,
     val type: TypeDescriptor,
+    val required: Boolean,
     val mediaTypes: Set<ContentType>,
     val headers: Map<String, OpenApiHeaderData>,
 )

ktor-swagger-ui/src/main/kotlin/io/github/smiley4/ktorswaggerui/data/TypeDescriptor.kt

@@ -15,7 +15,6 @@ sealed interface TypeDescriptor
  */
 class SwaggerTypeDescriptor(val schema: Schema<*>) : TypeDescriptor
 
-
 /**
  * Describes a type from a kotlin [KType]
  */

ktor-swagger-ui/src/main/kotlin/io/github/smiley4/ktorswaggerui/dsl/routes/OpenApiMultipartPart.kt

@@ -24,6 +24,11 @@ class OpenApiMultipartPart(
     val type: TypeDescriptor
 ) {
 
+    /**
+     * Whether this part is required
+     */
+    var required: Boolean = false
+
     /**
      * Specific content types for this part
      */
@@ -83,6 +88,7 @@ class OpenApiMultipartPart(
     fun build() = OpenApiMultipartPartData(
         name = name,
         type = type,
+        required = required,
         mediaTypes = mediaTypes.toSet(),
         headers = headers.mapValues { it.value.build() }
     )