loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Remove dots and dashes from model names

Browse Source
This commit is contained in:
Andrew Gibiansky 2016-04-05 12:01:49 -07:00
parent 569d458bc9
commit c49b22bcdd
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/HaskellServantCodegen.java
View File

@ -249,7 +249,7 @@ public class HaskellServantCodegen extends DefaultCodegen implements CodegenConf
Property inner = mp.getAdditionalProperties(); Property inner = mp.getAdditionalProperties();
return "Map.Map String " + getTypeDeclaration(inner); return "Map.Map String " + getTypeDeclaration(inner);
} }
return super.getTypeDeclaration(p); return fixModelChars(super.getTypeDeclaration(p));
} }
/** /**
@ -459,11 +459,19 @@ public class HaskellServantCodegen extends DefaultCodegen implements CodegenConf
return sb.toString(); return sb.toString();
} }
// Remove characters from a string that do not belong in a model classname
private String fixModelChars(String string) {
return string.replace(".", "").replace("-", "");
}
// Override fromModel to create the appropriate model namings // Override fromModel to create the appropriate model namings
@Override @Override
public CodegenModel fromModel(String name, Model mod, Map<String, Model> allDefinitions) { public CodegenModel fromModel(String name, Model mod, Map<String, Model> allDefinitions) {
CodegenModel model = super.fromModel(name, mod, allDefinitions); CodegenModel model = super.fromModel(name, mod, allDefinitions);
// Clean up the class name to remove invalid characters
model.classname = fixModelChars(model.classname);
// From the model name, compute the prefix for the fields. // From the model name, compute the prefix for the fields.
String prefix = camelize(model.classname, true); String prefix = camelize(model.classname, true);
for(CodegenProperty prop : model.vars) { for(CodegenProperty prop : model.vars) {
@ -491,5 +499,4 @@ public class HaskellServantCodegen extends DefaultCodegen implements CodegenConf
p.vendorExtensions.put("x-formParamName", camelize(p.baseName)); p.vendorExtensions.put("x-formParamName", camelize(p.baseName));
return p; return p;
} }
} }