Merge remote-tracking branch 'origin/master' into 2.3.0

2016-10-22 23:08:36 +08:00
parent a839a6803f 92c474b2c2
commit af16601654
44 changed files with 522 additions and 498 deletions
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
@@ -3171,7 +3171,12 @@ public class DefaultCodegen {
                buf.append(StringUtils.capitalize(part));
            }
        }
-        return buf.toString().replaceAll("[^a-zA-Z ]", "");
+        String returnTag = buf.toString().replaceAll("[^a-zA-Z0-9_]", "");
+        if (returnTag.matches("\\d.*")) {
+            return "_" + returnTag;
+        } else {
+            return returnTag;
+        }
    }

    /**