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

JavaScript: fix constructFromObject for Array fields

Browse Source 
Closes #1721
This commit is contained in:
xhh 2016-01-22 11:23:45 +08:00
parent 53abd8a8fb
commit 16e367bdc8
4 changed files with 6 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -624,41 +624,7 @@ public class DefaultCodegen {
* @return string presentation of the default value of the property * @return string presentation of the default value of the property
*/ */
public String toDefaultValueWithParam(String name, Property p) { public String toDefaultValueWithParam(String name, Property p) {
if (p instanceof StringProperty) { return " = data." + name + ";";
return " = data." + name + ";";
} else if (p instanceof BooleanProperty) {
return " = data." + name + ";";
} else if (p instanceof DateProperty) {
return " = data." + name + ";";
} else if (p instanceof DateTimeProperty) {
return " = data." + name + ";";
} else if (p instanceof DoubleProperty) {
DoubleProperty dp = (DoubleProperty) p;
if (dp.getDefault() != null) {
return dp.getDefault().toString();
}
return " = data." + name + ";";
} else if (p instanceof FloatProperty) {
FloatProperty dp = (FloatProperty) p;
if (dp.getDefault() != null) {
return dp.getDefault().toString();
}
return " = data." + name + ";";
} else if (p instanceof IntegerProperty) {
IntegerProperty dp = (IntegerProperty) p;
if (dp.getDefault() != null) {
return dp.getDefault().toString();
}
return " = data." + name + ";";
} else if (p instanceof LongProperty) {
LongProperty dp = (LongProperty) p;
if (dp.getDefault() != null) {
return dp.getDefault().toString();
}
return " = data." + name + ";";
} else {
return " = data." + name + ";";
}
} }
/** /**

15
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java
View File

@ -324,27 +324,16 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
return super.toDefaultValue(p); return super.toDefaultValue(p);
} }
@Override @Override
public String toDefaultValueWithParam(String name, Property p) { public String toDefaultValueWithParam(String name, Property p) {
if (p instanceof ArrayProperty) { if (p instanceof RefProperty) {
return " = new Array();"; RefProperty rp = (RefProperty) p;
} else if (p instanceof MapProperty) {
return " = {}";
} else if (p instanceof LongProperty) {
LongProperty dp = (LongProperty) p;
return " = data." + name + ";";
// added for Javascript
} else if (p instanceof RefProperty) {
RefProperty rp = (RefProperty)p;
return ".constructFromObject(data." + name + ");"; return ".constructFromObject(data." + name + ");";
} }
return super.toDefaultValueWithParam(name, p); return super.toDefaultValueWithParam(name, p);
} }
@Override @Override
public String getSwaggerType(Property p) { public String getSwaggerType(Property p) {
String swaggerType = super.getSwaggerType(p); String swaggerType = super.getSwaggerType(p);

4
samples/client/petstore/javascript/src/model/Pet.js
View File

@ -95,9 +95,9 @@ var StatusEnum = function StatusEnum() {
self.name = data.name; self.name = data.name;
self.photoUrls = new Array(); self.photoUrls = data.photoUrls;
self.tags = new Array(); self.tags = data.tags;
self.status = data.status; self.status = data.status;

1
samples/client/petstore/javascript/test/api/PetApiTest.js
View File

@ -40,6 +40,7 @@ describe('PetApi', function() {
expect(fetched).to.be.ok(); expect(fetched).to.be.ok();
expect(fetched.id).to.be(pet.id); expect(fetched.id).to.be(pet.id);
expect(fetched.getPhotoUrls()).to.eql(pet.getPhotoUrls());
expect(fetched.getCategory()).to.be.ok(); expect(fetched.getCategory()).to.be.ok();
expect(fetched.getCategory().getName()).to.be(pet.getCategory().getName()); expect(fetched.getCategory().getName()).to.be(pet.getCategory().getName());