Skip to content

Commit 8779e1d

Browse files
committed
[Kotlin Server] Clean up
1 parent aa45441 commit 8779e1d

File tree

4 files changed

+4
-5
lines changed
  • modules/openapi-generator/src/main
  • samples/server/petstore
    • kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server
    • kotlin-server/ktor/src/main/kotlin/org/openapitools/server

4 files changed

+4
-5
lines changed

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,6 @@ public static class Constants {
358358
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.";
359359
public static final String OMIT_GRADLE_WRAPPER = "omitGradleWrapper";
360360
public static final String OMIT_GRADLE_WRAPPER_DESC = "Whether to omit Gradle wrapper for creating a sub project.";
361-
public static final String KOTLIN_SERIALIZATION = "kotlinSerialization";
362361
}
363362

364363
@Override

modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/AppMain.kt.mustache

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ import java.util.concurrent.TimeUnit
2929
{{/featureMetrics}}
3030
import io.ktor.server.routing.*
3131
{{#hasAuthMethods}}
32-
{{#kotlinSerialization}}
3332
import io.ktor.serialization.kotlinx.json.json
34-
{{/kotlinSerialization}}
3533
import com.typesafe.config.ConfigFactory
3634
import io.ktor.client.HttpClient
3735
import io.ktor.client.engine.apache.Apache
@@ -56,9 +54,7 @@ fun Application.main() {
5654
{{/featureMetrics}}
5755
{{#generateApis}}
5856
install(ContentNegotiation) {
59-
{{#kotlinSerialization}}
6057
json()
61-
{{/kotlinSerialization}}
6258
}
6359
{{#featureAutoHead}}
6460
install(AutoHeadResponse) // see https://ktor.io/docs/autoheadresponse.html

samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/AppMain.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import com.codahale.metrics.Slf4jReporter
1212
import io.ktor.server.metrics.dropwizard.*
1313
import java.util.concurrent.TimeUnit
1414
import io.ktor.server.routing.*
15+
import io.ktor.serialization.kotlinx.json.json
1516
import com.typesafe.config.ConfigFactory
1617
import io.ktor.client.HttpClient
1718
import io.ktor.client.engine.apache.Apache
@@ -34,6 +35,7 @@ fun Application.main() {
3435
reporter.start(10, TimeUnit.SECONDS)
3536
}
3637
install(ContentNegotiation) {
38+
json()
3739
}
3840
install(AutoHeadResponse) // see https://ktor.io/docs/autoheadresponse.html
3941
install(Compression, ApplicationCompressionConfiguration()) // see https://ktor.io/docs/compression.html

samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/AppMain.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import com.codahale.metrics.Slf4jReporter
1212
import io.ktor.server.metrics.dropwizard.*
1313
import java.util.concurrent.TimeUnit
1414
import io.ktor.server.routing.*
15+
import io.ktor.serialization.kotlinx.json.json
1516
import com.typesafe.config.ConfigFactory
1617
import io.ktor.client.HttpClient
1718
import io.ktor.client.engine.apache.Apache
@@ -34,6 +35,7 @@ fun Application.main() {
3435
reporter.start(10, TimeUnit.SECONDS)
3536
}
3637
install(ContentNegotiation) {
38+
json()
3739
}
3840
install(AutoHeadResponse) // see https://ktor.io/docs/autoheadresponse.html
3941
install(Compression, ApplicationCompressionConfiguration()) // see https://ktor.io/docs/compression.html

0 commit comments

Comments
 (0)