Fix tests after conflicts resolved

Author: chomnoue

docs/generators/kotlin-server.md

@@ -22,6 +22,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |apiSuffix|suffix for api classes| |Api|
 |artifactId|Generated artifact id (name of jar).| |kotlin-server|
 |artifactVersion|Generated artifact's package version.| |1.0.0|
+|delegatePattern|Whether to generate the server files using the delegate pattern. This option is currently supported only when using ktor library.| |true|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', 'original', and 'bestEffortBacktick' (like 'original' but tries to wrap values in backticks before falling back to sanitizing, e.g. `name,asc` stays `name,asc` rather than becoming nameCommaAsc; useful for sort/order enums)| |original|
 |featureAutoHead|Automatically provide responses to HEAD requests for existing routes that have the GET verb defined.| |true|
 |featureCORS|Ktor by default provides an interceptor for implementing proper support for Cross-Origin Resource Sharing (CORS). See enable-cors.org.| |false|

modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinServerCodegenTest.java

@@ -40,6 +40,8 @@
 import static org.openapitools.codegen.languages.KotlinServerCodegen.Constants.RETURN_RESPONSE;
 import static org.openapitools.codegen.languages.KotlinServerCodegen.Constants.USE_TAGS;
 import static org.openapitools.codegen.languages.features.BeanValidationFeatures.USE_BEANVALIDATION;
+import static org.openapitools.codegen.languages.KotlinServerCodegen.Constants.DELEGATE_PATTERN;
+import static org.openapitools.codegen.languages.KotlinServerCodegen.Constants.KTOR;
 
 public class KotlinServerCodegenTest {
 

samples/server/petstore/kotlin-server/ktor-delegate-pattern/generated/.openapi-generator/VERSION

@@ -1 +1 @@
-7.21.0-SNAPSHOT
+7.23.0-SNAPSHOT

samples/server/petstore/kotlin-server/ktor-delegate-pattern/generated/README.md

@@ -2,7 +2,7 @@
 
 This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
 
-Generated by OpenAPI Generator 7.21.0-SNAPSHOT.
+Generated by OpenAPI Generator 7.23.0-SNAPSHOT.
 
 ## Requires
 

samples/server/petstore/kotlin-server/ktor-delegate-pattern/generated/build.gradle.kts

@@ -6,13 +6,13 @@ group = "org.openapitools"
 version = "1.0.0"
 
 plugins {
-    kotlin("jvm") version "2.0.20"
-    application
-    kotlin("plugin.serialization") version "2.0.20"
+    kotlin("jvm") version "2.3.0"
+    id("io.ktor.plugin") version "3.4.0"
+    kotlin("plugin.serialization") version "2.3.0"
 }
 
 application {
-    mainClass.set("io.ktor.server.netty.EngineMain")
+    mainClass = "io.ktor.server.netty.EngineMain"
 
     val isDevelopment: Boolean = project.ext.has("development")
     applicationDefaultJvmArgs = listOf("-Dio.ktor.development=$isDevelopment")
@@ -23,7 +23,6 @@ repositories {
 }
 
 dependencies {
-    implementation(platform("io.ktor:ktor-bom:3.0.2"))
     implementation("ch.qos.logback:logback-classic:$logback_version")
     implementation("com.typesafe:config:1.4.1")
     implementation("io.ktor:ktor-server-auth")

samples/server/petstore/kotlin-server/ktor-delegate-pattern/generated/gradle.properties

@@ -1,4 +1,4 @@
 kotlin.code.style=official
-ktor_version=3.0.2
-kotlin_version=2.0.20
+ktor_version=3.4.0
+kotlin_version=2.3.0
 logback_version=1.5.19

samples/server/petstore/kotlin-server/ktor-delegate-pattern/generated/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>