[Kotlin Server] Update Ktor to latest version; move config to kts

ktorio · Sep 30, 2024 · 2ab59fa · 2ab59fa
1 parent 849b3e8
commit 2ab59fa
Show file tree

Hide file tree

Showing 17 changed files with 188 additions and 185 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
@@ -272,21 +272,21 @@ public void processOpts() {
 
         supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
 
-        if (library.equals(Constants.KTOR)) {
+        if (isKtor()) {
             supportingFiles.add(new SupportingFile("Dockerfile.mustache", "", "Dockerfile"));
         }
 
         String gradleBuildFile = "build.gradle";
 
-        if (isJavalin()) {
+        if (isJavalin() || isKtor()) {
             gradleBuildFile = "build.gradle.kts";
         }
 
         supportingFiles.add(new SupportingFile(gradleBuildFile + ".mustache", "", gradleBuildFile));
         supportingFiles.add(new SupportingFile("settings.gradle.mustache", "", "settings.gradle"));
         supportingFiles.add(new SupportingFile("gradle.properties", "", "gradle.properties"));
 
-        if (library.equals(Constants.KTOR)) {
+        if (isKtor()) {
             supportingFiles.add(new SupportingFile("AppMain.kt.mustache", packageFolder, "AppMain.kt"));
             supportingFiles.add(new SupportingFile("Configuration.kt.mustache", packageFolder, "Configuration.kt"));
 
@@ -300,6 +300,11 @@ public void processOpts() {
             final String infrastructureFolder = (sourceFolder + File.separator + packageName + File.separator + "infrastructure").replace(".", File.separator);
 
             supportingFiles.add(new SupportingFile("ApiKeyAuth.kt.mustache", infrastructureFolder, "ApiKeyAuth.kt"));
+
+            if (!getOmitGradleWrapper()) {
+                supportingFiles.add(new SupportingFile("gradle-wrapper.properties", "gradle" + File.separator + "wrapper", "gradle-wrapper.properties"));
+            }
+
         } else if (isJavalin()) {
             supportingFiles.add(new SupportingFile("Main.kt.mustache", packageFolder, "Main.kt"));
             apiTemplateFiles.put("service.mustache", "Service.kt");
@@ -412,4 +417,8 @@ public void setReturnContainer(final String returnContainer) {
     private boolean isJavalin() {
         return Constants.JAVALIN5.equals(library) || Constants.JAVALIN6.equals(library);
     }
+
+    private boolean isKtor() {
+        return Constants.KTOR.equals(library);
+    }
 }
diff --git a/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/README.mustache b/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/README.mustache
@@ -8,8 +8,8 @@ Generated by OpenAPI Generator {{generatorVersion}}{{^hideGenerationTimestamp}}
 
 ## Requires
 
-* Kotlin 1.7.20
-* Gradle 7.4.2
+* Kotlin 2.0.20
+* Gradle 8.10.2
 
 ## Build
 

diff --git a/...enapi-generator/src/main/resources/kotlin-server/libraries/ktor/build.gradle.kts.mustache b/...enapi-generator/src/main/resources/kotlin-server/libraries/ktor/build.gradle.kts.mustache
@@ -0,0 +1,61 @@
+
+val kotlin_version: String by project
+val logback_version: String by project
+
+group = "{{groupId}}"
+version = "{{artifactVersion}}"
+
+plugins {
+    kotlin("jvm") version "2.0.20"
+    id("io.ktor.plugin") version "2.3.12"
+}
+
+application {
+    mainClass.set("io.ktor.server.netty.EngineMain")
+
+    val isDevelopment: Boolean = project.ext.has("development")
+    applicationDefaultJvmArgs = listOf("-Dio.ktor.development=$isDevelopment")
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation("ch.qos.logback:logback-classic:$logback_version")
+{{#hasAuthMethods}}
+    implementation("com.typesafe:config:1.4.1")
+{{/hasAuthMethods}}
+    implementation("io.ktor:ktor-server-auth")
+{{#hasAuthMethods}}
+    implementation("io.ktor:ktor-client-apache")
+{{/hasAuthMethods}}
+{{#featureAutoHead}}
+    implementation("io.ktor:ktor-server-auto-head-response")
+{{/featureAutoHead}}
+    implementation("io.ktor:ktor-server-default-headers")
+    implementation("io.ktor:ktor-server-content-negotiation")
+    implementation("io.ktor:ktor-serialization-gson")
+{{#featureResources}}
+    implementation("io.ktor:ktor-server-resources")
+{{/featureResources}}
+{{#featureHSTS}}
+    implementation("io.ktor:ktor-server-hsts")
+{{/featureHSTS}}
+{{#featureCORS}}
+    implementation("io.ktor:ktor-server-cors")
+{{/featureCORS}}
+{{#featureConditionalHeaders}}
+    implementation("io.ktor:ktor-server-conditional-headers")
+{{/featureConditionalHeaders}}
+{{#featureCompression}}
+    implementation("io.ktor:ktor-server-compression")
+{{/featureCompression}}
+{{#featureMetrics}}
+    implementation("io.dropwizard.metrics:metrics-core:4.1.18")
+    implementation("io.ktor:ktor-server-metrics")
+{{/featureMetrics}}
+    implementation("io.ktor:ktor-server-netty")
+
+    testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
+}
diff --git a/...s/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/build.gradle.mustache b/...s/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/build.gradle.mustache
diff --git a/...enapi-generator/src/main/resources/kotlin-server/libraries/ktor/gradle-wrapper.properties b/...enapi-generator/src/main/resources/kotlin-server/libraries/ktor/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/gradle.properties b/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/gradle.properties
@@ -1 +1,4 @@
-org.gradle.caching=true
+kotlin.code.style=official
+ktor_version=2.3.12
+kotlin_version=2.0.20
+logback_version=1.4.14
diff --git a/samples/server/petstore/kotlin-server-modelMutable/.openapi-generator/FILES b/samples/server/petstore/kotlin-server-modelMutable/.openapi-generator/FILES
@@ -1,7 +1,8 @@
 Dockerfile
 README.md
-build.gradle
+build.gradle.kts
 gradle.properties
+gradle/wrapper/gradle-wrapper.properties
 settings.gradle
 src/main/kotlin/org/openapitools/server/AppMain.kt
 src/main/kotlin/org/openapitools/server/Configuration.kt

diff --git a/samples/server/petstore/kotlin-server-modelMutable/README.md b/samples/server/petstore/kotlin-server-modelMutable/README.md
@@ -6,8 +6,8 @@ Generated by OpenAPI Generator 7.9.0-SNAPSHOT.
 
 ## Requires
 
-* Kotlin 1.7.20
-* Gradle 7.4.2
+* Kotlin 2.0.20
+* Gradle 8.10.2
 
 ## Build
 

diff --git a/samples/server/petstore/kotlin-server-modelMutable/build.gradle.kts b/samples/server/petstore/kotlin-server-modelMutable/build.gradle.kts
@@ -0,0 +1,41 @@
+
+val kotlin_version: String by project
+val logback_version: String by project
+
+group = "org.openapitools"
+version = "1.0.0"
+
+plugins {
+    kotlin("jvm") version "2.0.20"
+    id("io.ktor.plugin") version "2.3.12"
+}
+
+application {
+    mainClass.set("io.ktor.server.netty.EngineMain")
+
+    val isDevelopment: Boolean = project.ext.has("development")
+    applicationDefaultJvmArgs = listOf("-Dio.ktor.development=$isDevelopment")
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation("ch.qos.logback:logback-classic:$logback_version")
+    implementation("com.typesafe:config:1.4.1")
+    implementation("io.ktor:ktor-server-auth")
+    implementation("io.ktor:ktor-client-apache")
+    implementation("io.ktor:ktor-server-auto-head-response")
+    implementation("io.ktor:ktor-server-default-headers")
+    implementation("io.ktor:ktor-server-content-negotiation")
+    implementation("io.ktor:ktor-serialization-gson")
+    implementation("io.ktor:ktor-server-resources")
+    implementation("io.ktor:ktor-server-hsts")
+    implementation("io.ktor:ktor-server-compression")
+    implementation("io.dropwizard.metrics:metrics-core:4.1.18")
+    implementation("io.ktor:ktor-server-metrics")
+    implementation("io.ktor:ktor-server-netty")
+
+    testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
+}
diff --git a/samples/server/petstore/kotlin-server-modelMutable/gradle.properties b/samples/server/petstore/kotlin-server-modelMutable/gradle.properties
@@ -1 +1,4 @@
-org.gradle.caching=true
+kotlin.code.style=official
+ktor_version=2.3.12
+kotlin_version=2.0.20
+logback_version=1.4.14
diff --git a/samples/server/petstore/kotlin-server-modelMutable/gradle/wrapper/gradle-wrapper.properties b/samples/server/petstore/kotlin-server-modelMutable/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/samples/server/petstore/kotlin-server/ktor/.openapi-generator/FILES b/samples/server/petstore/kotlin-server/ktor/.openapi-generator/FILES
@@ -1,7 +1,8 @@
 Dockerfile
 README.md
-build.gradle
+build.gradle.kts
 gradle.properties
+gradle/wrapper/gradle-wrapper.properties
 settings.gradle
 src/main/kotlin/org/openapitools/server/AppMain.kt
 src/main/kotlin/org/openapitools/server/Configuration.kt

diff --git a/samples/server/petstore/kotlin-server/ktor/README.md b/samples/server/petstore/kotlin-server/ktor/README.md
@@ -6,8 +6,8 @@ Generated by OpenAPI Generator 7.9.0-SNAPSHOT.
 
 ## Requires
 
-* Kotlin 1.7.20
-* Gradle 7.4.2
+* Kotlin 2.0.20
+* Gradle 8.10.2
 
 ## Build