Merge pull request #910 from atlassian-forks/enum-underscore

909: Fixed bug where an enum value could end up being called "_" whic…

Author: HugoMario

src/main/java/io/swagger/codegen/v3/generators/java/AbstractJavaCodegen.java

@@ -492,6 +492,15 @@ private void sanitizeConfig() {
         }
     }
 
+    protected String escapeUnderscore(String name) {
+        // Java 8 discourages naming things _, but Java 9 does not allow it.
+        if("_".equals(name)) {
+            return "_u";
+        } else {
+            return name;
+        }
+    }
+
     @Override
     public String escapeReservedWord(String name) {
         if(this.reservedWordsMappings().containsKey(name)) {
@@ -562,11 +571,9 @@ public String toVarName(String name) {
             return "propertyClass";
         }
 
-        if("_".equals(name)) {
-            name = "_u";
-        }
+        name = escapeUnderscore(name);
 
-        // if it's all uppper case, do nothing
+        // if it's all upper case, do nothing
         if (name.matches("^[A-Z_]*$")) {
             return name;
         }
@@ -1264,7 +1271,7 @@ public String toEnumVarName(String value, String datatype) {
         if (var.matches("\\d.*")) {
             return "_" + var;
         } else {
-            return var;
+            return escapeUnderscore(var).toUpperCase();
         }
     }
 

src/test/java/io/swagger/codegen/v3/generators/java/AbstractJavaCodegenTest.java

@@ -23,6 +23,11 @@ public void toEnumVarNameShouldNotShortenUnderScore() throws Exception {
         Assert.assertEquals("__", fakeJavaCodegen.toEnumVarName("_,.", "String"));
     }
 
+    @Test
+    public void toEnumVarNameShouldNotCreateSingleUnderscore() throws Exception {
+        Assert.assertEquals("_U", fakeJavaCodegen.toEnumVarName(",.", "String"));
+    }
+
     @Test
     public void toVarNameShouldAvoidOverloadingGetClassMethod() throws Exception {
         Assert.assertEquals("propertyClass", fakeJavaCodegen.toVarName("class"));
@@ -96,6 +101,7 @@ public void convertVarName() throws Exception {
         Assert.assertEquals(fakeJavaCodegen.toVarName("user_name"), "userName");
         Assert.assertEquals(fakeJavaCodegen.toVarName("_user_name"), "_userName");
         Assert.assertEquals(fakeJavaCodegen.toVarName(":user_name"), "userName");
+        Assert.assertEquals(fakeJavaCodegen.toVarName("_"), "u");
     }
 
     @Test