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

fixed import types

Browse Source
This commit is contained in:
Tony Tam 2014-10-21 00:02:28 -07:00
parent 461cb51f6a
commit e2ae99acac
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java
View File

@ -648,7 +648,7 @@ public class DefaultCodegen {
collectionFormat = qp.getCollectionFormat(); collectionFormat = qp.getCollectionFormat();
CodegenProperty pr = fromProperty("inner", inner); CodegenProperty pr = fromProperty("inner", inner);
p.baseType = pr.datatype; p.baseType = pr.datatype;
imports.add(pr.datatype); imports.add(pr.baseType);
} }
else else
property = PropertyBuilder.build(qp.getType(), qp.getFormat(), null); property = PropertyBuilder.build(qp.getType(), qp.getFormat(), null);
@ -657,8 +657,9 @@ public class DefaultCodegen {
p.dataType = model.datatype; p.dataType = model.datatype;
p.paramName = toParamName(qp.getName()); p.paramName = toParamName(qp.getName());
if(model.complexType != null) if(model.complexType != null) {
imports.add(model.complexType); imports.add(model.complexType);
}
} }
else { else {
BodyParameter bp = (BodyParameter) param; BodyParameter bp = (BodyParameter) param;
@ -668,7 +669,6 @@ public class DefaultCodegen {
ModelImpl impl = (ModelImpl) model; ModelImpl impl = (ModelImpl) model;
CodegenModel cm = fromModel(bp.getName(), impl); CodegenModel cm = fromModel(bp.getName(), impl);
p.dataType = getTypeDeclaration(cm.classname); p.dataType = getTypeDeclaration(cm.classname);
System.out.println("added import for " + p.dataType);
imports.add(p.dataType); imports.add(p.dataType);
} }
else if(model instanceof ArrayModel) { else if(model instanceof ArrayModel) {
@ -679,6 +679,7 @@ public class DefaultCodegen {
// get the single property // get the single property
ArrayProperty ap = new ArrayProperty().items(impl.getItems()); ArrayProperty ap = new ArrayProperty().items(impl.getItems());
CodegenProperty cp = fromProperty("inner", ap); CodegenProperty cp = fromProperty("inner", ap);
imports.add(cp.baseType); imports.add(cp.baseType);
p.dataType = cp.datatype; p.dataType = cp.datatype;
p.isContainer = true; p.isContainer = true;
@ -691,8 +692,9 @@ public class DefaultCodegen {
name = typeMapping.get(name); name = typeMapping.get(name);
else { else {
name = toModelName(name); name = toModelName(name);
if(defaultIncludes.contains(name)) if(defaultIncludes.contains(name)) {
imports.add(name); imports.add(name);
}
name = getTypeDeclaration(name); name = getTypeDeclaration(name);
} }
p.dataType = name; p.dataType = name;