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

Javascript: fix the constructFromObject issue

Browse Source 
Closes #1721
Also fixed indentations in models
This commit is contained in:
xhh 2015-12-17 21:29:05 +08:00
parent a58f755a6a
commit 1b0294dac0
6 changed files with 288 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
modules/swagger-codegen/src/main/resources/Javascript/model.mustache
View File

@ -12,34 +12,37 @@ if (typeof module === 'object' && module.exports) {
//export module //export module
if ( typeof define === "function" && define.amd ) { if ( typeof define === "function" && define.amd ) {
define('{{classname}}', ['jquery'{{#vars}}{{^isPrimitiveType}}{{^-last}}, {{/-last}}'{{datatypeWithEnum}}'{{/isPrimitiveType}}{{/vars}}], define('{{classname}}', ['jquery'{{#vars}}{{^isPrimitiveType}}{{^-last}}, {{/-last}}'{{datatypeWithEnum}}'{{/isPrimitiveType}}{{/vars}}],
function(${{#vars}}{{^isPrimitiveType}}{{^-last}}, {{/-last}}{{datatypeWithEnum}}{{/isPrimitiveType}}{{/vars}}) { function(${{#vars}}{{^isPrimitiveType}}{{^-last}}, {{/-last}}{{datatypeWithEnum}}{{/isPrimitiveType}}{{/vars}}) {
return {{classname}}; return {{classname}};
}); });
} }
{{#description}}/** {{#description}}/**
* {{description}} * {{description}}
**/{{/description}} **/{{/description}}
var {{classname}} = function {{classname}}({{#mandatory}}{{this}}{{^-last}}, {{/-last}}{{/mandatory}}) { {{#parent}}/* extends {{{parent}}}*/{{/parent}} var {{classname}} = function {{classname}}({{#mandatory}}{{this}}{{^-last}}, {{/-last}}{{/mandatory}}) { {{#parent}}/* extends {{{parent}}}*/{{/parent}}
var self = this; var self = this;
{{#vars}} {{#vars}}
/**{{#description}} /**{{#description}}
* {{{description}}}{{/description}} * {{{description}}}{{/description}}
* datatype: {{{datatypeWithEnum}}}{{#required}} * datatype: {{{datatypeWithEnum}}}{{#required}}
* required{{/required}}{{#minimum}} * required{{/required}}{{#minimum}}
* minimum: {{minimum}}{{/minimum}}{{#maximum}} * minimum: {{minimum}}{{/minimum}}{{#maximum}}
* maximum: {{maximum}}{{/maximum}} * maximum: {{maximum}}{{/maximum}}
**/ **/
self.{{name}} = {{#required}}{{name}}{{/required}}{{^required}}{{{defaultValue}}}{{/required}}; self.{{name}} = {{#required}}{{name}}{{/required}}{{^required}}{{{defaultValue}}}{{/required}};
{{/vars}} {{/vars}}
self.constructFromObject = function(data) {
{{#vars}}
self.{{name}}{{{defaultValueWithParam}}}
{{/vars}}
}
self.constructFromObject = function(data) {
if (!data) {
return;
}
{{#vars}}
self.{{name}}{{{defaultValueWithParam}}}
{{/vars}}
}
{{#vars}} {{#vars}}
/**{{#description}} /**{{#description}}
* get {{{description}}}{{/description}}{{#minimum}} * get {{{description}}}{{/description}}{{#minimum}}
@ -50,7 +53,7 @@ var {{classname}} = function {{classname}}({{#mandatory}}{{this}}{{^-last}}, {{/
self.{{getter}} = function() { self.{{getter}} = function() {
return self.{{name}}; return self.{{name}};
} }
/**{{#description}} /**{{#description}}
* set {{{description}}}{{/description}} * set {{{description}}}{{/description}}
* @param {{=<% %>=}}{<% datatypeWithEnum %>}<%={{ }}=%> {{name}} * @param {{=<% %>=}}{<% datatypeWithEnum %>}<%={{ }}=%> {{name}}
@ -61,7 +64,7 @@ var {{classname}} = function {{classname}}({{#mandatory}}{{this}}{{^-last}}, {{/
{{/vars}} {{/vars}}
self.toJson = function () { self.toJson = function () {
return JSON.stringify(self); return JSON.stringify(self);
} }
} }

55
samples/client/petstore/javascript/src/model/Category.js
View File

@ -9,35 +9,38 @@ if (typeof module === 'object' && module.exports) {
//export module //export module
if ( typeof define === "function" && define.amd ) { if ( typeof define === "function" && define.amd ) {
define('Category', ['jquery'], define('Category', ['jquery'],
function($) { function($) {
return Category; return Category;
}); });
} }
var Category = function Category() { var Category = function Category() {
var self = this; var self = this;
/**
* datatype: Integer
**/
self.id = null;
/**
* datatype: String
**/
self.name = null;
self.constructFromObject = function(data) { /**
* datatype: Integer
self.id = data.id; **/
self.id = null;
self.name = data.name;
}
/**
* datatype: String
**/
self.name = null;
self.constructFromObject = function(data) {
if (!data) {
return;
}
self.id = data.id;
self.name = data.name;
}
/** /**
* @return {Integer} * @return {Integer}
@ -45,7 +48,7 @@ var Category = function Category() {
self.getId = function() { self.getId = function() {
return self.id; return self.id;
} }
/** /**
* @param {Integer} id * @param {Integer} id
**/ **/
@ -59,7 +62,7 @@ var Category = function Category() {
self.getName = function() { self.getName = function() {
return self.name; return self.name;
} }
/** /**
* @param {String} name * @param {String} name
**/ **/
@ -69,7 +72,7 @@ var Category = function Category() {
self.toJson = function () { self.toJson = function () {
return JSON.stringify(self); return JSON.stringify(self);
} }
} }

121
samples/client/petstore/javascript/src/model/Order.js
View File

@ -37,64 +37,67 @@ var StatusEnum = function StatusEnum() {
//export module //export module
if ( typeof define === "function" && define.amd ) { if ( typeof define === "function" && define.amd ) {
define('Order', ['jquery'], define('Order', ['jquery'],
function($) { function($) {
return Order; return Order;
}); });
} }
var Order = function Order() { var Order = function Order() {
var self = this; var self = this;
/**
* datatype: Integer
**/
self.id = null;
/**
* datatype: Integer
**/
self.petId = null;
/**
* datatype: Integer
**/
self.quantity = null;
/**
* datatype: Date
**/
self.shipDate = null;
/**
* Order Status
* datatype: StatusEnum
**/
self.status = null;
/**
* datatype: Boolean
**/
self.complete = null;
self.constructFromObject = function(data) { /**
* datatype: Integer
self.id = data.id; **/
self.id = null;
self.petId = data.petId;
self.quantity = data.quantity;
self.shipDate = data.shipDate;
self.status = data.status;
self.complete = data.complete;
}
/**
* datatype: Integer
**/
self.petId = null;
/**
* datatype: Integer
**/
self.quantity = null;
/**
* datatype: Date
**/
self.shipDate = null;
/**
* Order Status
* datatype: StatusEnum
**/
self.status = null;
/**
* datatype: Boolean
**/
self.complete = null;
self.constructFromObject = function(data) {
if (!data) {
return;
}
self.id = data.id;
self.petId = data.petId;
self.quantity = data.quantity;
self.shipDate = data.shipDate;
self.status = data.status;
self.complete = data.complete;
}
/** /**
* @return {Integer} * @return {Integer}
@ -102,7 +105,7 @@ var Order = function Order() {
self.getId = function() { self.getId = function() {
return self.id; return self.id;
} }
/** /**
* @param {Integer} id * @param {Integer} id
**/ **/
@ -116,7 +119,7 @@ var Order = function Order() {
self.getPetId = function() { self.getPetId = function() {
return self.petId; return self.petId;
} }
/** /**
* @param {Integer} petId * @param {Integer} petId
**/ **/
@ -130,7 +133,7 @@ var Order = function Order() {
self.getQuantity = function() { self.getQuantity = function() {
return self.quantity; return self.quantity;
} }
/** /**
* @param {Integer} quantity * @param {Integer} quantity
**/ **/
@ -144,7 +147,7 @@ var Order = function Order() {
self.getShipDate = function() { self.getShipDate = function() {
return self.shipDate; return self.shipDate;
} }
/** /**
* @param {Date} shipDate * @param {Date} shipDate
**/ **/
@ -159,7 +162,7 @@ var Order = function Order() {
self.getStatus = function() { self.getStatus = function() {
return self.status; return self.status;
} }
/** /**
* set Order Status * set Order Status
* @param {StatusEnum} status * @param {StatusEnum} status
@ -174,7 +177,7 @@ var Order = function Order() {
self.getComplete = function() { self.getComplete = function() {
return self.complete; return self.complete;
} }
/** /**
* @param {Boolean} complete * @param {Boolean} complete
**/ **/
@ -184,7 +187,7 @@ var Order = function Order() {
self.toJson = function () { self.toJson = function () {
return JSON.stringify(self); return JSON.stringify(self);
} }
} }

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

@ -39,66 +39,69 @@ var StatusEnum = function StatusEnum() {
//export module //export module
if ( typeof define === "function" && define.amd ) { if ( typeof define === "function" && define.amd ) {
define('Pet', ['jquery', 'Category', 'Array'], define('Pet', ['jquery', 'Category', 'Array'],
function($, Category, Array) { function($, Category, Array) {
return Pet; return Pet;
}); });
} }
var Pet = function Pet(photoUrls, name) { var Pet = function Pet(photoUrls, name) {
var self = this; var self = this;
/**
* datatype: Integer
**/
self.id = null;
/**
* datatype: Category
**/
self.category = new Category();
/**
* datatype: String
* required
**/
self.name = name;
/**
* datatype: Array
* required
**/
self.photoUrls = photoUrls;
/**
* datatype: Array
**/
self.tags = [];
/**
* pet status in the store
* datatype: StatusEnum
**/
self.status = null;
self.constructFromObject = function(data) { /**
* datatype: Integer
self.id = data.id; **/
self.id = null;
self.category.constructFromObject(data.category);
self.name = data.name;
self.photoUrls = new Array();
self.tags = new Array();
self.status = data.status;
}
/**
* datatype: Category
**/
self.category = new Category();
/**
* datatype: String
* required
**/
self.name = name;
/**
* datatype: Array
* required
**/
self.photoUrls = photoUrls;
/**
* datatype: Array
**/
self.tags = [];
/**
* pet status in the store
* datatype: StatusEnum
**/
self.status = null;
self.constructFromObject = function(data) {
if (!data) {
return;
}
self.id = data.id;
self.category.constructFromObject(data.category);
self.name = data.name;
self.photoUrls = new Array();
self.tags = new Array();
self.status = data.status;
}
/** /**
* @return {Integer} * @return {Integer}
@ -106,7 +109,7 @@ var Pet = function Pet(photoUrls, name) {
self.getId = function() { self.getId = function() {
return self.id; return self.id;
} }
/** /**
* @param {Integer} id * @param {Integer} id
**/ **/
@ -120,7 +123,7 @@ var Pet = function Pet(photoUrls, name) {
self.getCategory = function() { self.getCategory = function() {
return self.category; return self.category;
} }
/** /**
* @param {Category} category * @param {Category} category
**/ **/
@ -134,7 +137,7 @@ var Pet = function Pet(photoUrls, name) {
self.getName = function() { self.getName = function() {
return self.name; return self.name;
} }
/** /**
* @param {String} name * @param {String} name
**/ **/
@ -148,7 +151,7 @@ var Pet = function Pet(photoUrls, name) {
self.getPhotoUrls = function() { self.getPhotoUrls = function() {
return self.photoUrls; return self.photoUrls;
} }
/** /**
* @param {Array} photoUrls * @param {Array} photoUrls
**/ **/
@ -162,7 +165,7 @@ var Pet = function Pet(photoUrls, name) {
self.getTags = function() { self.getTags = function() {
return self.tags; return self.tags;
} }
/** /**
* @param {Array} tags * @param {Array} tags
**/ **/
@ -177,7 +180,7 @@ var Pet = function Pet(photoUrls, name) {
self.getStatus = function() { self.getStatus = function() {
return self.status; return self.status;
} }
/** /**
* set pet status in the store * set pet status in the store
* @param {StatusEnum} status * @param {StatusEnum} status
@ -188,7 +191,7 @@ var Pet = function Pet(photoUrls, name) {
self.toJson = function () { self.toJson = function () {
return JSON.stringify(self); return JSON.stringify(self);
} }
} }

55
samples/client/petstore/javascript/src/model/Tag.js
View File

@ -9,35 +9,38 @@ if (typeof module === 'object' && module.exports) {
//export module //export module
if ( typeof define === "function" && define.amd ) { if ( typeof define === "function" && define.amd ) {
define('Tag', ['jquery'], define('Tag', ['jquery'],
function($) { function($) {
return Tag; return Tag;
}); });
} }
var Tag = function Tag() { var Tag = function Tag() {
var self = this; var self = this;
/**
* datatype: Integer
**/
self.id = null;
/**
* datatype: String
**/
self.name = null;
self.constructFromObject = function(data) { /**
* datatype: Integer
self.id = data.id; **/
self.id = null;
self.name = data.name;
}
/**
* datatype: String
**/
self.name = null;
self.constructFromObject = function(data) {
if (!data) {
return;
}
self.id = data.id;
self.name = data.name;
}
/** /**
* @return {Integer} * @return {Integer}
@ -45,7 +48,7 @@ var Tag = function Tag() {
self.getId = function() { self.getId = function() {
return self.id; return self.id;
} }
/** /**
* @param {Integer} id * @param {Integer} id
**/ **/
@ -59,7 +62,7 @@ var Tag = function Tag() {
self.getName = function() { self.getName = function() {
return self.name; return self.name;
} }
/** /**
* @param {String} name * @param {String} name
**/ **/
@ -69,7 +72,7 @@ var Tag = function Tag() {
self.toJson = function () { self.toJson = function () {
return JSON.stringify(self); return JSON.stringify(self);
} }
} }

153
samples/client/petstore/javascript/src/model/User.js
View File

@ -9,78 +9,81 @@ if (typeof module === 'object' && module.exports) {
//export module //export module
if ( typeof define === "function" && define.amd ) { if ( typeof define === "function" && define.amd ) {
define('User', ['jquery'], define('User', ['jquery'],
function($) { function($) {
return User; return User;
}); });
} }
var User = function User() { var User = function User() {
var self = this; var self = this;
/**
* datatype: Integer
**/
self.id = null;
/**
* datatype: String
**/
self.username = null;
/**
* datatype: String
**/
self.firstName = null;
/**
* datatype: String
**/
self.lastName = null;
/**
* datatype: String
**/
self.email = null;
/**
* datatype: String
**/
self.password = null;
/**
* datatype: String
**/
self.phone = null;
/**
* User Status
* datatype: Integer
**/
self.userStatus = null;
self.constructFromObject = function(data) { /**
* datatype: Integer
self.id = data.id; **/
self.id = null;
self.username = data.username;
self.firstName = data.firstName;
self.lastName = data.lastName;
self.email = data.email;
self.password = data.password;
self.phone = data.phone;
self.userStatus = data.userStatus;
}
/**
* datatype: String
**/
self.username = null;
/**
* datatype: String
**/
self.firstName = null;
/**
* datatype: String
**/
self.lastName = null;
/**
* datatype: String
**/
self.email = null;
/**
* datatype: String
**/
self.password = null;
/**
* datatype: String
**/
self.phone = null;
/**
* User Status
* datatype: Integer
**/
self.userStatus = null;
self.constructFromObject = function(data) {
if (!data) {
return;
}
self.id = data.id;
self.username = data.username;
self.firstName = data.firstName;
self.lastName = data.lastName;
self.email = data.email;
self.password = data.password;
self.phone = data.phone;
self.userStatus = data.userStatus;
}
/** /**
* @return {Integer} * @return {Integer}
@ -88,7 +91,7 @@ var User = function User() {
self.getId = function() { self.getId = function() {
return self.id; return self.id;
} }
/** /**
* @param {Integer} id * @param {Integer} id
**/ **/
@ -102,7 +105,7 @@ var User = function User() {
self.getUsername = function() { self.getUsername = function() {
return self.username; return self.username;
} }
/** /**
* @param {String} username * @param {String} username
**/ **/
@ -116,7 +119,7 @@ var User = function User() {
self.getFirstName = function() { self.getFirstName = function() {
return self.firstName; return self.firstName;
} }
/** /**
* @param {String} firstName * @param {String} firstName
**/ **/
@ -130,7 +133,7 @@ var User = function User() {
self.getLastName = function() { self.getLastName = function() {
return self.lastName; return self.lastName;
} }
/** /**
* @param {String} lastName * @param {String} lastName
**/ **/
@ -144,7 +147,7 @@ var User = function User() {
self.getEmail = function() { self.getEmail = function() {
return self.email; return self.email;
} }
/** /**
* @param {String} email * @param {String} email
**/ **/
@ -158,7 +161,7 @@ var User = function User() {
self.getPassword = function() { self.getPassword = function() {
return self.password; return self.password;
} }
/** /**
* @param {String} password * @param {String} password
**/ **/
@ -172,7 +175,7 @@ var User = function User() {
self.getPhone = function() { self.getPhone = function() {
return self.phone; return self.phone;
} }
/** /**
* @param {String} phone * @param {String} phone
**/ **/
@ -187,7 +190,7 @@ var User = function User() {
self.getUserStatus = function() { self.getUserStatus = function() {
return self.userStatus; return self.userStatus;
} }
/** /**
* set User Status * set User Status
* @param {Integer} userStatus * @param {Integer} userStatus
@ -198,7 +201,7 @@ var User = function User() {
self.toJson = function () { self.toJson = function () {
return JSON.stringify(self); return JSON.stringify(self);
} }
} }