Change sanizeName logic

Author: jmini

src/main/java/io/swagger/codegen/languages/java/AbstractJavaCodegen.java

@@ -508,7 +508,7 @@ public String toApiFilename(String name) {
     @Override
     public String toVarName(String name) {
         // sanitize name
-        name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
+        name = sanitizeVarName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
         if (name.toLowerCase().matches("^_*class$")) {
             return "propertyClass";
@@ -584,7 +584,7 @@ public String toModelName(final String name) {
             return importMapping.get(name);
         }
 
-        final String sanitizedName = super.sanitizeName(name);
+        final String sanitizedName = sanitizeName(name);
 
         String nameWithPrefixSuffix = sanitizedName;
         if (!StringUtils.isEmpty(modelNamePrefix)) {
@@ -1058,8 +1058,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
         return op;
     }
 
-    @Override
-    public String sanitizeName(String name) {
+    public String sanitizeVarName(String name) {
         if (name == null) {
             LOGGER.warn("String to be sanitized is null. Default to " + Object.class.getSimpleName());
             return Object.class.getSimpleName();

src/test/java/io/swagger/codegen/languages/java/AbstractJavaCodegenTest.java

@@ -112,13 +112,20 @@ public void preprocessSwaggerWithNoFormOrBodyParamsDoesNotSetContentType() {
 
     @Test
      public void convertVarName() throws Exception {
-        AbstractJavaCodegen codegen = new JavaClientCodegen();
-        Assert.assertEquals(codegen.toVarName("name"), "name");
-        Assert.assertEquals(codegen.toVarName("$name"), "$name");
-        Assert.assertEquals(codegen.toVarName("nam$$e"), "nam$$e");
-        Assert.assertEquals(codegen.toVarName("_name"), "_name");
-        Assert.assertEquals(codegen.toVarName("user-name"), "userName");
-        Assert.assertEquals(codegen.toVarName("user_name"), "userName");
-        Assert.assertEquals(codegen.toVarName("_user_name"), "_userName");
+        Assert.assertEquals(fakeJavaCodegen.toVarName("name"), "name");
+        Assert.assertEquals(fakeJavaCodegen.toVarName("$name"), "$name");
+        Assert.assertEquals(fakeJavaCodegen.toVarName("nam$$e"), "nam$$e");
+        Assert.assertEquals(fakeJavaCodegen.toVarName("_name"), "_name");
+        Assert.assertEquals(fakeJavaCodegen.toVarName("user-name"), "userName");
+        Assert.assertEquals(fakeJavaCodegen.toVarName("user_name"), "userName");
+        Assert.assertEquals(fakeJavaCodegen.toVarName("_user_name"), "_userName");
+    }
+
+    @Test
+    public void convertModelName() throws Exception {
+        Assert.assertEquals(fakeJavaCodegen.toModelName("name"), "Name");
+        Assert.assertEquals(fakeJavaCodegen.toModelName("$name"), "Name");
+        Assert.assertEquals(fakeJavaCodegen.toModelName("nam#e"), "Name");
+        Assert.assertEquals(fakeJavaCodegen.toModelName("$another-fake?"), "AnotherFake");
     }
 }

src/test/java/io/swagger/codegen/languages/java/AbstractJavaJAXRSServerCodegenTest.java

@@ -0,0 +1,46 @@
+package io.swagger.codegen.languages.java;
+
+import io.swagger.codegen.CodegenArgument;
+import io.swagger.codegen.CodegenType;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+import java.util.List;
+
+public class AbstractJavaJAXRSServerCodegenTest {
+
+    private final AbstractJavaJAXRSServerCodegen fakeJavaJAXRSCodegen = new AbstractJavaJAXRSServerCodegen() {
+        @Override
+        public String getArgumentsLocation() {
+            return null;
+        }
+
+        @Override
+        public CodegenType getTag() {
+            return null;
+        }
+
+        @Override
+        public String getName() {
+            return null;
+        }
+
+        @Override
+        public String getHelp() {
+            return null;
+        }
+
+        @Override
+        public List<CodegenArgument> readLanguageArguments() {
+            return null;
+        }
+    };
+
+    @Test
+    public void convertApiName() throws Exception {
+        Assert.assertEquals(fakeJavaJAXRSCodegen.toApiName("name"), "NameApi");
+        Assert.assertEquals(fakeJavaJAXRSCodegen.toApiName("$name"), "NameApi");
+        Assert.assertEquals(fakeJavaJAXRSCodegen.toApiName("nam#e"), "NameApi");
+        Assert.assertEquals(fakeJavaJAXRSCodegen.toApiName("$another-fake?"), "AnotherFakeApi");
+        Assert.assertEquals(fakeJavaJAXRSCodegen.toApiName("fake_classname_tags 123#$%^"), "FakeClassnameTags123Api");
+    }
+}