[Kotlin Server] Clean up

ktorio · Dec 4, 2024 · 8779e1d · 8779e1d
1 parent aa45441
commit 8779e1d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/...enapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java b/...enapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java
@@ -358,7 +358,6 @@ public static class Constants {
         public static final String USE_MUTINY_DESC = "Whether to use Mutiny (should not be used with useCoroutines). This option is currently supported only when using jaxrs-spec library.";
         public static final String OMIT_GRADLE_WRAPPER = "omitGradleWrapper";
         public static final String OMIT_GRADLE_WRAPPER_DESC = "Whether to omit Gradle wrapper for creating a sub project.";
-        public static final String KOTLIN_SERIALIZATION = "kotlinSerialization";
     }
 
     @Override

diff --git a/...les/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/AppMain.kt.mustache b/...les/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/AppMain.kt.mustache
@@ -29,9 +29,7 @@ import java.util.concurrent.TimeUnit
 {{/featureMetrics}}
 import io.ktor.server.routing.*
 {{#hasAuthMethods}}
-{{#kotlinSerialization}}
 import io.ktor.serialization.kotlinx.json.json
-{{/kotlinSerialization}}
 import com.typesafe.config.ConfigFactory
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.apache.Apache
@@ -56,9 +54,7 @@ fun Application.main() {
     {{/featureMetrics}}
 {{#generateApis}}
     install(ContentNegotiation) {
-    {{#kotlinSerialization}}
         json()
-    {{/kotlinSerialization}}
     }
     {{#featureAutoHead}}
     install(AutoHeadResponse) // see https://ktor.io/docs/autoheadresponse.html

diff --git a/...er/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/AppMain.kt b/...er/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/AppMain.kt
@@ -12,6 +12,7 @@ import com.codahale.metrics.Slf4jReporter
 import io.ktor.server.metrics.dropwizard.*
 import java.util.concurrent.TimeUnit
 import io.ktor.server.routing.*
+import io.ktor.serialization.kotlinx.json.json
 import com.typesafe.config.ConfigFactory
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.apache.Apache
@@ -34,6 +35,7 @@ fun Application.main() {
         reporter.start(10, TimeUnit.SECONDS)
     }
     install(ContentNegotiation) {
+        json()
     }
     install(AutoHeadResponse) // see https://ktor.io/docs/autoheadresponse.html
     install(Compression, ApplicationCompressionConfiguration()) // see https://ktor.io/docs/compression.html

diff --git a/...les/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/AppMain.kt b/...les/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/AppMain.kt
@@ -12,6 +12,7 @@ import com.codahale.metrics.Slf4jReporter
 import io.ktor.server.metrics.dropwizard.*
 import java.util.concurrent.TimeUnit
 import io.ktor.server.routing.*
+import io.ktor.serialization.kotlinx.json.json
 import com.typesafe.config.ConfigFactory
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.apache.Apache
@@ -34,6 +35,7 @@ fun Application.main() {
         reporter.start(10, TimeUnit.SECONDS)
     }
     install(ContentNegotiation) {
+        json()
     }
     install(AutoHeadResponse) // see https://ktor.io/docs/autoheadresponse.html
     install(Compression, ApplicationCompressionConfiguration()) // see https://ktor.io/docs/compression.html