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

More fine-grained fix

Browse Source 
Instead of just ignoring default values in the generated
model constructors, we modify the generator code in Java.
The template checks for null before outputting a default value.
This commit is contained in:
delenius
2016-02-16 09:40:29 -08:00
parent eec806b54e
commit 079addb6db
15 changed files with 73 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
samples/client/petstore/javascript/src/index.js
View File

@@ -1,21 +1,21 @@
(function(factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['./ApiClient', './model/User', './model/Category', './model/Pet', './model/Tag', './model/Order', './api/UserApi', './api/StoreApi', './api/PetApi'], factory);
define(['./ApiClient', './model/Order', './model/User', './model/Category', './model/Tag', './model/Pet', './api/UserApi', './api/StoreApi', './api/PetApi'], factory);
} else if (typeof module === 'object' && module.exports) {
// CommonJS-like environments that support module.exports, like Node.
module.exports = factory(require('./ApiClient'), require('./model/User'), require('./model/Category'), require('./model/Pet'), require('./model/Tag'), require('./model/Order'), require('./api/UserApi'), require('./api/StoreApi'), require('./api/PetApi'));
module.exports = factory(require('./ApiClient'), require('./model/Order'), require('./model/User'), require('./model/Category'), require('./model/Tag'), require('./model/Pet'), require('./api/UserApi'), require('./api/StoreApi'), require('./api/PetApi'));
}
}(function(ApiClient, User, Category, Pet, Tag, Order, UserApi, StoreApi, PetApi) {
}(function(ApiClient, Order, User, Category, Tag, Pet, UserApi, StoreApi, PetApi) {
'use strict';
return {
ApiClient: ApiClient,
Order: Order,
User: User,
Category: Category,
Pet: Pet,
Tag: Tag,
Order: Order,
Pet: Pet,
UserApi: UserApi,
StoreApi: StoreApi,
PetApi: PetApi

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

@@ -18,16 +18,6 @@
var Category = function Category() {
/**
* datatype: Integer
**/
this['id'] = null;
/**
* datatype: String
**/
this['name'] = null;
};
Category.constructFromObject = function(data) {

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

@@ -18,37 +18,6 @@
var Order = function Order() {
/**
* datatype: Integer
**/
this['id'] = null;
/**
* datatype: Integer
**/
this['petId'] = null;
/**
* datatype: Integer
**/
this['quantity'] = null;
/**
* datatype: Date
**/
this['shipDate'] = null;
/**
* Order Status
* datatype: StatusEnum
**/
this['status'] = null;
/**
* datatype: Boolean
**/
this['complete'] = null;
};
Order.constructFromObject = function(data) {

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

@@ -18,39 +18,16 @@
var Pet = function Pet(photoUrls, name) {
/**
* datatype: Integer
**/
this['id'] = null;
/**
* datatype: Category
**/
this['category'] = new Category();
/**
* datatype: String
* required
* required
**/
this['name'] = name;
/**
* datatype: [String]
* required
* required
**/
this['photoUrls'] = photoUrls;
/**
* datatype: [Tag]
**/
this['tags'] = [];
/**
* pet status in the store
* datatype: StatusEnum
**/
this['status'] = null;
};
Pet.constructFromObject = function(data) {

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

@@ -18,16 +18,6 @@
var Tag = function Tag() {
/**
* datatype: Integer
**/
this['id'] = null;
/**
* datatype: String
**/
this['name'] = null;
};
Tag.constructFromObject = function(data) {

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

@@ -18,47 +18,6 @@
var User = function User() {
/**
* datatype: Integer
**/
this['id'] = null;
/**
* datatype: String
**/
this['username'] = null;
/**
* datatype: String
**/
this['firstName'] = null;
/**
* datatype: String
**/
this['lastName'] = null;
/**
* datatype: String
**/
this['email'] = null;
/**
* datatype: String
**/
this['password'] = null;
/**
* datatype: String
**/
this['phone'] = null;
/**
* User Status
* datatype: Integer
**/
this['userStatus'] = null;
};
User.constructFromObject = function(data) {