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

fix for stripping prefix on single enums (#7726)

Browse Source
This commit is contained in:
lborupj 2018-03-09 07:33:34 +01:00 committed by William Cheng
parent 1947220159
commit e73eeb4fdf
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
View File

@ -263,12 +263,14 @@ public class DefaultCodegen {
} }
/** /**
* Returns the common prefix of variables for enum naming * Returns the common prefix of variables for enum naming if
* two or more variables are present
* *
* @param vars List of variable names * @param vars List of variable names
* @return the common prefix for naming * @return the common prefix for naming
*/ */
public String findCommonPrefixOfVars(List<Object> vars) { public String findCommonPrefixOfVars(List<Object> vars) {
if (vars.size() > 1) {
try { try {
String[] listStr = vars.toArray(new String[vars.size()]); String[] listStr = vars.toArray(new String[vars.size()]);
String prefix = StringUtils.getCommonPrefix(listStr); String prefix = StringUtils.getCommonPrefix(listStr);
@ -276,9 +278,11 @@ public class DefaultCodegen {
// e.g. ["status-on", "status-off"] => "status-" (not "status-o") // e.g. ["status-on", "status-off"] => "status-" (not "status-o")
return prefix.replaceAll("[a-zA-Z0-9]+\\z", ""); return prefix.replaceAll("[a-zA-Z0-9]+\\z", "");
} catch (ArrayStoreException e) { } catch (ArrayStoreException e) {
return ""; // do nothing, just return default value
} }
} }
return "";
}
/** /**
* Return the enum default value in the language specified format * Return the enum default value in the language specified format