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

Merge pull request #1359 from wing328/better_exception_handling2

Browse Source 
Better exception handling
This commit is contained in:
wing328
2015-10-12 16:58:01 +08:00
parent a5a6ae72c3 6ee42bebe6
commit d162d48fa3
21 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -492,10 +492,16 @@ public class DefaultCodegen {
} else if (p instanceof DecimalProperty) {
datatype = "number";
} else if (p instanceof RefProperty) {
RefProperty r = (RefProperty) p;
datatype = r.get$ref();
if (datatype.indexOf("#/definitions/") == 0) {
datatype = datatype.substring("#/definitions/".length());
try {
RefProperty r = (RefProperty) p;
datatype = r.get$ref();
if (datatype.indexOf("#/definitions/") == 0) {
datatype = datatype.substring("#/definitions/".length());
}
} catch (Exception e) {
LOGGER.warn("Error obtaining the datatype from RefProperty:" + p + ". Datatype default to Object");
datatype = "Object";
e.printStackTrace();
}
} else {
if (p != null) {
@@ -584,7 +590,7 @@ public class DefaultCodegen {
}
}
// interfaces (intermediate models)
if (allDefinitions != null) {
if (allDefinitions != null && composed.getInterfaces() != null) {
for (RefModel _interface : composed.getInterfaces()) {
final String interfaceRef = toModelName(_interface.getSimpleRef());
final Model interfaceModel = allDefinitions.get(interfaceRef);