Fix deserialization for ktor and ktor2 into Any and use calendar year

feczkob · feczkob · commit 878b96b67e74 · 2026-04-10T10:05:51.000+02:00
diff --git a/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/api.mustache
@@ -22,8 +22,6 @@ import {{packageName}}.infrastructure.ApiPrincipal
 
 {{#operations}}
 fun Route.{{classname}}() {
-    val empty = mutableMapOf<String, Any?>()
-
 {{#operation}}
     {{#hasAuthMethods}}
         {{#authMethods}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/logback.xml b/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/logback.xml
@@ -1,7 +1,7 @@
 <configuration>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
 
diff --git a/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor2/_response.mustache b/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor2/_response.mustache
@@ -2,7 +2,7 @@ val exampleContentType = "{{{contentType}}}"
 val exampleContentString = """{{&example}}"""
 
 when (exampleContentType) {
-    "application/json" -> call.respond(gson.fromJson(exampleContentString, empty::class.java))
+    "application/json" -> call.respond(gson.fromJson(exampleContentString, Any::class.java))
     "application/xml" -> call.respondText(exampleContentString, ContentType.Text.Xml)
     else -> call.respondText(exampleContentString)
 }
diff --git a/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor2/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor2/api.mustache
@@ -24,8 +24,6 @@ import {{packageName}}.infrastructure.ApiPrincipal
 {{#operations}}
 fun Route.{{classname}}() {
     val gson = Gson()
-    val empty = mutableMapOf<String, Any?>()
-
 {{#operation}}
     {{#hasAuthMethods}}
         {{#authMethods}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor2/logback.xml b/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor2/logback.xml
@@ -1,7 +1,7 @@
 <configuration>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
 
diff --git a/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/apis/PetApi.kt b/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/apis/PetApi.kt
@@ -29,8 +29,6 @@ import org.openapitools.server.models.ModelApiResponse
 import org.openapitools.server.models.Pet
 
 fun Route.PetApi() {
-    val empty = mutableMapOf<String, Any?>()
-
     authenticate("petstore_auth") {
     post<Paths.addPet> {
         
diff --git a/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt b/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt
@@ -28,8 +28,6 @@ import org.openapitools.server.infrastructure.ApiPrincipal
 import org.openapitools.server.models.Order
 
 fun Route.StoreApi() {
-    val empty = mutableMapOf<String, Any?>()
-
     delete<Paths.deleteOrder> {
         call.respond(HttpStatusCode.NotImplemented)
         
diff --git a/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/apis/UserApi.kt b/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/apis/UserApi.kt
@@ -28,8 +28,6 @@ import org.openapitools.server.infrastructure.ApiPrincipal
 import org.openapitools.server.models.User
 
 fun Route.UserApi() {
-    val empty = mutableMapOf<String, Any?>()
-
     post<Paths.createUser> {
         call.respond(HttpStatusCode.NotImplemented)
         
diff --git a/samples/server/petstore/kotlin-server-modelMutable/src/main/resources/logback.xml b/samples/server/petstore/kotlin-server-modelMutable/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <configuration>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
 
diff --git a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/apis/PetApi.kt b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/apis/PetApi.kt
@@ -29,8 +29,6 @@ import org.openapitools.server.models.ModelApiResponse
 import org.openapitools.server.models.Pet
 
 fun Route.PetApi() {
-    val empty = mutableMapOf<String, Any?>()
-
     authenticate("petstore_auth") {
     post<Paths.addPet> {
         
diff --git a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt
@@ -28,8 +28,6 @@ import org.openapitools.server.infrastructure.ApiPrincipal
 import org.openapitools.server.models.Order
 
 fun Route.StoreApi() {
-    val empty = mutableMapOf<String, Any?>()
-
     delete<Paths.deleteOrder> {
         call.respond(HttpStatusCode.NotImplemented)
         
diff --git a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/apis/UserApi.kt b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/apis/UserApi.kt
@@ -28,8 +28,6 @@ import org.openapitools.server.infrastructure.ApiPrincipal
 import org.openapitools.server.models.User
 
 fun Route.UserApi() {
-    val empty = mutableMapOf<String, Any?>()
-
     post<Paths.createUser> {
         call.respond(HttpStatusCode.NotImplemented)
         
diff --git a/samples/server/petstore/kotlin-server/ktor/src/main/resources/logback.xml b/samples/server/petstore/kotlin-server/ktor/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <configuration>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
 
diff --git a/samples/server/petstore/kotlin-server/ktor2-usetags-false/src/main/kotlin/org/openapitools/server/apis/PetApi.kt b/samples/server/petstore/kotlin-server/ktor2-usetags-false/src/main/kotlin/org/openapitools/server/apis/PetApi.kt
@@ -31,8 +31,6 @@ import org.openapitools.server.models.Pet
 
 fun Route.PetApi() {
     val gson = Gson()
-    val empty = mutableMapOf<String, Any?>()
-
     authenticate("petstore_auth") {
     post<Paths.addPet> {
         
@@ -97,7 +95,7 @@ fun Route.PetApi() {
             } ]"""
             
             when (exampleContentType) {
-                "application/json" -> call.respond(gson.fromJson(exampleContentString, empty::class.java))
+                "application/json" -> call.respond(gson.fromJson(exampleContentString, Any::class.java))
                 "application/xml" -> call.respondText(exampleContentString, ContentType.Text.Xml)
                 else -> call.respondText(exampleContentString)
             }
@@ -147,7 +145,7 @@ fun Route.PetApi() {
             } ]"""
             
             when (exampleContentType) {
-                "application/json" -> call.respond(gson.fromJson(exampleContentString, empty::class.java))
+                "application/json" -> call.respond(gson.fromJson(exampleContentString, Any::class.java))
                 "application/xml" -> call.respondText(exampleContentString, ContentType.Text.Xml)
                 else -> call.respondText(exampleContentString)
             }
@@ -192,7 +190,7 @@ fun Route.PetApi() {
             }"""
             
             when (exampleContentType) {
-                "application/json" -> call.respond(gson.fromJson(exampleContentString, empty::class.java))
+                "application/json" -> call.respond(gson.fromJson(exampleContentString, Any::class.java))
                 "application/xml" -> call.respondText(exampleContentString, ContentType.Text.Xml)
                 else -> call.respondText(exampleContentString)
             }
@@ -236,7 +234,7 @@ fun Route.PetApi() {
             }"""
             
             when (exampleContentType) {
-                "application/json" -> call.respond(gson.fromJson(exampleContentString, empty::class.java))
+                "application/json" -> call.respond(gson.fromJson(exampleContentString, Any::class.java))
                 "application/xml" -> call.respondText(exampleContentString, ContentType.Text.Xml)
                 else -> call.respondText(exampleContentString)
             }
@@ -258,7 +256,7 @@ fun Route.PetApi() {
             }"""
             
             when (exampleContentType) {
-                "application/json" -> call.respond(gson.fromJson(exampleContentString, empty::class.java))
+                "application/json" -> call.respond(gson.fromJson(exampleContentString, Any::class.java))
                 "application/xml" -> call.respondText(exampleContentString, ContentType.Text.Xml)
                 else -> call.respondText(exampleContentString)
             }
diff --git a/samples/server/petstore/kotlin-server/ktor2-usetags-false/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt b/samples/server/petstore/kotlin-server/ktor2-usetags-false/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt
@@ -30,8 +30,6 @@ import org.openapitools.server.models.Order
 
 fun Route.StoreApi() {
     val gson = Gson()
-    val empty = mutableMapOf<String, Any?>()
-
     delete<Paths.deleteOrder> {
         call.respond(HttpStatusCode.NotImplemented)
         
@@ -60,7 +58,7 @@ fun Route.StoreApi() {
         }"""
         
         when (exampleContentType) {
-            "application/json" -> call.respond(gson.fromJson(exampleContentString, empty::class.java))
+            "application/json" -> call.respond(gson.fromJson(exampleContentString, Any::class.java))
             "application/xml" -> call.respondText(exampleContentString, ContentType.Text.Xml)
             else -> call.respondText(exampleContentString)
         }
@@ -79,7 +77,7 @@ fun Route.StoreApi() {
         }"""
         
         when (exampleContentType) {
-            "application/json" -> call.respond(gson.fromJson(exampleContentString, empty::class.java))
+            "application/json" -> call.respond(gson.fromJson(exampleContentString, Any::class.java))
             "application/xml" -> call.respondText(exampleContentString, ContentType.Text.Xml)
             else -> call.respondText(exampleContentString)
         }
diff --git a/samples/server/petstore/kotlin-server/ktor2-usetags-false/src/main/kotlin/org/openapitools/server/apis/UserApi.kt b/samples/server/petstore/kotlin-server/ktor2-usetags-false/src/main/kotlin/org/openapitools/server/apis/UserApi.kt
@@ -30,8 +30,6 @@ import org.openapitools.server.models.User
 
 fun Route.UserApi() {
     val gson = Gson()
-    val empty = mutableMapOf<String, Any?>()
-
     post<Paths.createUser> {
         call.respond(HttpStatusCode.NotImplemented)
         
@@ -66,7 +64,7 @@ fun Route.UserApi() {
         }"""
         
         when (exampleContentType) {
-            "application/json" -> call.respond(gson.fromJson(exampleContentString, empty::class.java))
+            "application/json" -> call.respond(gson.fromJson(exampleContentString, Any::class.java))
             "application/xml" -> call.respondText(exampleContentString, ContentType.Text.Xml)
             else -> call.respondText(exampleContentString)
         }
diff --git a/samples/server/petstore/kotlin-server/ktor2-usetags-false/src/main/resources/logback.xml b/samples/server/petstore/kotlin-server/ktor2-usetags-false/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <configuration>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
 
diff --git a/samples/server/petstore/kotlin-server/ktor2/src/main/kotlin/org/openapitools/server/apis/PetApi.kt b/samples/server/petstore/kotlin-server/ktor2/src/main/kotlin/org/openapitools/server/apis/PetApi.kt
@@ -31,8 +31,6 @@ import org.openapitools.server.models.Pet
 
 fun Route.PetApi() {
     val gson = Gson()
-    val empty = mutableMapOf<String, Any?>()
-
     authenticate("petstore_auth") {
     post<Paths.addPet> {
         
@@ -59,7 +57,7 @@ fun Route.PetApi() {
             }"""
             
             when (exampleContentType) {
-                "application/json" -> call.respond(gson.fromJson(exampleContentString, empty::class.java))
+                "application/json" -> call.respond(gson.fromJson(exampleContentString, Any::class.java))
                 "application/xml" -> call.respondText(exampleContentString, ContentType.Text.Xml)
                 else -> call.respondText(exampleContentString)
             }
@@ -120,7 +118,7 @@ fun Route.PetApi() {
             } ]"""
             
             when (exampleContentType) {
-                "application/json" -> call.respond(gson.fromJson(exampleContentString, empty::class.java))
+                "application/json" -> call.respond(gson.fromJson(exampleContentString, Any::class.java))
                 "application/xml" -> call.respondText(exampleContentString, ContentType.Text.Xml)
                 else -> call.respondText(exampleContentString)
             }
@@ -170,7 +168,7 @@ fun Route.PetApi() {
             } ]"""
             
             when (exampleContentType) {
-                "application/json" -> call.respond(gson.fromJson(exampleContentString, empty::class.java))
+                "application/json" -> call.respond(gson.fromJson(exampleContentString, Any::class.java))
                 "application/xml" -> call.respondText(exampleContentString, ContentType.Text.Xml)
                 else -> call.respondText(exampleContentString)
             }
@@ -204,7 +202,7 @@ fun Route.PetApi() {
             }"""
             
             when (exampleContentType) {
-                "application/json" -> call.respond(gson.fromJson(exampleContentString, empty::class.java))
+                "application/json" -> call.respond(gson.fromJson(exampleContentString, Any::class.java))
                 "application/xml" -> call.respondText(exampleContentString, ContentType.Text.Xml)
                 else -> call.respondText(exampleContentString)
             }
@@ -238,7 +236,7 @@ fun Route.PetApi() {
             }"""
             
             when (exampleContentType) {
-                "application/json" -> call.respond(gson.fromJson(exampleContentString, empty::class.java))
+                "application/json" -> call.respond(gson.fromJson(exampleContentString, Any::class.java))
                 "application/xml" -> call.respondText(exampleContentString, ContentType.Text.Xml)
                 else -> call.respondText(exampleContentString)
             }
@@ -271,7 +269,7 @@ fun Route.PetApi() {
             }"""
             
             when (exampleContentType) {
-                "application/json" -> call.respond(gson.fromJson(exampleContentString, empty::class.java))
+                "application/json" -> call.respond(gson.fromJson(exampleContentString, Any::class.java))
                 "application/xml" -> call.respondText(exampleContentString, ContentType.Text.Xml)
                 else -> call.respondText(exampleContentString)
             }
diff --git a/samples/server/petstore/kotlin-server/ktor2/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt b/samples/server/petstore/kotlin-server/ktor2/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt
@@ -30,8 +30,6 @@ import org.openapitools.server.models.Order
 
 fun Route.StoreApi() {
     val gson = Gson()
-    val empty = mutableMapOf<String, Any?>()
-
     delete<Paths.deleteOrder> {
         call.respond(HttpStatusCode.NotImplemented)
         
@@ -60,7 +58,7 @@ fun Route.StoreApi() {
         }"""
         
         when (exampleContentType) {
-            "application/json" -> call.respond(gson.fromJson(exampleContentString, empty::class.java))
+            "application/json" -> call.respond(gson.fromJson(exampleContentString, Any::class.java))
             "application/xml" -> call.respondText(exampleContentString, ContentType.Text.Xml)
             else -> call.respondText(exampleContentString)
         }
@@ -79,7 +77,7 @@ fun Route.StoreApi() {
         }"""
         
         when (exampleContentType) {
-            "application/json" -> call.respond(gson.fromJson(exampleContentString, empty::class.java))
+            "application/json" -> call.respond(gson.fromJson(exampleContentString, Any::class.java))
             "application/xml" -> call.respondText(exampleContentString, ContentType.Text.Xml)
             else -> call.respondText(exampleContentString)
         }
diff --git a/samples/server/petstore/kotlin-server/ktor2/src/main/kotlin/org/openapitools/server/apis/UserApi.kt b/samples/server/petstore/kotlin-server/ktor2/src/main/kotlin/org/openapitools/server/apis/UserApi.kt
@@ -30,8 +30,6 @@ import org.openapitools.server.models.User
 
 fun Route.UserApi() {
     val gson = Gson()
-    val empty = mutableMapOf<String, Any?>()
-
     authenticate("api_key") {
     post<Paths.createUser> {
         
@@ -90,7 +88,7 @@ fun Route.UserApi() {
         }"""
         
         when (exampleContentType) {
-            "application/json" -> call.respond(gson.fromJson(exampleContentString, empty::class.java))
+            "application/json" -> call.respond(gson.fromJson(exampleContentString, Any::class.java))
             "application/xml" -> call.respondText(exampleContentString, ContentType.Text.Xml)
             else -> call.respondText(exampleContentString)
         }
diff --git a/samples/server/petstore/kotlin-server/ktor2/src/main/resources/logback.xml b/samples/server/petstore/kotlin-server/ktor2/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <configuration>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ val exampleContentType = "{{{contentType}}}"`
`2`	`2`	`val exampleContentString = """{{&example}}"""`
`3`	`3`
`4`	`4`	`when (exampleContentType) {`
`5`		`- "application/json" -> call.respond(gson.fromJson(exampleContentString, empty::class.java))`
	`5`	`+ "application/json" -> call.respond(gson.fromJson(exampleContentString, Any::class.java))`
`6`	`6`	`"application/xml" -> call.respondText(exampleContentString, ContentType.Text.Xml)`
`7`	`7`	`else -> call.respondText(exampleContentString)`
`8`	`8`	`}`