implement suggestions from CR. Fix declarative interface naming.

Author: Picazsoo

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

@@ -816,7 +816,7 @@ public void processOpts() {
                         gradleWrapperPackage.replace(".", File.separator), "gradle-wrapper.jar"));
             }
 
-            apiTemplateFiles.put("apiInterface.mustache", "Client.kt");
+            apiTemplateFiles.put("apiInterface.mustache", ".kt");
             apiTestTemplateFiles.clear();
         }
 

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

@@ -1215,7 +1215,7 @@ public void generateHttpInterfaceReactiveWithReactorResponseEntity() throws Exce
 
         generator.opts(input).generate();
 
-        Path path = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/StoreApiClient.kt");
+        Path path = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/StoreApi.kt");
         assertFileContains(
                 path,
                 "import reactor.core.publisher.Flux\n"
@@ -1287,7 +1287,7 @@ public void generateHttpInterfaceReactiveWithCoroutinesResponseEntity() throws E
 
         generator.opts(input).generate();
 
-        Path path = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/StoreApiClient.kt");
+        Path path = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/StoreApi.kt");
         assertFileContains(
                 path,
                 "    suspend fun getInventory(\n"
@@ -1329,7 +1329,7 @@ public void generateHttpInterfaceReactiveWithReactor() throws Exception {
 
         generator.opts(input).generate();
 
-        Path path = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/StoreApiClient.kt");
+        Path path = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/StoreApi.kt");
         assertFileContains(
                 path,
                 "import reactor.core.publisher.Flux\n"
@@ -1377,7 +1377,7 @@ public void generateHttpInterfaceReactiveWithCoroutines() throws Exception {
 
         generator.opts(input).generate();
 
-        Path path = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/StoreApiClient.kt");
+        Path path = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/StoreApi.kt");
         assertFileContains(
                 path,
                 "    suspend fun getInventory(\n"
@@ -1418,7 +1418,7 @@ public void generateHttpInterfaceResponseEntity() throws Exception {
 
         generator.opts(input).generate();
 
-        Path path = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/StoreApiClient.kt");
+        Path path = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/StoreApi.kt");
         assertFileContains(
                 path,
                 "    fun getInventory(\n"
@@ -1463,7 +1463,7 @@ public void generateHttpInterface() throws Exception {
 
         generator.opts(input).generate();
 
-        Path path = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/StoreApiClient.kt");
+        Path path = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/StoreApi.kt");
         // Note: We cannot use property placeholders as HttpServiceProxyFactory does not resolve them by default.
         assertFileContains(
                 path,

modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml

@@ -797,13 +797,6 @@ paths:
       description: Tests x-spring-paginated with no query params except pagination
       operationId: listPetsByIdPaginated
       parameters:
-        - name: petId
-          in: path
-          description: Pet ID
-          required: true
-          schema:
-            type: integer
-            format: int64
         - name: X-Request-ID
           in: header
           description: Request ID for tracing
@@ -842,13 +835,6 @@ paths:
       description: Comprehensive test with all parameter types
       operationId: listPetsMixedParams
       parameters:
-        - name: categoryId
-          in: path
-          description: Category ID
-          required: true
-          schema:
-            type: integer
-            format: int64
         - name: Authorization
           in: header
           description: Authorization header

samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/.openapi-generator/FILES

@@ -6,9 +6,9 @@ gradlew
 gradlew.bat
 pom.xml
 settings.gradle
-src/main/kotlin/org/openapitools/api/PetApiClient.kt
-src/main/kotlin/org/openapitools/api/StoreApiClient.kt
-src/main/kotlin/org/openapitools/api/UserApiClient.kt
+src/main/kotlin/org/openapitools/api/PetApi.kt
+src/main/kotlin/org/openapitools/api/StoreApi.kt
+src/main/kotlin/org/openapitools/api/UserApi.kt
 src/main/kotlin/org/openapitools/model/Category.kt
 src/main/kotlin/org/openapitools/model/ModelApiResponse.kt
 src/main/kotlin/org/openapitools/model/Order.kt

…lin/org/openapitools/api/PetApiClient.kt …in/kotlin/org/openapitools/api/PetApi.ktsamples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/PetApiClient.kt renamed to samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/PetApi.kt samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/PetApiClient.kt renamed to samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/PetApi.kt

@@ -6,9 +6,9 @@ gradlew
 gradlew.bat
 pom.xml
 settings.gradle
-src/main/kotlin/org/openapitools/api/PetApiClient.kt
-src/main/kotlin/org/openapitools/api/StoreApiClient.kt
-src/main/kotlin/org/openapitools/api/UserApiClient.kt
+src/main/kotlin/org/openapitools/api/PetApi.kt
+src/main/kotlin/org/openapitools/api/StoreApi.kt
+src/main/kotlin/org/openapitools/api/UserApi.kt
 src/main/kotlin/org/openapitools/model/Category.kt
 src/main/kotlin/org/openapitools/model/ModelApiResponse.kt
 src/main/kotlin/org/openapitools/model/Order.kt