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

Don't set missing optional params in models

Browse Source 
Fixes #2103.

In the constructFromObject methods, we were always setting all the
parameters, including optional ones that were missing in the `data`
object. Because of the `convertToType` calls, this had the effect
of producing the *strings* `"undefined"` or `"null"` as property
values on the constructed object! This obviously leads to difficult
bugs.

This commit makes sure that we first check that the data field
exists in the data object. Note that both `null` and `undefined`
values will be skipped.
This commit is contained in:
delenius
2016-02-09 10:58:10 -08:00
parent fdaf1e6236
commit c7766457bd
11 changed files with 147 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/client/petstore/javascript-promise/src/model/Category.js
View File

@@ -38,9 +38,13 @@
return this;
}
this['id'] = ApiClient.convertToType(data['id'], 'Integer');
if (data['id']) {
this['id'] = ApiClient.convertToType(data['id'], 'Integer');
}
this['name'] = ApiClient.convertToType(data['name'], 'String');
if (data['name']) {
this['name'] = ApiClient.convertToType(data['name'], 'String');
}
return this;
}

24
samples/client/petstore/javascript-promise/src/model/Order.js
View File

@@ -87,17 +87,29 @@ var StatusEnum = function StatusEnum() {
return this;
}
this['id'] = ApiClient.convertToType(data['id'], 'Integer');
if (data['id']) {
this['id'] = ApiClient.convertToType(data['id'], 'Integer');
}
this['petId'] = ApiClient.convertToType(data['petId'], 'Integer');
if (data['petId']) {
this['petId'] = ApiClient.convertToType(data['petId'], 'Integer');
}
this['quantity'] = ApiClient.convertToType(data['quantity'], 'Integer');
if (data['quantity']) {
this['quantity'] = ApiClient.convertToType(data['quantity'], 'Integer');
}
this['shipDate'] = ApiClient.convertToType(data['shipDate'], 'Date');
if (data['shipDate']) {
this['shipDate'] = ApiClient.convertToType(data['shipDate'], 'Date');
}
this['status'] = ApiClient.convertToType(data['status'], 'String');
if (data['status']) {
this['status'] = ApiClient.convertToType(data['status'], 'String');
}
this['complete'] = ApiClient.convertToType(data['complete'], 'Boolean');
if (data['complete']) {
this['complete'] = ApiClient.convertToType(data['complete'], 'Boolean');
}
return this;
}

24
samples/client/petstore/javascript-promise/src/model/Pet.js
View File

@@ -89,17 +89,29 @@ var StatusEnum = function StatusEnum() {
return this;
}
this['id'] = ApiClient.convertToType(data['id'], 'Integer');
if (data['id']) {
this['id'] = ApiClient.convertToType(data['id'], 'Integer');
}
this['category'].constructFromObject(data['category']);
if (data['category']) {
this['category'].constructFromObject(data['category']);
}
this['name'] = ApiClient.convertToType(data['name'], 'String');
if (data['name']) {
this['name'] = ApiClient.convertToType(data['name'], 'String');
}
this['photoUrls'] = ApiClient.convertToType(data['photoUrls'], ['String']);
if (data['photoUrls']) {
this['photoUrls'] = ApiClient.convertToType(data['photoUrls'], ['String']);
}
this['tags'] = ApiClient.convertToType(data['tags'], [Tag]);
if (data['tags']) {
this['tags'] = ApiClient.convertToType(data['tags'], [Tag]);
}
this['status'] = ApiClient.convertToType(data['status'], 'String');
if (data['status']) {
this['status'] = ApiClient.convertToType(data['status'], 'String');
}
return this;
}

8
samples/client/petstore/javascript-promise/src/model/Tag.js
View File

@@ -38,9 +38,13 @@
return this;
}
this['id'] = ApiClient.convertToType(data['id'], 'Integer');
if (data['id']) {
this['id'] = ApiClient.convertToType(data['id'], 'Integer');
}
this['name'] = ApiClient.convertToType(data['name'], 'String');
if (data['name']) {
this['name'] = ApiClient.convertToType(data['name'], 'String');
}
return this;
}

32
samples/client/petstore/javascript-promise/src/model/User.js
View File

@@ -69,21 +69,37 @@
return this;
}
this['id'] = ApiClient.convertToType(data['id'], 'Integer');
if (data['id']) {
this['id'] = ApiClient.convertToType(data['id'], 'Integer');
}
this['username'] = ApiClient.convertToType(data['username'], 'String');
if (data['username']) {
this['username'] = ApiClient.convertToType(data['username'], 'String');
}
this['firstName'] = ApiClient.convertToType(data['firstName'], 'String');
if (data['firstName']) {
this['firstName'] = ApiClient.convertToType(data['firstName'], 'String');
}
this['lastName'] = ApiClient.convertToType(data['lastName'], 'String');
if (data['lastName']) {
this['lastName'] = ApiClient.convertToType(data['lastName'], 'String');
}
this['email'] = ApiClient.convertToType(data['email'], 'String');
if (data['email']) {
this['email'] = ApiClient.convertToType(data['email'], 'String');
}
this['password'] = ApiClient.convertToType(data['password'], 'String');
if (data['password']) {
this['password'] = ApiClient.convertToType(data['password'], 'String');
}
this['phone'] = ApiClient.convertToType(data['phone'], 'String');
if (data['phone']) {
this['phone'] = ApiClient.convertToType(data['phone'], 'String');
}
this['userStatus'] = ApiClient.convertToType(data['userStatus'], 'Integer');
if (data['userStatus']) {
this['userStatus'] = ApiClient.convertToType(data['userStatus'], 'Integer');
}
return this;
}