Merge pull request #1378 from xhh/java-invalid-enum-name

wing328 · wing328 · commit 22218cb13233 · 2015-10-15T10:51:03.000+08:00
[Java] Handle enum names starting with number in Java client
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
@@ -427,7 +427,12 @@ private String findCommonPrefixOfVars(List<String> vars) {
     }
 
     private String toEnumVarName(String value) {
-        return value.replaceAll("\\W+", "_").toUpperCase();
+        String var = value.replaceAll("\\W+", "_").toUpperCase();
+        if (var.matches("\\d.*")) {
+            return "_" + var;
+        } else {
+            return var;
+        }
     }
 
     private CodegenModel reconcileInlineEnums(CodegenModel codegenModel, CodegenModel parentCodegenModel) {

Original file line number	Diff line number	Diff line change
`@@ -427,7 +427,12 @@ private String findCommonPrefixOfVars(List<String> vars) {`
`427`	`427`	`}`
`428`	`428`
`429`	`429`	`private String toEnumVarName(String value) {`
`430`		`- return value.replaceAll("\\W+", "_").toUpperCase();`
	`430`	`+ String var = value.replaceAll("\\W+", "_").toUpperCase();`
	`431`	`+ if (var.matches("\\d.*")) {`
	`432`	`+ return "_" + var;`
	`433`	`+ } else {`
	`434`	`+ return var;`
	`435`	`+ }`
`431`	`436`	`}`
`432`	`437`
`433`	`438`	`private CodegenModel reconcileInlineEnums(CodegenModel codegenModel, CodegenModel parentCodegenModel) {`