Merge pull request #584 from michaeldavis-wf/fix-property-sanitization

[AbstractJavaCodegen] Fix property sanitization

Author: HugoMario

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

@@ -1146,10 +1146,10 @@ public String sanitizeVarName(String name) {
         // remove everything else other than word, number and _
         // $php_variable => php_variable
         if (allowUnicodeIdentifiers) { //could be converted to a single line with ?: operator
-            name = Pattern.compile("\\W-[\\$]", Pattern.UNICODE_CHARACTER_CLASS).matcher(name).replaceAll(StringUtils.EMPTY);
+            name = Pattern.compile("[\\W&&[^$]]", Pattern.UNICODE_CHARACTER_CLASS).matcher(name).replaceAll(StringUtils.EMPTY);
         }
         else {
-            name = name.replaceAll("\\W-[\\$]", StringUtils.EMPTY);
+            name = name.replaceAll("[\\W&&[^$]]", StringUtils.EMPTY);
         }
         return name;
     }

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

@@ -95,6 +95,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(":user_name"), "userName");
     }
 
     @Test