From e9836aee74deebc54e03dcf9280aeb970fffb186 Mon Sep 17 00:00:00 2001 From: Taylor Becker Date: Fri, 5 Apr 2024 11:54:04 -0400 Subject: [PATCH] Kotlin: Do not escape/sanitize quoted enum values --- .../openapitools/codegen/languages/AbstractKotlinCodegen.java | 2 +- .../openapitools/codegen/kotlin/AbstractKotlinCodegenTest.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java index d7708e5d28c8..cc3bb5b73a44 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java @@ -901,7 +901,7 @@ public String toEnumValue(String value, String datatype) { } else if ("kotlin.Float".equals(datatype)) { return value + "f"; } else { - return "\"" + escapeText(value) + "\""; + return "\"" + value + "\""; } } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/AbstractKotlinCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/AbstractKotlinCodegenTest.java index 374d1d08e614..b820edc33848 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/AbstractKotlinCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/AbstractKotlinCodegenTest.java @@ -60,6 +60,7 @@ public void originalEnumConverter() { assertEquals(codegen.toEnumVarName("long Name", null), "long_Name"); assertEquals(codegen.toEnumVarName("1long Name", null), "_1long_Name"); assertEquals(codegen.toEnumVarName("not1long Name", null), "not1long_Name"); + assertEquals(codegen.toEnumVarName("data/*", null), "dataSlashStar"); } @Test public void pascalCaseEnumConverter() { @@ -78,6 +79,7 @@ public void toEnumValue() { assertEquals(codegen.toEnumValue("5", "kotlin.Float"), "5f"); assertEquals(codegen.toEnumValue("1.0", "kotlin.Float"), "1.0f"); assertEquals(codegen.toEnumValue("data", "Something"), "\"data\""); + assertEquals(codegen.toEnumValue("data/*", "Something"), "\"data/*\""); } private static class P_AbstractKotlinCodegen extends AbstractKotlinCodegen {