fix openapi properties mapping

Author: angryziber

openapi/build.gradle.kts

@@ -1,6 +1,6 @@
 dependencies {
   implementation(project(":server"))
-  api("io.swagger.core.v3:swagger-annotations:2.2.29")
+  api("io.swagger.core.v3:swagger-annotations:2.2.30")
 
   testImplementation(project(":json"))
   testImplementation(project(":jackson"))

openapi/src/Generate.kt

@@ -103,7 +103,7 @@ private fun KType.toJsonSchema(response: Boolean = false): Map<String, Any?>? {
       else -> null
     })
     else -> mapOfNotNull("type" to "object",
-      "properties" to cls.publicProperties.map { it.key to it.value.returnType.toJsonSchema(response) }.takeIf { it.isNotEmpty() },
+      "properties" to cls.publicProperties.mapValues { it.value.returnType.toJsonSchema(response) }.takeIf { it.isNotEmpty() },
       "required" to cls.publicProperties.values.filter { p ->
         !p.returnType.isMarkedNullable && (response || cls.primaryConstructor?.parameters?.find { it.name == p.name }?.isOptional != true)
       }.map { it.name }.toSet().takeIf { it.isNotEmpty() })

openapi/test/OpenAPITest.kt

@@ -121,7 +121,7 @@ class OpenAPITest {
       "operationId" to "MyRoutes.saveUser",
       "tags" to listOf("MyRoutes"),
       "parameters" to emptyList<Any>(),
-      "requestBody" to mapOf("description" to "Application and applicant", "required" to true, "content" to userSchema(), "required" to true),
+      "requestBody" to mapOf("description" to "Application and applicant", "required" to true, "content" to userSchema()),
       "responses" to mapOf(
         OK to mapOf("description" to "OK", "content" to userSchema(response = true)),
         BadRequest to mapOf("description" to "Very bad request"),