Skip to content

Fix issue9444 #13668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ahsanfz wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix issue9444 #13668

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4ecde58
Add a simplistic way to add back underscore to a var when it appears …
ahsanfz Jul 12, 2021
220ce08
Lets not change how we decide to lowercase first letter
ahsanfz Jul 12, 2021
7b21476
Fix the corner case with variable name as only "_"
ahsanfz Jul 12, 2021
802c213
Add strange case with class, _class and __class. Need to find out why…
ahsanfz Jul 12, 2021
11d432b
It should be not for the class properties in condition.
ahsanfz Jul 12, 2021
28d53a3
Inline condition and fix propertyClass check.
ahsanfz Jul 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions ...enapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,6 +763,10 @@ public String toVarName(String name) {
// sanitize name
name = sanitizeName(name, "\\W-[\\$]"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.

// We need to rePrepend the "_" if it appears as first character of a series of characters in a name.
// name is not just equal to "_" which translates to "_u" corner case.
boolean prependUnderscore = name.length()!=1 && name.startsWith("_");

if (name.toLowerCase(Locale.ROOT).matches("^_*class$")) {
return "propertyClass";
}
Expand Down Expand Up @@ -798,7 +802,8 @@ public String toVarName(String name) {
name = camelize(name, true);

// for reserved word or word starting with number, append _
if (isReservedWord(name) || name.matches("^\\d.*")) {
// for _ in start of word, put it back in, as camelize removes it totally.
if (isReservedWord(name) || name.matches("^\\d.*") || prependUnderscore ) {
name = escapeReservedWord(name);
}

Expand Down Expand Up @@ -1986,6 +1991,7 @@ public String getterAndSetterCapitalize(String name) {
if (name == null || name.length() == 0) {
return name;
}
boolean prependUnderscore = name.length()!=1 && name.startsWith("_");
name = toVarName(name);
//
// Let the property name capitalized
Expand All @@ -1996,7 +2002,12 @@ public String getterAndSetterCapitalize(String name) {
if (name.length() > 1 && Character.isLowerCase(name.charAt(0)) && Character.isUpperCase(name.charAt(1))) {
lowercaseFirstLetter = true;
}
return camelize(name, lowercaseFirstLetter);
name = camelize(name, lowercaseFirstLetter);
// Note capitalizing "P" initial letter since camelize capitalizes it
if ( prependUnderscore && !name.equals("PropertyClass")) {
name = "_" + name;
}
return name;
}

@Override
Expand Down