update nodejs/ts package license to use Apache-2.0

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptNodeClientCodegen.java

@@ -42,7 +42,6 @@ public class TypeScriptNodeClientCodegen extends AbstractTypeScriptClientCodegen
         supportingFiles.add(new SupportingFile("api.mustache", null, "api.ts"));
         supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
 
-        LOGGER.warn("check additionals: " + additionalProperties.get(NPM_NAME));
         if(additionalProperties.containsKey(NPM_NAME)) {
             addNpmPackageGeneration();
         }

modules/swagger-codegen/src/main/resources/Javascript/package.mustache

@@ -1,8 +1,8 @@
 {
   "name": "{{{projectName}}}",
   "version": "{{{projectVersion}}}",
-  "description": "{{{projectDescription}}}",{{#projectLicenseName}}
+  "description": "{{{projectDescription}}}",
-  "license": "{{{projectLicenseName}}}",{{/projectLicenseName}}
+  "license": "Apache-2.0",
   "main": "{{sourceFolder}}{{#invokerPackage}}/{{invokerPackage}}{{/invokerPackage}}/index.js",
   "scripts": {
     "test": "./node_modules/mocha/bin/mocha --recursive"

modules/swagger-codegen/src/main/resources/TypeScript-Fetch/package.json.mustache

@@ -1,6 +1,7 @@
 {
   "name": "{{#npmName}}{{{npmName}}}{{/npmName}}{{^npmName}}typescript-fetch-api{{/npmName}}",
   "version": "{{#npmVersion}}{{{npmVersion}}}{{/npmVersion}}{{^npmVersion}}0.0.0{{/npmVersion}}",
+  "license": "Apache-2.0",
   "main": "./dist/api.js",
   "browser": "./dist/api.js",
   "typings": "./dist/api.d.ts",

modules/swagger-codegen/src/main/resources/nodejs/package.mustache

@@ -6,7 +6,7 @@
   "keywords": [
     "swagger"
   ],
-  "license": "MIT",
+  "license": "Apache-2.0",
   "private": true,
   "dependencies": {
     "connect": "^3.2.0",

modules/swagger-codegen/src/main/resources/swagger-static/package.mustache

@@ -8,5 +8,5 @@
   "dependencies": {
     "express": "3.x"
   },
-  "license": "apache 2.0"
+  "license": "Apache-2.0"
 }

modules/swagger-codegen/src/main/resources/typescript-angular2/package.mustache

@@ -6,7 +6,7 @@
   "keywords": [
     "swagger-client"
   ],
-  "license": "MIT",
+  "license": "Apache-2.0",
   "files": [
     "lib"
   ],

modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/package.json

@@ -6,7 +6,7 @@
   "keywords": [
     "swagger-client"
   ],
-  "license": "MIT",
+  "license": "Apache-2.0",
   "files": [
     "lib"
   ],

modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/package.json

@@ -6,7 +6,7 @@
   "keywords": [
     "swagger-client"
   ],
-  "license": "MIT",
+  "license": "Apache-2.0",
   "files": [
     "lib"
   ],

modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/package.json

@@ -7,7 +7,7 @@
         "build": "typings install && tsc"
     },
     "author": "Swagger Codegen Contributors",
-    "license": "MIT",
+    "license": "Apache-2.0",
     "dependencies": {
         "bluebird": "^3.3.5",
         "request": "^2.72.0"

samples/client/petstore/javascript/README.md

@@ -1,12 +1,12 @@
 # swagger-petstore
 
 SwaggerPetstore - JavaScript client for swagger-petstore
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 This SDK is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build date: 2016-05-06T18:34:50.267+08:00
+- Build date: 2016-05-29T18:06:05.597+08:00
 - Build package: class io.swagger.codegen.languages.JavascriptClientCodegen
 
 ## Installation
@@ -91,7 +91,7 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*SwaggerPetstore.FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters
+*SwaggerPetstore.FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 *SwaggerPetstore.PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *SwaggerPetstore.PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
 *SwaggerPetstore.PetApi* | [**findPetsByStatus**](docs/PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
@@ -116,20 +116,24 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [SwaggerPetstore.AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
  - [SwaggerPetstore.Animal](docs/Animal.md)
  - [SwaggerPetstore.AnimalFarm](docs/AnimalFarm.md)
  - [SwaggerPetstore.ApiResponse](docs/ApiResponse.md)
+ - [SwaggerPetstore.ArrayTest](docs/ArrayTest.md)
  - [SwaggerPetstore.Cat](docs/Cat.md)
  - [SwaggerPetstore.Category](docs/Category.md)
  - [SwaggerPetstore.Dog](docs/Dog.md)
  - [SwaggerPetstore.EnumClass](docs/EnumClass.md)
  - [SwaggerPetstore.EnumTest](docs/EnumTest.md)
  - [SwaggerPetstore.FormatTest](docs/FormatTest.md)
+ - [SwaggerPetstore.MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
  - [SwaggerPetstore.Model200Response](docs/Model200Response.md)
  - [SwaggerPetstore.ModelReturn](docs/ModelReturn.md)
  - [SwaggerPetstore.Name](docs/Name.md)
  - [SwaggerPetstore.Order](docs/Order.md)
  - [SwaggerPetstore.Pet](docs/Pet.md)
+ - [SwaggerPetstore.ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SwaggerPetstore.SpecialModelName](docs/SpecialModelName.md)
  - [SwaggerPetstore.Tag](docs/Tag.md)
  - [SwaggerPetstore.User](docs/User.md)
@@ -138,6 +142,12 @@ Class | Method | HTTP request | Description
 ## Documentation for Authorization
 
 
+### api_key
+
+- **Type**: API key
+- **API key parameter name**: api_key
+- **Location**: HTTP header
+
 ### petstore_auth
 
 - **Type**: OAuth
@@ -147,9 +157,3 @@ Class | Method | HTTP request | Description
   - write:pets: modify pets in your account
   - read:pets: read your pets
 
-### api_key
-
-- **Type**: API key
-- **API key parameter name**: api_key
-- **Location**: HTTP header
-

samples/client/petstore/javascript/docs/Animal.md

@@ -4,5 +4,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **className** | **String** |  | 
+**color** | **String** |  | [optional] [default to 'red']
 
 

samples/client/petstore/javascript/docs/FakeApi.md

@@ -4,16 +4,16 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters
+[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
 
 <a name="testEndpointParameters"></a>
 # **testEndpointParameters**
 > testEndpointParameters(_number, _double, _string, _byte, opts)
 
-Fake endpoint for testing various parameters
+Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
-Fake endpoint for testing various parameters
+Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
 ### Example
 ```javascript
@@ -77,6 +77,6 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/xml; charset=utf-8, application/json; charset=utf-8
- - **Accept**: application/xml, application/json
+ - **Accept**: application/xml; charset=utf-8, application/json; charset=utf-8
 

samples/client/petstore/javascript/docs/Name.md

@@ -6,5 +6,6 @@ Name | Type | Description | Notes
 **name** | **Integer** |  | 
 **snakeCase** | **Integer** |  | [optional] 
 **property** | **String** |  | [optional] 
+**_123Number** | **Integer** |  | [optional] 
 
 

samples/client/petstore/javascript/package.json

@@ -1,8 +1,8 @@
 {
   "name": "swagger-petstore",
   "version": "1.0.0",
-  "description": "This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.",
+  "description": "This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ ",
-  "license": "Apache 2.0",
+  "license": "Apache-2.0",
   "main": "src/index.js",
   "scripts": {
     "test": "./node_modules/mocha/bin/mocha --recursive"

samples/client/petstore/javascript/src/ApiClient.js

@@ -40,8 +40,8 @@
      * @type {Array.<String>}
      */
     this.authentications = {
-      'petstore_auth': {type: 'oauth2'},
+      'api_key': {type: 'apiKey', 'in': 'header', name: 'api_key'},
-      'api_key': {type: 'apiKey', 'in': 'header', name: 'api_key'}
+      'petstore_auth': {type: 'oauth2'}
     };
     /**
      * The default HTTP headers to be included for all API calls.

samples/client/petstore/javascript/src/api/FakeApi.js

@@ -41,8 +41,8 @@
      */
 
     /**
-     * Fake endpoint for testing various parameters
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-     * Fake endpoint for testing various parameters
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
      * @param {Number} _number None
      * @param {Number} _double None
      * @param {String} _string None
@@ -105,8 +105,8 @@
       };
 
       var authNames = [];
-      var contentTypes = [];
+      var contentTypes = ['application/xml; charset=utf-8', 'application/json; charset=utf-8'];
-      var accepts = ['application/xml', 'application/json'];
+      var accepts = ['application/xml; charset=utf-8', 'application/json; charset=utf-8'];
       var returnType = null;
 
       return this.apiClient.callApi(

samples/client/petstore/javascript/src/index.js

@@ -1,16 +1,16 @@
 (function(factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/Animal', 'model/AnimalFarm', 'model/ApiResponse', 'model/Cat', 'model/Category', 'model/Dog', 'model/EnumClass', 'model/EnumTest', 'model/FormatTest', 'model/Model200Response', 'model/ModelReturn', 'model/Name', 'model/Order', 'model/Pet', 'model/SpecialModelName', 'model/Tag', 'model/User', 'api/FakeApi', 'api/PetApi', 'api/StoreApi', 'api/UserApi'], factory);
+    define(['ApiClient', 'model/AdditionalPropertiesClass', 'model/Animal', 'model/AnimalFarm', 'model/ApiResponse', 'model/ArrayTest', 'model/Cat', 'model/Category', 'model/Dog', 'model/EnumClass', 'model/EnumTest', 'model/FormatTest', 'model/MixedPropertiesAndAdditionalPropertiesClass', 'model/Model200Response', 'model/ModelReturn', 'model/Name', 'model/Order', 'model/Pet', 'model/ReadOnlyFirst', 'model/SpecialModelName', 'model/Tag', 'model/User', 'api/FakeApi', 'api/PetApi', 'api/StoreApi', 'api/UserApi'], factory);
   } else if (typeof module === 'object' && module.exports) {
     // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('./ApiClient'), require('./model/Animal'), require('./model/AnimalFarm'), require('./model/ApiResponse'), require('./model/Cat'), require('./model/Category'), require('./model/Dog'), require('./model/EnumClass'), require('./model/EnumTest'), require('./model/FormatTest'), require('./model/Model200Response'), require('./model/ModelReturn'), require('./model/Name'), require('./model/Order'), require('./model/Pet'), require('./model/SpecialModelName'), require('./model/Tag'), require('./model/User'), require('./api/FakeApi'), require('./api/PetApi'), require('./api/StoreApi'), require('./api/UserApi'));
+    module.exports = factory(require('./ApiClient'), require('./model/AdditionalPropertiesClass'), require('./model/Animal'), require('./model/AnimalFarm'), require('./model/ApiResponse'), require('./model/ArrayTest'), require('./model/Cat'), require('./model/Category'), require('./model/Dog'), require('./model/EnumClass'), require('./model/EnumTest'), require('./model/FormatTest'), require('./model/MixedPropertiesAndAdditionalPropertiesClass'), require('./model/Model200Response'), require('./model/ModelReturn'), require('./model/Name'), require('./model/Order'), require('./model/Pet'), require('./model/ReadOnlyFirst'), require('./model/SpecialModelName'), require('./model/Tag'), require('./model/User'), require('./api/FakeApi'), require('./api/PetApi'), require('./api/StoreApi'), require('./api/UserApi'));
   }
-}(function(ApiClient, Animal, AnimalFarm, ApiResponse, Cat, Category, Dog, EnumClass, EnumTest, FormatTest, Model200Response, ModelReturn, Name, Order, Pet, SpecialModelName, Tag, User, FakeApi, PetApi, StoreApi, UserApi) {
+}(function(ApiClient, AdditionalPropertiesClass, Animal, AnimalFarm, ApiResponse, ArrayTest, Cat, Category, Dog, EnumClass, EnumTest, FormatTest, MixedPropertiesAndAdditionalPropertiesClass, Model200Response, ModelReturn, Name, Order, Pet, ReadOnlyFirst, SpecialModelName, Tag, User, FakeApi, PetApi, StoreApi, UserApi) {
   'use strict';
 
   /**
-   * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose..<br>
+   * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \&quot; \\ .<br>
    * The <code>index</code> module provides access to constructors for all the classes which comprise the public API.
    * <p>
    * An AMD (recommended!) or CommonJS application will generally do something equivalent to the following:
@@ -46,6 +46,11 @@
      * @property {module:ApiClient}
      */
     ApiClient: ApiClient,
+    /**
+     * The AdditionalPropertiesClass model constructor.
+     * @property {module:model/AdditionalPropertiesClass}
+     */
+    AdditionalPropertiesClass: AdditionalPropertiesClass,
     /**
      * The Animal model constructor.
      * @property {module:model/Animal}
@@ -61,6 +66,11 @@
      * @property {module:model/ApiResponse}
      */
     ApiResponse: ApiResponse,
+    /**
+     * The ArrayTest model constructor.
+     * @property {module:model/ArrayTest}
+     */
+    ArrayTest: ArrayTest,
     /**
      * The Cat model constructor.
      * @property {module:model/Cat}
@@ -91,6 +101,11 @@
      * @property {module:model/FormatTest}
      */
     FormatTest: FormatTest,
+    /**
+     * The MixedPropertiesAndAdditionalPropertiesClass model constructor.
+     * @property {module:model/MixedPropertiesAndAdditionalPropertiesClass}
+     */
+    MixedPropertiesAndAdditionalPropertiesClass: MixedPropertiesAndAdditionalPropertiesClass,
     /**
      * The Model200Response model constructor.
      * @property {module:model/Model200Response}
@@ -116,6 +131,11 @@
      * @property {module:model/Pet}
      */
     Pet: Pet,
+    /**
+     * The ReadOnlyFirst model constructor.
+     * @property {module:model/ReadOnlyFirst}
+     */
+    ReadOnlyFirst: ReadOnlyFirst,
     /**
      * The SpecialModelName model constructor.
      * @property {module:model/SpecialModelName}

samples/client/petstore/javascript/src/model/Animal.js

@@ -34,6 +34,7 @@
     var _this = this;
 
     _this['className'] = className;
+
   };
 
   /**
@@ -50,6 +51,9 @@
       if (data.hasOwnProperty('className')) {
         obj['className'] = ApiClient.convertToType(data['className'], 'String');
       }
+      if (data.hasOwnProperty('color')) {
+        obj['color'] = ApiClient.convertToType(data['color'], 'String');
+      }
     }
     return obj;
   }
@@ -58,6 +62,11 @@
    * @member {String} className
    */
   exports.prototype['className'] = undefined;
+  /**
+   * @member {String} color
+   * @default 'red'
+   */
+  exports.prototype['color'] = 'red';
 
 
 

samples/client/petstore/javascript/src/model/Name.js

@@ -37,6 +37,7 @@
     _this['name'] = name;
 
 
+
   };
 
   /**
@@ -59,6 +60,9 @@
       if (data.hasOwnProperty('property')) {
         obj['property'] = ApiClient.convertToType(data['property'], 'String');
       }
+      if (data.hasOwnProperty('123Number')) {
+        obj['123Number'] = ApiClient.convertToType(data['123Number'], 'Integer');
+      }
     }
     return obj;
   }
@@ -75,6 +79,10 @@
    * @member {String} property
    */
   exports.prototype['property'] = undefined;
+  /**
+   * @member {Integer} 123Number
+   */
+  exports.prototype['123Number'] = undefined;
 
 
 

samples/client/petstore/typescript-node/default/api.ts

@@ -1,6 +1,6 @@
 import request = require('request');
 import http = require('http');
-import promise = require('bluebird');
+import Promise = require('bluebird');
 
 let defaultBasePath = 'http://petstore.swagger.io/v2';
 
@@ -132,8 +132,8 @@ export class PetApi {
 
     protected authentications = {
         'default': <Authentication>new VoidAuth(),
-        'petstore_auth': new OAuth(),
         'api_key': new ApiKeyAuth('header', 'api_key'),
+        'petstore_auth': new OAuth(),
     }
 
     constructor(basePath?: string);
@@ -182,7 +182,6 @@ export class PetApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'POST',
             qs: queryParameters,
@@ -204,18 +203,19 @@ export class PetApi {
                 requestOptions.form = formParams;
             }
         }
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
             request(requestOptions, (error, response, body) => {
                 if (error) {
-                localVarDeferred.reject(error);
+                    reject(error);
                 } else {
                     if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+                        resolve({ response: response, body: body });
                     } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                        reject({ response: response, body: body });
                     }
                 }
             });
-        return localVarDeferred.promise;
+        });
     }
     /**
      * Deletes a pet
@@ -240,7 +240,6 @@ export class PetApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'DELETE',
             qs: queryParameters,
@@ -261,18 +260,19 @@ export class PetApi {
                 requestOptions.form = formParams;
             }
         }
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
             request(requestOptions, (error, response, body) => {
                 if (error) {
-                localVarDeferred.reject(error);
+                    reject(error);
                 } else {
                     if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+                        resolve({ response: response, body: body });
                     } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                        reject({ response: response, body: body });
                     }
                 }
             });
-        return localVarDeferred.promise;
+        });
     }
     /**
      * Finds Pets by status
@@ -292,7 +292,6 @@ export class PetApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Array<Pet>;  }>();
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
@@ -313,18 +312,19 @@ export class PetApi {
                 requestOptions.form = formParams;
             }
         }
+        return new Promise<{ response: http.ClientResponse; body: Array<Pet>;  }>((resolve, reject) => {
             request(requestOptions, (error, response, body) => {
                 if (error) {
-                localVarDeferred.reject(error);
+                    reject(error);
                 } else {
                     if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+                        resolve({ response: response, body: body });
                     } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                        reject({ response: response, body: body });
                     }
                 }
             });
-        return localVarDeferred.promise;
+        });
     }
     /**
      * Finds Pets by tags
@@ -344,7 +344,6 @@ export class PetApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Array<Pet>;  }>();
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
@@ -365,18 +364,19 @@ export class PetApi {
                 requestOptions.form = formParams;
             }
         }
+        return new Promise<{ response: http.ClientResponse; body: Array<Pet>;  }>((resolve, reject) => {
             request(requestOptions, (error, response, body) => {
                 if (error) {
-                localVarDeferred.reject(error);
+                    reject(error);
                 } else {
                     if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+                        resolve({ response: response, body: body });
                     } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                        reject({ response: response, body: body });
                     }
                 }
             });
-        return localVarDeferred.promise;
+        });
     }
     /**
      * Find pet by ID
@@ -398,7 +398,6 @@ export class PetApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Pet;  }>();
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
@@ -408,10 +407,10 @@ export class PetApi {
             json: true,
         };
 
-        this.authentications.petstore_auth.applyToRequest(requestOptions);
-
         this.authentications.api_key.applyToRequest(requestOptions);
 
+        this.authentications.petstore_auth.applyToRequest(requestOptions);
+
         this.authentications.default.applyToRequest(requestOptions);
 
         if (Object.keys(formParams).length) {
@@ -421,18 +420,19 @@ export class PetApi {
                 requestOptions.form = formParams;
             }
         }
+        return new Promise<{ response: http.ClientResponse; body: Pet;  }>((resolve, reject) => {
             request(requestOptions, (error, response, body) => {
                 if (error) {
-                localVarDeferred.reject(error);
+                    reject(error);
                 } else {
                     if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+                        resolve({ response: response, body: body });
                     } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                        reject({ response: response, body: body });
                     }
                 }
             });
-        return localVarDeferred.promise;
+        });
     }
     /**
      * Update an existing pet
@@ -448,7 +448,6 @@ export class PetApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'PUT',
             qs: queryParameters,
@@ -470,18 +469,19 @@ export class PetApi {
                 requestOptions.form = formParams;
             }
         }
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
             request(requestOptions, (error, response, body) => {
                 if (error) {
-                localVarDeferred.reject(error);
+                    reject(error);
                 } else {
                     if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+                        resolve({ response: response, body: body });
                     } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                        reject({ response: response, body: body });
                     }
                 }
             });
-        return localVarDeferred.promise;
+        });
     }
     /**
      * Updates a pet in the store with form data
@@ -513,7 +513,6 @@ export class PetApi {
             formParams['status'] = status;
         }
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'POST',
             qs: queryParameters,
@@ -534,18 +533,19 @@ export class PetApi {
                 requestOptions.form = formParams;
             }
         }
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
             request(requestOptions, (error, response, body) => {
                 if (error) {
-                localVarDeferred.reject(error);
+                    reject(error);
                 } else {
                     if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+                        resolve({ response: response, body: body });
                     } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                        reject({ response: response, body: body });
                     }
                 }
             });
-        return localVarDeferred.promise;
+        });
     }
     /**
      * uploads an image
@@ -578,7 +578,6 @@ export class PetApi {
         }
         useFormData = true;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'POST',
             qs: queryParameters,
@@ -599,18 +598,19 @@ export class PetApi {
                 requestOptions.form = formParams;
             }
         }
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
             request(requestOptions, (error, response, body) => {
                 if (error) {
-                localVarDeferred.reject(error);
+                    reject(error);
                 } else {
                     if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+                        resolve({ response: response, body: body });
                     } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                        reject({ response: response, body: body });
                     }
                 }
             });
-        return localVarDeferred.promise;
+        });
     }
 }
 export enum StoreApiApiKeys {
@@ -624,8 +624,8 @@ export class StoreApi {
 
     protected authentications = {
         'default': <Authentication>new VoidAuth(),
-        'petstore_auth': new OAuth(),
         'api_key': new ApiKeyAuth('header', 'api_key'),
+        'petstore_auth': new OAuth(),
     }
 
     constructor(basePath?: string);
@@ -680,7 +680,6 @@ export class StoreApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'DELETE',
             qs: queryParameters,
@@ -699,18 +698,19 @@ export class StoreApi {
                 requestOptions.form = formParams;
             }
         }
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
             request(requestOptions, (error, response, body) => {
                 if (error) {
-                localVarDeferred.reject(error);
+                    reject(error);
                 } else {
                     if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+                        resolve({ response: response, body: body });
                     } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                        reject({ response: response, body: body });
                     }
                 }
             });
-        return localVarDeferred.promise;
+        });
     }
     /**
      * Returns pet inventories by status
@@ -725,7 +725,6 @@ export class StoreApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: { [key: string]: number; };  }>();
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
@@ -746,18 +745,19 @@ export class StoreApi {
                 requestOptions.form = formParams;
             }
         }
+        return new Promise<{ response: http.ClientResponse; body: { [key: string]: number; };  }>((resolve, reject) => {
             request(requestOptions, (error, response, body) => {
                 if (error) {
-                localVarDeferred.reject(error);
+                    reject(error);
                 } else {
                     if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+                        resolve({ response: response, body: body });
                     } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                        reject({ response: response, body: body });
                     }
                 }
             });
-        return localVarDeferred.promise;
+        });
     }
     /**
      * Find purchase order by ID
@@ -779,7 +779,6 @@ export class StoreApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Order;  }>();
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
@@ -798,18 +797,19 @@ export class StoreApi {
                 requestOptions.form = formParams;
             }
         }
+        return new Promise<{ response: http.ClientResponse; body: Order;  }>((resolve, reject) => {
             request(requestOptions, (error, response, body) => {
                 if (error) {
-                localVarDeferred.reject(error);
+                    reject(error);
                 } else {
                     if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+                        resolve({ response: response, body: body });
                     } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                        reject({ response: response, body: body });
                     }
                 }
             });
-        return localVarDeferred.promise;
+        });
     }
     /**
      * Place an order for a pet
@@ -825,7 +825,6 @@ export class StoreApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Order;  }>();
         let requestOptions: request.Options = {
             method: 'POST',
             qs: queryParameters,
@@ -845,18 +844,19 @@ export class StoreApi {
                 requestOptions.form = formParams;
             }
         }
+        return new Promise<{ response: http.ClientResponse; body: Order;  }>((resolve, reject) => {
             request(requestOptions, (error, response, body) => {
                 if (error) {
-                localVarDeferred.reject(error);
+                    reject(error);
                 } else {
                     if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+                        resolve({ response: response, body: body });
                     } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                        reject({ response: response, body: body });
                     }
                 }
             });
-        return localVarDeferred.promise;
+        });
     }
 }
 export enum UserApiApiKeys {
@@ -870,8 +870,8 @@ export class UserApi {
 
     protected authentications = {
         'default': <Authentication>new VoidAuth(),
-        'petstore_auth': new OAuth(),
         'api_key': new ApiKeyAuth('header', 'api_key'),
+        'petstore_auth': new OAuth(),
     }
 
     constructor(basePath?: string);
@@ -920,7 +920,6 @@ export class UserApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'POST',
             qs: queryParameters,
@@ -940,18 +939,19 @@ export class UserApi {
                 requestOptions.form = formParams;
             }
         }
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
             request(requestOptions, (error, response, body) => {
                 if (error) {
-                localVarDeferred.reject(error);
+                    reject(error);
                 } else {
                     if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+                        resolve({ response: response, body: body });
                     } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                        reject({ response: response, body: body });
                     }
                 }
             });
-        return localVarDeferred.promise;
+        });
     }
     /**
      * Creates list of users with given input array
@@ -967,7 +967,6 @@ export class UserApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'POST',
             qs: queryParameters,
@@ -987,18 +986,19 @@ export class UserApi {
                 requestOptions.form = formParams;
             }
         }
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
             request(requestOptions, (error, response, body) => {
                 if (error) {
-                localVarDeferred.reject(error);
+                    reject(error);
                 } else {
                     if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+                        resolve({ response: response, body: body });
                     } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                        reject({ response: response, body: body });
                     }
                 }
             });
-        return localVarDeferred.promise;
+        });
     }
     /**
      * Creates list of users with given input array
@@ -1014,7 +1014,6 @@ export class UserApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'POST',
             qs: queryParameters,
@@ -1034,18 +1033,19 @@ export class UserApi {
                 requestOptions.form = formParams;
             }
         }
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
             request(requestOptions, (error, response, body) => {
                 if (error) {
-                localVarDeferred.reject(error);
+                    reject(error);
                 } else {
                     if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+                        resolve({ response: response, body: body });
                     } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                        reject({ response: response, body: body });
                     }
                 }
             });
-        return localVarDeferred.promise;
+        });
     }
     /**
      * Delete user
@@ -1067,7 +1067,6 @@ export class UserApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'DELETE',
             qs: queryParameters,
@@ -1086,18 +1085,19 @@ export class UserApi {
                 requestOptions.form = formParams;
             }
         }
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
             request(requestOptions, (error, response, body) => {
                 if (error) {
-                localVarDeferred.reject(error);
+                    reject(error);
                 } else {
                     if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+                        resolve({ response: response, body: body });
                     } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                        reject({ response: response, body: body });
                     }
                 }
             });
-        return localVarDeferred.promise;
+        });
     }
     /**
      * Get user by user name
@@ -1119,7 +1119,6 @@ export class UserApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: User;  }>();
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
@@ -1138,18 +1137,19 @@ export class UserApi {
                 requestOptions.form = formParams;
             }
         }
+        return new Promise<{ response: http.ClientResponse; body: User;  }>((resolve, reject) => {
             request(requestOptions, (error, response, body) => {
                 if (error) {
-                localVarDeferred.reject(error);
+                    reject(error);
                 } else {
                     if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+                        resolve({ response: response, body: body });
                     } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                        reject({ response: response, body: body });
                     }
                 }
             });
-        return localVarDeferred.promise;
+        });
     }
     /**
      * Logs user into the system
@@ -1174,7 +1174,6 @@ export class UserApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: string;  }>();
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
@@ -1193,18 +1192,19 @@ export class UserApi {
                 requestOptions.form = formParams;
             }
         }
+        return new Promise<{ response: http.ClientResponse; body: string;  }>((resolve, reject) => {
             request(requestOptions, (error, response, body) => {
                 if (error) {
-                localVarDeferred.reject(error);
+                    reject(error);
                 } else {
                     if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+                        resolve({ response: response, body: body });
                     } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                        reject({ response: response, body: body });
                     }
                 }
             });
-        return localVarDeferred.promise;
+        });
     }
     /**
      * Logs out current logged in user session
@@ -1219,7 +1219,6 @@ export class UserApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
@@ -1238,18 +1237,19 @@ export class UserApi {
                 requestOptions.form = formParams;
             }
         }
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
             request(requestOptions, (error, response, body) => {
                 if (error) {
-                localVarDeferred.reject(error);
+                    reject(error);
                 } else {
                     if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+                        resolve({ response: response, body: body });
                     } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                        reject({ response: response, body: body });
                     }
                 }
             });
-        return localVarDeferred.promise;
+        });
     }
     /**
      * Updated user
@@ -1272,7 +1272,6 @@ export class UserApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'PUT',
             qs: queryParameters,
@@ -1292,17 +1291,18 @@ export class UserApi {
                 requestOptions.form = formParams;
             }
         }
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
             request(requestOptions, (error, response, body) => {
                 if (error) {
-                localVarDeferred.reject(error);
+                    reject(error);
                 } else {
                     if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+                        resolve({ response: response, body: body });
                     } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                        reject({ response: response, body: body });
                     }
                 }
             });
-        return localVarDeferred.promise;
+        });
     }
 }

samples/client/petstore/typescript-node/npm/api.ts

@@ -132,8 +132,8 @@ export class PetApi {
 
     protected authentications = {
         'default': <Authentication>new VoidAuth(),
-        'petstore_auth': new OAuth(),
         'api_key': new ApiKeyAuth('header', 'api_key'),
+        'petstore_auth': new OAuth(),
     }
 
     constructor(basePath?: string);
@@ -407,10 +407,10 @@ export class PetApi {
             json: true,
         };
 
-        this.authentications.petstore_auth.applyToRequest(requestOptions);
-
         this.authentications.api_key.applyToRequest(requestOptions);
 
+        this.authentications.petstore_auth.applyToRequest(requestOptions);
+
         this.authentications.default.applyToRequest(requestOptions);
 
         if (Object.keys(formParams).length) {
@@ -624,8 +624,8 @@ export class StoreApi {
 
     protected authentications = {
         'default': <Authentication>new VoidAuth(),
-        'petstore_auth': new OAuth(),
         'api_key': new ApiKeyAuth('header', 'api_key'),
+        'petstore_auth': new OAuth(),
     }
 
     constructor(basePath?: string);
@@ -870,8 +870,8 @@ export class UserApi {
 
     protected authentications = {
         'default': <Authentication>new VoidAuth(),
-        'petstore_auth': new OAuth(),
         'api_key': new ApiKeyAuth('header', 'api_key'),
+        'petstore_auth': new OAuth(),
     }
 
     constructor(basePath?: string);

samples/server/petstore/nodejs/api/swagger.yaml

@@ -587,6 +587,10 @@ paths:
           description: "User not found"
       x-swagger-router-controller: "User"
 securityDefinitions:
+  api_key:
+    type: "apiKey"
+    name: "api_key"
+    in: "header"
   petstore_auth:
     type: "oauth2"
     authorizationUrl: "http://petstore.swagger.io/api/oauth/dialog"
@@ -594,10 +598,6 @@ securityDefinitions:
     scopes:
       write:pets: "modify pets in your account"
       read:pets: "read your pets"
-  api_key:
-    type: "apiKey"
-    name: "api_key"
-    in: "header"
 definitions:
   Order:
     type: "object"

samples/server/petstore/nodejs/controllers/PetService.js

@@ -26,18 +26,18 @@ exports.findPetsByStatus = function(args, res, next) {
   **/
     var examples = {};
   examples['application/json'] = [ {
-  "photoUrls" : [ "aeiou" ],
+  "tags" : [ {
-  "name" : "doggie",
+    "id" : 123456789,
+    "name" : "aeiou"
+  } ],
   "id" : 123456789,
   "category" : {
-    "name" : "aeiou",
+    "id" : 123456789,
-    "id" : 123456789
+    "name" : "aeiou"
   },
-  "tags" : [ {
+  "status" : "aeiou",
-    "name" : "aeiou",
+  "name" : "doggie",
-    "id" : 123456789
+  "photoUrls" : [ "aeiou" ]
-  } ],
-  "status" : "aeiou"
 } ];
   if(Object.keys(examples).length > 0) {
     res.setHeader('Content-Type', 'application/json');
@@ -56,18 +56,18 @@ exports.findPetsByTags = function(args, res, next) {
   **/
     var examples = {};
   examples['application/json'] = [ {
-  "photoUrls" : [ "aeiou" ],
+  "tags" : [ {
-  "name" : "doggie",
+    "id" : 123456789,
+    "name" : "aeiou"
+  } ],
   "id" : 123456789,
   "category" : {
-    "name" : "aeiou",
+    "id" : 123456789,
-    "id" : 123456789
+    "name" : "aeiou"
   },
-  "tags" : [ {
+  "status" : "aeiou",
-    "name" : "aeiou",
+  "name" : "doggie",
-    "id" : 123456789
+  "photoUrls" : [ "aeiou" ]
-  } ],
-  "status" : "aeiou"
 } ];
   if(Object.keys(examples).length > 0) {
     res.setHeader('Content-Type', 'application/json');
@@ -86,18 +86,18 @@ exports.getPetById = function(args, res, next) {
   **/
     var examples = {};
   examples['application/json'] = {
-  "photoUrls" : [ "aeiou" ],
+  "tags" : [ {
-  "name" : "doggie",
+    "id" : 123456789,
+    "name" : "aeiou"
+  } ],
   "id" : 123456789,
   "category" : {
-    "name" : "aeiou",
+    "id" : 123456789,
-    "id" : 123456789
+    "name" : "aeiou"
   },
-  "tags" : [ {
+  "status" : "aeiou",
-    "name" : "aeiou",
+  "name" : "doggie",
-    "id" : 123456789
+  "photoUrls" : [ "aeiou" ]
-  } ],
-  "status" : "aeiou"
 };
   if(Object.keys(examples).length > 0) {
     res.setHeader('Content-Type', 'application/json');
@@ -138,9 +138,9 @@ exports.uploadFile = function(args, res, next) {
   **/
     var examples = {};
   examples['application/json'] = {
+  "message" : "aeiou",
   "code" : 123,
-  "type" : "aeiou",
+  "type" : "aeiou"
-  "message" : "aeiou"
 };
   if(Object.keys(examples).length > 0) {
     res.setHeader('Content-Type', 'application/json');

samples/server/petstore/nodejs/controllers/StoreService.js

@@ -34,12 +34,12 @@ exports.getOrderById = function(args, res, next) {
   **/
     var examples = {};
   examples['application/json'] = {
-  "petId" : 123456789,
-  "quantity" : 123,
   "id" : 123456789,
-  "shipDate" : "2000-01-23T04:56:07.000+0000",
+  "petId" : 123456789,
   "complete" : true,
-  "status" : "aeiou"
+  "status" : "aeiou",
+  "quantity" : 123,
+  "shipDate" : "2000-01-23T04:56:07.000+0000"
 };
   if(Object.keys(examples).length > 0) {
     res.setHeader('Content-Type', 'application/json');
@@ -58,12 +58,12 @@ exports.placeOrder = function(args, res, next) {
   **/
     var examples = {};
   examples['application/json'] = {
-  "petId" : 123456789,
-  "quantity" : 123,
   "id" : 123456789,
-  "shipDate" : "2000-01-23T04:56:07.000+0000",
+  "petId" : 123456789,
   "complete" : true,
-  "status" : "aeiou"
+  "status" : "aeiou",
+  "quantity" : 123,
+  "shipDate" : "2000-01-23T04:56:07.000+0000"
 };
   if(Object.keys(examples).length > 0) {
     res.setHeader('Content-Type', 'application/json');

samples/server/petstore/nodejs/controllers/UserService.js

@@ -43,14 +43,14 @@ exports.getUserByName = function(args, res, next) {
   **/
     var examples = {};
   examples['application/json'] = {
-  "firstName" : "aeiou",
-  "lastName" : "aeiou",
-  "password" : "aeiou",
-  "userStatus" : 123,
-  "phone" : "aeiou",
   "id" : 123456789,
+  "lastName" : "aeiou",
+  "phone" : "aeiou",
+  "username" : "aeiou",
   "email" : "aeiou",
-  "username" : "aeiou"
+  "userStatus" : 123,
+  "firstName" : "aeiou",
+  "password" : "aeiou"
 };
   if(Object.keys(examples).length > 0) {
     res.setHeader('Content-Type', 'application/json');

samples/server/petstore/nodejs/package.json

@@ -6,7 +6,7 @@
   "keywords": [
     "swagger"
   ],
-  "license": "MIT",
+  "license": "Apache-2.0",
   "private": true,
   "dependencies": {
     "connect": "^3.2.0",