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

Improvements on enum var name in Java client

Browse Source 
* Place each enum var in a separate line
* Truncate common prefix when present
This commit is contained in:
xhh
2015-09-21 17:29:26 +08:00
parent cbc2fb237d
commit 6dcaa890cf
4 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
View File

@@ -351,20 +351,34 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
Map<String, Object> allowableValues = var.allowableValues;
// handle ArrayProperty
if(var.items != null) {
if (var.items != null) {
allowableValues = var.items.allowableValues;
}
if (allowableValues == null)
if (allowableValues == null) {
continue;
}
List<String> values = (List<String>) allowableValues.get("values");
// put "enumVars" map into `allowableValues", including `name` and `value`
if (values == null)
if (values == null) {
continue;
}
// put "enumVars" map into `allowableValues", including `name` and `value`
List<Map<String, String>> enumVars = new ArrayList<Map<String, String>>();
String commonPrefix = findCommonPrefixOfVars(values);
int truncateIdx = "".equals(commonPrefix) ? 0 : commonPrefix.length();
for (String value : values) {
Map<String, String> enumVar = new HashMap<String, String>();
enumVar.put("name", toVarName(value.toUpperCase()));
String enumName;
if (truncateIdx == 0) {
enumName = value;
} else {
enumName = value.substring(truncateIdx);
if ("".equals(enumName)) {
enumName = value;
}
}
enumVar.put("name", toEnumVarName(enumName));
enumVar.put("value", value);
enumVars.add(enumVar);
}
@@ -374,6 +388,17 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
return objs;
}
private String findCommonPrefixOfVars(List<String> vars) {
String prefix = StringUtils.getCommonPrefix(vars.toArray(new String[vars.size()]));
// exclude trailing characters that should be part of a valid variable
// e.g. ["status-on", "status-off"] => "status-" (not "status-o")
return prefix.replaceAll("[a-zA-Z0-9]+\\z", "");
}
private String toEnumVarName(String value) {
return value.replaceAll("\\W+", "_").toUpperCase();
}
private CodegenModel reconcileInlineEnums(CodegenModel codegenModel, CodegenModel parentCodegenModel) {
// This generator uses inline classes to define enums, which breaks when
// dealing with models that have subTypes. To clean this up, we will analyze