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

fix NPE for enum (#5445)

Browse Source
This commit is contained in:
William Cheng 2020-02-27 12:04:38 +08:00 committed by GitHub
parent 6ad9fbc9a6
commit ba0d673eaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
View File

@ -4762,17 +4762,18 @@ public class DefaultCodegen implements CodegenConfig {
protected List<Map<String, Object>> buildEnumVars(List<Object> values, String dataType) { protected List<Map<String, Object>> buildEnumVars(List<Object> values, String dataType) {
List<Map<String, Object>> enumVars = new ArrayList<>(); List<Map<String, Object>> enumVars = new ArrayList<>();
int truncateIdx = 0; int truncateIdx = 0;
if (isRemoveEnumValuePrefix()) { if (isRemoveEnumValuePrefix()) {
String commonPrefix = findCommonPrefixOfVars(values); String commonPrefix = findCommonPrefixOfVars(values);
truncateIdx = commonPrefix.length(); truncateIdx = commonPrefix.length();
} }
for (Object value : values) { for (Object value : values) {
Map<String, Object> enumVar = new HashMap<>(); Map<String, Object> enumVar = new HashMap<>();
String enumName; String enumName;
if (truncateIdx == 0) { if (truncateIdx == 0) {
enumName = value.toString(); enumName = String.valueOf(value);
} } else {
else {
enumName = value.toString().substring(truncateIdx); enumName = value.toString().substring(truncateIdx);
if ("".equals(enumName)) { if ("".equals(enumName)) {
enumName = value.toString(); enumName = value.toString();
@ -4780,7 +4781,7 @@ public class DefaultCodegen implements CodegenConfig {
} }
enumVar.put("name", toEnumVarName(enumName, dataType)); enumVar.put("name", toEnumVarName(enumName, dataType));
enumVar.put("value", toEnumValue(value.toString(), dataType)); enumVar.put("value", toEnumValue(String.valueOf(value), dataType));
enumVar.put("isString", isDataTypeString(dataType)); enumVar.put("isString", isDataTypeString(dataType));
enumVars.add(enumVar); enumVars.add(enumVar);
} }