loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-12-10 09:26:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 2.3.0

Browse Source
This commit is contained in:
wing328
2017-03-26 22:54:17 +08:00
parent 597ceae3da e50e653e3d
commit 9acefcffdd
21 changed files with 62 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/client/petstore/javascript/docs/FakeApi.md
View File

@@ -81,7 +81,7 @@ var _double = 1.2; // Number | None
var patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
var _byte = "B"; // String | None
var _byte = B; // Blob | None
var opts = {
'integer': 56, // Number | None
@@ -89,7 +89,7 @@ var opts = {
'int64': 789, // Number | None
'_float': 3.4, // Number | None
'_string': "_string_example", // String | None
'binary': "B", // String | None
'binary': B, // Blob | None
'_date': new Date("2013-10-20"), // Date | None
'dateTime': new Date("2013-10-20T19:20:30+01:00"), // Date | None
'password': "password_example", // String | None
@@ -113,13 +113,13 @@ Name | Type | Description | Notes
**_number** | **Number**| None |
**_double** | **Number**| None |
**patternWithoutDelimiter** | **String**| None |
**_byte** | **String**| None |
**_byte** | **Blob**| None |
**integer** | **Number**| None | [optional]
**int32** | **Number**| None | [optional]
**int64** | **Number**| None | [optional]
**_float** | **Number**| None | [optional]
**_string** | **String**| None | [optional]
**binary** | **String**| None | [optional]
**binary** | **Blob**| None | [optional]
**_date** | **Date**| None | [optional]
**dateTime** | **Date**| None | [optional]
**password** | **String**| None | [optional]

4
samples/client/petstore/javascript/docs/FormatTest.md
View File

@@ -10,8 +10,8 @@ Name | Type | Description | Notes
**_float** | **Number** | | [optional]
**_double** | **Number** | | [optional]
**_string** | **String** | | [optional]
**_byte** | **String** | |
**binary** | **String** | | [optional]
**_byte** | **Blob** | |
**binary** | **Blob** | | [optional]
**_date** | **Date** | |
**dateTime** | **Date** | | [optional]
**uuid** | **String** | | [optional]

2
samples/client/petstore/javascript/package.json
View File

@@ -8,7 +8,7 @@
"test": "./node_modules/mocha/bin/mocha --recursive"
},
"dependencies": {
"superagent": "1.7.1"
"superagent": "3.5.2"
},
"devDependencies": {
"mocha": "~2.3.4",

6
samples/client/petstore/javascript/src/ApiClient.js
View File

@@ -443,6 +443,10 @@
if (accept) {
request.accept(accept);
}
if (returnType === 'Blob') {
request.responseType('blob');
}
// Attach previously saved cookies, if enabled
if (this.enableCookies){
@@ -508,6 +512,8 @@
return String(data);
case 'Date':
return this.parseDate(String(data));
case 'Blob':
return data;
default:
if (type === Object) {
// generic object, return directly

4
samples/client/petstore/javascript/src/api/FakeApi.js
View File

@@ -106,14 +106,14 @@
* @param {Number} _number None
* @param {Number} _double None
* @param {String} patternWithoutDelimiter None
* @param {String} _byte None
* @param {Blob} _byte None
* @param {Object} opts Optional parameters
* @param {Number} opts.integer None
* @param {Number} opts.int32 None
* @param {Number} opts.int64 None
* @param {Number} opts._float None
* @param {String} opts._string None
* @param {String} opts.binary None
* @param {Blob} opts.binary None
* @param {Date} opts._date None
* @param {Date} opts.dateTime None
* @param {String} opts.password None

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

@@ -42,7 +42,7 @@
* @alias module:model/FormatTest
* @class
* @param _number {Number}
* @param _byte {String}
* @param _byte {Blob}
* @param _date {Date}
* @param password {String}
*/
@@ -97,10 +97,10 @@
obj['string'] = ApiClient.convertToType(data['string'], 'String');
}
if (data.hasOwnProperty('byte')) {
obj['byte'] = ApiClient.convertToType(data['byte'], 'String');
obj['byte'] = ApiClient.convertToType(data['byte'], Blob);
}
if (data.hasOwnProperty('binary')) {
obj['binary'] = ApiClient.convertToType(data['binary'], 'String');
obj['binary'] = ApiClient.convertToType(data['binary'], Blob);
}
if (data.hasOwnProperty('date')) {
obj['date'] = ApiClient.convertToType(data['date'], 'Date');
@@ -147,11 +147,11 @@
*/
exports.prototype['string'] = undefined;
/**
* @member {String} byte
* @member {Blob} byte
*/
exports.prototype['byte'] = undefined;
/**
* @member {String} binary
* @member {Blob} binary
*/
exports.prototype['binary'] = undefined;
/**