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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Dave Baird
2015-11-11 23:24:39 +00:00
parent 2144cf5d31 52320e5f71
commit 3ca7ce6ce6
19 changed files with 1511 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -497,7 +497,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
}
allowableValues.put("enumVars", enumVars);
// handle default value for enum, e.g. available => StatusEnum.AVAILABLE
if (var.defaultValue != null && !"null".equals(var.defaultValue)) {
if (var.defaultValue != null) {
String enumName = null;
for (Map<String, String> enumVar : enumVars) {
if (var.defaultValue.equals(enumVar.get("value"))) {
@@ -505,10 +505,9 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
break;
}
}
if (enumName == null) {
throw new RuntimeException("default value of property \"" + var.baseName + "\" is not in allowed values: " + var.defaultValue);
if (enumName != null) {
var.defaultValue = var.datatypeWithEnum + "." + enumName;
}
var.defaultValue = var.datatypeWithEnum + "." + enumName;
}
}
}