diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/CamelCaseLambda.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/CamelCaseLambda.java index d7b14546f190..bb73a599683e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/CamelCaseLambda.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/CamelCaseLambda.java @@ -72,16 +72,6 @@ public class CamelCaseLambda implements Mustache.Lambda { String text = camelize(fragment.execute().replace(" ", "_"), option); if (generator != null) { text = generator.sanitizeName(text); - if (generator.reservedWords().contains(text)) { - // Escaping must be done *after* camelize, because generators may escape using characters removed by camelize function. - text = generator.escapeReservedWord(text); - } - - if (escapeParam) { - // NOTE: many generators call escapeReservedWord in toParamName, but we can't assume that's always the case. - // Here, we'll have to accept that we may be duplicating some work. - text = generator.toParamName(text); - } } writer.write(text); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/CaseFormatLambda.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/CaseFormatLambda.java index 27bb9c6ce5ed..318b31375b08 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/CaseFormatLambda.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/CaseFormatLambda.java @@ -40,10 +40,6 @@ public class CaseFormatLambda implements Mustache.Lambda { @Override public void execute(Template.Fragment fragment, Writer writer) throws IOException { String text = initialFormat.converterTo(targetFormat).convert(fragment.execute()); - if (generator != null && generator.reservedWords().contains(text)) { - text = generator.escapeReservedWord(text); - } - if (text != null) { writer.write(text); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/LowercaseLambda.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/LowercaseLambda.java index f930eaa2c002..1b21671bc4f9 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/LowercaseLambda.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/LowercaseLambda.java @@ -53,9 +53,6 @@ public class LowercaseLambda implements Mustache.Lambda { @Override public void execute(Template.Fragment fragment, Writer writer) throws IOException { String text = fragment.execute().toLowerCase(Locale.ROOT); - if (generator != null && generator.reservedWords().contains(text)) { - text = generator.escapeReservedWord(text); - } writer.write(text); }