Skip to content
New issue

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

#

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

Already on GitHub? # to your account

[golang] Fix Null pointer exception in toVarName #377

Merged
merged 3 commits into from
Jul 3, 2018
+2 −1
Merged

[golang] Fix Null pointer exception in toVarName #377

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99718f9
Fix Null pointer exception in toVarName
etherealjoy Jun 21, 2018
c3a88c5
Removed redundant code handled in super
etherealjoy Jul 2, 2018
3c293df
Remove \t
etherealjoy Jul 2, 2018
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
6 changes: 5 additions & 1 deletion ...openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,12 @@ public String escapeReservedWord(String name) {

@Override
public String toVarName(String name) {

if(name != null) {
name = name.replaceAll("-", "_");
}
// replace - with _ e.g. created-at => created_at
name = sanitizeName(name.replaceAll("-", "_"));
name = sanitizeName(name);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will sanitizeName() always return a non-null object?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@macjohnny super will always return non null. If name is null it will return ERROR_UNKNOWN
This is a different issue tracked here #376

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, so then this should be fine

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why that replaceAll is here at all? Go should not use _ or - in variable names. Camelize removes both these.

  // Remove all underscores (underscore_case to camelCase)
        p = Pattern.compile("(_)(.)");
        m = p.matcher(word);
        while (m.find()) {
            String original = m.group(2);
            String upperCase = original.toUpperCase();
            if (original.equals(upperCase)) {
                word = word.replaceFirst("_", "");
            } else {
                word = m.replaceFirst(upperCase);
            }
            m = p.matcher(word);
        }

        // Remove all hyphens (hyphen-case to camelCase)
        p = Pattern.compile("(-)(.)");
        m = p.matcher(word);
        while (m.find()) {
            word = m.replaceFirst(m.group(2).toUpperCase());
            m = p.matcher(word);
        }

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I could update this.


// if it's all uppper case, do nothing
if (name.matches("^[A-Z_]*$"))
Expand Down