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

Merge pull request #1264 from xhh/java-enum-improvements

Browse Source 
[Java] Improvements on enum var name in Java client
This commit is contained in:
wing328
2015-09-24 11:42:11 +08:00
parent ee7f447f77 bcbf9c54c7
commit 5ee86b9816
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

@@ -358,20 +358,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 = 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);
}
@@ -404,6 +418,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