jlengrand/openapi-generator
1
0
Fork 0
mirror of https://github.com/jlengrand/openapi-generator.git synced 2026-05-17 00:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix and tests for #503

Browse Source
This commit is contained in:
Tony Tam
2015-03-16 22:10:35 -07:00
parent 46d1950fbd
commit c215d8ab91
3 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java
View File

@@ -448,18 +448,19 @@ public class DefaultCodegen {
return m;
}
public static String getterAndSetterCapitalize(String name) {
if (name == null || name.length() == 0) {
return name;
}
if (name.length() > 1 && Character.isUpperCase(name.charAt(1)) &&
Character.isLowerCase(name.charAt(0))){
return name;
}
char chars[] = name.toCharArray();
chars[0] = Character.toUpperCase(chars[0]);
return new String(chars);
public String getterAndSetterCapitalize(String name) {
if (name == null || name.length() == 0) {
return name;
}
name = toVarName(name);
if (name.length() > 1 && Character.isUpperCase(name.charAt(1)) &&
Character.isLowerCase(name.charAt(0))){
return name;
}
char chars[] = name.toCharArray();
chars[0] = Character.toUpperCase(chars[0]);
return new String(chars);
}
public CodegenProperty fromProperty(String name, Property p) {
if(p == null) {

9
modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java
View File

@@ -87,6 +87,15 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
}
@Override
public String toVarName(String name) {
if(reservedWords.contains(name))
return escapeReservedWord(name);
else {
return name.replaceAll("-", "_");
}
}
@Override
public String getTypeDeclaration(Property p) {
if(p instanceof ArrayProperty) {