Skip to content

Commit 81b96fd

Browse files
authored
Prevent enum item names being reserved keywords (#17804)
1 parent 62b3ba7 commit 81b96fd

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -928,10 +928,14 @@ public String toEnumVarName(String value, String datatype) {
928928

929929
String var = value.replaceAll("\\W+", "_").toUpperCase(Locale.ROOT);
930930
if (var.matches("\\d.*")) {
931-
return "_" + var;
932-
} else {
933-
return var;
931+
var = "_" + var;
932+
}
933+
934+
if (reservedWords.contains(var)) {
935+
return escapeReservedWord(var);
934936
}
937+
938+
return var;
935939
}
936940

937941
public boolean specVersionGreaterThanOrEqualTo310(OpenAPI openAPI) {

0 commit comments

Comments
 (0)