From a33a0fd5c7f8ce7af2dc03ae78cc651f0c68b245 Mon Sep 17 00:00:00 2001
From: martinsaison <63776494+martinsaison@users.noreply.github.com>
Date: Fri, 29 Oct 2021 04:06:37 +0200
Subject: [PATCH] [kotlin-spring] change the suffix from ".kt" to
 "Controller.kt" when generating a controller class (#10671)

* fix: [kotlin-spring] wrong filenames for generated controller classes (#10670)

* fix: [kotlin-spring] wrong filenames for generated controller classes (#10670)

Updated unit test with correct filenames

* fix: [kotlin-spring] wrong filenames for generated controller classes (#10670)

Including files generated by generate-samples.sh and export_docs_generators.sh

Co-authored-by: Martin Saison <khodev@users.noreply.github.com>
---
 .../languages/KotlinSpringServerCodegen.java  |  2 +-
 .../spring/KotlinSpringServerCodegenTest.java | 22 +++++++++----------
 .../.openapi-generator/FILES                  |  6 ++---
 .../api/{PetApi.kt => PetApiController.kt}    |  0
 .../{StoreApi.kt => StoreApiController.kt}    |  0
 .../api/{UserApi.kt => UserApiController.kt}  |  0
 .../.openapi-generator/FILES                  |  6 ++---
 .../api/{PetApi.kt => PetApiController.kt}    |  0
 .../{StoreApi.kt => StoreApiController.kt}    |  0
 .../api/{UserApi.kt => UserApiController.kt}  |  0
 10 files changed, 18 insertions(+), 18 deletions(-)
 rename samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/{PetApi.kt => PetApiController.kt} (100%)
 rename samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/{StoreApi.kt => StoreApiController.kt} (100%)
 rename samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/{UserApi.kt => UserApiController.kt} (100%)
 rename samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/{PetApi.kt => PetApiController.kt} (100%)
 rename samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/{StoreApi.kt => StoreApiController.kt} (100%)
 rename samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/{UserApi.kt => UserApiController.kt} (100%)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java
index c08ecec4e23..93d7428c236 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java
@@ -379,7 +379,7 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen
         } else if (interfaceOnly) {
             apiTemplateFiles.put("apiInterface.mustache", ".kt");
         } else {
-            apiTemplateFiles.put("api.mustache", ".kt");
+            apiTemplateFiles.put("api.mustache", "Controller.kt");
             apiTestTemplateFiles.put("api_test.mustache", ".kt");
         }
 
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java
index 6a506a7221f..f949ac99bec 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java
@@ -285,7 +285,7 @@ public class KotlinSpringServerCodegenTest {
 
         generator.opts(input).generate();
 
-        assertFileNotContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PonyApi.kt"), "@RequestParam");
+        assertFileNotContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PonyApiController.kt"), "@RequestParam");
     }
 
     @Test
@@ -315,14 +315,14 @@ public class KotlinSpringServerCodegenTest {
 
         generator.opts(input).generate();
 
-        assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/MonkeysApi.kt"), "@RequestParam");
-        assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/ElephantsApi.kt"), "@RequestParam");
-        assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/ZebrasApi.kt"), "@RequestParam");
-        assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/BearsApi.kt"), "@RequestParam");
-        assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/CamelsApi.kt"), "@RequestParam");
-        assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PandasApi.kt"), "@RequestParam");
-        assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/CrocodilesApi.kt"), "@RequestParam");
-        assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PolarBearsApi.kt"), "@RequestParam");
+        assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/MonkeysApiController.kt"), "@RequestParam");
+        assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/ElephantsApiController.kt"), "@RequestParam");
+        assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/ZebrasApiController.kt"), "@RequestParam");
+        assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/BearsApiController.kt"), "@RequestParam");
+        assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/CamelsApiController.kt"), "@RequestParam");
+        assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PandasApiController.kt"), "@RequestParam");
+        assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/CrocodilesApiController.kt"), "@RequestParam");
+        assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PolarBearsApiController.kt"), "@RequestParam");
     }
 
     @Test
@@ -352,11 +352,11 @@ public class KotlinSpringServerCodegenTest {
         generator.opts(input).generate();
 
         assertFileContains(
-                Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/ElephantsApi.kt"),
+                Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/ElephantsApiController.kt"),
                 "@org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE)"
         );
         assertFileContains(
-                Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/ZebrasApi.kt"),
+                Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/ZebrasApiController.kt"),
                 "@org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME)"
         );
     }
diff --git a/samples/server/petstore/kotlin-springboot-reactive/.openapi-generator/FILES b/samples/server/petstore/kotlin-springboot-reactive/.openapi-generator/FILES
index e48401e8ff4..fdc7a16af74 100644
--- a/samples/server/petstore/kotlin-springboot-reactive/.openapi-generator/FILES
+++ b/samples/server/petstore/kotlin-springboot-reactive/.openapi-generator/FILES
@@ -4,13 +4,13 @@ pom.xml
 settings.gradle
 src/main/kotlin/org/openapitools/Application.kt
 src/main/kotlin/org/openapitools/api/ApiUtil.kt
-src/main/kotlin/org/openapitools/api/PetApi.kt
+src/main/kotlin/org/openapitools/api/PetApiController.kt
 src/main/kotlin/org/openapitools/api/PetApiService.kt
 src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt
-src/main/kotlin/org/openapitools/api/StoreApi.kt
+src/main/kotlin/org/openapitools/api/StoreApiController.kt
 src/main/kotlin/org/openapitools/api/StoreApiService.kt
 src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt
-src/main/kotlin/org/openapitools/api/UserApi.kt
+src/main/kotlin/org/openapitools/api/UserApiController.kt
 src/main/kotlin/org/openapitools/api/UserApiService.kt
 src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt
 src/main/kotlin/org/openapitools/model/Category.kt
diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt
similarity index 100%
rename from samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApi.kt
rename to samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt
diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.kt
similarity index 100%
rename from samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApi.kt
rename to samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.kt
diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.kt
similarity index 100%
rename from samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApi.kt
rename to samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.kt
diff --git a/samples/server/petstore/kotlin-springboot/.openapi-generator/FILES b/samples/server/petstore/kotlin-springboot/.openapi-generator/FILES
index 612ea14bbdb..50a9d2bc75d 100644
--- a/samples/server/petstore/kotlin-springboot/.openapi-generator/FILES
+++ b/samples/server/petstore/kotlin-springboot/.openapi-generator/FILES
@@ -5,13 +5,13 @@ settings.gradle
 src/main/kotlin/org/openapitools/Application.kt
 src/main/kotlin/org/openapitools/api/ApiUtil.kt
 src/main/kotlin/org/openapitools/api/Exceptions.kt
-src/main/kotlin/org/openapitools/api/PetApi.kt
+src/main/kotlin/org/openapitools/api/PetApiController.kt
 src/main/kotlin/org/openapitools/api/PetApiService.kt
 src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt
-src/main/kotlin/org/openapitools/api/StoreApi.kt
+src/main/kotlin/org/openapitools/api/StoreApiController.kt
 src/main/kotlin/org/openapitools/api/StoreApiService.kt
 src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt
-src/main/kotlin/org/openapitools/api/UserApi.kt
+src/main/kotlin/org/openapitools/api/UserApiController.kt
 src/main/kotlin/org/openapitools/api/UserApiService.kt
 src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt
 src/main/kotlin/org/openapitools/model/Category.kt
diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt
similarity index 100%
rename from samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApi.kt
rename to samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt
diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiController.kt
similarity index 100%
rename from samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApi.kt
rename to samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiController.kt
diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt
similarity index 100%
rename from samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApi.kt
rename to samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt