fix variable name starting with number, make LOGGER protected

This commit is contained in:
wing328 2015-08-17 10:43:03 +08:00
parent 4163f07911
commit d4ff25f0b3
4 changed files with 19 additions and 13 deletions

View File

@ -63,7 +63,7 @@ import java.util.regex.Pattern;
public class DefaultCodegen { public class DefaultCodegen {
private static final Logger LOGGER = LoggerFactory.getLogger(DefaultCodegen.class); protected static final Logger LOGGER = LoggerFactory.getLogger(DefaultCodegen.class);
protected String outputFolder = ""; protected String outputFolder = "";
protected Set<String> defaultIncludes = new HashSet<String>(); protected Set<String> defaultIncludes = new HashSet<String>();

View File

@ -159,15 +159,17 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig {
@Override @Override
public String toVarName(String name) { public String toVarName(String name) {
// return the name in underscore style
// PhoneNumber => phone_number
name = underscore(name);
// parameter name starting with number won't compile // parameter name starting with number won't compile
// need to escape it by appending _ at the beginning // need to escape it by appending _ at the beginning
if (name.matches("^[0-9]")) { if (name.matches("^\\d.*")) {
name = "_" + name; name = "_" + name;
} }
// return the name in underscore style return name;
// PhoneNumber => phone_number
return underscore(name);
} }
@Override @Override

View File

@ -284,15 +284,17 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
@Override @Override
public String toVarName(String name) { public String toVarName(String name) {
// return the name in underscore style
// PhoneNumber => phone_number
name = underscore(name);
// parameter name starting with number won't compile // parameter name starting with number won't compile
// need to escape it by appending _ at the beginning // need to escape it by appending _ at the beginning
if (name.matches("^[0-9]")) { if (name.matches("^\\d.*")) {
name = "_" + name; name = "_" + name;
} }
// return the name in underscore style return name;
// PhoneNumber => phone_number
return underscore(name);
} }
@Override @Override

View File

@ -154,15 +154,17 @@ public class SilexServerCodegen extends DefaultCodegen implements CodegenConfig
@Override @Override
public String toVarName(String name) { public String toVarName(String name) {
// return the name in underscore style
// PhoneNumber => phone_number
name = underscore(name);
// parameter name starting with number won't compile // parameter name starting with number won't compile
// need to escape it by appending _ at the beginning // need to escape it by appending _ at the beginning
if (name.matches("^[0-9]")) { if (name.matches("^\\d.*")) {
name = "_" + name; name = "_" + name;
} }
// return the name in underscore style return name;
// PhoneNumber => phone_number
return underscore(name);
} }
@Override @Override