[bug][kotlin] sanitize model names according to convention (#16267)

* [bug][kotlin] sanitize model names according to convention * [bug][kotlin] revert to english word sanitization except minus --------- Co-authored-by: Theo Meneau <[email protected]>
OpenAPITools · Aug 7, 2023 · 097385b · 097385b
1 parent f6ac603
commit 097385b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/...api-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java b/...api-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
@@ -729,7 +729,7 @@ public String toModelName(final String name) {
             return importMapping.get(name);
         }
 
-        String modifiedName = name.replaceAll("\\.", "");
+        String modifiedName = name.replaceAll("\\.", "").replaceAll("-", "_");
 
         String nameWithPrefixSuffix = sanitizeKotlinSpecificNames(modifiedName);
         if (!StringUtils.isEmpty(modelNamePrefix)) {

diff --git a/...pi-generator/src/test/java/org/openapitools/codegen/kotlin/AbstractKotlinCodegenTest.java b/...pi-generator/src/test/java/org/openapitools/codegen/kotlin/AbstractKotlinCodegenTest.java
@@ -126,7 +126,7 @@ public void convertModelName() {
         assertEquals(codegen.toModelName("Pony?"), "PonyQuestionMark");
         assertEquals(codegen.toModelName("$name"), "DollarName");
         assertEquals(codegen.toModelName("nam#e"), "NamHashE");
-        assertEquals(codegen.toModelName("$another-fake?"), "DollarAnotherMinusFakeQuestionMark");
+        assertEquals(codegen.toModelName("$another-fake?"), "DollarAnotherFakeQuestionMark");
         assertEquals(codegen.toModelName("Pony>=>="), "PonyGreaterThanEqualGreaterThanEqual");
     }
 

diff --git a/...generator/src/test/java/org/openapitools/codegen/kotlin/KotlinClientCodegenModelTest.java b/...generator/src/test/java/org/openapitools/codegen/kotlin/KotlinClientCodegenModelTest.java
@@ -343,6 +343,7 @@ public static Object[][] modelNames() {
                 {"$", new ModelNameTest("$", "Dollar")},
                 {"for", new ModelNameTest("`for`", "For")},
                 {"One<Two", new ModelNameTest("One<Two", "OneLessThanTwo")},
+                {"One-Two", new ModelNameTest("One-Two", "OneTwo")},
                 {"this is a test", new ModelNameTest("this is a test", "ThisIsATest")}
         };
     }