diff --git a/samples/client/petstore/javascript-es6/docs/FakeApi.md b/samples/client/petstore/javascript-es6/docs/FakeApi.md
index 85ac0b3d8a2..159eabe7058 100644
--- a/samples/client/petstore/javascript-es6/docs/FakeApi.md
+++ b/samples/client/petstore/javascript-es6/docs/FakeApi.md
@@ -23,22 +23,21 @@ Test serialization of outer boolean types
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.FakeApi();
+let apiInstance = new SwaggerPetstore.FakeApi();
 
-var opts = { 
+let opts = { 
   'body': new SwaggerPetstore.OuterBoolean() // OuterBoolean | Input boolean as post body
 };
 
-var callback = function(error, data, response) {
+apiInstance.fakeOuterBooleanSerialize(opts, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.fakeOuterBooleanSerialize(opts, callback);
+});
 ```
 
 ### Parameters
@@ -70,22 +69,21 @@ Test serialization of object with outer number type
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.FakeApi();
+let apiInstance = new SwaggerPetstore.FakeApi();
 
-var opts = { 
+let opts = { 
   'body': new SwaggerPetstore.OuterComposite() // OuterComposite | Input composite as post body
 };
 
-var callback = function(error, data, response) {
+apiInstance.fakeOuterCompositeSerialize(opts, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.fakeOuterCompositeSerialize(opts, callback);
+});
 ```
 
 ### Parameters
@@ -117,22 +115,21 @@ Test serialization of outer number types
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.FakeApi();
+let apiInstance = new SwaggerPetstore.FakeApi();
 
-var opts = { 
+let opts = { 
   'body': new SwaggerPetstore.OuterNumber() // OuterNumber | Input number as post body
 };
 
-var callback = function(error, data, response) {
+apiInstance.fakeOuterNumberSerialize(opts, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.fakeOuterNumberSerialize(opts, callback);
+});
 ```
 
 ### Parameters
@@ -164,22 +161,21 @@ Test serialization of outer string types
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.FakeApi();
+let apiInstance = new SwaggerPetstore.FakeApi();
 
-var opts = { 
+let opts = { 
   'body': new SwaggerPetstore.OuterString() // OuterString | Input string as post body
 };
 
-var callback = function(error, data, response) {
+apiInstance.fakeOuterStringSerialize(opts, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.fakeOuterStringSerialize(opts, callback);
+});
 ```
 
 ### Parameters
@@ -211,21 +207,20 @@ To test \"client\" model
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.FakeApi();
+let apiInstance = new SwaggerPetstore.FakeApi();
 
-var body = new SwaggerPetstore.Client(); // Client | client model
+let body = new SwaggerPetstore.Client(); // Client | client model
 
 
-var callback = function(error, data, response) {
+apiInstance.testClientModel(body, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.testClientModel(body, callback);
+});
 ```
 
 ### Parameters
@@ -257,25 +252,25 @@ Fake endpoint for testing various parameters 假端點 偽のエンドポイン
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure HTTP basic authorization: http_basic_test
-var http_basic_test = defaultClient.authentications['http_basic_test'];
+let http_basic_test = defaultClient.authentications['http_basic_test'];
 http_basic_test.username = 'YOUR USERNAME';
 http_basic_test.password = 'YOUR PASSWORD';
 
-var apiInstance = new SwaggerPetstore.FakeApi();
+let apiInstance = new SwaggerPetstore.FakeApi();
 
-var _number = 3.4; // Number | None
+let _number = 3.4; // Number | None
 
-var _double = 1.2; // Number | None
+let _double = 1.2; // Number | None
 
-var patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
+let patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
 
-var _byte = B; // Blob | None
+let _byte = B; // Blob | None
 
-var opts = { 
+let opts = { 
   'integer': 56, // Number | None
   'int32': 56, // Number | None
   'int64': 789, // Number | None
@@ -288,14 +283,13 @@ var opts = {
   'callback': "callback_example" // String | None
 };
 
-var callback = function(error, data, response) {
+apiInstance.testEndpointParameters(_number, _double, patternWithoutDelimiter, _byte, opts, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully.');
   }
-};
-apiInstance.testEndpointParameters(_number, _double, patternWithoutDelimiter, _byte, opts, callback);
+});
 ```
 
 ### Parameters
@@ -340,11 +334,11 @@ To test enum parameters
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.FakeApi();
+let apiInstance = new SwaggerPetstore.FakeApi();
 
-var opts = { 
+let opts = { 
   'enumFormStringArray': ["enumFormStringArray_example"], // [String] | Form parameter enum test (string array)
   'enumFormString': "-efg", // String | Form parameter enum test (string)
   'enumHeaderStringArray': ["enumHeaderStringArray_example"], // [String] | Header parameter enum test (string array)
@@ -355,14 +349,13 @@ var opts = {
   'enumQueryDouble': 1.2 // Number | Query parameter enum test (double)
 };
 
-var callback = function(error, data, response) {
+apiInstance.testEnumParameters(opts, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully.');
   }
-};
-apiInstance.testEnumParameters(opts, callback);
+});
 ```
 
 ### Parameters
diff --git a/samples/client/petstore/javascript-es6/docs/PetApi.md b/samples/client/petstore/javascript-es6/docs/PetApi.md
index fee9b40dbbc..9901993bf12 100644
--- a/samples/client/petstore/javascript-es6/docs/PetApi.md
+++ b/samples/client/petstore/javascript-es6/docs/PetApi.md
@@ -24,26 +24,25 @@ Add a new pet to the store
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
+let petstore_auth = defaultClient.authentications['petstore_auth'];
 petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
 
-var apiInstance = new SwaggerPetstore.PetApi();
+let apiInstance = new SwaggerPetstore.PetApi();
 
-var body = new SwaggerPetstore.Pet(); // Pet | Pet object that needs to be added to the store
+let body = new SwaggerPetstore.Pet(); // Pet | Pet object that needs to be added to the store
 
 
-var callback = function(error, data, response) {
+apiInstance.addPet(body, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully.');
   }
-};
-apiInstance.addPet(body, callback);
+});
 ```
 
 ### Parameters
@@ -75,29 +74,28 @@ Deletes a pet
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
+let petstore_auth = defaultClient.authentications['petstore_auth'];
 petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
 
-var apiInstance = new SwaggerPetstore.PetApi();
+let apiInstance = new SwaggerPetstore.PetApi();
 
-var petId = 789; // Number | Pet id to delete
+let petId = 789; // Number | Pet id to delete
 
-var opts = { 
+let opts = { 
   'apiKey': "apiKey_example" // String | 
 };
 
-var callback = function(error, data, response) {
+apiInstance.deletePet(petId, opts, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully.');
   }
-};
-apiInstance.deletePet(petId, opts, callback);
+});
 ```
 
 ### Parameters
@@ -130,26 +128,25 @@ Multiple status values can be provided with comma separated strings
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
+let petstore_auth = defaultClient.authentications['petstore_auth'];
 petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
 
-var apiInstance = new SwaggerPetstore.PetApi();
+let apiInstance = new SwaggerPetstore.PetApi();
 
-var status = ["status_example"]; // [String] | Status values that need to be considered for filter
+let status = ["status_example"]; // [String] | Status values that need to be considered for filter
 
 
-var callback = function(error, data, response) {
+apiInstance.findPetsByStatus(status, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.findPetsByStatus(status, callback);
+});
 ```
 
 ### Parameters
@@ -181,26 +178,25 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
+let petstore_auth = defaultClient.authentications['petstore_auth'];
 petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
 
-var apiInstance = new SwaggerPetstore.PetApi();
+let apiInstance = new SwaggerPetstore.PetApi();
 
-var tags = ["tags_example"]; // [String] | Tags to filter by
+let tags = ["tags_example"]; // [String] | Tags to filter by
 
 
-var callback = function(error, data, response) {
+apiInstance.findPetsByTags(tags, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.findPetsByTags(tags, callback);
+});
 ```
 
 ### Parameters
@@ -232,28 +228,27 @@ Returns a single pet
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure API key authorization: api_key
-var api_key = defaultClient.authentications['api_key'];
+let api_key = defaultClient.authentications['api_key'];
 api_key.apiKey = 'YOUR API KEY';
 // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
 //api_key.apiKeyPrefix = 'Token';
 
-var apiInstance = new SwaggerPetstore.PetApi();
+let apiInstance = new SwaggerPetstore.PetApi();
 
-var petId = 789; // Number | ID of pet to return
+let petId = 789; // Number | ID of pet to return
 
 
-var callback = function(error, data, response) {
+apiInstance.getPetById(petId, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.getPetById(petId, callback);
+});
 ```
 
 ### Parameters
@@ -285,26 +280,25 @@ Update an existing pet
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
+let petstore_auth = defaultClient.authentications['petstore_auth'];
 petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
 
-var apiInstance = new SwaggerPetstore.PetApi();
+let apiInstance = new SwaggerPetstore.PetApi();
 
-var body = new SwaggerPetstore.Pet(); // Pet | Pet object that needs to be added to the store
+let body = new SwaggerPetstore.Pet(); // Pet | Pet object that needs to be added to the store
 
 
-var callback = function(error, data, response) {
+apiInstance.updatePet(body, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully.');
   }
-};
-apiInstance.updatePet(body, callback);
+});
 ```
 
 ### Parameters
@@ -336,30 +330,29 @@ Updates a pet in the store with form data
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
+let petstore_auth = defaultClient.authentications['petstore_auth'];
 petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
 
-var apiInstance = new SwaggerPetstore.PetApi();
+let apiInstance = new SwaggerPetstore.PetApi();
 
-var petId = 789; // Number | ID of pet that needs to be updated
+let petId = 789; // Number | ID of pet that needs to be updated
 
-var opts = { 
+let opts = { 
   'name': "name_example", // String | Updated name of the pet
   'status': "status_example" // String | Updated status of the pet
 };
 
-var callback = function(error, data, response) {
+apiInstance.updatePetWithForm(petId, opts, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully.');
   }
-};
-apiInstance.updatePetWithForm(petId, opts, callback);
+});
 ```
 
 ### Parameters
@@ -393,30 +386,29 @@ uploads an image
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
+let petstore_auth = defaultClient.authentications['petstore_auth'];
 petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
 
-var apiInstance = new SwaggerPetstore.PetApi();
+let apiInstance = new SwaggerPetstore.PetApi();
 
-var petId = 789; // Number | ID of pet to update
+let petId = 789; // Number | ID of pet to update
 
-var opts = { 
+let opts = { 
   'additionalMetadata': "additionalMetadata_example", // String | Additional data to pass to server
   'file': "/path/to/file.txt" // File | file to upload
 };
 
-var callback = function(error, data, response) {
+apiInstance.uploadFile(petId, opts, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.uploadFile(petId, opts, callback);
+});
 ```
 
 ### Parameters
diff --git a/samples/client/petstore/javascript-es6/docs/StoreApi.md b/samples/client/petstore/javascript-es6/docs/StoreApi.md
index 64d4658232d..2581dc0b7d3 100644
--- a/samples/client/petstore/javascript-es6/docs/StoreApi.md
+++ b/samples/client/petstore/javascript-es6/docs/StoreApi.md
@@ -20,21 +20,20 @@ For valid response try integer IDs with value < 1000. Anything above 1000 or
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.StoreApi();
+let apiInstance = new SwaggerPetstore.StoreApi();
 
-var orderId = "orderId_example"; // String | ID of the order that needs to be deleted
+let orderId = "orderId_example"; // String | ID of the order that needs to be deleted
 
 
-var callback = function(error, data, response) {
+apiInstance.deleteOrder(orderId, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully.');
   }
-};
-apiInstance.deleteOrder(orderId, callback);
+});
 ```
 
 ### Parameters
@@ -66,25 +65,24 @@ Returns a map of status codes to quantities
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure API key authorization: api_key
-var api_key = defaultClient.authentications['api_key'];
+let api_key = defaultClient.authentications['api_key'];
 api_key.apiKey = 'YOUR API KEY';
 // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
 //api_key.apiKeyPrefix = 'Token';
 
-var apiInstance = new SwaggerPetstore.StoreApi();
+let apiInstance = new SwaggerPetstore.StoreApi();
 
-var callback = function(error, data, response) {
+apiInstance.getInventory((error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.getInventory(callback);
+});
 ```
 
 ### Parameters
@@ -113,21 +111,20 @@ For valid response try integer IDs with value <= 5 or > 10. Other val
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.StoreApi();
+let apiInstance = new SwaggerPetstore.StoreApi();
 
-var orderId = 789; // Number | ID of pet that needs to be fetched
+let orderId = 789; // Number | ID of pet that needs to be fetched
 
 
-var callback = function(error, data, response) {
+apiInstance.getOrderById(orderId, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.getOrderById(orderId, callback);
+});
 ```
 
 ### Parameters
@@ -159,21 +156,20 @@ Place an order for a pet
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.StoreApi();
+let apiInstance = new SwaggerPetstore.StoreApi();
 
-var body = new SwaggerPetstore.Order(); // Order | order placed for purchasing the pet
+let body = new SwaggerPetstore.Order(); // Order | order placed for purchasing the pet
 
 
-var callback = function(error, data, response) {
+apiInstance.placeOrder(body, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.placeOrder(body, callback);
+});
 ```
 
 ### Parameters
diff --git a/samples/client/petstore/javascript-es6/docs/UserApi.md b/samples/client/petstore/javascript-es6/docs/UserApi.md
index d0ff1003b0c..d77e8413fd3 100644
--- a/samples/client/petstore/javascript-es6/docs/UserApi.md
+++ b/samples/client/petstore/javascript-es6/docs/UserApi.md
@@ -24,21 +24,20 @@ This can only be done by the logged in user.
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.UserApi();
+let apiInstance = new SwaggerPetstore.UserApi();
 
-var body = new SwaggerPetstore.User(); // User | Created user object
+let body = new SwaggerPetstore.User(); // User | Created user object
 
 
-var callback = function(error, data, response) {
+apiInstance.createUser(body, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully.');
   }
-};
-apiInstance.createUser(body, callback);
+});
 ```
 
 ### Parameters
@@ -70,21 +69,20 @@ Creates list of users with given input array
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.UserApi();
+let apiInstance = new SwaggerPetstore.UserApi();
 
-var body = [new SwaggerPetstore.User()]; // [User] | List of user object
+let body = [new SwaggerPetstore.User()]; // [User] | List of user object
 
 
-var callback = function(error, data, response) {
+apiInstance.createUsersWithArrayInput(body, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully.');
   }
-};
-apiInstance.createUsersWithArrayInput(body, callback);
+});
 ```
 
 ### Parameters
@@ -116,21 +114,20 @@ Creates list of users with given input array
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.UserApi();
+let apiInstance = new SwaggerPetstore.UserApi();
 
-var body = [new SwaggerPetstore.User()]; // [User] | List of user object
+let body = [new SwaggerPetstore.User()]; // [User] | List of user object
 
 
-var callback = function(error, data, response) {
+apiInstance.createUsersWithListInput(body, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully.');
   }
-};
-apiInstance.createUsersWithListInput(body, callback);
+});
 ```
 
 ### Parameters
@@ -162,21 +159,20 @@ This can only be done by the logged in user.
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.UserApi();
+let apiInstance = new SwaggerPetstore.UserApi();
 
-var username = "username_example"; // String | The name that needs to be deleted
+let username = "username_example"; // String | The name that needs to be deleted
 
 
-var callback = function(error, data, response) {
+apiInstance.deleteUser(username, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully.');
   }
-};
-apiInstance.deleteUser(username, callback);
+});
 ```
 
 ### Parameters
@@ -208,21 +204,20 @@ Get user by user name
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.UserApi();
+let apiInstance = new SwaggerPetstore.UserApi();
 
-var username = "username_example"; // String | The name that needs to be fetched. Use user1 for testing. 
+let username = "username_example"; // String | The name that needs to be fetched. Use user1 for testing. 
 
 
-var callback = function(error, data, response) {
+apiInstance.getUserByName(username, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.getUserByName(username, callback);
+});
 ```
 
 ### Parameters
@@ -254,23 +249,22 @@ Logs user into the system
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.UserApi();
+let apiInstance = new SwaggerPetstore.UserApi();
 
-var username = "username_example"; // String | The user name for login
+let username = "username_example"; // String | The user name for login
 
-var password = "password_example"; // String | The password for login in clear text
+let password = "password_example"; // String | The password for login in clear text
 
 
-var callback = function(error, data, response) {
+apiInstance.loginUser(username, password, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.loginUser(username, password, callback);
+});
 ```
 
 ### Parameters
@@ -303,18 +297,17 @@ Logs out current logged in user session
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.UserApi();
+let apiInstance = new SwaggerPetstore.UserApi();
 
-var callback = function(error, data, response) {
+apiInstance.logoutUser((error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully.');
   }
-};
-apiInstance.logoutUser(callback);
+});
 ```
 
 ### Parameters
@@ -343,23 +336,22 @@ This can only be done by the logged in user.
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.UserApi();
+let apiInstance = new SwaggerPetstore.UserApi();
 
-var username = "username_example"; // String | name that need to be deleted
+let username = "username_example"; // String | name that need to be deleted
 
-var body = new SwaggerPetstore.User(); // User | Updated user object
+let body = new SwaggerPetstore.User(); // User | Updated user object
 
 
-var callback = function(error, data, response) {
+apiInstance.updateUser(username, body, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully.');
   }
-};
-apiInstance.updateUser(username, body, callback);
+});
 ```
 
 ### Parameters
diff --git a/samples/client/petstore/javascript-es6/package.json b/samples/client/petstore/javascript-es6/package.json
index 881163c02f4..0332217891a 100644
--- a/samples/client/petstore/javascript-es6/package.json
+++ b/samples/client/petstore/javascript-es6/package.json
@@ -5,17 +5,22 @@
   "license": "Unlicense",
   "main": "src/index.js",
   "scripts": {
-    "test": "./node_modules/mocha/bin/mocha --recursive"
+    "test": "mocha --compilers js:babel-core/register --recursive"
   },
   "browser": {
     "fs": false
   },
   "dependencies": {
+    "babel": "^6.23.0",
+    "babel-cli": "^6.24.1",
     "superagent": "3.5.2"
   },
   "devDependencies": {
+    "babel-core": "6.18.0",
+    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-stage-0": "^6.24.1",
+    "expect.js": "~0.3.1",
     "mocha": "~2.3.4",
-    "sinon": "1.17.3",
-    "expect.js": "~0.3.1"
+    "sinon": "1.17.3"
   }
 }
diff --git a/samples/client/petstore/javascript-es6/src/ApiClient.js b/samples/client/petstore/javascript-es6/src/ApiClient.js
index 5abc81c7dba..d47828d2a41 100644
--- a/samples/client/petstore/javascript-es6/src/ApiClient.js
+++ b/samples/client/petstore/javascript-es6/src/ApiClient.js
@@ -7,564 +7,570 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['superagent', 'querystring'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('superagent'), require('querystring'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import superagent from "superagent";
+import querystring from "querystring";
+
+/**
+* @module ApiClient
+* @version 1.0.0
+*/
+
+/**
+* Manages low level client-server communications, parameter marshalling, etc. There should not be any need for an
+* application to use this class directly - the *Api and model classes provide the public API for the service. The
+* contents of this file should be regarded as internal but are documented for completeness.
+* @alias module:ApiClient
+* @class
+*/
+export default class ApiClient {
+    constructor() {
+        /**
+         * The base URL against which to resolve every API call's (relative) path.
+         * @type {String}
+         * @default http://petstore.swagger.io:80/v2
+         */
+        this.basePath = 'http://petstore.swagger.io:80/v2'.replace(/\/+$/, '');
+
+        /**
+         * The authentication methods to be included for all API calls.
+         * @type {Array.<String>}
+         */
+        this.authentications = {
+            'api_key': {type: 'apiKey', 'in': 'header', name: 'api_key'},
+            'http_basic_test': {type: 'basic'},
+            'petstore_auth': {type: 'oauth2'}
+        }
+
+        /**
+         * The default HTTP headers to be included for all API calls.
+         * @type {Array.<String>}
+         * @default {}
+         */
+        this.defaultHeaders = {};
+
+        /**
+         * The default HTTP timeout for all API calls.
+         * @type {Number}
+         * @default 60000
+         */
+        this.timeout = 60000;
+
+        /**
+         * If set to false an additional timestamp parameter is added to all API GET calls to
+         * prevent browser caching
+         * @type {Boolean}
+         * @default true
+         */
+        this.cache = true;
+
+        /**
+         * If set to true, the client will save the cookies from each server
+         * response, and return them in the next request.
+         * @default false
+         */
+        this.enableCookies = false;
+
+        /*
+         * Used to save and return cookies in a node.js (non-browser) setting,
+         * if this.enableCookies is set to true.
+         */
+        if (typeof window === 'undefined') {
+          this.agent = new superagent.agent();
+        }
     }
-    root.SwaggerPetstore.ApiClient = factory(root.superagent, root.querystring);
-  }
-}(this, function(superagent, querystring) {
-  'use strict';
-
-  /**
-   * @module ApiClient
-   * @version 1.0.0
-   */
-
-  /**
-   * Manages low level client-server communications, parameter marshalling, etc. There should not be any need for an
-   * application to use this class directly - the *Api and model classes provide the public API for the service. The
-   * contents of this file should be regarded as internal but are documented for completeness.
-   * @alias module:ApiClient
-   * @class
-   */
-  var exports = function() {
-    /**
-     * The base URL against which to resolve every API call's (relative) path.
-     * @type {String}
-     * @default http://petstore.swagger.io:80/v2
-     */
-    this.basePath = 'http://petstore.swagger.io:80/v2'.replace(/\/+$/, '');
 
     /**
-     * The authentication methods to be included for all API calls.
-     * @type {Array.<String>}
-     */
-    this.authentications = {
-      'api_key': {type: 'apiKey', 'in': 'header', name: 'api_key'},
-      'http_basic_test': {type: 'basic'},
-      'petstore_auth': {type: 'oauth2'}
+    * Returns a string representation for an actual parameter.
+    * @param param The actual parameter.
+    * @returns {String} The string representation of <code>param</code>.
+    */
+    paramToString(param) {
+        if (param == undefined || param == null) {
+            return '';
+        }
+        if (param instanceof Date) {
+            return param.toJSON();
+        }
+
+        return param.toString();
+    }
+
+    /**
+    * Builds full URL by appending the given path to the base URL and replacing path parameter place-holders with parameter values.
+    * NOTE: query parameters are not handled here.
+    * @param {String} path The path to append to the base URL.
+    * @param {Object} pathParams The parameter values to append.
+    * @returns {String} The encoded path with parameter values substituted.
+    */
+    buildUrl(path, pathParams) {
+        if (!path.match(/^\//)) {
+            path = '/' + path;
+        }
+
+        var url = this.basePath + path;
+        url = url.replace(/\{([\w-]+)\}/g, (fullMatch, key) => {
+            var value;
+            if (pathParams.hasOwnProperty(key)) {
+                value = this.paramToString(pathParams[key]);
+            } else {
+                value = fullMatch;
+            }
+
+            return encodeURIComponent(value);
+        });
+
+        return url;
+    }
+
+    /**
+    * Checks whether the given content type represents JSON.<br>
+    * JSON content type examples:<br>
+    * <ul>
+    * <li>application/json</li>
+    * <li>application/json; charset=UTF8</li>
+    * <li>APPLICATION/JSON</li>
+    * </ul>
+    * @param {String} contentType The MIME content type to check.
+    * @returns {Boolean} <code>true</code> if <code>contentType</code> represents JSON, otherwise <code>false</code>.
+    */
+    isJsonMime(contentType) {
+        return Boolean(contentType != null && contentType.match(/^application\/json(;.*)?$/i));
+    }
+
+    /**
+    * Chooses a content type from the given array, with JSON preferred; i.e. return JSON if included, otherwise return the first.
+    * @param {Array.<String>} contentTypes
+    * @returns {String} The chosen content type, preferring JSON.
+    */
+    jsonPreferredMime(contentTypes) {
+        for (var i = 0; i < contentTypes.length; i++) {
+            if (this.isJsonMime(contentTypes[i])) {
+                return contentTypes[i];
+            }
+        }
+
+        return contentTypes[0];
+    }
+
+    /**
+    * Checks whether the given parameter value represents file-like content.
+    * @param param The parameter to check.
+    * @returns {Boolean} <code>true</code> if <code>param</code> represents a file.
+    */
+    isFileParam(param) {
+        // fs.ReadStream in Node.js and Electron (but not in runtime like browserify)
+        if (typeof require === 'function') {
+            let fs;
+            try {
+                fs = require('fs');
+            } catch (err) {}
+            if (fs && fs.ReadStream && param instanceof fs.ReadStream) {
+                return true;
+            }
+        }
+
+        // Buffer in Node.js
+        if (typeof Buffer === 'function' && param instanceof Buffer) {
+            return true;
+        }
+
+        // Blob in browser
+        if (typeof Blob === 'function' && param instanceof Blob) {
+            return true;
+        }
+
+        // File in browser (it seems File object is also instance of Blob, but keep this for safe)
+        if (typeof File === 'function' && param instanceof File) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+    * Normalizes parameter values:
+    * <ul>
+    * <li>remove nils</li>
+    * <li>keep files and arrays</li>
+    * <li>format to string with `paramToString` for other cases</li>
+    * </ul>
+    * @param {Object.<String, Object>} params The parameters as object properties.
+    * @returns {Object.<String, Object>} normalized parameters.
+    */
+    normalizeParams(params) {
+        var newParams = {};
+        for (var key in params) {
+            if (params.hasOwnProperty(key) && params[key] != undefined && params[key] != null) {
+                var value = params[key];
+                if (this.isFileParam(value) || Array.isArray(value)) {
+                    newParams[key] = value;
+                } else {
+                    newParams[key] = this.paramToString(value);
+                }
+            }
+        }
+
+        return newParams;
+    }
+
+    /**
+    * Enumeration of collection format separator strategies.
+    * @enum {String}
+    * @readonly
+    */
+    static CollectionFormatEnum = {
+        /**
+         * Comma-separated values. Value: <code>csv</code>
+         * @const
+         */
+        CSV: ',',
+
+        /**
+         * Space-separated values. Value: <code>ssv</code>
+         * @const
+         */
+        SSV: ' ',
+
+        /**
+         * Tab-separated values. Value: <code>tsv</code>
+         * @const
+         */
+        TSV: '\t',
+
+        /**
+         * Pipe(|)-separated values. Value: <code>pipes</code>
+         * @const
+         */
+        PIPES: '|',
+
+        /**
+         * Native array. Value: <code>multi</code>
+         * @const
+         */
+        MULTI: 'multi'
     };
-    /**
-     * The default HTTP headers to be included for all API calls.
-     * @type {Array.<String>}
-     * @default {}
-     */
-    this.defaultHeaders = {};
 
     /**
-     * The default HTTP timeout for all API calls.
-     * @type {Number}
-     * @default 60000
-     */
-    this.timeout = 60000;
+    * Builds a string representation of an array-type actual parameter, according to the given collection format.
+    * @param {Array} param An array parameter.
+    * @param {module:ApiClient.CollectionFormatEnum} collectionFormat The array element separator strategy.
+    * @returns {String|Array} A string representation of the supplied collection, using the specified delimiter. Returns
+    * <code>param</code> as is if <code>collectionFormat</code> is <code>multi</code>.
+    */
+    buildCollectionParam(param, collectionFormat) {
+        if (param == null) {
+            return null;
+        }
+        switch (collectionFormat) {
+            case 'csv':
+                return param.map(this.paramToString).join(',');
+            case 'ssv':
+                return param.map(this.paramToString).join(' ');
+            case 'tsv':
+                return param.map(this.paramToString).join('\t');
+            case 'pipes':
+                return param.map(this.paramToString).join('|');
+            case 'multi':
+                //return the array directly as SuperAgent will handle it as expected
+                return param.map(this.paramToString);
+            default:
+                throw new Error('Unknown collection format: ' + collectionFormat);
+        }
+    }
 
     /**
-     * If set to false an additional timestamp parameter is added to all API GET calls to
-     * prevent browser caching
-     * @type {Boolean}
-     * @default true
-     */
-    this.cache = true;
+    * Applies authentication headers to the request.
+    * @param {Object} request The request object created by a <code>superagent()</code> call.
+    * @param {Array.<String>} authNames An array of authentication method names.
+    */
+    applyAuthToRequest(request, authNames) {
+        authNames.forEach((authName) => {
+            var auth = this.authentications[authName];
+            switch (auth.type) {
+                case 'basic':
+                    if (auth.username || auth.password) {
+                        request.auth(auth.username || '', auth.password || '');
+                    }
+
+                    break;
+                case 'apiKey':
+                    if (auth.apiKey) {
+                        var data = {};
+                        if (auth.apiKeyPrefix) {
+                            data[auth.name] = auth.apiKeyPrefix + ' ' + auth.apiKey;
+                        } else {
+                            data[auth.name] = auth.apiKey;
+                        }
+
+                        if (auth['in'] === 'header') {
+                            request.set(data);
+                        } else {
+                            request.query(data);
+                        }
+                    }
+
+                    break;
+                case 'oauth2':
+                    if (auth.accessToken) {
+                        request.set({'Authorization': 'Bearer ' + auth.accessToken});
+                    }
+
+                    break;
+                default:
+                    throw new Error('Unknown authentication type: ' + auth.type);
+            }
+        });
+    }
 
     /**
-     * If set to true, the client will save the cookies from each server
-     * response, and return them in the next request.
-     * @default false
-     */
-    this.enableCookies = false;
+    * Deserializes an HTTP response body into a value of the specified type.
+    * @param {Object} response A SuperAgent response object.
+    * @param {(String|Array.<String>|Object.<String, Object>|Function)} returnType The type to return. Pass a string for simple types
+    * or the constructor function for a complex type. Pass an array containing the type name to return an array of that type. To
+    * return an object, pass an object with one property whose name is the key type and whose value is the corresponding value type:
+    * all properties on <code>data<code> will be converted to this type.
+    * @returns A value of the specified type.
+    */
+    deserialize(response, returnType) {
+        if (response == null || returnType == null || response.status == 204) {
+            return null;
+        }
 
-    /*
-     * Used to save and return cookies in a node.js (non-browser) setting,
-     * if this.enableCookies is set to true.
-     */
-    if (typeof window === 'undefined') {
-      this.agent = new superagent.agent();
+        // Rely on SuperAgent for parsing response body.
+        // See http://visionmedia.github.io/superagent/#parsing-response-bodies
+        var data = response.body;
+        if (data == null || (typeof data === 'object' && typeof data.length === 'undefined' && !Object.keys(data).length)) {
+            // SuperAgent does not always produce a body; use the unparsed response as a fallback
+            data = response.text;
+        }
+
+        return ApiClient.convertToType(data, returnType);
     }
 
-  };
+    /**
+    * Callback function to receive the result of the operation.
+    * @callback module:ApiClient~callApiCallback
+    * @param {String} error Error message, if any.
+    * @param data The data returned by the service call.
+    * @param {String} response The complete HTTP response.
+    */
 
-  /**
-   * Returns a string representation for an actual parameter.
-   * @param param The actual parameter.
-   * @returns {String} The string representation of <code>param</code>.
-   */
-  exports.prototype.paramToString = function(param) {
-    if (param == undefined || param == null) {
-      return '';
-    }
-    if (param instanceof Date) {
-      return param.toJSON();
-    }
-    return param.toString();
-  };
+    /**
+    * Invokes the REST service using the supplied settings and parameters.
+    * @param {String} path The base URL to invoke.
+    * @param {String} httpMethod The HTTP method to use.
+    * @param {Object.<String, String>} pathParams A map of path parameters and their values.
+    * @param {Object.<String, Object>} queryParams A map of query parameters and their values.
+    * @param {Object.<String, Object>} headerParams A map of header parameters and their values.
+    * @param {Object.<String, Object>} formParams A map of form parameters and their values.
+    * @param {Object} bodyParam The value to pass as the request body.
+    * @param {Array.<String>} authNames An array of authentication type names.
+    * @param {Array.<String>} contentTypes An array of request MIME types.
+    * @param {Array.<String>} accepts An array of acceptable response MIME types.
+    * @param {(String|Array|ObjectFunction)} returnType The required type to return; can be a string for simple types or the
+    * constructor for a complex type.
+    * @param {module:ApiClient~callApiCallback} callback The callback function.
+    * @returns {Object} The SuperAgent request object.
+    */
+    callApi(path, httpMethod, pathParams,
+        queryParams, headerParams, formParams, bodyParam, authNames, contentTypes, accepts,
+        returnType, callback) {
 
-  /**
-   * Builds full URL by appending the given path to the base URL and replacing path parameter place-holders with parameter values.
-   * NOTE: query parameters are not handled here.
-   * @param {String} path The path to append to the base URL.
-   * @param {Object} pathParams The parameter values to append.
-   * @returns {String} The encoded path with parameter values substituted.
-   */
-  exports.prototype.buildUrl = function(path, pathParams) {
-    if (!path.match(/^\//)) {
-      path = '/' + path;
-    }
-    var url = this.basePath + path;
-    var _this = this;
-    url = url.replace(/\{([\w-]+)\}/g, function(fullMatch, key) {
-      var value;
-      if (pathParams.hasOwnProperty(key)) {
-        value = _this.paramToString(pathParams[key]);
-      } else {
-        value = fullMatch;
-      }
-      return encodeURIComponent(value);
-    });
-    return url;
-  };
+        var url = this.buildUrl(path, pathParams);
+        var request = superagent(httpMethod, url);
 
-  /**
-   * Checks whether the given content type represents JSON.<br>
-   * JSON content type examples:<br>
-   * <ul>
-   * <li>application/json</li>
-   * <li>application/json; charset=UTF8</li>
-   * <li>APPLICATION/JSON</li>
-   * </ul>
-   * @param {String} contentType The MIME content type to check.
-   * @returns {Boolean} <code>true</code> if <code>contentType</code> represents JSON, otherwise <code>false</code>.
-   */
-  exports.prototype.isJsonMime = function(contentType) {
-    return Boolean(contentType != null && contentType.match(/^application\/json(;.*)?$/i));
-  };
+        // apply authentications
+        this.applyAuthToRequest(request, authNames);
 
-  /**
-   * Chooses a content type from the given array, with JSON preferred; i.e. return JSON if included, otherwise return the first.
-   * @param {Array.<String>} contentTypes
-   * @returns {String} The chosen content type, preferring JSON.
-   */
-  exports.prototype.jsonPreferredMime = function(contentTypes) {
-    for (var i = 0; i < contentTypes.length; i++) {
-      if (this.isJsonMime(contentTypes[i])) {
-        return contentTypes[i];
-      }
-    }
-    return contentTypes[0];
-  };
+        // set query parameters
+        if (httpMethod.toUpperCase() === 'GET' && this.cache === false) {
+            queryParams['_'] = new Date().getTime();
+        }
 
-  /**
-   * Checks whether the given parameter value represents file-like content.
-   * @param param The parameter to check.
-   * @returns {Boolean} <code>true</code> if <code>param</code> represents a file.
-   */
-  exports.prototype.isFileParam = function(param) {
-    // fs.ReadStream in Node.js and Electron (but not in runtime like browserify)
-    if (typeof require === 'function') {
-      var fs;
-      try {
-        fs = require('fs');
-      } catch (err) {}
-      if (fs && fs.ReadStream && param instanceof fs.ReadStream) {
-        return true;
-      }
-    }
-    // Buffer in Node.js
-    if (typeof Buffer === 'function' && param instanceof Buffer) {
-      return true;
-    }
-    // Blob in browser
-    if (typeof Blob === 'function' && param instanceof Blob) {
-      return true;
-    }
-    // File in browser (it seems File object is also instance of Blob, but keep this for safe)
-    if (typeof File === 'function' && param instanceof File) {
-      return true;
-    }
-    return false;
-  };
+        request.query(this.normalizeParams(queryParams));
 
-  /**
-   * Normalizes parameter values:
-   * <ul>
-   * <li>remove nils</li>
-   * <li>keep files and arrays</li>
-   * <li>format to string with `paramToString` for other cases</li>
-   * </ul>
-   * @param {Object.<String, Object>} params The parameters as object properties.
-   * @returns {Object.<String, Object>} normalized parameters.
-   */
-  exports.prototype.normalizeParams = function(params) {
-    var newParams = {};
-    for (var key in params) {
-      if (params.hasOwnProperty(key) && params[key] != undefined && params[key] != null) {
-        var value = params[key];
-        if (this.isFileParam(value) || Array.isArray(value)) {
-          newParams[key] = value;
+        // set header parameters
+        request.set(this.defaultHeaders).set(this.normalizeParams(headerParams));
+
+        // set request timeout
+        request.timeout(this.timeout);
+
+        var contentType = this.jsonPreferredMime(contentTypes);
+        if (contentType) {
+            // Issue with superagent and multipart/form-data (https://github.com/visionmedia/superagent/issues/746)
+            if(contentType != 'multipart/form-data') {
+                request.type(contentType);
+            }
+        } else if (!request.header['Content-Type']) {
+            request.type('application/json');
+        }
+
+        if (contentType === 'application/x-www-form-urlencoded') {
+            request.send(querystring.stringify(this.normalizeParams(formParams)));
+        } else if (contentType == 'multipart/form-data') {
+            var _formParams = this.normalizeParams(formParams);
+            for (var key in _formParams) {
+                if (_formParams.hasOwnProperty(key)) {
+                    if (this.isFileParam(_formParams[key])) {
+                        // file field
+                        request.attach(key, _formParams[key]);
+                    } else {
+                        request.field(key, _formParams[key]);
+                    }
+                }
+            }
+        } else if (bodyParam) {
+            request.send(bodyParam);
+        }
+
+        var accept = this.jsonPreferredMime(accepts);
+        if (accept) {
+            request.accept(accept);
+        }
+
+        if (returnType === 'Blob') {
+          request.responseType('blob');
+        } else if (returnType === 'String') {
+          request.responseType('string');
+        }
+
+        // Attach previously saved cookies, if enabled
+        if (this.enableCookies){
+            if (typeof window === 'undefined') {
+                this.agent.attachCookies(request);
+            }
+            else {
+                request.withCredentials();
+            }
+        }
+
+        
+
+        request.end((error, response) => {
+            if (callback) {
+                var data = null;
+                if (!error) {
+                    try {
+                        data = this.deserialize(response, returnType);
+                        if (this.enableCookies && typeof window === 'undefined'){
+                            this.agent.saveCookies(response);
+                        }
+                    } catch (err) {
+                        error = err;
+                    }
+                }
+
+                callback(error, data, response);
+            }
+        });
+
+        return request;
+    }
+
+    /**
+    * Parses an ISO-8601 string representation of a date value.
+    * @param {String} str The date value as a string.
+    * @returns {Date} The parsed date object.
+    */
+    static parseDate(str) {
+        return new Date(str.replace(/T/i, ' '));
+    }
+
+    /**
+    * Converts a value to the specified type.
+    * @param {(String|Object)} data The data to convert, as a string or object.
+    * @param {(String|Array.<String>|Object.<String, Object>|Function)} type The type to return. Pass a string for simple types
+    * or the constructor function for a complex type. Pass an array containing the type name to return an array of that type. To
+    * return an object, pass an object with one property whose name is the key type and whose value is the corresponding value type:
+    * all properties on <code>data<code> will be converted to this type.
+    * @returns An instance of the specified type or null or undefined if data is null or undefined.
+    */
+    static convertToType(data, type) {
+        if (data === null || data === undefined)
+            return data
+
+        switch (type) {
+            case 'Boolean':
+                return Boolean(data);
+            case 'Integer':
+                return parseInt(data, 10);
+            case 'Number':
+                return parseFloat(data);
+            case 'String':
+                return String(data);
+            case 'Date':
+                return ApiClient.parseDate(String(data));
+            case 'Blob':
+                return data;
+            default:
+                if (type === Object) {
+                    // generic object, return directly
+                    return data;
+                } else if (typeof type === 'function') {
+                    // for model type like: User
+                    return type.constructFromObject(data);
+                } else if (Array.isArray(type)) {
+                    // for array type like: ['String']
+                    var itemType = type[0];
+
+                    return data.map((item) => {
+                        return ApiClient.convertToType(item, itemType);
+                    });
+                } else if (typeof type === 'object') {
+                    // for plain object type like: {'String': 'Integer'}
+                    var keyType, valueType;
+                    for (var k in type) {
+                        if (type.hasOwnProperty(k)) {
+                            keyType = k;
+                            valueType = type[k];
+                            break;
+                        }
+                    }
+
+                    var result = {};
+                    for (var k in data) {
+                        if (data.hasOwnProperty(k)) {
+                            var key = ApiClient.convertToType(k, keyType);
+                            var value = ApiClient.convertToType(data[k], valueType);
+                            result[key] = value;
+                        }
+                    }
+
+                    return result;
+                } else {
+                    // for unknown type, return the data directly
+                    return data;
+                }
+        }
+    }
+
+    /**
+    * Constructs a new map or array model from REST data.
+    * @param data {Object|Array} The REST data.
+    * @param obj {Object|Array} The target object or array.
+    */
+    static constructFromObject(data, obj, itemType) {
+        if (Array.isArray(data)) {
+            for (var i = 0; i < data.length; i++) {
+                if (data.hasOwnProperty(i))
+                    obj[i] = ApiClient.convertToType(data[i], itemType);
+            }
         } else {
-          newParams[key] = this.paramToString(value);
+            for (var k in data) {
+                if (data.hasOwnProperty(k))
+                    obj[k] = ApiClient.convertToType(data[k], itemType);
+            }
         }
-      }
-    }
-    return newParams;
-  };
+    };
+}
 
-  /**
-   * Enumeration of collection format separator strategies.
-   * @enum {String}
-   * @readonly
-   */
-  exports.CollectionFormatEnum = {
-    /**
-     * Comma-separated values. Value: <code>csv</code>
-     * @const
-     */
-    CSV: ',',
-    /**
-     * Space-separated values. Value: <code>ssv</code>
-     * @const
-     */
-    SSV: ' ',
-    /**
-     * Tab-separated values. Value: <code>tsv</code>
-     * @const
-     */
-    TSV: '\t',
-    /**
-     * Pipe(|)-separated values. Value: <code>pipes</code>
-     * @const
-     */
-    PIPES: '|',
-    /**
-     * Native array. Value: <code>multi</code>
-     * @const
-     */
-    MULTI: 'multi'
-  };
-
-  /**
-   * Builds a string representation of an array-type actual parameter, according to the given collection format.
-   * @param {Array} param An array parameter.
-   * @param {module:ApiClient.CollectionFormatEnum} collectionFormat The array element separator strategy.
-   * @returns {String|Array} A string representation of the supplied collection, using the specified delimiter. Returns
-   * <code>param</code> as is if <code>collectionFormat</code> is <code>multi</code>.
-   */
-  exports.prototype.buildCollectionParam = function buildCollectionParam(param, collectionFormat) {
-    if (param == null) {
-      return null;
-    }
-    switch (collectionFormat) {
-      case 'csv':
-        return param.map(this.paramToString).join(',');
-      case 'ssv':
-        return param.map(this.paramToString).join(' ');
-      case 'tsv':
-        return param.map(this.paramToString).join('\t');
-      case 'pipes':
-        return param.map(this.paramToString).join('|');
-      case 'multi':
-        // return the array directly as SuperAgent will handle it as expected
-        return param.map(this.paramToString);
-      default:
-        throw new Error('Unknown collection format: ' + collectionFormat);
-    }
-  };
-
-  /**
-   * Applies authentication headers to the request.
-   * @param {Object} request The request object created by a <code>superagent()</code> call.
-   * @param {Array.<String>} authNames An array of authentication method names.
-   */
-  exports.prototype.applyAuthToRequest = function(request, authNames) {
-    var _this = this;
-    authNames.forEach(function(authName) {
-      var auth = _this.authentications[authName];
-      switch (auth.type) {
-        case 'basic':
-          if (auth.username || auth.password) {
-            request.auth(auth.username || '', auth.password || '');
-          }
-          break;
-        case 'apiKey':
-          if (auth.apiKey) {
-            var data = {};
-            if (auth.apiKeyPrefix) {
-              data[auth.name] = auth.apiKeyPrefix + ' ' + auth.apiKey;
-            } else {
-              data[auth.name] = auth.apiKey;
-            }
-            if (auth['in'] === 'header') {
-              request.set(data);
-            } else {
-              request.query(data);
-            }
-          }
-          break;
-        case 'oauth2':
-          if (auth.accessToken) {
-            request.set({'Authorization': 'Bearer ' + auth.accessToken});
-          }
-          break;
-        default:
-          throw new Error('Unknown authentication type: ' + auth.type);
-      }
-    });
-  };
-
-  /**
-   * Deserializes an HTTP response body into a value of the specified type.
-   * @param {Object} response A SuperAgent response object.
-   * @param {(String|Array.<String>|Object.<String, Object>|Function)} returnType The type to return. Pass a string for simple types
-   * or the constructor function for a complex type. Pass an array containing the type name to return an array of that type. To
-   * return an object, pass an object with one property whose name is the key type and whose value is the corresponding value type:
-   * all properties on <code>data<code> will be converted to this type.
-   * @returns A value of the specified type.
-   */
-  exports.prototype.deserialize = function deserialize(response, returnType) {
-    if (response == null || returnType == null || response.status == 204) {
-      return null;
-    }
-    // Rely on SuperAgent for parsing response body.
-    // See http://visionmedia.github.io/superagent/#parsing-response-bodies
-    var data = response.body;
-    if (data == null || (typeof data === 'object' && typeof data.length === 'undefined' && !Object.keys(data).length)) {
-      // SuperAgent does not always produce a body; use the unparsed response as a fallback
-      data = response.text;
-    }
-    return exports.convertToType(data, returnType);
-  };
-
-  /**
-   * Callback function to receive the result of the operation.
-   * @callback module:ApiClient~callApiCallback
-   * @param {String} error Error message, if any.
-   * @param data The data returned by the service call.
-   * @param {String} response The complete HTTP response.
-   */
-
-  /**
-   * Invokes the REST service using the supplied settings and parameters.
-   * @param {String} path The base URL to invoke.
-   * @param {String} httpMethod The HTTP method to use.
-   * @param {Object.<String, String>} pathParams A map of path parameters and their values.
-   * @param {Object.<String, Object>} queryParams A map of query parameters and their values.
-   * @param {Object.<String, Object>} headerParams A map of header parameters and their values.
-   * @param {Object.<String, Object>} formParams A map of form parameters and their values.
-   * @param {Object} bodyParam The value to pass as the request body.
-   * @param {Array.<String>} authNames An array of authentication type names.
-   * @param {Array.<String>} contentTypes An array of request MIME types.
-   * @param {Array.<String>} accepts An array of acceptable response MIME types.
-   * @param {(String|Array|ObjectFunction)} returnType The required type to return; can be a string for simple types or the
-   * constructor for a complex type.
-   * @param {module:ApiClient~callApiCallback} callback The callback function.
-   * @returns {Object} The SuperAgent request object.
-   */
-  exports.prototype.callApi = function callApi(path, httpMethod, pathParams,
-      queryParams, headerParams, formParams, bodyParam, authNames, contentTypes, accepts,
-      returnType, callback) {
-
-    var _this = this;
-    var url = this.buildUrl(path, pathParams);
-    var request = superagent(httpMethod, url);
-
-    // apply authentications
-    this.applyAuthToRequest(request, authNames);
-
-    // set query parameters
-    if (httpMethod.toUpperCase() === 'GET' && this.cache === false) {
-        queryParams['_'] = new Date().getTime();
-    }
-    request.query(this.normalizeParams(queryParams));
-
-    // set header parameters
-    request.set(this.defaultHeaders).set(this.normalizeParams(headerParams));
-
-    // set request timeout
-    request.timeout(this.timeout);
-
-    var contentType = this.jsonPreferredMime(contentTypes);
-    if (contentType) {
-      // Issue with superagent and multipart/form-data (https://github.com/visionmedia/superagent/issues/746)
-      if(contentType != 'multipart/form-data') {
-        request.type(contentType);
-      }
-    } else if (!request.header['Content-Type']) {
-      request.type('application/json');
-    }
-
-    if (contentType === 'application/x-www-form-urlencoded') {
-      request.send(querystring.stringify(this.normalizeParams(formParams)));
-    } else if (contentType == 'multipart/form-data') {
-      var _formParams = this.normalizeParams(formParams);
-      for (var key in _formParams) {
-        if (_formParams.hasOwnProperty(key)) {
-          if (this.isFileParam(_formParams[key])) {
-            // file field
-            request.attach(key, _formParams[key]);
-          } else {
-            request.field(key, _formParams[key]);
-          }
-        }
-      }
-    } else if (bodyParam) {
-      request.send(bodyParam);
-    }
-
-    var accept = this.jsonPreferredMime(accepts);
-    if (accept) {
-      request.accept(accept);
-    }
-
-    if (returnType === 'Blob') {
-      request.responseType('blob');
-    } else if (returnType === 'String') {
-      request.responseType('string');
-    }
-
-    // Attach previously saved cookies, if enabled
-    if (this.enableCookies){
-      if (typeof window === 'undefined') {
-        this.agent.attachCookies(request);
-      }
-      else {
-        request.withCredentials();
-      }
-    }
-
-
-    request.end(function(error, response) {
-      if (callback) {
-        var data = null;
-        if (!error) {
-          try {
-            data = _this.deserialize(response, returnType);
-            if (_this.enableCookies && typeof window === 'undefined'){
-              _this.agent.saveCookies(response);
-            }
-          } catch (err) {
-            error = err;
-          }
-        }
-        callback(error, data, response);
-      }
-    });
-
-    return request;
-  };
-
-  /**
-   * Parses an ISO-8601 string representation of a date value.
-   * @param {String} str The date value as a string.
-   * @returns {Date} The parsed date object.
-   */
-  exports.parseDate = function(str) {
-    return new Date(str.replace(/T/i, ' '));
-  };
-
-  /**
-   * Converts a value to the specified type.
-   * @param {(String|Object)} data The data to convert, as a string or object.
-   * @param {(String|Array.<String>|Object.<String, Object>|Function)} type The type to return. Pass a string for simple types
-   * or the constructor function for a complex type. Pass an array containing the type name to return an array of that type. To
-   * return an object, pass an object with one property whose name is the key type and whose value is the corresponding value type:
-   * all properties on <code>data<code> will be converted to this type.
-   * @returns An instance of the specified type or null or undefined if data is null or undefined.
-   */
-  exports.convertToType = function(data, type) {
-    if (data === null || data === undefined)
-      return data
-
-    switch (type) {
-      case 'Boolean':
-        return Boolean(data);
-      case 'Integer':
-        return parseInt(data, 10);
-      case 'Number':
-        return parseFloat(data);
-      case 'String':
-        return String(data);
-      case 'Date':
-        return this.parseDate(String(data));
-      case 'Blob':
-      	return data;
-      default:
-        if (type === Object) {
-          // generic object, return directly
-          return data;
-        } else if (typeof type === 'function') {
-          // for model type like: User
-          return type.constructFromObject(data);
-        } else if (Array.isArray(type)) {
-          // for array type like: ['String']
-          var itemType = type[0];
-          return data.map(function(item) {
-            return exports.convertToType(item, itemType);
-          });
-        } else if (typeof type === 'object') {
-          // for plain object type like: {'String': 'Integer'}
-          var keyType, valueType;
-          for (var k in type) {
-            if (type.hasOwnProperty(k)) {
-              keyType = k;
-              valueType = type[k];
-              break;
-            }
-          }
-          var result = {};
-          for (var k in data) {
-            if (data.hasOwnProperty(k)) {
-              var key = exports.convertToType(k, keyType);
-              var value = exports.convertToType(data[k], valueType);
-              result[key] = value;
-            }
-          }
-          return result;
-        } else {
-          // for unknown type, return the data directly
-          return data;
-        }
-    }
-  };
-
-  /**
-   * Constructs a new map or array model from REST data.
-   * @param data {Object|Array} The REST data.
-   * @param obj {Object|Array} The target object or array.
-   */
-  exports.constructFromObject = function(data, obj, itemType) {
-    if (Array.isArray(data)) {
-      for (var i = 0; i < data.length; i++) {
-        if (data.hasOwnProperty(i))
-          obj[i] = exports.convertToType(data[i], itemType);
-      }
-    } else {
-      for (var k in data) {
-        if (data.hasOwnProperty(k))
-          obj[k] = exports.convertToType(data[k], itemType);
-      }
-    }
-  };
-
-  /**
-   * The default API client implementation.
-   * @type {module:ApiClient}
-   */
-  exports.instance = new exports();
-
-  return exports;
-}));
+/**
+* The default API client implementation.
+* @type {module:ApiClient}
+*/
+ApiClient.instance = new ApiClient();
diff --git a/samples/client/petstore/javascript-es6/src/api/FakeApi.js b/samples/client/petstore/javascript-es6/src/api/FakeApi.js
index 579a8f87289..6c3d3384fa6 100644
--- a/samples/client/petstore/javascript-es6/src/api/FakeApi.js
+++ b/samples/client/petstore/javascript-es6/src/api/FakeApi.js
@@ -7,45 +7,35 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/Client', 'model/OuterBoolean', 'model/OuterComposite', 'model/OuterNumber', 'model/OuterString'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('../model/Client'), require('../model/OuterBoolean'), require('../model/OuterComposite'), require('../model/OuterNumber'), require('../model/OuterString'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from "../ApiClient";
+import Client from '../model/Client';
+import OuterBoolean from '../model/OuterBoolean';
+import OuterComposite from '../model/OuterComposite';
+import OuterNumber from '../model/OuterNumber';
+import OuterString from '../model/OuterString';
+
+/**
+* Fake service.
+* @module api/FakeApi
+* @version 1.0.0
+*/
+export default class FakeApi {
+
+    /**
+    * Constructs a new FakeApi. 
+    * @alias module:api/FakeApi
+    * @class
+    * @param {module:ApiClient} apiClient Optional API client implementation to use,
+    * default to {@link module:ApiClient#instance} if unspecified.
+    */
+    constructor(apiClient) {
+        this.apiClient = apiClient || ApiClient.instance;
     }
-    root.SwaggerPetstore.FakeApi = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Client, root.SwaggerPetstore.OuterBoolean, root.SwaggerPetstore.OuterComposite, root.SwaggerPetstore.OuterNumber, root.SwaggerPetstore.OuterString);
-  }
-}(this, function(ApiClient, Client, OuterBoolean, OuterComposite, OuterNumber, OuterString) {
-  'use strict';
-
-  /**
-   * Fake service.
-   * @module api/FakeApi
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new FakeApi. 
-   * @alias module:api/FakeApi
-   * @class
-   * @param {module:ApiClient} apiClient Optional API client implementation to use,
-   * default to {@link module:ApiClient#instance} if unspecified.
-   */
-  var exports = function(apiClient) {
-    this.apiClient = apiClient || ApiClient.instance;
 
 
     /**
@@ -63,24 +53,24 @@
      * @param {module:api/FakeApi~fakeOuterBooleanSerializeCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link module:model/OuterBoolean}
      */
-    this.fakeOuterBooleanSerialize = function(opts, callback) {
+    fakeOuterBooleanSerialize(opts, callback) {
       opts = opts || {};
-      var postBody = opts['body'];
+      let postBody = opts['body'];
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = [];
-      var returnType = OuterBoolean;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = [];
+      let returnType = OuterBoolean;
 
       return this.apiClient.callApi(
         '/fake/outer/boolean', 'POST',
@@ -104,24 +94,24 @@
      * @param {module:api/FakeApi~fakeOuterCompositeSerializeCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link module:model/OuterComposite}
      */
-    this.fakeOuterCompositeSerialize = function(opts, callback) {
+    fakeOuterCompositeSerialize(opts, callback) {
       opts = opts || {};
-      var postBody = opts['body'];
+      let postBody = opts['body'];
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = [];
-      var returnType = OuterComposite;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = [];
+      let returnType = OuterComposite;
 
       return this.apiClient.callApi(
         '/fake/outer/composite', 'POST',
@@ -145,24 +135,24 @@
      * @param {module:api/FakeApi~fakeOuterNumberSerializeCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link module:model/OuterNumber}
      */
-    this.fakeOuterNumberSerialize = function(opts, callback) {
+    fakeOuterNumberSerialize(opts, callback) {
       opts = opts || {};
-      var postBody = opts['body'];
+      let postBody = opts['body'];
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = [];
-      var returnType = OuterNumber;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = [];
+      let returnType = OuterNumber;
 
       return this.apiClient.callApi(
         '/fake/outer/number', 'POST',
@@ -186,24 +176,24 @@
      * @param {module:api/FakeApi~fakeOuterStringSerializeCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link module:model/OuterString}
      */
-    this.fakeOuterStringSerialize = function(opts, callback) {
+    fakeOuterStringSerialize(opts, callback) {
       opts = opts || {};
-      var postBody = opts['body'];
+      let postBody = opts['body'];
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = [];
-      var returnType = OuterString;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = [];
+      let returnType = OuterString;
 
       return this.apiClient.callApi(
         '/fake/outer/string', 'POST',
@@ -227,8 +217,8 @@
      * @param {module:api/FakeApi~testClientModelCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link module:model/Client}
      */
-    this.testClientModel = function(body, callback) {
-      var postBody = body;
+    testClientModel(body, callback) {
+      let postBody = body;
 
       // verify the required parameter 'body' is set
       if (body === undefined || body === null) {
@@ -236,19 +226,19 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = ['application/json'];
-      var accepts = ['application/json'];
-      var returnType = Client;
+      let authNames = [];
+      let contentTypes = ['application/json'];
+      let accepts = ['application/json'];
+      let returnType = Client;
 
       return this.apiClient.callApi(
         '/fake', 'PATCH',
@@ -285,9 +275,9 @@
      * @param {String} opts.callback None
      * @param {module:api/FakeApi~testEndpointParametersCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    this.testEndpointParameters = function(_number, _double, patternWithoutDelimiter, _byte, opts, callback) {
+    testEndpointParameters(_number, _double, patternWithoutDelimiter, _byte, opts, callback) {
       opts = opts || {};
-      var postBody = null;
+      let postBody = null;
 
       // verify the required parameter '_number' is set
       if (_number === undefined || _number === null) {
@@ -310,13 +300,13 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
         'integer': opts['integer'],
         'int32': opts['int32'],
         'int64': opts['int64'],
@@ -333,10 +323,10 @@
         'callback': opts['callback']
       };
 
-      var authNames = ['http_basic_test'];
-      var contentTypes = ['application/xml; charset=utf-8', 'application/json; charset=utf-8'];
-      var accepts = ['application/xml; charset=utf-8', 'application/json; charset=utf-8'];
-      var returnType = null;
+      let authNames = ['http_basic_test'];
+      let contentTypes = ['application/xml; charset=utf-8', 'application/json; charset=utf-8'];
+      let accepts = ['application/xml; charset=utf-8', 'application/json; charset=utf-8'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/fake', 'POST',
@@ -367,32 +357,32 @@
      * @param {module:model/Number} opts.enumQueryDouble Query parameter enum test (double)
      * @param {module:api/FakeApi~testEnumParametersCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    this.testEnumParameters = function(opts, callback) {
+    testEnumParameters(opts, callback) {
       opts = opts || {};
-      var postBody = null;
+      let postBody = null;
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
         'enum_query_string_array': this.apiClient.buildCollectionParam(opts['enumQueryStringArray'], 'csv'),
         'enum_query_string': opts['enumQueryString'],
         'enum_query_integer': opts['enumQueryInteger']
       };
-      var headerParams = {
+      let headerParams = {
         'enum_header_string_array': opts['enumHeaderStringArray'],
         'enum_header_string': opts['enumHeaderString']
       };
-      var formParams = {
+      let formParams = {
         'enum_form_string_array': this.apiClient.buildCollectionParam(opts['enumFormStringArray'], 'csv'),
         'enum_form_string': opts['enumFormString'],
         'enum_query_double': opts['enumQueryDouble']
       };
 
-      var authNames = [];
-      var contentTypes = ['*/*'];
-      var accepts = ['*/*'];
-      var returnType = null;
+      let authNames = [];
+      let contentTypes = ['*/*'];
+      let accepts = ['*/*'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/fake', 'GET',
@@ -400,7 +390,6 @@
         authNames, contentTypes, accepts, returnType, callback
       );
     }
-  };
 
-  return exports;
-}));
+
+}
diff --git a/samples/client/petstore/javascript-es6/src/api/PetApi.js b/samples/client/petstore/javascript-es6/src/api/PetApi.js
index fecf45f6e30..e59d99bcc38 100644
--- a/samples/client/petstore/javascript-es6/src/api/PetApi.js
+++ b/samples/client/petstore/javascript-es6/src/api/PetApi.js
@@ -7,45 +7,32 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/ApiResponse', 'model/Pet'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('../model/ApiResponse'), require('../model/Pet'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from "../ApiClient";
+import ApiResponse from '../model/ApiResponse';
+import Pet from '../model/Pet';
+
+/**
+* Pet service.
+* @module api/PetApi
+* @version 1.0.0
+*/
+export default class PetApi {
+
+    /**
+    * Constructs a new PetApi. 
+    * @alias module:api/PetApi
+    * @class
+    * @param {module:ApiClient} apiClient Optional API client implementation to use,
+    * default to {@link module:ApiClient#instance} if unspecified.
+    */
+    constructor(apiClient) {
+        this.apiClient = apiClient || ApiClient.instance;
     }
-    root.SwaggerPetstore.PetApi = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.ApiResponse, root.SwaggerPetstore.Pet);
-  }
-}(this, function(ApiClient, ApiResponse, Pet) {
-  'use strict';
-
-  /**
-   * Pet service.
-   * @module api/PetApi
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new PetApi. 
-   * @alias module:api/PetApi
-   * @class
-   * @param {module:ApiClient} apiClient Optional API client implementation to use,
-   * default to {@link module:ApiClient#instance} if unspecified.
-   */
-  var exports = function(apiClient) {
-    this.apiClient = apiClient || ApiClient.instance;
 
 
     /**
@@ -62,8 +49,8 @@
      * @param {module:model/Pet} body Pet object that needs to be added to the store
      * @param {module:api/PetApi~addPetCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    this.addPet = function(body, callback) {
-      var postBody = body;
+    addPet(body, callback) {
+      let postBody = body;
 
       // verify the required parameter 'body' is set
       if (body === undefined || body === null) {
@@ -71,19 +58,19 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = ['petstore_auth'];
-      var contentTypes = ['application/json', 'application/xml'];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = ['petstore_auth'];
+      let contentTypes = ['application/json', 'application/xml'];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/pet', 'POST',
@@ -108,9 +95,9 @@
      * @param {String} opts.apiKey 
      * @param {module:api/PetApi~deletePetCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    this.deletePet = function(petId, opts, callback) {
+    deletePet(petId, opts, callback) {
       opts = opts || {};
-      var postBody = null;
+      let postBody = null;
 
       // verify the required parameter 'petId' is set
       if (petId === undefined || petId === null) {
@@ -118,21 +105,21 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'petId': petId
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
         'api_key': opts['apiKey']
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = ['petstore_auth'];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = ['petstore_auth'];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/pet/{petId}', 'DELETE',
@@ -156,8 +143,8 @@
      * @param {module:api/PetApi~findPetsByStatusCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link Array.<module:model/Pet>}
      */
-    this.findPetsByStatus = function(status, callback) {
-      var postBody = null;
+    findPetsByStatus(status, callback) {
+      let postBody = null;
 
       // verify the required parameter 'status' is set
       if (status === undefined || status === null) {
@@ -165,20 +152,20 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
         'status': this.apiClient.buildCollectionParam(status, 'csv')
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = ['petstore_auth'];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = [Pet];
+      let authNames = ['petstore_auth'];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = [Pet];
 
       return this.apiClient.callApi(
         '/pet/findByStatus', 'GET',
@@ -202,8 +189,8 @@
      * @param {module:api/PetApi~findPetsByTagsCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link Array.<module:model/Pet>}
      */
-    this.findPetsByTags = function(tags, callback) {
-      var postBody = null;
+    findPetsByTags(tags, callback) {
+      let postBody = null;
 
       // verify the required parameter 'tags' is set
       if (tags === undefined || tags === null) {
@@ -211,20 +198,20 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
         'tags': this.apiClient.buildCollectionParam(tags, 'csv')
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = ['petstore_auth'];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = [Pet];
+      let authNames = ['petstore_auth'];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = [Pet];
 
       return this.apiClient.callApi(
         '/pet/findByTags', 'GET',
@@ -248,8 +235,8 @@
      * @param {module:api/PetApi~getPetByIdCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link module:model/Pet}
      */
-    this.getPetById = function(petId, callback) {
-      var postBody = null;
+    getPetById(petId, callback) {
+      let postBody = null;
 
       // verify the required parameter 'petId' is set
       if (petId === undefined || petId === null) {
@@ -257,20 +244,20 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'petId': petId
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = ['api_key'];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = Pet;
+      let authNames = ['api_key'];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = Pet;
 
       return this.apiClient.callApi(
         '/pet/{petId}', 'GET',
@@ -293,8 +280,8 @@
      * @param {module:model/Pet} body Pet object that needs to be added to the store
      * @param {module:api/PetApi~updatePetCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    this.updatePet = function(body, callback) {
-      var postBody = body;
+    updatePet(body, callback) {
+      let postBody = body;
 
       // verify the required parameter 'body' is set
       if (body === undefined || body === null) {
@@ -302,19 +289,19 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = ['petstore_auth'];
-      var contentTypes = ['application/json', 'application/xml'];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = ['petstore_auth'];
+      let contentTypes = ['application/json', 'application/xml'];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/pet', 'PUT',
@@ -340,9 +327,9 @@
      * @param {String} opts.status Updated status of the pet
      * @param {module:api/PetApi~updatePetWithFormCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    this.updatePetWithForm = function(petId, opts, callback) {
+    updatePetWithForm(petId, opts, callback) {
       opts = opts || {};
-      var postBody = null;
+      let postBody = null;
 
       // verify the required parameter 'petId' is set
       if (petId === undefined || petId === null) {
@@ -350,22 +337,22 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'petId': petId
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
         'name': opts['name'],
         'status': opts['status']
       };
 
-      var authNames = ['petstore_auth'];
-      var contentTypes = ['application/x-www-form-urlencoded'];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = ['petstore_auth'];
+      let contentTypes = ['application/x-www-form-urlencoded'];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/pet/{petId}', 'POST',
@@ -392,9 +379,9 @@
      * @param {module:api/PetApi~uploadFileCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link module:model/ApiResponse}
      */
-    this.uploadFile = function(petId, opts, callback) {
+    uploadFile(petId, opts, callback) {
       opts = opts || {};
-      var postBody = null;
+      let postBody = null;
 
       // verify the required parameter 'petId' is set
       if (petId === undefined || petId === null) {
@@ -402,22 +389,22 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'petId': petId
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
         'additionalMetadata': opts['additionalMetadata'],
         'file': opts['file']
       };
 
-      var authNames = ['petstore_auth'];
-      var contentTypes = ['multipart/form-data'];
-      var accepts = ['application/json'];
-      var returnType = ApiResponse;
+      let authNames = ['petstore_auth'];
+      let contentTypes = ['multipart/form-data'];
+      let accepts = ['application/json'];
+      let returnType = ApiResponse;
 
       return this.apiClient.callApi(
         '/pet/{petId}/uploadImage', 'POST',
@@ -425,7 +412,6 @@
         authNames, contentTypes, accepts, returnType, callback
       );
     }
-  };
 
-  return exports;
-}));
+
+}
diff --git a/samples/client/petstore/javascript-es6/src/api/StoreApi.js b/samples/client/petstore/javascript-es6/src/api/StoreApi.js
index 1f7359be1ae..b70fc4c0883 100644
--- a/samples/client/petstore/javascript-es6/src/api/StoreApi.js
+++ b/samples/client/petstore/javascript-es6/src/api/StoreApi.js
@@ -7,45 +7,31 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/Order'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('../model/Order'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from "../ApiClient";
+import Order from '../model/Order';
+
+/**
+* Store service.
+* @module api/StoreApi
+* @version 1.0.0
+*/
+export default class StoreApi {
+
+    /**
+    * Constructs a new StoreApi. 
+    * @alias module:api/StoreApi
+    * @class
+    * @param {module:ApiClient} apiClient Optional API client implementation to use,
+    * default to {@link module:ApiClient#instance} if unspecified.
+    */
+    constructor(apiClient) {
+        this.apiClient = apiClient || ApiClient.instance;
     }
-    root.SwaggerPetstore.StoreApi = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Order);
-  }
-}(this, function(ApiClient, Order) {
-  'use strict';
-
-  /**
-   * Store service.
-   * @module api/StoreApi
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new StoreApi. 
-   * @alias module:api/StoreApi
-   * @class
-   * @param {module:ApiClient} apiClient Optional API client implementation to use,
-   * default to {@link module:ApiClient#instance} if unspecified.
-   */
-  var exports = function(apiClient) {
-    this.apiClient = apiClient || ApiClient.instance;
 
 
     /**
@@ -62,8 +48,8 @@
      * @param {String} orderId ID of the order that needs to be deleted
      * @param {module:api/StoreApi~deleteOrderCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    this.deleteOrder = function(orderId, callback) {
-      var postBody = null;
+    deleteOrder(orderId, callback) {
+      let postBody = null;
 
       // verify the required parameter 'orderId' is set
       if (orderId === undefined || orderId === null) {
@@ -71,20 +57,20 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'order_id': orderId
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/store/order/{order_id}', 'DELETE',
@@ -107,23 +93,23 @@
      * @param {module:api/StoreApi~getInventoryCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link Object.<String, {'String': 'Number'}>}
      */
-    this.getInventory = function(callback) {
-      var postBody = null;
+    getInventory(callback) {
+      let postBody = null;
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = ['api_key'];
-      var contentTypes = [];
-      var accepts = ['application/json'];
-      var returnType = {'String': 'Number'};
+      let authNames = ['api_key'];
+      let contentTypes = [];
+      let accepts = ['application/json'];
+      let returnType = {'String': 'Number'};
 
       return this.apiClient.callApi(
         '/store/inventory', 'GET',
@@ -147,8 +133,8 @@
      * @param {module:api/StoreApi~getOrderByIdCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link module:model/Order}
      */
-    this.getOrderById = function(orderId, callback) {
-      var postBody = null;
+    getOrderById(orderId, callback) {
+      let postBody = null;
 
       // verify the required parameter 'orderId' is set
       if (orderId === undefined || orderId === null) {
@@ -156,20 +142,20 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'order_id': orderId
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = Order;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = Order;
 
       return this.apiClient.callApi(
         '/store/order/{order_id}', 'GET',
@@ -193,8 +179,8 @@
      * @param {module:api/StoreApi~placeOrderCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link module:model/Order}
      */
-    this.placeOrder = function(body, callback) {
-      var postBody = body;
+    placeOrder(body, callback) {
+      let postBody = body;
 
       // verify the required parameter 'body' is set
       if (body === undefined || body === null) {
@@ -202,19 +188,19 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = Order;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = Order;
 
       return this.apiClient.callApi(
         '/store/order', 'POST',
@@ -222,7 +208,6 @@
         authNames, contentTypes, accepts, returnType, callback
       );
     }
-  };
 
-  return exports;
-}));
+
+}
diff --git a/samples/client/petstore/javascript-es6/src/api/UserApi.js b/samples/client/petstore/javascript-es6/src/api/UserApi.js
index a2195636b6c..54c9b110d7b 100644
--- a/samples/client/petstore/javascript-es6/src/api/UserApi.js
+++ b/samples/client/petstore/javascript-es6/src/api/UserApi.js
@@ -7,45 +7,31 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/User'], 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'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from "../ApiClient";
+import User from '../model/User';
+
+/**
+* User service.
+* @module api/UserApi
+* @version 1.0.0
+*/
+export default class UserApi {
+
+    /**
+    * Constructs a new UserApi. 
+    * @alias module:api/UserApi
+    * @class
+    * @param {module:ApiClient} apiClient Optional API client implementation to use,
+    * default to {@link module:ApiClient#instance} if unspecified.
+    */
+    constructor(apiClient) {
+        this.apiClient = apiClient || ApiClient.instance;
     }
-    root.SwaggerPetstore.UserApi = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.User);
-  }
-}(this, function(ApiClient, User) {
-  'use strict';
-
-  /**
-   * User service.
-   * @module api/UserApi
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new UserApi. 
-   * @alias module:api/UserApi
-   * @class
-   * @param {module:ApiClient} apiClient Optional API client implementation to use,
-   * default to {@link module:ApiClient#instance} if unspecified.
-   */
-  var exports = function(apiClient) {
-    this.apiClient = apiClient || ApiClient.instance;
 
 
     /**
@@ -62,8 +48,8 @@
      * @param {module:model/User} body Created user object
      * @param {module:api/UserApi~createUserCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    this.createUser = function(body, callback) {
-      var postBody = body;
+    createUser(body, callback) {
+      let postBody = body;
 
       // verify the required parameter 'body' is set
       if (body === undefined || body === null) {
@@ -71,19 +57,19 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/user', 'POST',
@@ -106,8 +92,8 @@
      * @param {Array.<module:model/User>} body List of user object
      * @param {module:api/UserApi~createUsersWithArrayInputCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    this.createUsersWithArrayInput = function(body, callback) {
-      var postBody = body;
+    createUsersWithArrayInput(body, callback) {
+      let postBody = body;
 
       // verify the required parameter 'body' is set
       if (body === undefined || body === null) {
@@ -115,19 +101,19 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/user/createWithArray', 'POST',
@@ -150,8 +136,8 @@
      * @param {Array.<module:model/User>} body List of user object
      * @param {module:api/UserApi~createUsersWithListInputCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    this.createUsersWithListInput = function(body, callback) {
-      var postBody = body;
+    createUsersWithListInput(body, callback) {
+      let postBody = body;
 
       // verify the required parameter 'body' is set
       if (body === undefined || body === null) {
@@ -159,19 +145,19 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/user/createWithList', 'POST',
@@ -194,8 +180,8 @@
      * @param {String} username The name that needs to be deleted
      * @param {module:api/UserApi~deleteUserCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    this.deleteUser = function(username, callback) {
-      var postBody = null;
+    deleteUser(username, callback) {
+      let postBody = null;
 
       // verify the required parameter 'username' is set
       if (username === undefined || username === null) {
@@ -203,20 +189,20 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'username': username
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/user/{username}', 'DELETE',
@@ -240,8 +226,8 @@
      * @param {module:api/UserApi~getUserByNameCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link module:model/User}
      */
-    this.getUserByName = function(username, callback) {
-      var postBody = null;
+    getUserByName(username, callback) {
+      let postBody = null;
 
       // verify the required parameter 'username' is set
       if (username === undefined || username === null) {
@@ -249,20 +235,20 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'username': username
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = User;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = User;
 
       return this.apiClient.callApi(
         '/user/{username}', 'GET',
@@ -287,8 +273,8 @@
      * @param {module:api/UserApi~loginUserCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link 'String'}
      */
-    this.loginUser = function(username, password, callback) {
-      var postBody = null;
+    loginUser(username, password, callback) {
+      let postBody = null;
 
       // verify the required parameter 'username' is set
       if (username === undefined || username === null) {
@@ -301,21 +287,21 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
         'username': username,
         'password': password
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = 'String';
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = 'String';
 
       return this.apiClient.callApi(
         '/user/login', 'GET',
@@ -337,23 +323,23 @@
      * 
      * @param {module:api/UserApi~logoutUserCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    this.logoutUser = function(callback) {
-      var postBody = null;
+    logoutUser(callback) {
+      let postBody = null;
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/user/logout', 'GET',
@@ -377,8 +363,8 @@
      * @param {module:model/User} body Updated user object
      * @param {module:api/UserApi~updateUserCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    this.updateUser = function(username, body, callback) {
-      var postBody = body;
+    updateUser(username, body, callback) {
+      let postBody = body;
 
       // verify the required parameter 'username' is set
       if (username === undefined || username === null) {
@@ -391,20 +377,20 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'username': username
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/user/{username}', 'PUT',
@@ -412,7 +398,6 @@
         authNames, contentTypes, accepts, returnType, callback
       );
     }
-  };
 
-  return exports;
-}));
+
+}
diff --git a/samples/client/petstore/javascript-es6/src/index.js b/samples/client/petstore/javascript-es6/src/index.js
index 6acae4aaaf4..3a016977a34 100644
--- a/samples/client/petstore/javascript-es6/src/index.js
+++ b/samples/client/petstore/javascript-es6/src/index.js
@@ -7,262 +7,329 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/AdditionalPropertiesClass', 'model/Animal', 'model/AnimalFarm', 'model/ApiResponse', 'model/ArrayOfArrayOfNumberOnly', 'model/ArrayOfNumberOnly', 'model/ArrayTest', 'model/Capitalization', 'model/Category', 'model/ClassModel', 'model/Client', 'model/EnumArrays', 'model/EnumClass', 'model/EnumTest', 'model/FormatTest', 'model/HasOnlyReadOnly', 'model/List', 'model/MapTest', 'model/MixedPropertiesAndAdditionalPropertiesClass', 'model/Model200Response', 'model/ModelReturn', 'model/Name', 'model/NumberOnly', 'model/Order', 'model/OuterBoolean', 'model/OuterComposite', 'model/OuterEnum', 'model/OuterNumber', 'model/OuterString', 'model/Pet', 'model/ReadOnlyFirst', 'model/SpecialModelName', 'model/Tag', 'model/User', 'model/Cat', 'model/Dog', '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/AdditionalPropertiesClass'), require('./model/Animal'), require('./model/AnimalFarm'), require('./model/ApiResponse'), require('./model/ArrayOfArrayOfNumberOnly'), require('./model/ArrayOfNumberOnly'), require('./model/ArrayTest'), require('./model/Capitalization'), require('./model/Category'), require('./model/ClassModel'), require('./model/Client'), require('./model/EnumArrays'), require('./model/EnumClass'), require('./model/EnumTest'), require('./model/FormatTest'), require('./model/HasOnlyReadOnly'), require('./model/List'), require('./model/MapTest'), require('./model/MixedPropertiesAndAdditionalPropertiesClass'), require('./model/Model200Response'), require('./model/ModelReturn'), require('./model/Name'), require('./model/NumberOnly'), require('./model/Order'), require('./model/OuterBoolean'), require('./model/OuterComposite'), require('./model/OuterEnum'), require('./model/OuterNumber'), require('./model/OuterString'), require('./model/Pet'), require('./model/ReadOnlyFirst'), require('./model/SpecialModelName'), require('./model/Tag'), require('./model/User'), require('./model/Cat'), require('./model/Dog'), require('./api/FakeApi'), require('./api/PetApi'), require('./api/StoreApi'), require('./api/UserApi'));
-  }
-}(function(ApiClient, AdditionalPropertiesClass, Animal, AnimalFarm, ApiResponse, ArrayOfArrayOfNumberOnly, ArrayOfNumberOnly, ArrayTest, Capitalization, Category, ClassModel, Client, EnumArrays, EnumClass, EnumTest, FormatTest, HasOnlyReadOnly, List, MapTest, MixedPropertiesAndAdditionalPropertiesClass, Model200Response, ModelReturn, Name, NumberOnly, Order, OuterBoolean, OuterComposite, OuterEnum, OuterNumber, OuterString, Pet, ReadOnlyFirst, SpecialModelName, Tag, User, Cat, Dog, 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__Special_characters__.<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:
-   * <pre>
-   * var SwaggerPetstore = require('index'); // See note below*.
-   * var xxxSvc = new SwaggerPetstore.XxxApi(); // Allocate the API class we're going to use.
-   * var yyyModel = new SwaggerPetstore.Yyy(); // Construct a model instance.
-   * yyyModel.someProperty = 'someValue';
-   * ...
-   * var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
-   * ...
-   * </pre>
-   * <em>*NOTE: For a top-level AMD script, use require(['index'], function(){...})
-   * and put the application logic within the callback function.</em>
-   * </p>
-   * <p>
-   * A non-AMD browser application (discouraged) might do something like this:
-   * <pre>
-   * var xxxSvc = new SwaggerPetstore.XxxApi(); // Allocate the API class we're going to use.
-   * var yyy = new SwaggerPetstore.Yyy(); // Construct a model instance.
-   * yyyModel.someProperty = 'someValue';
-   * ...
-   * var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
-   * ...
-   * </pre>
-   * </p>
-   * @module index
-   * @version 1.0.0
-   */
-  var exports = {
+import ApiClient from './ApiClient';
+import AdditionalPropertiesClass from './model/AdditionalPropertiesClass';
+import Animal from './model/Animal';
+import AnimalFarm from './model/AnimalFarm';
+import ApiResponse from './model/ApiResponse';
+import ArrayOfArrayOfNumberOnly from './model/ArrayOfArrayOfNumberOnly';
+import ArrayOfNumberOnly from './model/ArrayOfNumberOnly';
+import ArrayTest from './model/ArrayTest';
+import Capitalization from './model/Capitalization';
+import Category from './model/Category';
+import ClassModel from './model/ClassModel';
+import Client from './model/Client';
+import EnumArrays from './model/EnumArrays';
+import EnumClass from './model/EnumClass';
+import EnumTest from './model/EnumTest';
+import FormatTest from './model/FormatTest';
+import HasOnlyReadOnly from './model/HasOnlyReadOnly';
+import List from './model/List';
+import MapTest from './model/MapTest';
+import MixedPropertiesAndAdditionalPropertiesClass from './model/MixedPropertiesAndAdditionalPropertiesClass';
+import Model200Response from './model/Model200Response';
+import ModelReturn from './model/ModelReturn';
+import Name from './model/Name';
+import NumberOnly from './model/NumberOnly';
+import Order from './model/Order';
+import OuterBoolean from './model/OuterBoolean';
+import OuterComposite from './model/OuterComposite';
+import OuterEnum from './model/OuterEnum';
+import OuterNumber from './model/OuterNumber';
+import OuterString from './model/OuterString';
+import Pet from './model/Pet';
+import ReadOnlyFirst from './model/ReadOnlyFirst';
+import SpecialModelName from './model/SpecialModelName';
+import Tag from './model/Tag';
+import User from './model/User';
+import Cat from './model/Cat';
+import Dog from './model/Dog';
+import FakeApi from './api/FakeApi';
+import PetApi from './api/PetApi';
+import StoreApi from './api/StoreApi';
+import UserApi from './api/UserApi';
+
+
+/**
+* This_spec_is_mainly_for_testing_Petstore_server_and_contains_fake_endpoints_models__Please_do_not_use_this_for_any_other_purpose__Special_characters__.<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:
+* <pre>
+* var SwaggerPetstore = require('index'); // See note below*.
+* var xxxSvc = new SwaggerPetstore.XxxApi(); // Allocate the API class we're going to use.
+* var yyyModel = new SwaggerPetstore.Yyy(); // Construct a model instance.
+* yyyModel.someProperty = 'someValue';
+* ...
+* var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
+* ...
+* </pre>
+* <em>*NOTE: For a top-level AMD script, use require(['index'], function(){...})
+* and put the application logic within the callback function.</em>
+* </p>
+* <p>
+* A non-AMD browser application (discouraged) might do something like this:
+* <pre>
+* var xxxSvc = new SwaggerPetstore.XxxApi(); // Allocate the API class we're going to use.
+* var yyy = new SwaggerPetstore.Yyy(); // Construct a model instance.
+* yyyModel.someProperty = 'someValue';
+* ...
+* var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
+* ...
+* </pre>
+* </p>
+* @module index
+* @version 1.0.0
+*/
+export {
     /**
      * The ApiClient constructor.
      * @property {module:ApiClient}
      */
-    ApiClient: ApiClient,
+    ApiClient,
+
     /**
      * The AdditionalPropertiesClass model constructor.
      * @property {module:model/AdditionalPropertiesClass}
      */
-    AdditionalPropertiesClass: AdditionalPropertiesClass,
+    AdditionalPropertiesClass,
+
     /**
      * The Animal model constructor.
      * @property {module:model/Animal}
      */
-    Animal: Animal,
+    Animal,
+
     /**
      * The AnimalFarm model constructor.
      * @property {module:model/AnimalFarm}
      */
-    AnimalFarm: AnimalFarm,
+    AnimalFarm,
+
     /**
      * The ApiResponse model constructor.
      * @property {module:model/ApiResponse}
      */
-    ApiResponse: ApiResponse,
+    ApiResponse,
+
     /**
      * The ArrayOfArrayOfNumberOnly model constructor.
      * @property {module:model/ArrayOfArrayOfNumberOnly}
      */
-    ArrayOfArrayOfNumberOnly: ArrayOfArrayOfNumberOnly,
+    ArrayOfArrayOfNumberOnly,
+
     /**
      * The ArrayOfNumberOnly model constructor.
      * @property {module:model/ArrayOfNumberOnly}
      */
-    ArrayOfNumberOnly: ArrayOfNumberOnly,
+    ArrayOfNumberOnly,
+
     /**
      * The ArrayTest model constructor.
      * @property {module:model/ArrayTest}
      */
-    ArrayTest: ArrayTest,
+    ArrayTest,
+
     /**
      * The Capitalization model constructor.
      * @property {module:model/Capitalization}
      */
-    Capitalization: Capitalization,
+    Capitalization,
+
     /**
      * The Category model constructor.
      * @property {module:model/Category}
      */
-    Category: Category,
+    Category,
+
     /**
      * The ClassModel model constructor.
      * @property {module:model/ClassModel}
      */
-    ClassModel: ClassModel,
+    ClassModel,
+
     /**
      * The Client model constructor.
      * @property {module:model/Client}
      */
-    Client: Client,
+    Client,
+
     /**
      * The EnumArrays model constructor.
      * @property {module:model/EnumArrays}
      */
-    EnumArrays: EnumArrays,
+    EnumArrays,
+
     /**
      * The EnumClass model constructor.
      * @property {module:model/EnumClass}
      */
-    EnumClass: EnumClass,
+    EnumClass,
+
     /**
      * The EnumTest model constructor.
      * @property {module:model/EnumTest}
      */
-    EnumTest: EnumTest,
+    EnumTest,
+
     /**
      * The FormatTest model constructor.
      * @property {module:model/FormatTest}
      */
-    FormatTest: FormatTest,
+    FormatTest,
+
     /**
      * The HasOnlyReadOnly model constructor.
      * @property {module:model/HasOnlyReadOnly}
      */
-    HasOnlyReadOnly: HasOnlyReadOnly,
+    HasOnlyReadOnly,
+
     /**
      * The List model constructor.
      * @property {module:model/List}
      */
-    List: List,
+    List,
+
     /**
      * The MapTest model constructor.
      * @property {module:model/MapTest}
      */
-    MapTest: MapTest,
+    MapTest,
+
     /**
      * The MixedPropertiesAndAdditionalPropertiesClass model constructor.
      * @property {module:model/MixedPropertiesAndAdditionalPropertiesClass}
      */
-    MixedPropertiesAndAdditionalPropertiesClass: MixedPropertiesAndAdditionalPropertiesClass,
+    MixedPropertiesAndAdditionalPropertiesClass,
+
     /**
      * The Model200Response model constructor.
      * @property {module:model/Model200Response}
      */
-    Model200Response: Model200Response,
+    Model200Response,
+
     /**
      * The ModelReturn model constructor.
      * @property {module:model/ModelReturn}
      */
-    ModelReturn: ModelReturn,
+    ModelReturn,
+
     /**
      * The Name model constructor.
      * @property {module:model/Name}
      */
-    Name: Name,
+    Name,
+
     /**
      * The NumberOnly model constructor.
      * @property {module:model/NumberOnly}
      */
-    NumberOnly: NumberOnly,
+    NumberOnly,
+
     /**
      * The Order model constructor.
      * @property {module:model/Order}
      */
-    Order: Order,
+    Order,
+
     /**
      * The OuterBoolean model constructor.
      * @property {module:model/OuterBoolean}
      */
-    OuterBoolean: OuterBoolean,
+    OuterBoolean,
+
     /**
      * The OuterComposite model constructor.
      * @property {module:model/OuterComposite}
      */
-    OuterComposite: OuterComposite,
+    OuterComposite,
+
     /**
      * The OuterEnum model constructor.
      * @property {module:model/OuterEnum}
      */
-    OuterEnum: OuterEnum,
+    OuterEnum,
+
     /**
      * The OuterNumber model constructor.
      * @property {module:model/OuterNumber}
      */
-    OuterNumber: OuterNumber,
+    OuterNumber,
+
     /**
      * The OuterString model constructor.
      * @property {module:model/OuterString}
      */
-    OuterString: OuterString,
+    OuterString,
+
     /**
      * The Pet model constructor.
      * @property {module:model/Pet}
      */
-    Pet: Pet,
+    Pet,
+
     /**
      * The ReadOnlyFirst model constructor.
      * @property {module:model/ReadOnlyFirst}
      */
-    ReadOnlyFirst: ReadOnlyFirst,
+    ReadOnlyFirst,
+
     /**
      * The SpecialModelName model constructor.
      * @property {module:model/SpecialModelName}
      */
-    SpecialModelName: SpecialModelName,
+    SpecialModelName,
+
     /**
      * The Tag model constructor.
      * @property {module:model/Tag}
      */
-    Tag: Tag,
+    Tag,
+
     /**
      * The User model constructor.
      * @property {module:model/User}
      */
-    User: User,
+    User,
+
     /**
      * The Cat model constructor.
      * @property {module:model/Cat}
      */
-    Cat: Cat,
+    Cat,
+
     /**
      * The Dog model constructor.
      * @property {module:model/Dog}
      */
-    Dog: Dog,
-    /**
-     * The FakeApi service constructor.
-     * @property {module:api/FakeApi}
-     */
-    FakeApi: FakeApi,
-    /**
-     * The PetApi service constructor.
-     * @property {module:api/PetApi}
-     */
-    PetApi: PetApi,
-    /**
-     * The StoreApi service constructor.
-     * @property {module:api/StoreApi}
-     */
-    StoreApi: StoreApi,
-    /**
-     * The UserApi service constructor.
-     * @property {module:api/UserApi}
-     */
-    UserApi: UserApi
-  };
+    Dog,
 
-  return exports;
-}));
+    /**
+    * The FakeApi service constructor.
+    * @property {module:api/FakeApi}
+    */
+    FakeApi,
+
+    /**
+    * The PetApi service constructor.
+    * @property {module:api/PetApi}
+    */
+    PetApi,
+
+    /**
+    * The StoreApi service constructor.
+    * @property {module:api/StoreApi}
+    */
+    StoreApi,
+
+    /**
+    * The UserApi service constructor.
+    * @property {module:api/UserApi}
+    */
+    UserApi
+};
diff --git a/samples/client/petstore/javascript-es6/src/model/AdditionalPropertiesClass.js b/samples/client/petstore/javascript-es6/src/model/AdditionalPropertiesClass.js
index 2744647b18a..088cbb29b35 100644
--- a/samples/client/petstore/javascript-es6/src/model/AdditionalPropertiesClass.js
+++ b/samples/client/petstore/javascript-es6/src/model/AdditionalPropertiesClass.js
@@ -7,84 +7,81 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The AdditionalPropertiesClass model module.
+* @module model/AdditionalPropertiesClass
+* @version 1.0.0
+*/
+export default class AdditionalPropertiesClass {
+    /**
+    * Constructs a new <code>AdditionalPropertiesClass</code>.
+    * @alias module:model/AdditionalPropertiesClass
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.AdditionalPropertiesClass = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>AdditionalPropertiesClass</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/AdditionalPropertiesClass} obj Optional instance to populate.
+    * @return {module:model/AdditionalPropertiesClass} The populated <code>AdditionalPropertiesClass</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new AdditionalPropertiesClass();
 
+            
+            
+            
 
-
-  /**
-   * The AdditionalPropertiesClass model module.
-   * @module model/AdditionalPropertiesClass
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>AdditionalPropertiesClass</code>.
-   * @alias module:model/AdditionalPropertiesClass
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-  };
-
-  /**
-   * Constructs a <code>AdditionalPropertiesClass</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/AdditionalPropertiesClass} obj Optional instance to populate.
-   * @return {module:model/AdditionalPropertiesClass} The populated <code>AdditionalPropertiesClass</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('map_property')) {
-        obj['map_property'] = ApiClient.convertToType(data['map_property'], {'String': 'String'});
-      }
-      if (data.hasOwnProperty('map_of_map_property')) {
-        obj['map_of_map_property'] = ApiClient.convertToType(data['map_of_map_property'], {'String': {'String': 'String'}});
-      }
+            if (data.hasOwnProperty('map_property')) {
+                obj['map_property'] = ApiClient.convertToType(data['map_property'], {'String': 'String'});
+            }
+            if (data.hasOwnProperty('map_of_map_property')) {
+                obj['map_of_map_property'] = ApiClient.convertToType(data['map_of_map_property'], {'String': {'String': 'String'}});
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Object.<String, String>} map_property
-   */
-  exports.prototype['map_property'] = undefined;
-  /**
-   * @member {Object.<String, Object.<String, String>>} map_of_map_property
-   */
-  exports.prototype['map_of_map_property'] = undefined;
+    /**
+    * @member {Object.<String, String>} map_property
+    */
+    map_property = undefined;
+    /**
+    * @member {Object.<String, Object.<String, String>>} map_of_map_property
+    */
+    map_of_map_property = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/Animal.js b/samples/client/petstore/javascript-es6/src/model/Animal.js
index 09119420568..b3fb1a63f32 100644
--- a/samples/client/petstore/javascript-es6/src/model/Animal.js
+++ b/samples/client/petstore/javascript-es6/src/model/Animal.js
@@ -7,86 +7,83 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The Animal model module.
+* @module model/Animal
+* @version 1.0.0
+*/
+export default class Animal {
+    /**
+    * Constructs a new <code>Animal</code>.
+    * @alias module:model/Animal
+    * @class
+    * @param className {String} 
+    */
+
+    constructor(className) {
+        
+
+        
+        
+
+        this['className'] = className;
+
+        
     }
-    root.SwaggerPetstore.Animal = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Animal</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Animal} obj Optional instance to populate.
+    * @return {module:model/Animal} The populated <code>Animal</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Animal();
 
+            
+            
+            
 
-
-  /**
-   * The Animal model module.
-   * @module model/Animal
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Animal</code>.
-   * @alias module:model/Animal
-   * @class
-   * @param className {String} 
-   */
-  var exports = function(className) {
-    var _this = this;
-
-    _this['className'] = className;
-
-  };
-
-  /**
-   * Constructs a <code>Animal</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Animal} obj Optional instance to populate.
-   * @return {module:model/Animal} The populated <code>Animal</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('className')) {
-        obj['className'] = ApiClient.convertToType(data['className'], 'String');
-      }
-      if (data.hasOwnProperty('color')) {
-        obj['color'] = ApiClient.convertToType(data['color'], 'String');
-      }
+            if (data.hasOwnProperty('className')) {
+                obj['className'] = ApiClient.convertToType(data['className'], 'String');
+            }
+            if (data.hasOwnProperty('color')) {
+                obj['color'] = ApiClient.convertToType(data['color'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {String} className
-   */
-  exports.prototype['className'] = undefined;
-  /**
-   * @member {String} color
-   * @default 'red'
-   */
-  exports.prototype['color'] = 'red';
+    /**
+    * @member {String} className
+    */
+    className = undefined;
+    /**
+    * @member {String} color
+    * @default 'red'
+    */
+    color = 'red';
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/AnimalFarm.js b/samples/client/petstore/javascript-es6/src/model/AnimalFarm.js
index 891009dab71..8dc9f00cadb 100644
--- a/samples/client/petstore/javascript-es6/src/model/AnimalFarm.js
+++ b/samples/client/petstore/javascript-es6/src/model/AnimalFarm.js
@@ -7,73 +7,72 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/Animal'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('./Animal'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+import Animal from './Animal';
+
+
+
+
+
+/**
+* The AnimalFarm model module.
+* @module model/AnimalFarm
+* @version 1.0.0
+*/
+export default class AnimalFarm {
+    /**
+    * Constructs a new <code>AnimalFarm</code>.
+    * @alias module:model/AnimalFarm
+    * @class
+    * @extends Array
+    */
+
+    constructor() {
+        
+        this = new Array();
+        Object.setPrototypeOf(this, AnimalFarm);
+
+        
+        
+
+        
+
+        return this;
     }
-    root.SwaggerPetstore.AnimalFarm = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Animal);
-  }
-}(this, function(ApiClient, Animal) {
-  'use strict';
 
+    /**
+    * Constructs a <code>AnimalFarm</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/AnimalFarm} obj Optional instance to populate.
+    * @return {module:model/AnimalFarm} The populated <code>AnimalFarm</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new AnimalFarm();
 
+            ApiClient.constructFromObject(data, obj, 'Animal');
 
+            
+            
 
-  /**
-   * The AnimalFarm model module.
-   * @module model/AnimalFarm
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>AnimalFarm</code>.
-   * @alias module:model/AnimalFarm
-   * @class
-   * @extends Array
-   */
-  var exports = function() {
-    var _this = this;
-    _this = new Array();
-    Object.setPrototypeOf(_this, exports);
-
-    return _this;
-  };
-
-  /**
-   * Constructs a <code>AnimalFarm</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/AnimalFarm} obj Optional instance to populate.
-   * @return {module:model/AnimalFarm} The populated <code>AnimalFarm</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-      ApiClient.constructFromObject(data, obj, 'Animal');
-
+        }
+        return obj;
     }
-    return obj;
-  }
 
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/ApiResponse.js b/samples/client/petstore/javascript-es6/src/model/ApiResponse.js
index 12e9e16275f..49ddd1ac27f 100644
--- a/samples/client/petstore/javascript-es6/src/model/ApiResponse.js
+++ b/samples/client/petstore/javascript-es6/src/model/ApiResponse.js
@@ -7,92 +7,88 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The ApiResponse model module.
+* @module model/ApiResponse
+* @version 1.0.0
+*/
+export default class ApiResponse {
+    /**
+    * Constructs a new <code>ApiResponse</code>.
+    * @alias module:model/ApiResponse
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.ApiResponse = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>ApiResponse</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/ApiResponse} obj Optional instance to populate.
+    * @return {module:model/ApiResponse} The populated <code>ApiResponse</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new ApiResponse();
 
+            
+            
+            
 
-
-  /**
-   * The ApiResponse model module.
-   * @module model/ApiResponse
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>ApiResponse</code>.
-   * @alias module:model/ApiResponse
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-
-  };
-
-  /**
-   * Constructs a <code>ApiResponse</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/ApiResponse} obj Optional instance to populate.
-   * @return {module:model/ApiResponse} The populated <code>ApiResponse</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('code')) {
-        obj['code'] = ApiClient.convertToType(data['code'], 'Number');
-      }
-      if (data.hasOwnProperty('type')) {
-        obj['type'] = ApiClient.convertToType(data['type'], 'String');
-      }
-      if (data.hasOwnProperty('message')) {
-        obj['message'] = ApiClient.convertToType(data['message'], 'String');
-      }
+            if (data.hasOwnProperty('code')) {
+                obj['code'] = ApiClient.convertToType(data['code'], 'Number');
+            }
+            if (data.hasOwnProperty('type')) {
+                obj['type'] = ApiClient.convertToType(data['type'], 'String');
+            }
+            if (data.hasOwnProperty('message')) {
+                obj['message'] = ApiClient.convertToType(data['message'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} code
-   */
-  exports.prototype['code'] = undefined;
-  /**
-   * @member {String} type
-   */
-  exports.prototype['type'] = undefined;
-  /**
-   * @member {String} message
-   */
-  exports.prototype['message'] = undefined;
+    /**
+    * @member {Number} code
+    */
+    code = undefined;
+    /**
+    * @member {String} type
+    */
+    type = undefined;
+    /**
+    * @member {String} message
+    */
+    message = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/ArrayOfArrayOfNumberOnly.js b/samples/client/petstore/javascript-es6/src/model/ArrayOfArrayOfNumberOnly.js
index c620c19e667..1dfd4487c62 100644
--- a/samples/client/petstore/javascript-es6/src/model/ArrayOfArrayOfNumberOnly.js
+++ b/samples/client/petstore/javascript-es6/src/model/ArrayOfArrayOfNumberOnly.js
@@ -7,76 +7,74 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The ArrayOfArrayOfNumberOnly model module.
+* @module model/ArrayOfArrayOfNumberOnly
+* @version 1.0.0
+*/
+export default class ArrayOfArrayOfNumberOnly {
+    /**
+    * Constructs a new <code>ArrayOfArrayOfNumberOnly</code>.
+    * @alias module:model/ArrayOfArrayOfNumberOnly
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.ArrayOfArrayOfNumberOnly = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>ArrayOfArrayOfNumberOnly</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/ArrayOfArrayOfNumberOnly} obj Optional instance to populate.
+    * @return {module:model/ArrayOfArrayOfNumberOnly} The populated <code>ArrayOfArrayOfNumberOnly</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new ArrayOfArrayOfNumberOnly();
 
+            
+            
+            
 
-
-  /**
-   * The ArrayOfArrayOfNumberOnly model module.
-   * @module model/ArrayOfArrayOfNumberOnly
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>ArrayOfArrayOfNumberOnly</code>.
-   * @alias module:model/ArrayOfArrayOfNumberOnly
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-  };
-
-  /**
-   * Constructs a <code>ArrayOfArrayOfNumberOnly</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/ArrayOfArrayOfNumberOnly} obj Optional instance to populate.
-   * @return {module:model/ArrayOfArrayOfNumberOnly} The populated <code>ArrayOfArrayOfNumberOnly</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('ArrayArrayNumber')) {
-        obj['ArrayArrayNumber'] = ApiClient.convertToType(data['ArrayArrayNumber'], [['Number']]);
-      }
+            if (data.hasOwnProperty('ArrayArrayNumber')) {
+                obj['ArrayArrayNumber'] = ApiClient.convertToType(data['ArrayArrayNumber'], [['Number']]);
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Array.<Array.<Number>>} ArrayArrayNumber
-   */
-  exports.prototype['ArrayArrayNumber'] = undefined;
+    /**
+    * @member {Array.<Array.<Number>>} ArrayArrayNumber
+    */
+    ArrayArrayNumber = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/ArrayOfNumberOnly.js b/samples/client/petstore/javascript-es6/src/model/ArrayOfNumberOnly.js
index 66980b9b8d1..379a19ba3ff 100644
--- a/samples/client/petstore/javascript-es6/src/model/ArrayOfNumberOnly.js
+++ b/samples/client/petstore/javascript-es6/src/model/ArrayOfNumberOnly.js
@@ -7,76 +7,74 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The ArrayOfNumberOnly model module.
+* @module model/ArrayOfNumberOnly
+* @version 1.0.0
+*/
+export default class ArrayOfNumberOnly {
+    /**
+    * Constructs a new <code>ArrayOfNumberOnly</code>.
+    * @alias module:model/ArrayOfNumberOnly
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.ArrayOfNumberOnly = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>ArrayOfNumberOnly</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/ArrayOfNumberOnly} obj Optional instance to populate.
+    * @return {module:model/ArrayOfNumberOnly} The populated <code>ArrayOfNumberOnly</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new ArrayOfNumberOnly();
 
+            
+            
+            
 
-
-  /**
-   * The ArrayOfNumberOnly model module.
-   * @module model/ArrayOfNumberOnly
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>ArrayOfNumberOnly</code>.
-   * @alias module:model/ArrayOfNumberOnly
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-  };
-
-  /**
-   * Constructs a <code>ArrayOfNumberOnly</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/ArrayOfNumberOnly} obj Optional instance to populate.
-   * @return {module:model/ArrayOfNumberOnly} The populated <code>ArrayOfNumberOnly</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('ArrayNumber')) {
-        obj['ArrayNumber'] = ApiClient.convertToType(data['ArrayNumber'], ['Number']);
-      }
+            if (data.hasOwnProperty('ArrayNumber')) {
+                obj['ArrayNumber'] = ApiClient.convertToType(data['ArrayNumber'], ['Number']);
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Array.<Number>} ArrayNumber
-   */
-  exports.prototype['ArrayNumber'] = undefined;
+    /**
+    * @member {Array.<Number>} ArrayNumber
+    */
+    ArrayNumber = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/ArrayTest.js b/samples/client/petstore/javascript-es6/src/model/ArrayTest.js
index 2fb4ecb6c24..58e9ac58840 100644
--- a/samples/client/petstore/javascript-es6/src/model/ArrayTest.js
+++ b/samples/client/petstore/javascript-es6/src/model/ArrayTest.js
@@ -7,92 +7,89 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/ReadOnlyFirst'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('./ReadOnlyFirst'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+import ReadOnlyFirst from './ReadOnlyFirst';
+
+
+
+
+
+/**
+* The ArrayTest model module.
+* @module model/ArrayTest
+* @version 1.0.0
+*/
+export default class ArrayTest {
+    /**
+    * Constructs a new <code>ArrayTest</code>.
+    * @alias module:model/ArrayTest
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.ArrayTest = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.ReadOnlyFirst);
-  }
-}(this, function(ApiClient, ReadOnlyFirst) {
-  'use strict';
 
+    /**
+    * Constructs a <code>ArrayTest</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/ArrayTest} obj Optional instance to populate.
+    * @return {module:model/ArrayTest} The populated <code>ArrayTest</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new ArrayTest();
 
+            
+            
+            
 
-
-  /**
-   * The ArrayTest model module.
-   * @module model/ArrayTest
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>ArrayTest</code>.
-   * @alias module:model/ArrayTest
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-
-  };
-
-  /**
-   * Constructs a <code>ArrayTest</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/ArrayTest} obj Optional instance to populate.
-   * @return {module:model/ArrayTest} The populated <code>ArrayTest</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('array_of_string')) {
-        obj['array_of_string'] = ApiClient.convertToType(data['array_of_string'], ['String']);
-      }
-      if (data.hasOwnProperty('array_array_of_integer')) {
-        obj['array_array_of_integer'] = ApiClient.convertToType(data['array_array_of_integer'], [['Number']]);
-      }
-      if (data.hasOwnProperty('array_array_of_model')) {
-        obj['array_array_of_model'] = ApiClient.convertToType(data['array_array_of_model'], [[ReadOnlyFirst]]);
-      }
+            if (data.hasOwnProperty('array_of_string')) {
+                obj['array_of_string'] = ApiClient.convertToType(data['array_of_string'], ['String']);
+            }
+            if (data.hasOwnProperty('array_array_of_integer')) {
+                obj['array_array_of_integer'] = ApiClient.convertToType(data['array_array_of_integer'], [['Number']]);
+            }
+            if (data.hasOwnProperty('array_array_of_model')) {
+                obj['array_array_of_model'] = ApiClient.convertToType(data['array_array_of_model'], [[ReadOnlyFirst]]);
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Array.<String>} array_of_string
-   */
-  exports.prototype['array_of_string'] = undefined;
-  /**
-   * @member {Array.<Array.<Number>>} array_array_of_integer
-   */
-  exports.prototype['array_array_of_integer'] = undefined;
-  /**
-   * @member {Array.<Array.<module:model/ReadOnlyFirst>>} array_array_of_model
-   */
-  exports.prototype['array_array_of_model'] = undefined;
+    /**
+    * @member {Array.<String>} array_of_string
+    */
+    array_of_string = undefined;
+    /**
+    * @member {Array.<Array.<Number>>} array_array_of_integer
+    */
+    array_array_of_integer = undefined;
+    /**
+    * @member {Array.<Array.<module:model/ReadOnlyFirst>>} array_array_of_model
+    */
+    array_array_of_model = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/Capitalization.js b/samples/client/petstore/javascript-es6/src/model/Capitalization.js
index 54154d396f8..12f3f3f5593 100644
--- a/samples/client/petstore/javascript-es6/src/model/Capitalization.js
+++ b/samples/client/petstore/javascript-es6/src/model/Capitalization.js
@@ -7,117 +7,110 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The Capitalization model module.
+* @module model/Capitalization
+* @version 1.0.0
+*/
+export default class Capitalization {
+    /**
+    * Constructs a new <code>Capitalization</code>.
+    * @alias module:model/Capitalization
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.Capitalization = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Capitalization</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Capitalization} obj Optional instance to populate.
+    * @return {module:model/Capitalization} The populated <code>Capitalization</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Capitalization();
 
+            
+            
+            
 
-
-  /**
-   * The Capitalization model module.
-   * @module model/Capitalization
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Capitalization</code>.
-   * @alias module:model/Capitalization
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-
-
-
-
-  };
-
-  /**
-   * Constructs a <code>Capitalization</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Capitalization} obj Optional instance to populate.
-   * @return {module:model/Capitalization} The populated <code>Capitalization</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('smallCamel')) {
-        obj['smallCamel'] = ApiClient.convertToType(data['smallCamel'], 'String');
-      }
-      if (data.hasOwnProperty('CapitalCamel')) {
-        obj['CapitalCamel'] = ApiClient.convertToType(data['CapitalCamel'], 'String');
-      }
-      if (data.hasOwnProperty('small_Snake')) {
-        obj['small_Snake'] = ApiClient.convertToType(data['small_Snake'], 'String');
-      }
-      if (data.hasOwnProperty('Capital_Snake')) {
-        obj['Capital_Snake'] = ApiClient.convertToType(data['Capital_Snake'], 'String');
-      }
-      if (data.hasOwnProperty('SCA_ETH_Flow_Points')) {
-        obj['SCA_ETH_Flow_Points'] = ApiClient.convertToType(data['SCA_ETH_Flow_Points'], 'String');
-      }
-      if (data.hasOwnProperty('ATT_NAME')) {
-        obj['ATT_NAME'] = ApiClient.convertToType(data['ATT_NAME'], 'String');
-      }
+            if (data.hasOwnProperty('smallCamel')) {
+                obj['smallCamel'] = ApiClient.convertToType(data['smallCamel'], 'String');
+            }
+            if (data.hasOwnProperty('CapitalCamel')) {
+                obj['CapitalCamel'] = ApiClient.convertToType(data['CapitalCamel'], 'String');
+            }
+            if (data.hasOwnProperty('small_Snake')) {
+                obj['small_Snake'] = ApiClient.convertToType(data['small_Snake'], 'String');
+            }
+            if (data.hasOwnProperty('Capital_Snake')) {
+                obj['Capital_Snake'] = ApiClient.convertToType(data['Capital_Snake'], 'String');
+            }
+            if (data.hasOwnProperty('SCA_ETH_Flow_Points')) {
+                obj['SCA_ETH_Flow_Points'] = ApiClient.convertToType(data['SCA_ETH_Flow_Points'], 'String');
+            }
+            if (data.hasOwnProperty('ATT_NAME')) {
+                obj['ATT_NAME'] = ApiClient.convertToType(data['ATT_NAME'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {String} smallCamel
-   */
-  exports.prototype['smallCamel'] = undefined;
-  /**
-   * @member {String} CapitalCamel
-   */
-  exports.prototype['CapitalCamel'] = undefined;
-  /**
-   * @member {String} small_Snake
-   */
-  exports.prototype['small_Snake'] = undefined;
-  /**
-   * @member {String} Capital_Snake
-   */
-  exports.prototype['Capital_Snake'] = undefined;
-  /**
-   * @member {String} SCA_ETH_Flow_Points
-   */
-  exports.prototype['SCA_ETH_Flow_Points'] = undefined;
-  /**
-   * Name of the pet 
-   * @member {String} ATT_NAME
-   */
-  exports.prototype['ATT_NAME'] = undefined;
+    /**
+    * @member {String} smallCamel
+    */
+    smallCamel = undefined;
+    /**
+    * @member {String} CapitalCamel
+    */
+    CapitalCamel = undefined;
+    /**
+    * @member {String} small_Snake
+    */
+    small_Snake = undefined;
+    /**
+    * @member {String} Capital_Snake
+    */
+    Capital_Snake = undefined;
+    /**
+    * @member {String} SCA_ETH_Flow_Points
+    */
+    SCA_ETH_Flow_Points = undefined;
+    /**
+    * Name of the pet 
+    * @member {String} ATT_NAME
+    */
+    ATT_NAME = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/Cat.js b/samples/client/petstore/javascript-es6/src/model/Cat.js
index 862e7b0c910..da946664d08 100644
--- a/samples/client/petstore/javascript-es6/src/model/Cat.js
+++ b/samples/client/petstore/javascript-es6/src/model/Cat.js
@@ -7,81 +7,78 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/Animal'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('./Animal'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+import Animal from './Animal';
+
+
+
+
+
+/**
+* The Cat model module.
+* @module model/Cat
+* @version 1.0.0
+*/
+export default class Cat {
+    /**
+    * Constructs a new <code>Cat</code>.
+    * @alias module:model/Cat
+    * @class
+    * @extends module:model/Animal
+    * @param className {String} 
+    */
+
+    constructor(className) {
+        
+
+        Animal.call(this, className);
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.Cat = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Animal);
-  }
-}(this, function(ApiClient, Animal) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Cat</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Cat} obj Optional instance to populate.
+    * @return {module:model/Cat} The populated <code>Cat</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Cat();
 
+            
 
+            Animal.constructFromObject(data, obj);
+            
 
-  /**
-   * The Cat model module.
-   * @module model/Cat
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Cat</code>.
-   * @alias module:model/Cat
-   * @class
-   * @extends module:model/Animal
-   * @param className {String} 
-   */
-  var exports = function(className) {
-    var _this = this;
-    Animal.call(_this, className);
-
-  };
-
-  /**
-   * Constructs a <code>Cat</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Cat} obj Optional instance to populate.
-   * @return {module:model/Cat} The populated <code>Cat</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-      Animal.constructFromObject(data, obj);
-      if (data.hasOwnProperty('declawed')) {
-        obj['declawed'] = ApiClient.convertToType(data['declawed'], 'Boolean');
-      }
+            if (data.hasOwnProperty('declawed')) {
+                obj['declawed'] = ApiClient.convertToType(data['declawed'], 'Boolean');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  exports.prototype = Object.create(Animal.prototype);
-  exports.prototype.constructor = exports;
-
-  /**
-   * @member {Boolean} declawed
-   */
-  exports.prototype['declawed'] = undefined;
+    /**
+    * @member {Boolean} declawed
+    */
+    declawed = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/Category.js b/samples/client/petstore/javascript-es6/src/model/Category.js
index d7ecc2207da..a281817b72f 100644
--- a/samples/client/petstore/javascript-es6/src/model/Category.js
+++ b/samples/client/petstore/javascript-es6/src/model/Category.js
@@ -7,84 +7,81 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The Category model module.
+* @module model/Category
+* @version 1.0.0
+*/
+export default class Category {
+    /**
+    * Constructs a new <code>Category</code>.
+    * @alias module:model/Category
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.Category = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Category</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Category} obj Optional instance to populate.
+    * @return {module:model/Category} The populated <code>Category</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Category();
 
+            
+            
+            
 
-
-  /**
-   * The Category model module.
-   * @module model/Category
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Category</code>.
-   * @alias module:model/Category
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-  };
-
-  /**
-   * Constructs a <code>Category</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Category} obj Optional instance to populate.
-   * @return {module:model/Category} The populated <code>Category</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('id')) {
-        obj['id'] = ApiClient.convertToType(data['id'], 'Number');
-      }
-      if (data.hasOwnProperty('name')) {
-        obj['name'] = ApiClient.convertToType(data['name'], 'String');
-      }
+            if (data.hasOwnProperty('id')) {
+                obj['id'] = ApiClient.convertToType(data['id'], 'Number');
+            }
+            if (data.hasOwnProperty('name')) {
+                obj['name'] = ApiClient.convertToType(data['name'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} id
-   */
-  exports.prototype['id'] = undefined;
-  /**
-   * @member {String} name
-   */
-  exports.prototype['name'] = undefined;
+    /**
+    * @member {Number} id
+    */
+    id = undefined;
+    /**
+    * @member {String} name
+    */
+    name = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/ClassModel.js b/samples/client/petstore/javascript-es6/src/model/ClassModel.js
index c3b7b83f9c5..6a558444ade 100644
--- a/samples/client/petstore/javascript-es6/src/model/ClassModel.js
+++ b/samples/client/petstore/javascript-es6/src/model/ClassModel.js
@@ -7,77 +7,75 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The ClassModel model module.
+* @module model/ClassModel
+* @version 1.0.0
+*/
+export default class ClassModel {
+    /**
+    * Constructs a new <code>ClassModel</code>.
+    * Model for testing model with \&quot;_class\&quot; property
+    * @alias module:model/ClassModel
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.ClassModel = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>ClassModel</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/ClassModel} obj Optional instance to populate.
+    * @return {module:model/ClassModel} The populated <code>ClassModel</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new ClassModel();
 
+            
+            
+            
 
-
-  /**
-   * The ClassModel model module.
-   * @module model/ClassModel
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>ClassModel</code>.
-   * Model for testing model with \&quot;_class\&quot; property
-   * @alias module:model/ClassModel
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-  };
-
-  /**
-   * Constructs a <code>ClassModel</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/ClassModel} obj Optional instance to populate.
-   * @return {module:model/ClassModel} The populated <code>ClassModel</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('_class')) {
-        obj['_class'] = ApiClient.convertToType(data['_class'], 'String');
-      }
+            if (data.hasOwnProperty('_class')) {
+                obj['_class'] = ApiClient.convertToType(data['_class'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {String} _class
-   */
-  exports.prototype['_class'] = undefined;
+    /**
+    * @member {String} _class
+    */
+    _class = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/Client.js b/samples/client/petstore/javascript-es6/src/model/Client.js
index a2912224910..a4f9b235154 100644
--- a/samples/client/petstore/javascript-es6/src/model/Client.js
+++ b/samples/client/petstore/javascript-es6/src/model/Client.js
@@ -7,76 +7,74 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The Client model module.
+* @module model/Client
+* @version 1.0.0
+*/
+export default class Client {
+    /**
+    * Constructs a new <code>Client</code>.
+    * @alias module:model/Client
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.Client = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Client</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Client} obj Optional instance to populate.
+    * @return {module:model/Client} The populated <code>Client</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Client();
 
+            
+            
+            
 
-
-  /**
-   * The Client model module.
-   * @module model/Client
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Client</code>.
-   * @alias module:model/Client
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-  };
-
-  /**
-   * Constructs a <code>Client</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Client} obj Optional instance to populate.
-   * @return {module:model/Client} The populated <code>Client</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('client')) {
-        obj['client'] = ApiClient.convertToType(data['client'], 'String');
-      }
+            if (data.hasOwnProperty('client')) {
+                obj['client'] = ApiClient.convertToType(data['client'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {String} client
-   */
-  exports.prototype['client'] = undefined;
+    /**
+    * @member {String} client
+    */
+    client = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/Dog.js b/samples/client/petstore/javascript-es6/src/model/Dog.js
index 2cd286fb741..e5bc0d3cecf 100644
--- a/samples/client/petstore/javascript-es6/src/model/Dog.js
+++ b/samples/client/petstore/javascript-es6/src/model/Dog.js
@@ -7,81 +7,78 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/Animal'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('./Animal'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+import Animal from './Animal';
+
+
+
+
+
+/**
+* The Dog model module.
+* @module model/Dog
+* @version 1.0.0
+*/
+export default class Dog {
+    /**
+    * Constructs a new <code>Dog</code>.
+    * @alias module:model/Dog
+    * @class
+    * @extends module:model/Animal
+    * @param className {String} 
+    */
+
+    constructor(className) {
+        
+
+        Animal.call(this, className);
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.Dog = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Animal);
-  }
-}(this, function(ApiClient, Animal) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Dog</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Dog} obj Optional instance to populate.
+    * @return {module:model/Dog} The populated <code>Dog</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Dog();
 
+            
 
+            Animal.constructFromObject(data, obj);
+            
 
-  /**
-   * The Dog model module.
-   * @module model/Dog
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Dog</code>.
-   * @alias module:model/Dog
-   * @class
-   * @extends module:model/Animal
-   * @param className {String} 
-   */
-  var exports = function(className) {
-    var _this = this;
-    Animal.call(_this, className);
-
-  };
-
-  /**
-   * Constructs a <code>Dog</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Dog} obj Optional instance to populate.
-   * @return {module:model/Dog} The populated <code>Dog</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-      Animal.constructFromObject(data, obj);
-      if (data.hasOwnProperty('breed')) {
-        obj['breed'] = ApiClient.convertToType(data['breed'], 'String');
-      }
+            if (data.hasOwnProperty('breed')) {
+                obj['breed'] = ApiClient.convertToType(data['breed'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  exports.prototype = Object.create(Animal.prototype);
-  exports.prototype.constructor = exports;
-
-  /**
-   * @member {String} breed
-   */
-  exports.prototype['breed'] = undefined;
+    /**
+    * @member {String} breed
+    */
+    breed = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/EnumArrays.js b/samples/client/petstore/javascript-es6/src/model/EnumArrays.js
index 079cfe25084..20a74f0d883 100644
--- a/samples/client/petstore/javascript-es6/src/model/EnumArrays.js
+++ b/samples/client/petstore/javascript-es6/src/model/EnumArrays.js
@@ -7,118 +7,121 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The EnumArrays model module.
+* @module model/EnumArrays
+* @version 1.0.0
+*/
+export default class EnumArrays {
+    /**
+    * Constructs a new <code>EnumArrays</code>.
+    * @alias module:model/EnumArrays
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.EnumArrays = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>EnumArrays</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/EnumArrays} obj Optional instance to populate.
+    * @return {module:model/EnumArrays} The populated <code>EnumArrays</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new EnumArrays();
 
+            
+            
+            
 
-
-  /**
-   * The EnumArrays model module.
-   * @module model/EnumArrays
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>EnumArrays</code>.
-   * @alias module:model/EnumArrays
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-  };
-
-  /**
-   * Constructs a <code>EnumArrays</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/EnumArrays} obj Optional instance to populate.
-   * @return {module:model/EnumArrays} The populated <code>EnumArrays</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('just_symbol')) {
-        obj['just_symbol'] = ApiClient.convertToType(data['just_symbol'], 'String');
-      }
-      if (data.hasOwnProperty('array_enum')) {
-        obj['array_enum'] = ApiClient.convertToType(data['array_enum'], ['String']);
-      }
+            if (data.hasOwnProperty('just_symbol')) {
+                obj['just_symbol'] = ApiClient.convertToType(data['just_symbol'], 'String');
+            }
+            if (data.hasOwnProperty('array_enum')) {
+                obj['array_enum'] = ApiClient.convertToType(data['array_enum'], ['String']);
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {module:model/EnumArrays.JustSymbolEnum} just_symbol
-   */
-  exports.prototype['just_symbol'] = undefined;
-  /**
-   * @member {Array.<module:model/EnumArrays.ArrayEnumEnum>} array_enum
-   */
-  exports.prototype['array_enum'] = undefined;
-
-
-  /**
-   * Allowed values for the <code>just_symbol</code> property.
-   * @enum {String}
-   * @readonly
-   */
-  exports.JustSymbolEnum = {
     /**
-     * value: ">="
-     * @const
-     */
-    "GREATER_THAN_OR_EQUAL_TO": ">=",
+    * @member {module:model/EnumArrays.JustSymbolEnum} just_symbol
+    */
+    just_symbol = undefined;
     /**
-     * value: "$"
-     * @const
-     */
-    "DOLLAR": "$"  };
+    * @member {Array.<module:model/EnumArrays.ArrayEnumEnum>} array_enum
+    */
+    array_enum = undefined;
+
+
+
+
+
 
-  /**
-   * Allowed values for the <code>arrayEnum</code> property.
-   * @enum {String}
-   * @readonly
-   */
-  exports.ArrayEnumEnum = {
     /**
-     * value: "fish"
-     * @const
-     */
-    "fish": "fish",
+    * Allowed values for the <code>just_symbol</code> property.
+    * @enum {String}
+    * @readonly
+    */
+    static JustSymbolEnum = {
+    
+        /**
+         * value: ">="
+         * @const
+         */
+        "GREATER_THAN_OR_EQUAL_TO": ">=",
+    
+        /**
+         * value: "$"
+         * @const
+         */
+        "DOLLAR": "$"    
+    };
+
     /**
-     * value: "crab"
-     * @const
-     */
-    "crab": "crab"  };
+    * Allowed values for the <code>arrayEnum</code> property.
+    * @enum {String}
+    * @readonly
+    */
+    static ArrayEnumEnum = {
+    
+        /**
+         * value: "fish"
+         * @const
+         */
+        "fish": "fish",
+    
+        /**
+         * value: "crab"
+         * @const
+         */
+        "crab": "crab"    
+    };
 
 
-  return exports;
-}));
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/EnumClass.js b/samples/client/petstore/javascript-es6/src/model/EnumClass.js
index 881a7503047..eeb08ca2864 100644
--- a/samples/client/petstore/javascript-es6/src/model/EnumClass.js
+++ b/samples/client/petstore/javascript-es6/src/model/EnumClass.js
@@ -7,63 +7,51 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+/**
+* Enum class EnumClass.
+* @enum {}
+* @readonly
+*/
+export default class EnumClass {
+    
+        /**
+         * value: "_abc"
+         * @const
+         */
+        _abc = "_abc";
+
+    
+        /**
+         * value: "-efg"
+         * @const
+         */
+        -efg = "-efg";
+
+    
+        /**
+         * value: "(xyz)"
+         * @const
+         */
+        (xyz) = "(xyz)";
+
+    
+
+    /**
+    * Returns a <code>EnumClass</code> enum value from a Javascript object name.
+    * @param {Object} data The plain JavaScript object containing the name of the enum value.
+    * @return {module:model/EnumClass} The enum <code>EnumClass</code> value.
+    */
+    static constructFromObject(object) {
+        return object;
     }
-    root.SwaggerPetstore.EnumClass = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
-
-
-  /**
-   * Enum class EnumClass.
-   * @enum {}
-   * @readonly
-   */
-  var exports = {
-    /**
-     * value: "_abc"
-     * @const
-     */
-    "_abc": "_abc",
-    /**
-     * value: "-efg"
-     * @const
-     */
-    "-efg": "-efg",
-    /**
-     * value: "(xyz)"
-     * @const
-     */
-    "(xyz)": "(xyz)"  };
-
-  /**
-   * Returns a <code>EnumClass</code> enum value from a Javascript object name.
-   * @param {Object} data The plain JavaScript object containing the name of the enum value.
-   * @return {module:model/EnumClass} The enum <code>EnumClass</code> value.
-   */
-  exports.constructFromObject = function(object) {
-    return object;
-  }
-
-  return exports;
-}));
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/EnumTest.js b/samples/client/petstore/javascript-es6/src/model/EnumTest.js
index 215bea59d38..b1f9b0b6c69 100644
--- a/samples/client/petstore/javascript-es6/src/model/EnumTest.js
+++ b/samples/client/petstore/javascript-es6/src/model/EnumTest.js
@@ -7,156 +7,162 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/OuterEnum'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('./OuterEnum'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+import OuterEnum from './OuterEnum';
+
+
+
+
+
+/**
+* The EnumTest model module.
+* @module model/EnumTest
+* @version 1.0.0
+*/
+export default class EnumTest {
+    /**
+    * Constructs a new <code>EnumTest</code>.
+    * @alias module:model/EnumTest
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.EnumTest = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.OuterEnum);
-  }
-}(this, function(ApiClient, OuterEnum) {
-  'use strict';
 
+    /**
+    * Constructs a <code>EnumTest</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/EnumTest} obj Optional instance to populate.
+    * @return {module:model/EnumTest} The populated <code>EnumTest</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new EnumTest();
 
+            
+            
+            
 
-
-  /**
-   * The EnumTest model module.
-   * @module model/EnumTest
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>EnumTest</code>.
-   * @alias module:model/EnumTest
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-
-
-  };
-
-  /**
-   * Constructs a <code>EnumTest</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/EnumTest} obj Optional instance to populate.
-   * @return {module:model/EnumTest} The populated <code>EnumTest</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('enum_string')) {
-        obj['enum_string'] = ApiClient.convertToType(data['enum_string'], 'String');
-      }
-      if (data.hasOwnProperty('enum_integer')) {
-        obj['enum_integer'] = ApiClient.convertToType(data['enum_integer'], 'Number');
-      }
-      if (data.hasOwnProperty('enum_number')) {
-        obj['enum_number'] = ApiClient.convertToType(data['enum_number'], 'Number');
-      }
-      if (data.hasOwnProperty('outerEnum')) {
-        obj['outerEnum'] = OuterEnum.constructFromObject(data['outerEnum']);
-      }
+            if (data.hasOwnProperty('enum_string')) {
+                obj['enum_string'] = ApiClient.convertToType(data['enum_string'], 'String');
+            }
+            if (data.hasOwnProperty('enum_integer')) {
+                obj['enum_integer'] = ApiClient.convertToType(data['enum_integer'], 'Number');
+            }
+            if (data.hasOwnProperty('enum_number')) {
+                obj['enum_number'] = ApiClient.convertToType(data['enum_number'], 'Number');
+            }
+            if (data.hasOwnProperty('outerEnum')) {
+                obj['outerEnum'] = OuterEnum.constructFromObject(data['outerEnum']);
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {module:model/EnumTest.EnumStringEnum} enum_string
-   */
-  exports.prototype['enum_string'] = undefined;
-  /**
-   * @member {module:model/EnumTest.EnumIntegerEnum} enum_integer
-   */
-  exports.prototype['enum_integer'] = undefined;
-  /**
-   * @member {module:model/EnumTest.EnumNumberEnum} enum_number
-   */
-  exports.prototype['enum_number'] = undefined;
-  /**
-   * @member {module:model/OuterEnum} outerEnum
-   */
-  exports.prototype['outerEnum'] = undefined;
-
-
-  /**
-   * Allowed values for the <code>enum_string</code> property.
-   * @enum {String}
-   * @readonly
-   */
-  exports.EnumStringEnum = {
     /**
-     * value: "UPPER"
-     * @const
-     */
-    "UPPER": "UPPER",
+    * @member {module:model/EnumTest.EnumStringEnum} enum_string
+    */
+    enum_string = undefined;
     /**
-     * value: "lower"
-     * @const
-     */
-    "lower": "lower",
+    * @member {module:model/EnumTest.EnumIntegerEnum} enum_integer
+    */
+    enum_integer = undefined;
     /**
-     * value: ""
-     * @const
-     */
-    "empty": ""  };
-
-  /**
-   * Allowed values for the <code>enum_integer</code> property.
-   * @enum {Number}
-   * @readonly
-   */
-  exports.EnumIntegerEnum = {
+    * @member {module:model/EnumTest.EnumNumberEnum} enum_number
+    */
+    enum_number = undefined;
     /**
-     * value: 1
-     * @const
-     */
-    "1": 1,
-    /**
-     * value: -1
-     * @const
-     */
-    "-1": -1  };
-
-  /**
-   * Allowed values for the <code>enum_number</code> property.
-   * @enum {Number}
-   * @readonly
-   */
-  exports.EnumNumberEnum = {
-    /**
-     * value: 1.1
-     * @const
-     */
-    "1.1": 1.1,
-    /**
-     * value: -1.2
-     * @const
-     */
-    "-1.2": -1.2  };
+    * @member {module:model/OuterEnum} outerEnum
+    */
+    outerEnum = undefined;
 
 
-  return exports;
-}));
+
+
+
+
+    /**
+    * Allowed values for the <code>enum_string</code> property.
+    * @enum {String}
+    * @readonly
+    */
+    static EnumStringEnum = {
+    
+        /**
+         * value: "UPPER"
+         * @const
+         */
+        "UPPER": "UPPER",
+    
+        /**
+         * value: "lower"
+         * @const
+         */
+        "lower": "lower",
+    
+        /**
+         * value: ""
+         * @const
+         */
+        "empty": ""    
+    };
+
+    /**
+    * Allowed values for the <code>enum_integer</code> property.
+    * @enum {Number}
+    * @readonly
+    */
+    static EnumIntegerEnum = {
+    
+        /**
+         * value: 1
+         * @const
+         */
+        "1": 1,
+    
+        /**
+         * value: -1
+         * @const
+         */
+        "-1": -1    
+    };
+
+    /**
+    * Allowed values for the <code>enum_number</code> property.
+    * @enum {Number}
+    * @readonly
+    */
+    static EnumNumberEnum = {
+    
+        /**
+         * value: 1.1
+         * @const
+         */
+        "1.1": 1.1,
+    
+        /**
+         * value: -1.2
+         * @const
+         */
+        "-1.2": -1.2    
+    };
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/FormatTest.js b/samples/client/petstore/javascript-es6/src/model/FormatTest.js
index 238224d0132..8773a3a7755 100644
--- a/samples/client/petstore/javascript-es6/src/model/FormatTest.js
+++ b/samples/client/petstore/javascript-es6/src/model/FormatTest.js
@@ -7,176 +7,162 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The FormatTest model module.
+* @module model/FormatTest
+* @version 1.0.0
+*/
+export default class FormatTest {
+    /**
+    * Constructs a new <code>FormatTest</code>.
+    * @alias module:model/FormatTest
+    * @class
+    * @param _number {Number} 
+    * @param _byte {Blob} 
+    * @param _date {Date} 
+    * @param password {String} 
+    */
+
+    constructor(_number, _byte, _date, password) {
+        
+
+        
+        
+
+        this['number'] = _number;this['byte'] = _byte;this['date'] = _date;this['password'] = password;
+
+        
     }
-    root.SwaggerPetstore.FormatTest = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>FormatTest</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/FormatTest} obj Optional instance to populate.
+    * @return {module:model/FormatTest} The populated <code>FormatTest</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new FormatTest();
 
+            
+            
+            
 
-
-  /**
-   * The FormatTest model module.
-   * @module model/FormatTest
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>FormatTest</code>.
-   * @alias module:model/FormatTest
-   * @class
-   * @param _number {Number} 
-   * @param _byte {Blob} 
-   * @param _date {Date} 
-   * @param password {String} 
-   */
-  var exports = function(_number, _byte, _date, password) {
-    var _this = this;
-
-
-
-
-    _this['number'] = _number;
-
-
-
-    _this['byte'] = _byte;
-
-    _this['date'] = _date;
-
-
-    _this['password'] = password;
-  };
-
-  /**
-   * Constructs a <code>FormatTest</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/FormatTest} obj Optional instance to populate.
-   * @return {module:model/FormatTest} The populated <code>FormatTest</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('integer')) {
-        obj['integer'] = ApiClient.convertToType(data['integer'], 'Number');
-      }
-      if (data.hasOwnProperty('int32')) {
-        obj['int32'] = ApiClient.convertToType(data['int32'], 'Number');
-      }
-      if (data.hasOwnProperty('int64')) {
-        obj['int64'] = ApiClient.convertToType(data['int64'], 'Number');
-      }
-      if (data.hasOwnProperty('number')) {
-        obj['number'] = ApiClient.convertToType(data['number'], 'Number');
-      }
-      if (data.hasOwnProperty('float')) {
-        obj['float'] = ApiClient.convertToType(data['float'], 'Number');
-      }
-      if (data.hasOwnProperty('double')) {
-        obj['double'] = ApiClient.convertToType(data['double'], 'Number');
-      }
-      if (data.hasOwnProperty('string')) {
-        obj['string'] = ApiClient.convertToType(data['string'], 'String');
-      }
-      if (data.hasOwnProperty('byte')) {
-        obj['byte'] = ApiClient.convertToType(data['byte'], 'Blob');
-      }
-      if (data.hasOwnProperty('binary')) {
-        obj['binary'] = ApiClient.convertToType(data['binary'], 'Blob');
-      }
-      if (data.hasOwnProperty('date')) {
-        obj['date'] = ApiClient.convertToType(data['date'], 'Date');
-      }
-      if (data.hasOwnProperty('dateTime')) {
-        obj['dateTime'] = ApiClient.convertToType(data['dateTime'], 'Date');
-      }
-      if (data.hasOwnProperty('uuid')) {
-        obj['uuid'] = ApiClient.convertToType(data['uuid'], 'String');
-      }
-      if (data.hasOwnProperty('password')) {
-        obj['password'] = ApiClient.convertToType(data['password'], 'String');
-      }
+            if (data.hasOwnProperty('integer')) {
+                obj['integer'] = ApiClient.convertToType(data['integer'], 'Number');
+            }
+            if (data.hasOwnProperty('int32')) {
+                obj['int32'] = ApiClient.convertToType(data['int32'], 'Number');
+            }
+            if (data.hasOwnProperty('int64')) {
+                obj['int64'] = ApiClient.convertToType(data['int64'], 'Number');
+            }
+            if (data.hasOwnProperty('number')) {
+                obj['number'] = ApiClient.convertToType(data['number'], 'Number');
+            }
+            if (data.hasOwnProperty('float')) {
+                obj['float'] = ApiClient.convertToType(data['float'], 'Number');
+            }
+            if (data.hasOwnProperty('double')) {
+                obj['double'] = ApiClient.convertToType(data['double'], 'Number');
+            }
+            if (data.hasOwnProperty('string')) {
+                obj['string'] = ApiClient.convertToType(data['string'], 'String');
+            }
+            if (data.hasOwnProperty('byte')) {
+                obj['byte'] = ApiClient.convertToType(data['byte'], 'Blob');
+            }
+            if (data.hasOwnProperty('binary')) {
+                obj['binary'] = ApiClient.convertToType(data['binary'], 'Blob');
+            }
+            if (data.hasOwnProperty('date')) {
+                obj['date'] = ApiClient.convertToType(data['date'], 'Date');
+            }
+            if (data.hasOwnProperty('dateTime')) {
+                obj['dateTime'] = ApiClient.convertToType(data['dateTime'], 'Date');
+            }
+            if (data.hasOwnProperty('uuid')) {
+                obj['uuid'] = ApiClient.convertToType(data['uuid'], 'String');
+            }
+            if (data.hasOwnProperty('password')) {
+                obj['password'] = ApiClient.convertToType(data['password'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} integer
-   */
-  exports.prototype['integer'] = undefined;
-  /**
-   * @member {Number} int32
-   */
-  exports.prototype['int32'] = undefined;
-  /**
-   * @member {Number} int64
-   */
-  exports.prototype['int64'] = undefined;
-  /**
-   * @member {Number} number
-   */
-  exports.prototype['number'] = undefined;
-  /**
-   * @member {Number} float
-   */
-  exports.prototype['float'] = undefined;
-  /**
-   * @member {Number} double
-   */
-  exports.prototype['double'] = undefined;
-  /**
-   * @member {String} string
-   */
-  exports.prototype['string'] = undefined;
-  /**
-   * @member {Blob} byte
-   */
-  exports.prototype['byte'] = undefined;
-  /**
-   * @member {Blob} binary
-   */
-  exports.prototype['binary'] = undefined;
-  /**
-   * @member {Date} date
-   */
-  exports.prototype['date'] = undefined;
-  /**
-   * @member {Date} dateTime
-   */
-  exports.prototype['dateTime'] = undefined;
-  /**
-   * @member {String} uuid
-   */
-  exports.prototype['uuid'] = undefined;
-  /**
-   * @member {String} password
-   */
-  exports.prototype['password'] = undefined;
+    /**
+    * @member {Number} integer
+    */
+    integer = undefined;
+    /**
+    * @member {Number} int32
+    */
+    int32 = undefined;
+    /**
+    * @member {Number} int64
+    */
+    int64 = undefined;
+    /**
+    * @member {Number} number
+    */
+    number = undefined;
+    /**
+    * @member {Number} float
+    */
+    float = undefined;
+    /**
+    * @member {Number} double
+    */
+    double = undefined;
+    /**
+    * @member {String} string
+    */
+    string = undefined;
+    /**
+    * @member {Blob} byte
+    */
+    byte = undefined;
+    /**
+    * @member {Blob} binary
+    */
+    binary = undefined;
+    /**
+    * @member {Date} date
+    */
+    date = undefined;
+    /**
+    * @member {Date} dateTime
+    */
+    dateTime = undefined;
+    /**
+    * @member {String} uuid
+    */
+    uuid = undefined;
+    /**
+    * @member {String} password
+    */
+    password = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/HasOnlyReadOnly.js b/samples/client/petstore/javascript-es6/src/model/HasOnlyReadOnly.js
index 566e0663de0..cb859fe3e50 100644
--- a/samples/client/petstore/javascript-es6/src/model/HasOnlyReadOnly.js
+++ b/samples/client/petstore/javascript-es6/src/model/HasOnlyReadOnly.js
@@ -7,84 +7,81 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The HasOnlyReadOnly model module.
+* @module model/HasOnlyReadOnly
+* @version 1.0.0
+*/
+export default class HasOnlyReadOnly {
+    /**
+    * Constructs a new <code>HasOnlyReadOnly</code>.
+    * @alias module:model/HasOnlyReadOnly
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.HasOnlyReadOnly = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>HasOnlyReadOnly</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/HasOnlyReadOnly} obj Optional instance to populate.
+    * @return {module:model/HasOnlyReadOnly} The populated <code>HasOnlyReadOnly</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new HasOnlyReadOnly();
 
+            
+            
+            
 
-
-  /**
-   * The HasOnlyReadOnly model module.
-   * @module model/HasOnlyReadOnly
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>HasOnlyReadOnly</code>.
-   * @alias module:model/HasOnlyReadOnly
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-  };
-
-  /**
-   * Constructs a <code>HasOnlyReadOnly</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/HasOnlyReadOnly} obj Optional instance to populate.
-   * @return {module:model/HasOnlyReadOnly} The populated <code>HasOnlyReadOnly</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('bar')) {
-        obj['bar'] = ApiClient.convertToType(data['bar'], 'String');
-      }
-      if (data.hasOwnProperty('foo')) {
-        obj['foo'] = ApiClient.convertToType(data['foo'], 'String');
-      }
+            if (data.hasOwnProperty('bar')) {
+                obj['bar'] = ApiClient.convertToType(data['bar'], 'String');
+            }
+            if (data.hasOwnProperty('foo')) {
+                obj['foo'] = ApiClient.convertToType(data['foo'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {String} bar
-   */
-  exports.prototype['bar'] = undefined;
-  /**
-   * @member {String} foo
-   */
-  exports.prototype['foo'] = undefined;
+    /**
+    * @member {String} bar
+    */
+    bar = undefined;
+    /**
+    * @member {String} foo
+    */
+    foo = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/List.js b/samples/client/petstore/javascript-es6/src/model/List.js
index b5db0490fe4..513acd45aff 100644
--- a/samples/client/petstore/javascript-es6/src/model/List.js
+++ b/samples/client/petstore/javascript-es6/src/model/List.js
@@ -7,76 +7,74 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The List model module.
+* @module model/List
+* @version 1.0.0
+*/
+export default class List {
+    /**
+    * Constructs a new <code>List</code>.
+    * @alias module:model/List
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.List = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>List</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/List} obj Optional instance to populate.
+    * @return {module:model/List} The populated <code>List</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new List();
 
+            
+            
+            
 
-
-  /**
-   * The List model module.
-   * @module model/List
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>List</code>.
-   * @alias module:model/List
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-  };
-
-  /**
-   * Constructs a <code>List</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/List} obj Optional instance to populate.
-   * @return {module:model/List} The populated <code>List</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('123-list')) {
-        obj['123-list'] = ApiClient.convertToType(data['123-list'], 'String');
-      }
+            if (data.hasOwnProperty('123-list')) {
+                obj['123-list'] = ApiClient.convertToType(data['123-list'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {String} 123-list
-   */
-  exports.prototype['123-list'] = undefined;
+    /**
+    * @member {String} 123-list
+    */
+    123-list = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/MapTest.js b/samples/client/petstore/javascript-es6/src/model/MapTest.js
index 59f089976c1..b7a60cd8d9d 100644
--- a/samples/client/petstore/javascript-es6/src/model/MapTest.js
+++ b/samples/client/petstore/javascript-es6/src/model/MapTest.js
@@ -7,101 +7,101 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
-    }
-    root.SwaggerPetstore.MapTest = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
+
+import ApiClient from '../ApiClient';
 
 
 
 
-  /**
-   * The MapTest model module.
-   * @module model/MapTest
-   * @version 1.0.0
-   */
 
-  /**
-   * Constructs a new <code>MapTest</code>.
-   * @alias module:model/MapTest
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-  };
-
-  /**
-   * Constructs a <code>MapTest</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/MapTest} obj Optional instance to populate.
-   * @return {module:model/MapTest} The populated <code>MapTest</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('map_map_of_string')) {
-        obj['map_map_of_string'] = ApiClient.convertToType(data['map_map_of_string'], {'String': {'String': 'String'}});
-      }
-      if (data.hasOwnProperty('map_of_enum_string')) {
-        obj['map_of_enum_string'] = ApiClient.convertToType(data['map_of_enum_string'], {'String': 'String'});
-      }
-    }
-    return obj;
-  }
-
-  /**
-   * @member {Object.<String, Object.<String, String>>} map_map_of_string
-   */
-  exports.prototype['map_map_of_string'] = undefined;
-  /**
-   * @member {Object.<String, module:model/MapTest.InnerEnum>} map_of_enum_string
-   */
-  exports.prototype['map_of_enum_string'] = undefined;
-
-
-  /**
-   * Allowed values for the <code>inner</code> property.
-   * @enum {String}
-   * @readonly
-   */
-  exports.InnerEnum = {
+/**
+* The MapTest model module.
+* @module model/MapTest
+* @version 1.0.0
+*/
+export default class MapTest {
     /**
-     * value: "UPPER"
-     * @const
-     */
-    "UPPER": "UPPER",
+    * Constructs a new <code>MapTest</code>.
+    * @alias module:model/MapTest
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
+    }
+
     /**
-     * value: "lower"
-     * @const
-     */
-    "lower": "lower"  };
+    * Constructs a <code>MapTest</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/MapTest} obj Optional instance to populate.
+    * @return {module:model/MapTest} The populated <code>MapTest</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new MapTest();
+
+            
+            
+            
+
+            if (data.hasOwnProperty('map_map_of_string')) {
+                obj['map_map_of_string'] = ApiClient.convertToType(data['map_map_of_string'], {'String': {'String': 'String'}});
+            }
+            if (data.hasOwnProperty('map_of_enum_string')) {
+                obj['map_of_enum_string'] = ApiClient.convertToType(data['map_of_enum_string'], {'String': 'String'});
+            }
+        }
+        return obj;
+    }
+
+    /**
+    * @member {Object.<String, Object.<String, String>>} map_map_of_string
+    */
+    map_map_of_string = undefined;
+    /**
+    * @member {Object.<String, module:model/MapTest.InnerEnum>} map_of_enum_string
+    */
+    map_of_enum_string = undefined;
 
 
-  return exports;
-}));
+
+
+
+
+    /**
+    * Allowed values for the <code>inner</code> property.
+    * @enum {String}
+    * @readonly
+    */
+    static InnerEnum = {
+    
+        /**
+         * value: "UPPER"
+         * @const
+         */
+        "UPPER": "UPPER",
+    
+        /**
+         * value: "lower"
+         * @const
+         */
+        "lower": "lower"    
+    };
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/MixedPropertiesAndAdditionalPropertiesClass.js b/samples/client/petstore/javascript-es6/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
index 334b0773a04..6d912ceeb9b 100644
--- a/samples/client/petstore/javascript-es6/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
+++ b/samples/client/petstore/javascript-es6/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
@@ -7,92 +7,89 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/Animal'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('./Animal'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+import Animal from './Animal';
+
+
+
+
+
+/**
+* The MixedPropertiesAndAdditionalPropertiesClass model module.
+* @module model/MixedPropertiesAndAdditionalPropertiesClass
+* @version 1.0.0
+*/
+export default class MixedPropertiesAndAdditionalPropertiesClass {
+    /**
+    * Constructs a new <code>MixedPropertiesAndAdditionalPropertiesClass</code>.
+    * @alias module:model/MixedPropertiesAndAdditionalPropertiesClass
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.MixedPropertiesAndAdditionalPropertiesClass = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Animal);
-  }
-}(this, function(ApiClient, Animal) {
-  'use strict';
 
+    /**
+    * Constructs a <code>MixedPropertiesAndAdditionalPropertiesClass</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/MixedPropertiesAndAdditionalPropertiesClass} obj Optional instance to populate.
+    * @return {module:model/MixedPropertiesAndAdditionalPropertiesClass} The populated <code>MixedPropertiesAndAdditionalPropertiesClass</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new MixedPropertiesAndAdditionalPropertiesClass();
 
+            
+            
+            
 
-
-  /**
-   * The MixedPropertiesAndAdditionalPropertiesClass model module.
-   * @module model/MixedPropertiesAndAdditionalPropertiesClass
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>MixedPropertiesAndAdditionalPropertiesClass</code>.
-   * @alias module:model/MixedPropertiesAndAdditionalPropertiesClass
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-
-  };
-
-  /**
-   * Constructs a <code>MixedPropertiesAndAdditionalPropertiesClass</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/MixedPropertiesAndAdditionalPropertiesClass} obj Optional instance to populate.
-   * @return {module:model/MixedPropertiesAndAdditionalPropertiesClass} The populated <code>MixedPropertiesAndAdditionalPropertiesClass</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('uuid')) {
-        obj['uuid'] = ApiClient.convertToType(data['uuid'], 'String');
-      }
-      if (data.hasOwnProperty('dateTime')) {
-        obj['dateTime'] = ApiClient.convertToType(data['dateTime'], 'Date');
-      }
-      if (data.hasOwnProperty('map')) {
-        obj['map'] = ApiClient.convertToType(data['map'], {'String': Animal});
-      }
+            if (data.hasOwnProperty('uuid')) {
+                obj['uuid'] = ApiClient.convertToType(data['uuid'], 'String');
+            }
+            if (data.hasOwnProperty('dateTime')) {
+                obj['dateTime'] = ApiClient.convertToType(data['dateTime'], 'Date');
+            }
+            if (data.hasOwnProperty('map')) {
+                obj['map'] = ApiClient.convertToType(data['map'], {'String': Animal});
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {String} uuid
-   */
-  exports.prototype['uuid'] = undefined;
-  /**
-   * @member {Date} dateTime
-   */
-  exports.prototype['dateTime'] = undefined;
-  /**
-   * @member {Object.<String, module:model/Animal>} map
-   */
-  exports.prototype['map'] = undefined;
+    /**
+    * @member {String} uuid
+    */
+    uuid = undefined;
+    /**
+    * @member {Date} dateTime
+    */
+    dateTime = undefined;
+    /**
+    * @member {Object.<String, module:model/Animal>} map
+    */
+    map = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/Model200Response.js b/samples/client/petstore/javascript-es6/src/model/Model200Response.js
index a10e470be5c..df4d957df7c 100644
--- a/samples/client/petstore/javascript-es6/src/model/Model200Response.js
+++ b/samples/client/petstore/javascript-es6/src/model/Model200Response.js
@@ -7,85 +7,82 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The Model200Response model module.
+* @module model/Model200Response
+* @version 1.0.0
+*/
+export default class Model200Response {
+    /**
+    * Constructs a new <code>Model200Response</code>.
+    * Model for testing model name starting with number
+    * @alias module:model/Model200Response
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.Model200Response = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Model200Response</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Model200Response} obj Optional instance to populate.
+    * @return {module:model/Model200Response} The populated <code>Model200Response</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Model200Response();
 
+            
+            
+            
 
-
-  /**
-   * The Model200Response model module.
-   * @module model/Model200Response
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Model200Response</code>.
-   * Model for testing model name starting with number
-   * @alias module:model/Model200Response
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-  };
-
-  /**
-   * Constructs a <code>Model200Response</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Model200Response} obj Optional instance to populate.
-   * @return {module:model/Model200Response} The populated <code>Model200Response</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('name')) {
-        obj['name'] = ApiClient.convertToType(data['name'], 'Number');
-      }
-      if (data.hasOwnProperty('class')) {
-        obj['class'] = ApiClient.convertToType(data['class'], 'String');
-      }
+            if (data.hasOwnProperty('name')) {
+                obj['name'] = ApiClient.convertToType(data['name'], 'Number');
+            }
+            if (data.hasOwnProperty('class')) {
+                obj['class'] = ApiClient.convertToType(data['class'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} name
-   */
-  exports.prototype['name'] = undefined;
-  /**
-   * @member {String} class
-   */
-  exports.prototype['class'] = undefined;
+    /**
+    * @member {Number} name
+    */
+    name = undefined;
+    /**
+    * @member {String} class
+    */
+    class = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/ModelReturn.js b/samples/client/petstore/javascript-es6/src/model/ModelReturn.js
index 07467bbaa63..88fd97ab85f 100644
--- a/samples/client/petstore/javascript-es6/src/model/ModelReturn.js
+++ b/samples/client/petstore/javascript-es6/src/model/ModelReturn.js
@@ -7,77 +7,75 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The ModelReturn model module.
+* @module model/ModelReturn
+* @version 1.0.0
+*/
+export default class ModelReturn {
+    /**
+    * Constructs a new <code>ModelReturn</code>.
+    * Model for testing reserved words
+    * @alias module:model/ModelReturn
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.ModelReturn = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>ModelReturn</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/ModelReturn} obj Optional instance to populate.
+    * @return {module:model/ModelReturn} The populated <code>ModelReturn</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new ModelReturn();
 
+            
+            
+            
 
-
-  /**
-   * The ModelReturn model module.
-   * @module model/ModelReturn
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>ModelReturn</code>.
-   * Model for testing reserved words
-   * @alias module:model/ModelReturn
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-  };
-
-  /**
-   * Constructs a <code>ModelReturn</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/ModelReturn} obj Optional instance to populate.
-   * @return {module:model/ModelReturn} The populated <code>ModelReturn</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('return')) {
-        obj['return'] = ApiClient.convertToType(data['return'], 'Number');
-      }
+            if (data.hasOwnProperty('return')) {
+                obj['return'] = ApiClient.convertToType(data['return'], 'Number');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} return
-   */
-  exports.prototype['return'] = undefined;
+    /**
+    * @member {Number} return
+    */
+    return = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/Name.js b/samples/client/petstore/javascript-es6/src/model/Name.js
index d79c05387fe..f355fbdd403 100644
--- a/samples/client/petstore/javascript-es6/src/model/Name.js
+++ b/samples/client/petstore/javascript-es6/src/model/Name.js
@@ -7,102 +7,97 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The Name model module.
+* @module model/Name
+* @version 1.0.0
+*/
+export default class Name {
+    /**
+    * Constructs a new <code>Name</code>.
+    * Model for testing model name same as property name
+    * @alias module:model/Name
+    * @class
+    * @param name {Number} 
+    */
+
+    constructor(name) {
+        
+
+        
+        
+
+        this['name'] = name;
+
+        
     }
-    root.SwaggerPetstore.Name = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Name</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Name} obj Optional instance to populate.
+    * @return {module:model/Name} The populated <code>Name</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Name();
 
+            
+            
+            
 
-
-  /**
-   * The Name model module.
-   * @module model/Name
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Name</code>.
-   * Model for testing model name same as property name
-   * @alias module:model/Name
-   * @class
-   * @param name {Number} 
-   */
-  var exports = function(name) {
-    var _this = this;
-
-    _this['name'] = name;
-
-
-
-  };
-
-  /**
-   * Constructs a <code>Name</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Name} obj Optional instance to populate.
-   * @return {module:model/Name} The populated <code>Name</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('name')) {
-        obj['name'] = ApiClient.convertToType(data['name'], 'Number');
-      }
-      if (data.hasOwnProperty('snake_case')) {
-        obj['snake_case'] = ApiClient.convertToType(data['snake_case'], 'Number');
-      }
-      if (data.hasOwnProperty('property')) {
-        obj['property'] = ApiClient.convertToType(data['property'], 'String');
-      }
-      if (data.hasOwnProperty('123Number')) {
-        obj['123Number'] = ApiClient.convertToType(data['123Number'], 'Number');
-      }
+            if (data.hasOwnProperty('name')) {
+                obj['name'] = ApiClient.convertToType(data['name'], 'Number');
+            }
+            if (data.hasOwnProperty('snake_case')) {
+                obj['snake_case'] = ApiClient.convertToType(data['snake_case'], 'Number');
+            }
+            if (data.hasOwnProperty('property')) {
+                obj['property'] = ApiClient.convertToType(data['property'], 'String');
+            }
+            if (data.hasOwnProperty('123Number')) {
+                obj['123Number'] = ApiClient.convertToType(data['123Number'], 'Number');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} name
-   */
-  exports.prototype['name'] = undefined;
-  /**
-   * @member {Number} snake_case
-   */
-  exports.prototype['snake_case'] = undefined;
-  /**
-   * @member {String} property
-   */
-  exports.prototype['property'] = undefined;
-  /**
-   * @member {Number} 123Number
-   */
-  exports.prototype['123Number'] = undefined;
+    /**
+    * @member {Number} name
+    */
+    name = undefined;
+    /**
+    * @member {Number} snake_case
+    */
+    snake_case = undefined;
+    /**
+    * @member {String} property
+    */
+    property = undefined;
+    /**
+    * @member {Number} 123Number
+    */
+    123Number = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/NumberOnly.js b/samples/client/petstore/javascript-es6/src/model/NumberOnly.js
index c5edb0b0a50..bee66870891 100644
--- a/samples/client/petstore/javascript-es6/src/model/NumberOnly.js
+++ b/samples/client/petstore/javascript-es6/src/model/NumberOnly.js
@@ -7,76 +7,74 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The NumberOnly model module.
+* @module model/NumberOnly
+* @version 1.0.0
+*/
+export default class NumberOnly {
+    /**
+    * Constructs a new <code>NumberOnly</code>.
+    * @alias module:model/NumberOnly
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.NumberOnly = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>NumberOnly</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/NumberOnly} obj Optional instance to populate.
+    * @return {module:model/NumberOnly} The populated <code>NumberOnly</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new NumberOnly();
 
+            
+            
+            
 
-
-  /**
-   * The NumberOnly model module.
-   * @module model/NumberOnly
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>NumberOnly</code>.
-   * @alias module:model/NumberOnly
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-  };
-
-  /**
-   * Constructs a <code>NumberOnly</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/NumberOnly} obj Optional instance to populate.
-   * @return {module:model/NumberOnly} The populated <code>NumberOnly</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('JustNumber')) {
-        obj['JustNumber'] = ApiClient.convertToType(data['JustNumber'], 'Number');
-      }
+            if (data.hasOwnProperty('JustNumber')) {
+                obj['JustNumber'] = ApiClient.convertToType(data['JustNumber'], 'Number');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} JustNumber
-   */
-  exports.prototype['JustNumber'] = undefined;
+    /**
+    * @member {Number} JustNumber
+    */
+    JustNumber = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/Order.js b/samples/client/petstore/javascript-es6/src/model/Order.js
index f4f9087001d..ff704900bbc 100644
--- a/samples/client/petstore/javascript-es6/src/model/Order.js
+++ b/samples/client/petstore/javascript-es6/src/model/Order.js
@@ -7,140 +7,137 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The Order model module.
+* @module model/Order
+* @version 1.0.0
+*/
+export default class Order {
+    /**
+    * Constructs a new <code>Order</code>.
+    * @alias module:model/Order
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.Order = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Order</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Order} obj Optional instance to populate.
+    * @return {module:model/Order} The populated <code>Order</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Order();
 
+            
+            
+            
 
-
-  /**
-   * The Order model module.
-   * @module model/Order
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Order</code>.
-   * @alias module:model/Order
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-
-
-
-
-  };
-
-  /**
-   * Constructs a <code>Order</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Order} obj Optional instance to populate.
-   * @return {module:model/Order} The populated <code>Order</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('id')) {
-        obj['id'] = ApiClient.convertToType(data['id'], 'Number');
-      }
-      if (data.hasOwnProperty('petId')) {
-        obj['petId'] = ApiClient.convertToType(data['petId'], 'Number');
-      }
-      if (data.hasOwnProperty('quantity')) {
-        obj['quantity'] = ApiClient.convertToType(data['quantity'], 'Number');
-      }
-      if (data.hasOwnProperty('shipDate')) {
-        obj['shipDate'] = ApiClient.convertToType(data['shipDate'], 'Date');
-      }
-      if (data.hasOwnProperty('status')) {
-        obj['status'] = ApiClient.convertToType(data['status'], 'String');
-      }
-      if (data.hasOwnProperty('complete')) {
-        obj['complete'] = ApiClient.convertToType(data['complete'], 'Boolean');
-      }
+            if (data.hasOwnProperty('id')) {
+                obj['id'] = ApiClient.convertToType(data['id'], 'Number');
+            }
+            if (data.hasOwnProperty('petId')) {
+                obj['petId'] = ApiClient.convertToType(data['petId'], 'Number');
+            }
+            if (data.hasOwnProperty('quantity')) {
+                obj['quantity'] = ApiClient.convertToType(data['quantity'], 'Number');
+            }
+            if (data.hasOwnProperty('shipDate')) {
+                obj['shipDate'] = ApiClient.convertToType(data['shipDate'], 'Date');
+            }
+            if (data.hasOwnProperty('status')) {
+                obj['status'] = ApiClient.convertToType(data['status'], 'String');
+            }
+            if (data.hasOwnProperty('complete')) {
+                obj['complete'] = ApiClient.convertToType(data['complete'], 'Boolean');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} id
-   */
-  exports.prototype['id'] = undefined;
-  /**
-   * @member {Number} petId
-   */
-  exports.prototype['petId'] = undefined;
-  /**
-   * @member {Number} quantity
-   */
-  exports.prototype['quantity'] = undefined;
-  /**
-   * @member {Date} shipDate
-   */
-  exports.prototype['shipDate'] = undefined;
-  /**
-   * Order Status
-   * @member {module:model/Order.StatusEnum} status
-   */
-  exports.prototype['status'] = undefined;
-  /**
-   * @member {Boolean} complete
-   * @default false
-   */
-  exports.prototype['complete'] = false;
-
-
-  /**
-   * Allowed values for the <code>status</code> property.
-   * @enum {String}
-   * @readonly
-   */
-  exports.StatusEnum = {
     /**
-     * value: "placed"
-     * @const
-     */
-    "placed": "placed",
+    * @member {Number} id
+    */
+    id = undefined;
     /**
-     * value: "approved"
-     * @const
-     */
-    "approved": "approved",
+    * @member {Number} petId
+    */
+    petId = undefined;
     /**
-     * value: "delivered"
-     * @const
-     */
-    "delivered": "delivered"  };
+    * @member {Number} quantity
+    */
+    quantity = undefined;
+    /**
+    * @member {Date} shipDate
+    */
+    shipDate = undefined;
+    /**
+    * Order Status
+    * @member {module:model/Order.StatusEnum} status
+    */
+    status = undefined;
+    /**
+    * @member {Boolean} complete
+    * @default false
+    */
+    complete = false;
 
 
-  return exports;
-}));
+
+
+
+
+    /**
+    * Allowed values for the <code>status</code> property.
+    * @enum {String}
+    * @readonly
+    */
+    static StatusEnum = {
+    
+        /**
+         * value: "placed"
+         * @const
+         */
+        "placed": "placed",
+    
+        /**
+         * value: "approved"
+         * @const
+         */
+        "approved": "approved",
+    
+        /**
+         * value: "delivered"
+         * @const
+         */
+        "delivered": "delivered"    
+    };
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/OuterBoolean.js b/samples/client/petstore/javascript-es6/src/model/OuterBoolean.js
index 80f1a64b99b..592a0b69864 100644
--- a/samples/client/petstore/javascript-es6/src/model/OuterBoolean.js
+++ b/samples/client/petstore/javascript-es6/src/model/OuterBoolean.js
@@ -7,68 +7,67 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The OuterBoolean model module.
+* @module model/OuterBoolean
+* @version 1.0.0
+*/
+export default class OuterBoolean {
+    /**
+    * Constructs a new <code>OuterBoolean</code>.
+    * @alias module:model/OuterBoolean
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.OuterBoolean = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>OuterBoolean</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/OuterBoolean} obj Optional instance to populate.
+    * @return {module:model/OuterBoolean} The populated <code>OuterBoolean</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new OuterBoolean();
 
+            
+            
+            
 
-
-  /**
-   * The OuterBoolean model module.
-   * @module model/OuterBoolean
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>OuterBoolean</code>.
-   * @alias module:model/OuterBoolean
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-  };
-
-  /**
-   * Constructs a <code>OuterBoolean</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/OuterBoolean} obj Optional instance to populate.
-   * @return {module:model/OuterBoolean} The populated <code>OuterBoolean</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
+        }
+        return obj;
     }
-    return obj;
-  }
 
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/OuterComposite.js b/samples/client/petstore/javascript-es6/src/model/OuterComposite.js
index 2a40ec942b5..327e303467a 100644
--- a/samples/client/petstore/javascript-es6/src/model/OuterComposite.js
+++ b/samples/client/petstore/javascript-es6/src/model/OuterComposite.js
@@ -7,92 +7,91 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/OuterBoolean', 'model/OuterNumber', 'model/OuterString'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('./OuterBoolean'), require('./OuterNumber'), require('./OuterString'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+import OuterBoolean from './OuterBoolean';
+import OuterNumber from './OuterNumber';
+import OuterString from './OuterString';
+
+
+
+
+
+/**
+* The OuterComposite model module.
+* @module model/OuterComposite
+* @version 1.0.0
+*/
+export default class OuterComposite {
+    /**
+    * Constructs a new <code>OuterComposite</code>.
+    * @alias module:model/OuterComposite
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.OuterComposite = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.OuterBoolean, root.SwaggerPetstore.OuterNumber, root.SwaggerPetstore.OuterString);
-  }
-}(this, function(ApiClient, OuterBoolean, OuterNumber, OuterString) {
-  'use strict';
 
+    /**
+    * Constructs a <code>OuterComposite</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/OuterComposite} obj Optional instance to populate.
+    * @return {module:model/OuterComposite} The populated <code>OuterComposite</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new OuterComposite();
 
+            
+            
+            
 
-
-  /**
-   * The OuterComposite model module.
-   * @module model/OuterComposite
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>OuterComposite</code>.
-   * @alias module:model/OuterComposite
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-
-  };
-
-  /**
-   * Constructs a <code>OuterComposite</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/OuterComposite} obj Optional instance to populate.
-   * @return {module:model/OuterComposite} The populated <code>OuterComposite</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('my_number')) {
-        obj['my_number'] = OuterNumber.constructFromObject(data['my_number']);
-      }
-      if (data.hasOwnProperty('my_string')) {
-        obj['my_string'] = OuterString.constructFromObject(data['my_string']);
-      }
-      if (data.hasOwnProperty('my_boolean')) {
-        obj['my_boolean'] = OuterBoolean.constructFromObject(data['my_boolean']);
-      }
+            if (data.hasOwnProperty('my_number')) {
+                obj['my_number'] = OuterNumber.constructFromObject(data['my_number']);
+            }
+            if (data.hasOwnProperty('my_string')) {
+                obj['my_string'] = OuterString.constructFromObject(data['my_string']);
+            }
+            if (data.hasOwnProperty('my_boolean')) {
+                obj['my_boolean'] = OuterBoolean.constructFromObject(data['my_boolean']);
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {module:model/OuterNumber} my_number
-   */
-  exports.prototype['my_number'] = undefined;
-  /**
-   * @member {module:model/OuterString} my_string
-   */
-  exports.prototype['my_string'] = undefined;
-  /**
-   * @member {module:model/OuterBoolean} my_boolean
-   */
-  exports.prototype['my_boolean'] = undefined;
+    /**
+    * @member {module:model/OuterNumber} my_number
+    */
+    my_number = undefined;
+    /**
+    * @member {module:model/OuterString} my_string
+    */
+    my_string = undefined;
+    /**
+    * @member {module:model/OuterBoolean} my_boolean
+    */
+    my_boolean = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/OuterEnum.js b/samples/client/petstore/javascript-es6/src/model/OuterEnum.js
index 4ba975cf97a..bf264fd8f64 100644
--- a/samples/client/petstore/javascript-es6/src/model/OuterEnum.js
+++ b/samples/client/petstore/javascript-es6/src/model/OuterEnum.js
@@ -7,63 +7,51 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+/**
+* Enum class OuterEnum.
+* @enum {}
+* @readonly
+*/
+export default class OuterEnum {
+    
+        /**
+         * value: "placed"
+         * @const
+         */
+        placed = "placed";
+
+    
+        /**
+         * value: "approved"
+         * @const
+         */
+        approved = "approved";
+
+    
+        /**
+         * value: "delivered"
+         * @const
+         */
+        delivered = "delivered";
+
+    
+
+    /**
+    * Returns a <code>OuterEnum</code> enum value from a Javascript object name.
+    * @param {Object} data The plain JavaScript object containing the name of the enum value.
+    * @return {module:model/OuterEnum} The enum <code>OuterEnum</code> value.
+    */
+    static constructFromObject(object) {
+        return object;
     }
-    root.SwaggerPetstore.OuterEnum = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
-
-
-  /**
-   * Enum class OuterEnum.
-   * @enum {}
-   * @readonly
-   */
-  var exports = {
-    /**
-     * value: "placed"
-     * @const
-     */
-    "placed": "placed",
-    /**
-     * value: "approved"
-     * @const
-     */
-    "approved": "approved",
-    /**
-     * value: "delivered"
-     * @const
-     */
-    "delivered": "delivered"  };
-
-  /**
-   * Returns a <code>OuterEnum</code> enum value from a Javascript object name.
-   * @param {Object} data The plain JavaScript object containing the name of the enum value.
-   * @return {module:model/OuterEnum} The enum <code>OuterEnum</code> value.
-   */
-  exports.constructFromObject = function(object) {
-    return object;
-  }
-
-  return exports;
-}));
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/OuterNumber.js b/samples/client/petstore/javascript-es6/src/model/OuterNumber.js
index f3ab0768253..ff65b1588b7 100644
--- a/samples/client/petstore/javascript-es6/src/model/OuterNumber.js
+++ b/samples/client/petstore/javascript-es6/src/model/OuterNumber.js
@@ -7,68 +7,67 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The OuterNumber model module.
+* @module model/OuterNumber
+* @version 1.0.0
+*/
+export default class OuterNumber {
+    /**
+    * Constructs a new <code>OuterNumber</code>.
+    * @alias module:model/OuterNumber
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.OuterNumber = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>OuterNumber</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/OuterNumber} obj Optional instance to populate.
+    * @return {module:model/OuterNumber} The populated <code>OuterNumber</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new OuterNumber();
 
+            
+            
+            
 
-
-  /**
-   * The OuterNumber model module.
-   * @module model/OuterNumber
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>OuterNumber</code>.
-   * @alias module:model/OuterNumber
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-  };
-
-  /**
-   * Constructs a <code>OuterNumber</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/OuterNumber} obj Optional instance to populate.
-   * @return {module:model/OuterNumber} The populated <code>OuterNumber</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
+        }
+        return obj;
     }
-    return obj;
-  }
 
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/OuterString.js b/samples/client/petstore/javascript-es6/src/model/OuterString.js
index 9edb9747a67..6921029ede1 100644
--- a/samples/client/petstore/javascript-es6/src/model/OuterString.js
+++ b/samples/client/petstore/javascript-es6/src/model/OuterString.js
@@ -7,68 +7,67 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The OuterString model module.
+* @module model/OuterString
+* @version 1.0.0
+*/
+export default class OuterString {
+    /**
+    * Constructs a new <code>OuterString</code>.
+    * @alias module:model/OuterString
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.OuterString = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>OuterString</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/OuterString} obj Optional instance to populate.
+    * @return {module:model/OuterString} The populated <code>OuterString</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new OuterString();
 
+            
+            
+            
 
-
-  /**
-   * The OuterString model module.
-   * @module model/OuterString
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>OuterString</code>.
-   * @alias module:model/OuterString
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-  };
-
-  /**
-   * Constructs a <code>OuterString</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/OuterString} obj Optional instance to populate.
-   * @return {module:model/OuterString} The populated <code>OuterString</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
+        }
+        return obj;
     }
-    return obj;
-  }
 
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/Pet.js b/samples/client/petstore/javascript-es6/src/model/Pet.js
index d5e8d5010ac..bb849152027 100644
--- a/samples/client/petstore/javascript-es6/src/model/Pet.js
+++ b/samples/client/petstore/javascript-es6/src/model/Pet.js
@@ -7,141 +7,140 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/Category', 'model/Tag'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('./Category'), require('./Tag'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+import Category from './Category';
+import Tag from './Tag';
+
+
+
+
+
+/**
+* The Pet model module.
+* @module model/Pet
+* @version 1.0.0
+*/
+export default class Pet {
+    /**
+    * Constructs a new <code>Pet</code>.
+    * @alias module:model/Pet
+    * @class
+    * @param name {String} 
+    * @param photoUrls {Array.<String>} 
+    */
+
+    constructor(name, photoUrls) {
+        
+
+        
+        
+
+        this['name'] = name;this['photoUrls'] = photoUrls;
+
+        
     }
-    root.SwaggerPetstore.Pet = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Category, root.SwaggerPetstore.Tag);
-  }
-}(this, function(ApiClient, Category, Tag) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Pet</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Pet} obj Optional instance to populate.
+    * @return {module:model/Pet} The populated <code>Pet</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Pet();
 
+            
+            
+            
 
-
-  /**
-   * The Pet model module.
-   * @module model/Pet
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Pet</code>.
-   * @alias module:model/Pet
-   * @class
-   * @param name {String} 
-   * @param photoUrls {Array.<String>} 
-   */
-  var exports = function(name, photoUrls) {
-    var _this = this;
-
-
-
-    _this['name'] = name;
-    _this['photoUrls'] = photoUrls;
-
-
-  };
-
-  /**
-   * Constructs a <code>Pet</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Pet} obj Optional instance to populate.
-   * @return {module:model/Pet} The populated <code>Pet</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('id')) {
-        obj['id'] = ApiClient.convertToType(data['id'], 'Number');
-      }
-      if (data.hasOwnProperty('category')) {
-        obj['category'] = Category.constructFromObject(data['category']);
-      }
-      if (data.hasOwnProperty('name')) {
-        obj['name'] = ApiClient.convertToType(data['name'], 'String');
-      }
-      if (data.hasOwnProperty('photoUrls')) {
-        obj['photoUrls'] = ApiClient.convertToType(data['photoUrls'], ['String']);
-      }
-      if (data.hasOwnProperty('tags')) {
-        obj['tags'] = ApiClient.convertToType(data['tags'], [Tag]);
-      }
-      if (data.hasOwnProperty('status')) {
-        obj['status'] = ApiClient.convertToType(data['status'], 'String');
-      }
+            if (data.hasOwnProperty('id')) {
+                obj['id'] = ApiClient.convertToType(data['id'], 'Number');
+            }
+            if (data.hasOwnProperty('category')) {
+                obj['category'] = Category.constructFromObject(data['category']);
+            }
+            if (data.hasOwnProperty('name')) {
+                obj['name'] = ApiClient.convertToType(data['name'], 'String');
+            }
+            if (data.hasOwnProperty('photoUrls')) {
+                obj['photoUrls'] = ApiClient.convertToType(data['photoUrls'], ['String']);
+            }
+            if (data.hasOwnProperty('tags')) {
+                obj['tags'] = ApiClient.convertToType(data['tags'], [Tag]);
+            }
+            if (data.hasOwnProperty('status')) {
+                obj['status'] = ApiClient.convertToType(data['status'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} id
-   */
-  exports.prototype['id'] = undefined;
-  /**
-   * @member {module:model/Category} category
-   */
-  exports.prototype['category'] = undefined;
-  /**
-   * @member {String} name
-   */
-  exports.prototype['name'] = undefined;
-  /**
-   * @member {Array.<String>} photoUrls
-   */
-  exports.prototype['photoUrls'] = undefined;
-  /**
-   * @member {Array.<module:model/Tag>} tags
-   */
-  exports.prototype['tags'] = undefined;
-  /**
-   * pet status in the store
-   * @member {module:model/Pet.StatusEnum} status
-   */
-  exports.prototype['status'] = undefined;
-
-
-  /**
-   * Allowed values for the <code>status</code> property.
-   * @enum {String}
-   * @readonly
-   */
-  exports.StatusEnum = {
     /**
-     * value: "available"
-     * @const
-     */
-    "available": "available",
+    * @member {Number} id
+    */
+    id = undefined;
     /**
-     * value: "pending"
-     * @const
-     */
-    "pending": "pending",
+    * @member {module:model/Category} category
+    */
+    category = undefined;
     /**
-     * value: "sold"
-     * @const
-     */
-    "sold": "sold"  };
+    * @member {String} name
+    */
+    name = undefined;
+    /**
+    * @member {Array.<String>} photoUrls
+    */
+    photoUrls = undefined;
+    /**
+    * @member {Array.<module:model/Tag>} tags
+    */
+    tags = undefined;
+    /**
+    * pet status in the store
+    * @member {module:model/Pet.StatusEnum} status
+    */
+    status = undefined;
 
 
-  return exports;
-}));
+
+
+
+
+    /**
+    * Allowed values for the <code>status</code> property.
+    * @enum {String}
+    * @readonly
+    */
+    static StatusEnum = {
+    
+        /**
+         * value: "available"
+         * @const
+         */
+        "available": "available",
+    
+        /**
+         * value: "pending"
+         * @const
+         */
+        "pending": "pending",
+    
+        /**
+         * value: "sold"
+         * @const
+         */
+        "sold": "sold"    
+    };
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/ReadOnlyFirst.js b/samples/client/petstore/javascript-es6/src/model/ReadOnlyFirst.js
index 91612f15351..143b34f3eb1 100644
--- a/samples/client/petstore/javascript-es6/src/model/ReadOnlyFirst.js
+++ b/samples/client/petstore/javascript-es6/src/model/ReadOnlyFirst.js
@@ -7,84 +7,81 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The ReadOnlyFirst model module.
+* @module model/ReadOnlyFirst
+* @version 1.0.0
+*/
+export default class ReadOnlyFirst {
+    /**
+    * Constructs a new <code>ReadOnlyFirst</code>.
+    * @alias module:model/ReadOnlyFirst
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.ReadOnlyFirst = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>ReadOnlyFirst</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/ReadOnlyFirst} obj Optional instance to populate.
+    * @return {module:model/ReadOnlyFirst} The populated <code>ReadOnlyFirst</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new ReadOnlyFirst();
 
+            
+            
+            
 
-
-  /**
-   * The ReadOnlyFirst model module.
-   * @module model/ReadOnlyFirst
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>ReadOnlyFirst</code>.
-   * @alias module:model/ReadOnlyFirst
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-  };
-
-  /**
-   * Constructs a <code>ReadOnlyFirst</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/ReadOnlyFirst} obj Optional instance to populate.
-   * @return {module:model/ReadOnlyFirst} The populated <code>ReadOnlyFirst</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('bar')) {
-        obj['bar'] = ApiClient.convertToType(data['bar'], 'String');
-      }
-      if (data.hasOwnProperty('baz')) {
-        obj['baz'] = ApiClient.convertToType(data['baz'], 'String');
-      }
+            if (data.hasOwnProperty('bar')) {
+                obj['bar'] = ApiClient.convertToType(data['bar'], 'String');
+            }
+            if (data.hasOwnProperty('baz')) {
+                obj['baz'] = ApiClient.convertToType(data['baz'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {String} bar
-   */
-  exports.prototype['bar'] = undefined;
-  /**
-   * @member {String} baz
-   */
-  exports.prototype['baz'] = undefined;
+    /**
+    * @member {String} bar
+    */
+    bar = undefined;
+    /**
+    * @member {String} baz
+    */
+    baz = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/SpecialModelName.js b/samples/client/petstore/javascript-es6/src/model/SpecialModelName.js
index bb13c09d956..4e0dd379b19 100644
--- a/samples/client/petstore/javascript-es6/src/model/SpecialModelName.js
+++ b/samples/client/petstore/javascript-es6/src/model/SpecialModelName.js
@@ -7,76 +7,74 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The SpecialModelName model module.
+* @module model/SpecialModelName
+* @version 1.0.0
+*/
+export default class SpecialModelName {
+    /**
+    * Constructs a new <code>SpecialModelName</code>.
+    * @alias module:model/SpecialModelName
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.SpecialModelName = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>SpecialModelName</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/SpecialModelName} obj Optional instance to populate.
+    * @return {module:model/SpecialModelName} The populated <code>SpecialModelName</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new SpecialModelName();
 
+            
+            
+            
 
-
-  /**
-   * The SpecialModelName model module.
-   * @module model/SpecialModelName
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>SpecialModelName</code>.
-   * @alias module:model/SpecialModelName
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-  };
-
-  /**
-   * Constructs a <code>SpecialModelName</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/SpecialModelName} obj Optional instance to populate.
-   * @return {module:model/SpecialModelName} The populated <code>SpecialModelName</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('$special[property.name]')) {
-        obj['$special[property.name]'] = ApiClient.convertToType(data['$special[property.name]'], 'Number');
-      }
+            if (data.hasOwnProperty('$special[property.name]')) {
+                obj['$special[property.name]'] = ApiClient.convertToType(data['$special[property.name]'], 'Number');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} $special[property.name]
-   */
-  exports.prototype['$special[property.name]'] = undefined;
+    /**
+    * @member {Number} $special[property.name]
+    */
+    $special[property.name] = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/Tag.js b/samples/client/petstore/javascript-es6/src/model/Tag.js
index 1066827e11e..759b3fa04e3 100644
--- a/samples/client/petstore/javascript-es6/src/model/Tag.js
+++ b/samples/client/petstore/javascript-es6/src/model/Tag.js
@@ -7,84 +7,81 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The Tag model module.
+* @module model/Tag
+* @version 1.0.0
+*/
+export default class Tag {
+    /**
+    * Constructs a new <code>Tag</code>.
+    * @alias module:model/Tag
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.Tag = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Tag</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Tag} obj Optional instance to populate.
+    * @return {module:model/Tag} The populated <code>Tag</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Tag();
 
+            
+            
+            
 
-
-  /**
-   * The Tag model module.
-   * @module model/Tag
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Tag</code>.
-   * @alias module:model/Tag
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-  };
-
-  /**
-   * Constructs a <code>Tag</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Tag} obj Optional instance to populate.
-   * @return {module:model/Tag} The populated <code>Tag</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('id')) {
-        obj['id'] = ApiClient.convertToType(data['id'], 'Number');
-      }
-      if (data.hasOwnProperty('name')) {
-        obj['name'] = ApiClient.convertToType(data['name'], 'String');
-      }
+            if (data.hasOwnProperty('id')) {
+                obj['id'] = ApiClient.convertToType(data['id'], 'Number');
+            }
+            if (data.hasOwnProperty('name')) {
+                obj['name'] = ApiClient.convertToType(data['name'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} id
-   */
-  exports.prototype['id'] = undefined;
-  /**
-   * @member {String} name
-   */
-  exports.prototype['name'] = undefined;
+    /**
+    * @member {Number} id
+    */
+    id = undefined;
+    /**
+    * @member {String} name
+    */
+    name = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-es6/src/model/User.js b/samples/client/petstore/javascript-es6/src/model/User.js
index e96af875697..36311e75938 100644
--- a/samples/client/petstore/javascript-es6/src/model/User.js
+++ b/samples/client/petstore/javascript-es6/src/model/User.js
@@ -7,133 +7,124 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The User model module.
+* @module model/User
+* @version 1.0.0
+*/
+export default class User {
+    /**
+    * Constructs a new <code>User</code>.
+    * @alias module:model/User
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.User = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>User</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/User} obj Optional instance to populate.
+    * @return {module:model/User} The populated <code>User</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new User();
 
+            
+            
+            
 
-
-  /**
-   * The User model module.
-   * @module model/User
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>User</code>.
-   * @alias module:model/User
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-
-
-
-
-
-
-  };
-
-  /**
-   * Constructs a <code>User</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/User} obj Optional instance to populate.
-   * @return {module:model/User} The populated <code>User</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('id')) {
-        obj['id'] = ApiClient.convertToType(data['id'], 'Number');
-      }
-      if (data.hasOwnProperty('username')) {
-        obj['username'] = ApiClient.convertToType(data['username'], 'String');
-      }
-      if (data.hasOwnProperty('firstName')) {
-        obj['firstName'] = ApiClient.convertToType(data['firstName'], 'String');
-      }
-      if (data.hasOwnProperty('lastName')) {
-        obj['lastName'] = ApiClient.convertToType(data['lastName'], 'String');
-      }
-      if (data.hasOwnProperty('email')) {
-        obj['email'] = ApiClient.convertToType(data['email'], 'String');
-      }
-      if (data.hasOwnProperty('password')) {
-        obj['password'] = ApiClient.convertToType(data['password'], 'String');
-      }
-      if (data.hasOwnProperty('phone')) {
-        obj['phone'] = ApiClient.convertToType(data['phone'], 'String');
-      }
-      if (data.hasOwnProperty('userStatus')) {
-        obj['userStatus'] = ApiClient.convertToType(data['userStatus'], 'Number');
-      }
+            if (data.hasOwnProperty('id')) {
+                obj['id'] = ApiClient.convertToType(data['id'], 'Number');
+            }
+            if (data.hasOwnProperty('username')) {
+                obj['username'] = ApiClient.convertToType(data['username'], 'String');
+            }
+            if (data.hasOwnProperty('firstName')) {
+                obj['firstName'] = ApiClient.convertToType(data['firstName'], 'String');
+            }
+            if (data.hasOwnProperty('lastName')) {
+                obj['lastName'] = ApiClient.convertToType(data['lastName'], 'String');
+            }
+            if (data.hasOwnProperty('email')) {
+                obj['email'] = ApiClient.convertToType(data['email'], 'String');
+            }
+            if (data.hasOwnProperty('password')) {
+                obj['password'] = ApiClient.convertToType(data['password'], 'String');
+            }
+            if (data.hasOwnProperty('phone')) {
+                obj['phone'] = ApiClient.convertToType(data['phone'], 'String');
+            }
+            if (data.hasOwnProperty('userStatus')) {
+                obj['userStatus'] = ApiClient.convertToType(data['userStatus'], 'Number');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} id
-   */
-  exports.prototype['id'] = undefined;
-  /**
-   * @member {String} username
-   */
-  exports.prototype['username'] = undefined;
-  /**
-   * @member {String} firstName
-   */
-  exports.prototype['firstName'] = undefined;
-  /**
-   * @member {String} lastName
-   */
-  exports.prototype['lastName'] = undefined;
-  /**
-   * @member {String} email
-   */
-  exports.prototype['email'] = undefined;
-  /**
-   * @member {String} password
-   */
-  exports.prototype['password'] = undefined;
-  /**
-   * @member {String} phone
-   */
-  exports.prototype['phone'] = undefined;
-  /**
-   * User Status
-   * @member {Number} userStatus
-   */
-  exports.prototype['userStatus'] = undefined;
+    /**
+    * @member {Number} id
+    */
+    id = undefined;
+    /**
+    * @member {String} username
+    */
+    username = undefined;
+    /**
+    * @member {String} firstName
+    */
+    firstName = undefined;
+    /**
+    * @member {String} lastName
+    */
+    lastName = undefined;
+    /**
+    * @member {String} email
+    */
+    email = undefined;
+    /**
+    * @member {String} password
+    */
+    password = undefined;
+    /**
+    * @member {String} phone
+    */
+    phone = undefined;
+    /**
+    * User Status
+    * @member {Number} userStatus
+    */
+    userStatus = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md b/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md
index 7bfea4df889..d26ee4e74bf 100644
--- a/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md
+++ b/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md
@@ -23,16 +23,16 @@ Test serialization of outer boolean types
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.FakeApi();
+let apiInstance = new SwaggerPetstore.FakeApi();
 
-var opts = { 
+let opts = { 
   'body': new SwaggerPetstore.OuterBoolean() // OuterBoolean | Input boolean as post body
 };
-apiInstance.fakeOuterBooleanSerialize(opts).then(function(data) {
+apiInstance.fakeOuterBooleanSerialize(opts).then((data) => {
   console.log('API called successfully. Returned data: ' + data);
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
@@ -67,16 +67,16 @@ Test serialization of object with outer number type
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.FakeApi();
+let apiInstance = new SwaggerPetstore.FakeApi();
 
-var opts = { 
+let opts = { 
   'body': new SwaggerPetstore.OuterComposite() // OuterComposite | Input composite as post body
 };
-apiInstance.fakeOuterCompositeSerialize(opts).then(function(data) {
+apiInstance.fakeOuterCompositeSerialize(opts).then((data) => {
   console.log('API called successfully. Returned data: ' + data);
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
@@ -111,16 +111,16 @@ Test serialization of outer number types
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.FakeApi();
+let apiInstance = new SwaggerPetstore.FakeApi();
 
-var opts = { 
+let opts = { 
   'body': new SwaggerPetstore.OuterNumber() // OuterNumber | Input number as post body
 };
-apiInstance.fakeOuterNumberSerialize(opts).then(function(data) {
+apiInstance.fakeOuterNumberSerialize(opts).then((data) => {
   console.log('API called successfully. Returned data: ' + data);
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
@@ -155,16 +155,16 @@ Test serialization of outer string types
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.FakeApi();
+let apiInstance = new SwaggerPetstore.FakeApi();
 
-var opts = { 
+let opts = { 
   'body': new SwaggerPetstore.OuterString() // OuterString | Input string as post body
 };
-apiInstance.fakeOuterStringSerialize(opts).then(function(data) {
+apiInstance.fakeOuterStringSerialize(opts).then((data) => {
   console.log('API called successfully. Returned data: ' + data);
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
@@ -199,15 +199,15 @@ To test \&quot;client\&quot; model
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.FakeApi();
+let apiInstance = new SwaggerPetstore.FakeApi();
 
-var body = new SwaggerPetstore.Client(); // Client | client model
+let body = new SwaggerPetstore.Client(); // Client | client model
 
-apiInstance.testClientModel(body).then(function(data) {
+apiInstance.testClientModel(body).then((data) => {
   console.log('API called successfully. Returned data: ' + data);
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
@@ -242,25 +242,25 @@ Fake endpoint for testing various parameters 假端點 偽のエンドポイン
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure HTTP basic authorization: http_basic_test
-var http_basic_test = defaultClient.authentications['http_basic_test'];
+let http_basic_test = defaultClient.authentications['http_basic_test'];
 http_basic_test.username = 'YOUR USERNAME';
 http_basic_test.password = 'YOUR PASSWORD';
 
-var apiInstance = new SwaggerPetstore.FakeApi();
+let apiInstance = new SwaggerPetstore.FakeApi();
 
-var _number = 3.4; // Number | None
+let _number = 3.4; // Number | None
 
-var _double = 1.2; // Number | None
+let _double = 1.2; // Number | None
 
-var patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
+let patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
 
-var _byte = B; // Blob | None
+let _byte = B; // Blob | None
 
-var opts = { 
+let opts = { 
   'integer': 56, // Number | None
   'int32': 56, // Number | None
   'int64': 789, // Number | None
@@ -272,9 +272,9 @@ var opts = {
   'password': "password_example", // String | None
   'callback': "callback_example" // String | None
 };
-apiInstance.testEndpointParameters(_number, _double, patternWithoutDelimiter, _byte, opts).then(function() {
+apiInstance.testEndpointParameters(_number, _double, patternWithoutDelimiter, _byte, opts).then(() => {
   console.log('API called successfully.');
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
@@ -322,11 +322,11 @@ To test enum parameters
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.FakeApi();
+let apiInstance = new SwaggerPetstore.FakeApi();
 
-var opts = { 
+let opts = { 
   'enumFormStringArray': ["enumFormStringArray_example"], // [String] | Form parameter enum test (string array)
   'enumFormString': "-efg", // String | Form parameter enum test (string)
   'enumHeaderStringArray': ["enumHeaderStringArray_example"], // [String] | Header parameter enum test (string array)
@@ -336,9 +336,9 @@ var opts = {
   'enumQueryInteger': 56, // Number | Query parameter enum test (double)
   'enumQueryDouble': 1.2 // Number | Query parameter enum test (double)
 };
-apiInstance.testEnumParameters(opts).then(function() {
+apiInstance.testEnumParameters(opts).then(() => {
   console.log('API called successfully.');
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
diff --git a/samples/client/petstore/javascript-promise-es6/docs/PetApi.md b/samples/client/petstore/javascript-promise-es6/docs/PetApi.md
index 8b88dab5f5c..1d5d78f6d7a 100644
--- a/samples/client/petstore/javascript-promise-es6/docs/PetApi.md
+++ b/samples/client/petstore/javascript-promise-es6/docs/PetApi.md
@@ -24,20 +24,20 @@ Add a new pet to the store
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
+let petstore_auth = defaultClient.authentications['petstore_auth'];
 petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
 
-var apiInstance = new SwaggerPetstore.PetApi();
+let apiInstance = new SwaggerPetstore.PetApi();
 
-var body = new SwaggerPetstore.Pet(); // Pet | Pet object that needs to be added to the store
+let body = new SwaggerPetstore.Pet(); // Pet | Pet object that needs to be added to the store
 
-apiInstance.addPet(body).then(function() {
+apiInstance.addPet(body).then(() => {
   console.log('API called successfully.');
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
@@ -72,23 +72,23 @@ Deletes a pet
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
+let petstore_auth = defaultClient.authentications['petstore_auth'];
 petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
 
-var apiInstance = new SwaggerPetstore.PetApi();
+let apiInstance = new SwaggerPetstore.PetApi();
 
-var petId = 789; // Number | Pet id to delete
+let petId = 789; // Number | Pet id to delete
 
-var opts = { 
+let opts = { 
   'apiKey': "apiKey_example" // String | 
 };
-apiInstance.deletePet(petId, opts).then(function() {
+apiInstance.deletePet(petId, opts).then(() => {
   console.log('API called successfully.');
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
@@ -124,20 +124,20 @@ Multiple status values can be provided with comma separated strings
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
+let petstore_auth = defaultClient.authentications['petstore_auth'];
 petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
 
-var apiInstance = new SwaggerPetstore.PetApi();
+let apiInstance = new SwaggerPetstore.PetApi();
 
-var status = ["status_example"]; // [String] | Status values that need to be considered for filter
+let status = ["status_example"]; // [String] | Status values that need to be considered for filter
 
-apiInstance.findPetsByStatus(status).then(function(data) {
+apiInstance.findPetsByStatus(status).then((data) => {
   console.log('API called successfully. Returned data: ' + data);
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
@@ -172,20 +172,20 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
+let petstore_auth = defaultClient.authentications['petstore_auth'];
 petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
 
-var apiInstance = new SwaggerPetstore.PetApi();
+let apiInstance = new SwaggerPetstore.PetApi();
 
-var tags = ["tags_example"]; // [String] | Tags to filter by
+let tags = ["tags_example"]; // [String] | Tags to filter by
 
-apiInstance.findPetsByTags(tags).then(function(data) {
+apiInstance.findPetsByTags(tags).then((data) => {
   console.log('API called successfully. Returned data: ' + data);
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
@@ -220,22 +220,22 @@ Returns a single pet
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure API key authorization: api_key
-var api_key = defaultClient.authentications['api_key'];
+let api_key = defaultClient.authentications['api_key'];
 api_key.apiKey = 'YOUR API KEY';
 // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
 //api_key.apiKeyPrefix = 'Token';
 
-var apiInstance = new SwaggerPetstore.PetApi();
+let apiInstance = new SwaggerPetstore.PetApi();
 
-var petId = 789; // Number | ID of pet to return
+let petId = 789; // Number | ID of pet to return
 
-apiInstance.getPetById(petId).then(function(data) {
+apiInstance.getPetById(petId).then((data) => {
   console.log('API called successfully. Returned data: ' + data);
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
@@ -270,20 +270,20 @@ Update an existing pet
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
+let petstore_auth = defaultClient.authentications['petstore_auth'];
 petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
 
-var apiInstance = new SwaggerPetstore.PetApi();
+let apiInstance = new SwaggerPetstore.PetApi();
 
-var body = new SwaggerPetstore.Pet(); // Pet | Pet object that needs to be added to the store
+let body = new SwaggerPetstore.Pet(); // Pet | Pet object that needs to be added to the store
 
-apiInstance.updatePet(body).then(function() {
+apiInstance.updatePet(body).then(() => {
   console.log('API called successfully.');
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
@@ -318,24 +318,24 @@ Updates a pet in the store with form data
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
+let petstore_auth = defaultClient.authentications['petstore_auth'];
 petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
 
-var apiInstance = new SwaggerPetstore.PetApi();
+let apiInstance = new SwaggerPetstore.PetApi();
 
-var petId = 789; // Number | ID of pet that needs to be updated
+let petId = 789; // Number | ID of pet that needs to be updated
 
-var opts = { 
+let opts = { 
   'name': "name_example", // String | Updated name of the pet
   'status': "status_example" // String | Updated status of the pet
 };
-apiInstance.updatePetWithForm(petId, opts).then(function() {
+apiInstance.updatePetWithForm(petId, opts).then(() => {
   console.log('API called successfully.');
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
@@ -372,24 +372,24 @@ uploads an image
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
+let petstore_auth = defaultClient.authentications['petstore_auth'];
 petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
 
-var apiInstance = new SwaggerPetstore.PetApi();
+let apiInstance = new SwaggerPetstore.PetApi();
 
-var petId = 789; // Number | ID of pet to update
+let petId = 789; // Number | ID of pet to update
 
-var opts = { 
+let opts = { 
   'additionalMetadata': "additionalMetadata_example", // String | Additional data to pass to server
   'file': "/path/to/file.txt" // File | file to upload
 };
-apiInstance.uploadFile(petId, opts).then(function(data) {
+apiInstance.uploadFile(petId, opts).then((data) => {
   console.log('API called successfully. Returned data: ' + data);
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
diff --git a/samples/client/petstore/javascript-promise-es6/docs/StoreApi.md b/samples/client/petstore/javascript-promise-es6/docs/StoreApi.md
index e0771378536..9f931097e03 100644
--- a/samples/client/petstore/javascript-promise-es6/docs/StoreApi.md
+++ b/samples/client/petstore/javascript-promise-es6/docs/StoreApi.md
@@ -20,15 +20,15 @@ For valid response try integer IDs with value &lt; 1000. Anything above 1000 or
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.StoreApi();
+let apiInstance = new SwaggerPetstore.StoreApi();
 
-var orderId = "orderId_example"; // String | ID of the order that needs to be deleted
+let orderId = "orderId_example"; // String | ID of the order that needs to be deleted
 
-apiInstance.deleteOrder(orderId).then(function() {
+apiInstance.deleteOrder(orderId).then(() => {
   console.log('API called successfully.');
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
@@ -63,19 +63,19 @@ Returns a map of status codes to quantities
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure API key authorization: api_key
-var api_key = defaultClient.authentications['api_key'];
+let api_key = defaultClient.authentications['api_key'];
 api_key.apiKey = 'YOUR API KEY';
 // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
 //api_key.apiKeyPrefix = 'Token';
 
-var apiInstance = new SwaggerPetstore.StoreApi();
-apiInstance.getInventory().then(function(data) {
+let apiInstance = new SwaggerPetstore.StoreApi();
+apiInstance.getInventory().then((data) => {
   console.log('API called successfully. Returned data: ' + data);
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
@@ -107,15 +107,15 @@ For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other val
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.StoreApi();
+let apiInstance = new SwaggerPetstore.StoreApi();
 
-var orderId = 789; // Number | ID of pet that needs to be fetched
+let orderId = 789; // Number | ID of pet that needs to be fetched
 
-apiInstance.getOrderById(orderId).then(function(data) {
+apiInstance.getOrderById(orderId).then((data) => {
   console.log('API called successfully. Returned data: ' + data);
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
@@ -150,15 +150,15 @@ Place an order for a pet
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.StoreApi();
+let apiInstance = new SwaggerPetstore.StoreApi();
 
-var body = new SwaggerPetstore.Order(); // Order | order placed for purchasing the pet
+let body = new SwaggerPetstore.Order(); // Order | order placed for purchasing the pet
 
-apiInstance.placeOrder(body).then(function(data) {
+apiInstance.placeOrder(body).then((data) => {
   console.log('API called successfully. Returned data: ' + data);
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
diff --git a/samples/client/petstore/javascript-promise-es6/docs/UserApi.md b/samples/client/petstore/javascript-promise-es6/docs/UserApi.md
index 3102a61d648..df53e06d15b 100644
--- a/samples/client/petstore/javascript-promise-es6/docs/UserApi.md
+++ b/samples/client/petstore/javascript-promise-es6/docs/UserApi.md
@@ -24,15 +24,15 @@ This can only be done by the logged in user.
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.UserApi();
+let apiInstance = new SwaggerPetstore.UserApi();
 
-var body = new SwaggerPetstore.User(); // User | Created user object
+let body = new SwaggerPetstore.User(); // User | Created user object
 
-apiInstance.createUser(body).then(function() {
+apiInstance.createUser(body).then(() => {
   console.log('API called successfully.');
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
@@ -67,15 +67,15 @@ Creates list of users with given input array
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.UserApi();
+let apiInstance = new SwaggerPetstore.UserApi();
 
-var body = [new SwaggerPetstore.User()]; // [User] | List of user object
+let body = [new SwaggerPetstore.User()]; // [User] | List of user object
 
-apiInstance.createUsersWithArrayInput(body).then(function() {
+apiInstance.createUsersWithArrayInput(body).then(() => {
   console.log('API called successfully.');
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
@@ -110,15 +110,15 @@ Creates list of users with given input array
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.UserApi();
+let apiInstance = new SwaggerPetstore.UserApi();
 
-var body = [new SwaggerPetstore.User()]; // [User] | List of user object
+let body = [new SwaggerPetstore.User()]; // [User] | List of user object
 
-apiInstance.createUsersWithListInput(body).then(function() {
+apiInstance.createUsersWithListInput(body).then(() => {
   console.log('API called successfully.');
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
@@ -153,15 +153,15 @@ This can only be done by the logged in user.
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.UserApi();
+let apiInstance = new SwaggerPetstore.UserApi();
 
-var username = "username_example"; // String | The name that needs to be deleted
+let username = "username_example"; // String | The name that needs to be deleted
 
-apiInstance.deleteUser(username).then(function() {
+apiInstance.deleteUser(username).then(() => {
   console.log('API called successfully.');
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
@@ -196,15 +196,15 @@ Get user by user name
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.UserApi();
+let apiInstance = new SwaggerPetstore.UserApi();
 
-var username = "username_example"; // String | The name that needs to be fetched. Use user1 for testing. 
+let username = "username_example"; // String | The name that needs to be fetched. Use user1 for testing. 
 
-apiInstance.getUserByName(username).then(function(data) {
+apiInstance.getUserByName(username).then((data) => {
   console.log('API called successfully. Returned data: ' + data);
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
@@ -239,17 +239,17 @@ Logs user into the system
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.UserApi();
+let apiInstance = new SwaggerPetstore.UserApi();
 
-var username = "username_example"; // String | The user name for login
+let username = "username_example"; // String | The user name for login
 
-var password = "password_example"; // String | The password for login in clear text
+let password = "password_example"; // String | The password for login in clear text
 
-apiInstance.loginUser(username, password).then(function(data) {
+apiInstance.loginUser(username, password).then((data) => {
   console.log('API called successfully. Returned data: ' + data);
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
@@ -285,12 +285,12 @@ Logs out current logged in user session
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.UserApi();
-apiInstance.logoutUser().then(function() {
+let apiInstance = new SwaggerPetstore.UserApi();
+apiInstance.logoutUser().then(() => {
   console.log('API called successfully.');
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
@@ -322,17 +322,17 @@ This can only be done by the logged in user.
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.UserApi();
+let apiInstance = new SwaggerPetstore.UserApi();
 
-var username = "username_example"; // String | name that need to be deleted
+let username = "username_example"; // String | name that need to be deleted
 
-var body = new SwaggerPetstore.User(); // User | Updated user object
+let body = new SwaggerPetstore.User(); // User | Updated user object
 
-apiInstance.updateUser(username, body).then(function() {
+apiInstance.updateUser(username, body).then(() => {
   console.log('API called successfully.');
-}, function(error) {
+}, (error) => {
   console.error(error);
 });
 
diff --git a/samples/client/petstore/javascript-promise-es6/package.json b/samples/client/petstore/javascript-promise-es6/package.json
index 881163c02f4..0332217891a 100644
--- a/samples/client/petstore/javascript-promise-es6/package.json
+++ b/samples/client/petstore/javascript-promise-es6/package.json
@@ -5,17 +5,22 @@
   "license": "Unlicense",
   "main": "src/index.js",
   "scripts": {
-    "test": "./node_modules/mocha/bin/mocha --recursive"
+    "test": "mocha --compilers js:babel-core/register --recursive"
   },
   "browser": {
     "fs": false
   },
   "dependencies": {
+    "babel": "^6.23.0",
+    "babel-cli": "^6.24.1",
     "superagent": "3.5.2"
   },
   "devDependencies": {
+    "babel-core": "6.18.0",
+    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-stage-0": "^6.24.1",
+    "expect.js": "~0.3.1",
     "mocha": "~2.3.4",
-    "sinon": "1.17.3",
-    "expect.js": "~0.3.1"
+    "sinon": "1.17.3"
   }
 }
diff --git a/samples/client/petstore/javascript-promise-es6/src/ApiClient.js b/samples/client/petstore/javascript-promise-es6/src/ApiClient.js
index 76e1384fdb1..c7dcea0de86 100644
--- a/samples/client/petstore/javascript-promise-es6/src/ApiClient.js
+++ b/samples/client/petstore/javascript-promise-es6/src/ApiClient.js
@@ -7,553 +7,562 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['superagent', 'querystring'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('superagent'), require('querystring'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import superagent from "superagent";
+import querystring from "querystring";
+
+/**
+* @module ApiClient
+* @version 1.0.0
+*/
+
+/**
+* Manages low level client-server communications, parameter marshalling, etc. There should not be any need for an
+* application to use this class directly - the *Api and model classes provide the public API for the service. The
+* contents of this file should be regarded as internal but are documented for completeness.
+* @alias module:ApiClient
+* @class
+*/
+export default class ApiClient {
+    constructor() {
+        /**
+         * The base URL against which to resolve every API call's (relative) path.
+         * @type {String}
+         * @default http://petstore.swagger.io:80/v2
+         */
+        this.basePath = 'http://petstore.swagger.io:80/v2'.replace(/\/+$/, '');
+
+        /**
+         * The authentication methods to be included for all API calls.
+         * @type {Array.<String>}
+         */
+        this.authentications = {
+            'api_key': {type: 'apiKey', 'in': 'header', name: 'api_key'},
+            'http_basic_test': {type: 'basic'},
+            'petstore_auth': {type: 'oauth2'}
+        }
+
+        /**
+         * The default HTTP headers to be included for all API calls.
+         * @type {Array.<String>}
+         * @default {}
+         */
+        this.defaultHeaders = {};
+
+        /**
+         * The default HTTP timeout for all API calls.
+         * @type {Number}
+         * @default 60000
+         */
+        this.timeout = 60000;
+
+        /**
+         * If set to false an additional timestamp parameter is added to all API GET calls to
+         * prevent browser caching
+         * @type {Boolean}
+         * @default true
+         */
+        this.cache = true;
+
+        /**
+         * If set to true, the client will save the cookies from each server
+         * response, and return them in the next request.
+         * @default false
+         */
+        this.enableCookies = false;
+
+        /*
+         * Used to save and return cookies in a node.js (non-browser) setting,
+         * if this.enableCookies is set to true.
+         */
+        if (typeof window === 'undefined') {
+          this.agent = new superagent.agent();
+        }
     }
-    root.SwaggerPetstore.ApiClient = factory(root.superagent, root.querystring);
-  }
-}(this, function(superagent, querystring) {
-  'use strict';
-
-  /**
-   * @module ApiClient
-   * @version 1.0.0
-   */
-
-  /**
-   * Manages low level client-server communications, parameter marshalling, etc. There should not be any need for an
-   * application to use this class directly - the *Api and model classes provide the public API for the service. The
-   * contents of this file should be regarded as internal but are documented for completeness.
-   * @alias module:ApiClient
-   * @class
-   */
-  var exports = function() {
-    /**
-     * The base URL against which to resolve every API call's (relative) path.
-     * @type {String}
-     * @default http://petstore.swagger.io:80/v2
-     */
-    this.basePath = 'http://petstore.swagger.io:80/v2'.replace(/\/+$/, '');
 
     /**
-     * The authentication methods to be included for all API calls.
-     * @type {Array.<String>}
-     */
-    this.authentications = {
-      'api_key': {type: 'apiKey', 'in': 'header', name: 'api_key'},
-      'http_basic_test': {type: 'basic'},
-      'petstore_auth': {type: 'oauth2'}
+    * Returns a string representation for an actual parameter.
+    * @param param The actual parameter.
+    * @returns {String} The string representation of <code>param</code>.
+    */
+    paramToString(param) {
+        if (param == undefined || param == null) {
+            return '';
+        }
+        if (param instanceof Date) {
+            return param.toJSON();
+        }
+
+        return param.toString();
+    }
+
+    /**
+    * Builds full URL by appending the given path to the base URL and replacing path parameter place-holders with parameter values.
+    * NOTE: query parameters are not handled here.
+    * @param {String} path The path to append to the base URL.
+    * @param {Object} pathParams The parameter values to append.
+    * @returns {String} The encoded path with parameter values substituted.
+    */
+    buildUrl(path, pathParams) {
+        if (!path.match(/^\//)) {
+            path = '/' + path;
+        }
+
+        var url = this.basePath + path;
+        url = url.replace(/\{([\w-]+)\}/g, (fullMatch, key) => {
+            var value;
+            if (pathParams.hasOwnProperty(key)) {
+                value = this.paramToString(pathParams[key]);
+            } else {
+                value = fullMatch;
+            }
+
+            return encodeURIComponent(value);
+        });
+
+        return url;
+    }
+
+    /**
+    * Checks whether the given content type represents JSON.<br>
+    * JSON content type examples:<br>
+    * <ul>
+    * <li>application/json</li>
+    * <li>application/json; charset=UTF8</li>
+    * <li>APPLICATION/JSON</li>
+    * </ul>
+    * @param {String} contentType The MIME content type to check.
+    * @returns {Boolean} <code>true</code> if <code>contentType</code> represents JSON, otherwise <code>false</code>.
+    */
+    isJsonMime(contentType) {
+        return Boolean(contentType != null && contentType.match(/^application\/json(;.*)?$/i));
+    }
+
+    /**
+    * Chooses a content type from the given array, with JSON preferred; i.e. return JSON if included, otherwise return the first.
+    * @param {Array.<String>} contentTypes
+    * @returns {String} The chosen content type, preferring JSON.
+    */
+    jsonPreferredMime(contentTypes) {
+        for (var i = 0; i < contentTypes.length; i++) {
+            if (this.isJsonMime(contentTypes[i])) {
+                return contentTypes[i];
+            }
+        }
+
+        return contentTypes[0];
+    }
+
+    /**
+    * Checks whether the given parameter value represents file-like content.
+    * @param param The parameter to check.
+    * @returns {Boolean} <code>true</code> if <code>param</code> represents a file.
+    */
+    isFileParam(param) {
+        // fs.ReadStream in Node.js and Electron (but not in runtime like browserify)
+        if (typeof require === 'function') {
+            let fs;
+            try {
+                fs = require('fs');
+            } catch (err) {}
+            if (fs && fs.ReadStream && param instanceof fs.ReadStream) {
+                return true;
+            }
+        }
+
+        // Buffer in Node.js
+        if (typeof Buffer === 'function' && param instanceof Buffer) {
+            return true;
+        }
+
+        // Blob in browser
+        if (typeof Blob === 'function' && param instanceof Blob) {
+            return true;
+        }
+
+        // File in browser (it seems File object is also instance of Blob, but keep this for safe)
+        if (typeof File === 'function' && param instanceof File) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+    * Normalizes parameter values:
+    * <ul>
+    * <li>remove nils</li>
+    * <li>keep files and arrays</li>
+    * <li>format to string with `paramToString` for other cases</li>
+    * </ul>
+    * @param {Object.<String, Object>} params The parameters as object properties.
+    * @returns {Object.<String, Object>} normalized parameters.
+    */
+    normalizeParams(params) {
+        var newParams = {};
+        for (var key in params) {
+            if (params.hasOwnProperty(key) && params[key] != undefined && params[key] != null) {
+                var value = params[key];
+                if (this.isFileParam(value) || Array.isArray(value)) {
+                    newParams[key] = value;
+                } else {
+                    newParams[key] = this.paramToString(value);
+                }
+            }
+        }
+
+        return newParams;
+    }
+
+    /**
+    * Enumeration of collection format separator strategies.
+    * @enum {String}
+    * @readonly
+    */
+    static CollectionFormatEnum = {
+        /**
+         * Comma-separated values. Value: <code>csv</code>
+         * @const
+         */
+        CSV: ',',
+
+        /**
+         * Space-separated values. Value: <code>ssv</code>
+         * @const
+         */
+        SSV: ' ',
+
+        /**
+         * Tab-separated values. Value: <code>tsv</code>
+         * @const
+         */
+        TSV: '\t',
+
+        /**
+         * Pipe(|)-separated values. Value: <code>pipes</code>
+         * @const
+         */
+        PIPES: '|',
+
+        /**
+         * Native array. Value: <code>multi</code>
+         * @const
+         */
+        MULTI: 'multi'
     };
-    /**
-     * The default HTTP headers to be included for all API calls.
-     * @type {Array.<String>}
-     * @default {}
-     */
-    this.defaultHeaders = {};
 
     /**
-     * The default HTTP timeout for all API calls.
-     * @type {Number}
-     * @default 60000
-     */
-    this.timeout = 60000;
+    * Builds a string representation of an array-type actual parameter, according to the given collection format.
+    * @param {Array} param An array parameter.
+    * @param {module:ApiClient.CollectionFormatEnum} collectionFormat The array element separator strategy.
+    * @returns {String|Array} A string representation of the supplied collection, using the specified delimiter. Returns
+    * <code>param</code> as is if <code>collectionFormat</code> is <code>multi</code>.
+    */
+    buildCollectionParam(param, collectionFormat) {
+        if (param == null) {
+            return null;
+        }
+        switch (collectionFormat) {
+            case 'csv':
+                return param.map(this.paramToString).join(',');
+            case 'ssv':
+                return param.map(this.paramToString).join(' ');
+            case 'tsv':
+                return param.map(this.paramToString).join('\t');
+            case 'pipes':
+                return param.map(this.paramToString).join('|');
+            case 'multi':
+                //return the array directly as SuperAgent will handle it as expected
+                return param.map(this.paramToString);
+            default:
+                throw new Error('Unknown collection format: ' + collectionFormat);
+        }
+    }
 
     /**
-     * If set to false an additional timestamp parameter is added to all API GET calls to
-     * prevent browser caching
-     * @type {Boolean}
-     * @default true
-     */
-    this.cache = true;
+    * Applies authentication headers to the request.
+    * @param {Object} request The request object created by a <code>superagent()</code> call.
+    * @param {Array.<String>} authNames An array of authentication method names.
+    */
+    applyAuthToRequest(request, authNames) {
+        authNames.forEach((authName) => {
+            var auth = this.authentications[authName];
+            switch (auth.type) {
+                case 'basic':
+                    if (auth.username || auth.password) {
+                        request.auth(auth.username || '', auth.password || '');
+                    }
+
+                    break;
+                case 'apiKey':
+                    if (auth.apiKey) {
+                        var data = {};
+                        if (auth.apiKeyPrefix) {
+                            data[auth.name] = auth.apiKeyPrefix + ' ' + auth.apiKey;
+                        } else {
+                            data[auth.name] = auth.apiKey;
+                        }
+
+                        if (auth['in'] === 'header') {
+                            request.set(data);
+                        } else {
+                            request.query(data);
+                        }
+                    }
+
+                    break;
+                case 'oauth2':
+                    if (auth.accessToken) {
+                        request.set({'Authorization': 'Bearer ' + auth.accessToken});
+                    }
+
+                    break;
+                default:
+                    throw new Error('Unknown authentication type: ' + auth.type);
+            }
+        });
+    }
 
     /**
-     * If set to true, the client will save the cookies from each server
-     * response, and return them in the next request.
-     * @default false
-     */
-    this.enableCookies = false;
+    * Deserializes an HTTP response body into a value of the specified type.
+    * @param {Object} response A SuperAgent response object.
+    * @param {(String|Array.<String>|Object.<String, Object>|Function)} returnType The type to return. Pass a string for simple types
+    * or the constructor function for a complex type. Pass an array containing the type name to return an array of that type. To
+    * return an object, pass an object with one property whose name is the key type and whose value is the corresponding value type:
+    * all properties on <code>data<code> will be converted to this type.
+    * @returns A value of the specified type.
+    */
+    deserialize(response, returnType) {
+        if (response == null || returnType == null || response.status == 204) {
+            return null;
+        }
 
-    /*
-     * Used to save and return cookies in a node.js (non-browser) setting,
-     * if this.enableCookies is set to true.
-     */
-    if (typeof window === 'undefined') {
-      this.agent = new superagent.agent();
+        // Rely on SuperAgent for parsing response body.
+        // See http://visionmedia.github.io/superagent/#parsing-response-bodies
+        var data = response.body;
+        if (data == null || (typeof data === 'object' && typeof data.length === 'undefined' && !Object.keys(data).length)) {
+            // SuperAgent does not always produce a body; use the unparsed response as a fallback
+            data = response.text;
+        }
+
+        return ApiClient.convertToType(data, returnType);
     }
 
-  };
+    
 
-  /**
-   * Returns a string representation for an actual parameter.
-   * @param param The actual parameter.
-   * @returns {String} The string representation of <code>param</code>.
-   */
-  exports.prototype.paramToString = function(param) {
-    if (param == undefined || param == null) {
-      return '';
-    }
-    if (param instanceof Date) {
-      return param.toJSON();
-    }
-    return param.toString();
-  };
+    /**
+    * Invokes the REST service using the supplied settings and parameters.
+    * @param {String} path The base URL to invoke.
+    * @param {String} httpMethod The HTTP method to use.
+    * @param {Object.<String, String>} pathParams A map of path parameters and their values.
+    * @param {Object.<String, Object>} queryParams A map of query parameters and their values.
+    * @param {Object.<String, Object>} headerParams A map of header parameters and their values.
+    * @param {Object.<String, Object>} formParams A map of form parameters and their values.
+    * @param {Object} bodyParam The value to pass as the request body.
+    * @param {Array.<String>} authNames An array of authentication type names.
+    * @param {Array.<String>} contentTypes An array of request MIME types.
+    * @param {Array.<String>} accepts An array of acceptable response MIME types.
+    * @param {(String|Array|ObjectFunction)} returnType The required type to return; can be a string for simple types or the
+    * constructor for a complex type.
+    * @returns {Promise} A {@link https://www.promisejs.org/|Promise} object.
+    */
+    callApi(path, httpMethod, pathParams,
+        queryParams, headerParams, formParams, bodyParam, authNames, contentTypes, accepts,
+        returnType) {
 
-  /**
-   * Builds full URL by appending the given path to the base URL and replacing path parameter place-holders with parameter values.
-   * NOTE: query parameters are not handled here.
-   * @param {String} path The path to append to the base URL.
-   * @param {Object} pathParams The parameter values to append.
-   * @returns {String} The encoded path with parameter values substituted.
-   */
-  exports.prototype.buildUrl = function(path, pathParams) {
-    if (!path.match(/^\//)) {
-      path = '/' + path;
-    }
-    var url = this.basePath + path;
-    var _this = this;
-    url = url.replace(/\{([\w-]+)\}/g, function(fullMatch, key) {
-      var value;
-      if (pathParams.hasOwnProperty(key)) {
-        value = _this.paramToString(pathParams[key]);
-      } else {
-        value = fullMatch;
-      }
-      return encodeURIComponent(value);
-    });
-    return url;
-  };
+        var url = this.buildUrl(path, pathParams);
+        var request = superagent(httpMethod, url);
 
-  /**
-   * Checks whether the given content type represents JSON.<br>
-   * JSON content type examples:<br>
-   * <ul>
-   * <li>application/json</li>
-   * <li>application/json; charset=UTF8</li>
-   * <li>APPLICATION/JSON</li>
-   * </ul>
-   * @param {String} contentType The MIME content type to check.
-   * @returns {Boolean} <code>true</code> if <code>contentType</code> represents JSON, otherwise <code>false</code>.
-   */
-  exports.prototype.isJsonMime = function(contentType) {
-    return Boolean(contentType != null && contentType.match(/^application\/json(;.*)?$/i));
-  };
+        // apply authentications
+        this.applyAuthToRequest(request, authNames);
 
-  /**
-   * Chooses a content type from the given array, with JSON preferred; i.e. return JSON if included, otherwise return the first.
-   * @param {Array.<String>} contentTypes
-   * @returns {String} The chosen content type, preferring JSON.
-   */
-  exports.prototype.jsonPreferredMime = function(contentTypes) {
-    for (var i = 0; i < contentTypes.length; i++) {
-      if (this.isJsonMime(contentTypes[i])) {
-        return contentTypes[i];
-      }
-    }
-    return contentTypes[0];
-  };
+        // set query parameters
+        if (httpMethod.toUpperCase() === 'GET' && this.cache === false) {
+            queryParams['_'] = new Date().getTime();
+        }
 
-  /**
-   * Checks whether the given parameter value represents file-like content.
-   * @param param The parameter to check.
-   * @returns {Boolean} <code>true</code> if <code>param</code> represents a file.
-   */
-  exports.prototype.isFileParam = function(param) {
-    // fs.ReadStream in Node.js and Electron (but not in runtime like browserify)
-    if (typeof require === 'function') {
-      var fs;
-      try {
-        fs = require('fs');
-      } catch (err) {}
-      if (fs && fs.ReadStream && param instanceof fs.ReadStream) {
-        return true;
-      }
-    }
-    // Buffer in Node.js
-    if (typeof Buffer === 'function' && param instanceof Buffer) {
-      return true;
-    }
-    // Blob in browser
-    if (typeof Blob === 'function' && param instanceof Blob) {
-      return true;
-    }
-    // File in browser (it seems File object is also instance of Blob, but keep this for safe)
-    if (typeof File === 'function' && param instanceof File) {
-      return true;
-    }
-    return false;
-  };
+        request.query(this.normalizeParams(queryParams));
 
-  /**
-   * Normalizes parameter values:
-   * <ul>
-   * <li>remove nils</li>
-   * <li>keep files and arrays</li>
-   * <li>format to string with `paramToString` for other cases</li>
-   * </ul>
-   * @param {Object.<String, Object>} params The parameters as object properties.
-   * @returns {Object.<String, Object>} normalized parameters.
-   */
-  exports.prototype.normalizeParams = function(params) {
-    var newParams = {};
-    for (var key in params) {
-      if (params.hasOwnProperty(key) && params[key] != undefined && params[key] != null) {
-        var value = params[key];
-        if (this.isFileParam(value) || Array.isArray(value)) {
-          newParams[key] = value;
+        // set header parameters
+        request.set(this.defaultHeaders).set(this.normalizeParams(headerParams));
+
+        // set request timeout
+        request.timeout(this.timeout);
+
+        var contentType = this.jsonPreferredMime(contentTypes);
+        if (contentType) {
+            // Issue with superagent and multipart/form-data (https://github.com/visionmedia/superagent/issues/746)
+            if(contentType != 'multipart/form-data') {
+                request.type(contentType);
+            }
+        } else if (!request.header['Content-Type']) {
+            request.type('application/json');
+        }
+
+        if (contentType === 'application/x-www-form-urlencoded') {
+            request.send(querystring.stringify(this.normalizeParams(formParams)));
+        } else if (contentType == 'multipart/form-data') {
+            var _formParams = this.normalizeParams(formParams);
+            for (var key in _formParams) {
+                if (_formParams.hasOwnProperty(key)) {
+                    if (this.isFileParam(_formParams[key])) {
+                        // file field
+                        request.attach(key, _formParams[key]);
+                    } else {
+                        request.field(key, _formParams[key]);
+                    }
+                }
+            }
+        } else if (bodyParam) {
+            request.send(bodyParam);
+        }
+
+        var accept = this.jsonPreferredMime(accepts);
+        if (accept) {
+            request.accept(accept);
+        }
+
+        if (returnType === 'Blob') {
+          request.responseType('blob');
+        } else if (returnType === 'String') {
+          request.responseType('string');
+        }
+
+        // Attach previously saved cookies, if enabled
+        if (this.enableCookies){
+            if (typeof window === 'undefined') {
+                this.agent.attachCookies(request);
+            }
+            else {
+                request.withCredentials();
+            }
+        }
+
+        return new Promise((resolve, reject) => {
+            request.end((error, response) => {
+                if (error) {
+                    reject(error);
+                } else {
+                    try {
+                        var data = this.deserialize(response, returnType);
+                        if (this.enableCookies && typeof window === 'undefined'){
+                            this.agent.saveCookies(response);
+                        }
+
+                        resolve({data, response});
+                    } catch (err) {
+                        reject(err);
+                    }
+                }
+            });
+        });
+
+        
+    }
+
+    /**
+    * Parses an ISO-8601 string representation of a date value.
+    * @param {String} str The date value as a string.
+    * @returns {Date} The parsed date object.
+    */
+    static parseDate(str) {
+        return new Date(str.replace(/T/i, ' '));
+    }
+
+    /**
+    * Converts a value to the specified type.
+    * @param {(String|Object)} data The data to convert, as a string or object.
+    * @param {(String|Array.<String>|Object.<String, Object>|Function)} type The type to return. Pass a string for simple types
+    * or the constructor function for a complex type. Pass an array containing the type name to return an array of that type. To
+    * return an object, pass an object with one property whose name is the key type and whose value is the corresponding value type:
+    * all properties on <code>data<code> will be converted to this type.
+    * @returns An instance of the specified type or null or undefined if data is null or undefined.
+    */
+    static convertToType(data, type) {
+        if (data === null || data === undefined)
+            return data
+
+        switch (type) {
+            case 'Boolean':
+                return Boolean(data);
+            case 'Integer':
+                return parseInt(data, 10);
+            case 'Number':
+                return parseFloat(data);
+            case 'String':
+                return String(data);
+            case 'Date':
+                return ApiClient.parseDate(String(data));
+            case 'Blob':
+                return data;
+            default:
+                if (type === Object) {
+                    // generic object, return directly
+                    return data;
+                } else if (typeof type === 'function') {
+                    // for model type like: User
+                    return type.constructFromObject(data);
+                } else if (Array.isArray(type)) {
+                    // for array type like: ['String']
+                    var itemType = type[0];
+
+                    return data.map((item) => {
+                        return ApiClient.convertToType(item, itemType);
+                    });
+                } else if (typeof type === 'object') {
+                    // for plain object type like: {'String': 'Integer'}
+                    var keyType, valueType;
+                    for (var k in type) {
+                        if (type.hasOwnProperty(k)) {
+                            keyType = k;
+                            valueType = type[k];
+                            break;
+                        }
+                    }
+
+                    var result = {};
+                    for (var k in data) {
+                        if (data.hasOwnProperty(k)) {
+                            var key = ApiClient.convertToType(k, keyType);
+                            var value = ApiClient.convertToType(data[k], valueType);
+                            result[key] = value;
+                        }
+                    }
+
+                    return result;
+                } else {
+                    // for unknown type, return the data directly
+                    return data;
+                }
+        }
+    }
+
+    /**
+    * Constructs a new map or array model from REST data.
+    * @param data {Object|Array} The REST data.
+    * @param obj {Object|Array} The target object or array.
+    */
+    static constructFromObject(data, obj, itemType) {
+        if (Array.isArray(data)) {
+            for (var i = 0; i < data.length; i++) {
+                if (data.hasOwnProperty(i))
+                    obj[i] = ApiClient.convertToType(data[i], itemType);
+            }
         } else {
-          newParams[key] = this.paramToString(value);
+            for (var k in data) {
+                if (data.hasOwnProperty(k))
+                    obj[k] = ApiClient.convertToType(data[k], itemType);
+            }
         }
-      }
-    }
-    return newParams;
-  };
+    };
+}
 
-  /**
-   * Enumeration of collection format separator strategies.
-   * @enum {String}
-   * @readonly
-   */
-  exports.CollectionFormatEnum = {
-    /**
-     * Comma-separated values. Value: <code>csv</code>
-     * @const
-     */
-    CSV: ',',
-    /**
-     * Space-separated values. Value: <code>ssv</code>
-     * @const
-     */
-    SSV: ' ',
-    /**
-     * Tab-separated values. Value: <code>tsv</code>
-     * @const
-     */
-    TSV: '\t',
-    /**
-     * Pipe(|)-separated values. Value: <code>pipes</code>
-     * @const
-     */
-    PIPES: '|',
-    /**
-     * Native array. Value: <code>multi</code>
-     * @const
-     */
-    MULTI: 'multi'
-  };
-
-  /**
-   * Builds a string representation of an array-type actual parameter, according to the given collection format.
-   * @param {Array} param An array parameter.
-   * @param {module:ApiClient.CollectionFormatEnum} collectionFormat The array element separator strategy.
-   * @returns {String|Array} A string representation of the supplied collection, using the specified delimiter. Returns
-   * <code>param</code> as is if <code>collectionFormat</code> is <code>multi</code>.
-   */
-  exports.prototype.buildCollectionParam = function buildCollectionParam(param, collectionFormat) {
-    if (param == null) {
-      return null;
-    }
-    switch (collectionFormat) {
-      case 'csv':
-        return param.map(this.paramToString).join(',');
-      case 'ssv':
-        return param.map(this.paramToString).join(' ');
-      case 'tsv':
-        return param.map(this.paramToString).join('\t');
-      case 'pipes':
-        return param.map(this.paramToString).join('|');
-      case 'multi':
-        // return the array directly as SuperAgent will handle it as expected
-        return param.map(this.paramToString);
-      default:
-        throw new Error('Unknown collection format: ' + collectionFormat);
-    }
-  };
-
-  /**
-   * Applies authentication headers to the request.
-   * @param {Object} request The request object created by a <code>superagent()</code> call.
-   * @param {Array.<String>} authNames An array of authentication method names.
-   */
-  exports.prototype.applyAuthToRequest = function(request, authNames) {
-    var _this = this;
-    authNames.forEach(function(authName) {
-      var auth = _this.authentications[authName];
-      switch (auth.type) {
-        case 'basic':
-          if (auth.username || auth.password) {
-            request.auth(auth.username || '', auth.password || '');
-          }
-          break;
-        case 'apiKey':
-          if (auth.apiKey) {
-            var data = {};
-            if (auth.apiKeyPrefix) {
-              data[auth.name] = auth.apiKeyPrefix + ' ' + auth.apiKey;
-            } else {
-              data[auth.name] = auth.apiKey;
-            }
-            if (auth['in'] === 'header') {
-              request.set(data);
-            } else {
-              request.query(data);
-            }
-          }
-          break;
-        case 'oauth2':
-          if (auth.accessToken) {
-            request.set({'Authorization': 'Bearer ' + auth.accessToken});
-          }
-          break;
-        default:
-          throw new Error('Unknown authentication type: ' + auth.type);
-      }
-    });
-  };
-
-  /**
-   * Deserializes an HTTP response body into a value of the specified type.
-   * @param {Object} response A SuperAgent response object.
-   * @param {(String|Array.<String>|Object.<String, Object>|Function)} returnType The type to return. Pass a string for simple types
-   * or the constructor function for a complex type. Pass an array containing the type name to return an array of that type. To
-   * return an object, pass an object with one property whose name is the key type and whose value is the corresponding value type:
-   * all properties on <code>data<code> will be converted to this type.
-   * @returns A value of the specified type.
-   */
-  exports.prototype.deserialize = function deserialize(response, returnType) {
-    if (response == null || returnType == null || response.status == 204) {
-      return null;
-    }
-    // Rely on SuperAgent for parsing response body.
-    // See http://visionmedia.github.io/superagent/#parsing-response-bodies
-    var data = response.body;
-    if (data == null || (typeof data === 'object' && typeof data.length === 'undefined' && !Object.keys(data).length)) {
-      // SuperAgent does not always produce a body; use the unparsed response as a fallback
-      data = response.text;
-    }
-    return exports.convertToType(data, returnType);
-  };
-
-  /**
-   * Invokes the REST service using the supplied settings and parameters.
-   * @param {String} path The base URL to invoke.
-   * @param {String} httpMethod The HTTP method to use.
-   * @param {Object.<String, String>} pathParams A map of path parameters and their values.
-   * @param {Object.<String, Object>} queryParams A map of query parameters and their values.
-   * @param {Object.<String, Object>} headerParams A map of header parameters and their values.
-   * @param {Object.<String, Object>} formParams A map of form parameters and their values.
-   * @param {Object} bodyParam The value to pass as the request body.
-   * @param {Array.<String>} authNames An array of authentication type names.
-   * @param {Array.<String>} contentTypes An array of request MIME types.
-   * @param {Array.<String>} accepts An array of acceptable response MIME types.
-   * @param {(String|Array|ObjectFunction)} returnType The required type to return; can be a string for simple types or the
-   * constructor for a complex type.
-   * @returns {Promise} A {@link https://www.promisejs.org/|Promise} object.
-   */
-  exports.prototype.callApi = function callApi(path, httpMethod, pathParams,
-      queryParams, headerParams, formParams, bodyParam, authNames, contentTypes, accepts,
-      returnType) {
-
-    var _this = this;
-    var url = this.buildUrl(path, pathParams);
-    var request = superagent(httpMethod, url);
-
-    // apply authentications
-    this.applyAuthToRequest(request, authNames);
-
-    // set query parameters
-    if (httpMethod.toUpperCase() === 'GET' && this.cache === false) {
-        queryParams['_'] = new Date().getTime();
-    }
-    request.query(this.normalizeParams(queryParams));
-
-    // set header parameters
-    request.set(this.defaultHeaders).set(this.normalizeParams(headerParams));
-
-    // set request timeout
-    request.timeout(this.timeout);
-
-    var contentType = this.jsonPreferredMime(contentTypes);
-    if (contentType) {
-      // Issue with superagent and multipart/form-data (https://github.com/visionmedia/superagent/issues/746)
-      if(contentType != 'multipart/form-data') {
-        request.type(contentType);
-      }
-    } else if (!request.header['Content-Type']) {
-      request.type('application/json');
-    }
-
-    if (contentType === 'application/x-www-form-urlencoded') {
-      request.send(querystring.stringify(this.normalizeParams(formParams)));
-    } else if (contentType == 'multipart/form-data') {
-      var _formParams = this.normalizeParams(formParams);
-      for (var key in _formParams) {
-        if (_formParams.hasOwnProperty(key)) {
-          if (this.isFileParam(_formParams[key])) {
-            // file field
-            request.attach(key, _formParams[key]);
-          } else {
-            request.field(key, _formParams[key]);
-          }
-        }
-      }
-    } else if (bodyParam) {
-      request.send(bodyParam);
-    }
-
-    var accept = this.jsonPreferredMime(accepts);
-    if (accept) {
-      request.accept(accept);
-    }
-
-    if (returnType === 'Blob') {
-      request.responseType('blob');
-    } else if (returnType === 'String') {
-      request.responseType('string');
-    }
-
-    // Attach previously saved cookies, if enabled
-    if (this.enableCookies){
-      if (typeof window === 'undefined') {
-        this.agent.attachCookies(request);
-      }
-      else {
-        request.withCredentials();
-      }
-    }
-
-    return new Promise(function(resolve, reject) {
-      request.end(function(error, response) {
-        if (error) {
-          reject(error);
-        } else {
-          try {
-            var data = _this.deserialize(response, returnType);
-            if (_this.enableCookies && typeof window === 'undefined'){
-              _this.agent.saveCookies(response);
-            }
-            resolve({data, response});
-          } catch (err) {
-            reject(err);
-          }
-        }
-      });
-    });
-  };
-
-  /**
-   * Parses an ISO-8601 string representation of a date value.
-   * @param {String} str The date value as a string.
-   * @returns {Date} The parsed date object.
-   */
-  exports.parseDate = function(str) {
-    return new Date(str.replace(/T/i, ' '));
-  };
-
-  /**
-   * Converts a value to the specified type.
-   * @param {(String|Object)} data The data to convert, as a string or object.
-   * @param {(String|Array.<String>|Object.<String, Object>|Function)} type The type to return. Pass a string for simple types
-   * or the constructor function for a complex type. Pass an array containing the type name to return an array of that type. To
-   * return an object, pass an object with one property whose name is the key type and whose value is the corresponding value type:
-   * all properties on <code>data<code> will be converted to this type.
-   * @returns An instance of the specified type or null or undefined if data is null or undefined.
-   */
-  exports.convertToType = function(data, type) {
-    if (data === null || data === undefined)
-      return data
-
-    switch (type) {
-      case 'Boolean':
-        return Boolean(data);
-      case 'Integer':
-        return parseInt(data, 10);
-      case 'Number':
-        return parseFloat(data);
-      case 'String':
-        return String(data);
-      case 'Date':
-        return this.parseDate(String(data));
-      case 'Blob':
-      	return data;
-      default:
-        if (type === Object) {
-          // generic object, return directly
-          return data;
-        } else if (typeof type === 'function') {
-          // for model type like: User
-          return type.constructFromObject(data);
-        } else if (Array.isArray(type)) {
-          // for array type like: ['String']
-          var itemType = type[0];
-          return data.map(function(item) {
-            return exports.convertToType(item, itemType);
-          });
-        } else if (typeof type === 'object') {
-          // for plain object type like: {'String': 'Integer'}
-          var keyType, valueType;
-          for (var k in type) {
-            if (type.hasOwnProperty(k)) {
-              keyType = k;
-              valueType = type[k];
-              break;
-            }
-          }
-          var result = {};
-          for (var k in data) {
-            if (data.hasOwnProperty(k)) {
-              var key = exports.convertToType(k, keyType);
-              var value = exports.convertToType(data[k], valueType);
-              result[key] = value;
-            }
-          }
-          return result;
-        } else {
-          // for unknown type, return the data directly
-          return data;
-        }
-    }
-  };
-
-  /**
-   * Constructs a new map or array model from REST data.
-   * @param data {Object|Array} The REST data.
-   * @param obj {Object|Array} The target object or array.
-   */
-  exports.constructFromObject = function(data, obj, itemType) {
-    if (Array.isArray(data)) {
-      for (var i = 0; i < data.length; i++) {
-        if (data.hasOwnProperty(i))
-          obj[i] = exports.convertToType(data[i], itemType);
-      }
-    } else {
-      for (var k in data) {
-        if (data.hasOwnProperty(k))
-          obj[k] = exports.convertToType(data[k], itemType);
-      }
-    }
-  };
-
-  /**
-   * The default API client implementation.
-   * @type {module:ApiClient}
-   */
-  exports.instance = new exports();
-
-  return exports;
-}));
+/**
+* The default API client implementation.
+* @type {module:ApiClient}
+*/
+ApiClient.instance = new ApiClient();
diff --git a/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js b/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js
index 5d02c0d220f..2cdc729a803 100644
--- a/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js
+++ b/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js
@@ -7,45 +7,35 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/Client', 'model/OuterBoolean', 'model/OuterComposite', 'model/OuterNumber', 'model/OuterString'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('../model/Client'), require('../model/OuterBoolean'), require('../model/OuterComposite'), require('../model/OuterNumber'), require('../model/OuterString'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from "../ApiClient";
+import Client from '../model/Client';
+import OuterBoolean from '../model/OuterBoolean';
+import OuterComposite from '../model/OuterComposite';
+import OuterNumber from '../model/OuterNumber';
+import OuterString from '../model/OuterString';
+
+/**
+* Fake service.
+* @module api/FakeApi
+* @version 1.0.0
+*/
+export default class FakeApi {
+
+    /**
+    * Constructs a new FakeApi. 
+    * @alias module:api/FakeApi
+    * @class
+    * @param {module:ApiClient} apiClient Optional API client implementation to use,
+    * default to {@link module:ApiClient#instance} if unspecified.
+    */
+    constructor(apiClient) {
+        this.apiClient = apiClient || ApiClient.instance;
     }
-    root.SwaggerPetstore.FakeApi = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Client, root.SwaggerPetstore.OuterBoolean, root.SwaggerPetstore.OuterComposite, root.SwaggerPetstore.OuterNumber, root.SwaggerPetstore.OuterString);
-  }
-}(this, function(ApiClient, Client, OuterBoolean, OuterComposite, OuterNumber, OuterString) {
-  'use strict';
-
-  /**
-   * Fake service.
-   * @module api/FakeApi
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new FakeApi. 
-   * @alias module:api/FakeApi
-   * @class
-   * @param {module:ApiClient} apiClient Optional API client implementation to use,
-   * default to {@link module:ApiClient#instance} if unspecified.
-   */
-  var exports = function(apiClient) {
-    this.apiClient = apiClient || ApiClient.instance;
 
 
 
@@ -55,24 +45,24 @@
      * @param {module:model/OuterBoolean} opts.body Input boolean as post body
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/OuterBoolean} and HTTP response
      */
-    this.fakeOuterBooleanSerializeWithHttpInfo = function(opts) {
+    fakeOuterBooleanSerializeWithHttpInfo(opts) {
       opts = opts || {};
-      var postBody = opts['body'];
+      let postBody = opts['body'];
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = [];
-      var returnType = OuterBoolean;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = [];
+      let returnType = OuterBoolean;
 
       return this.apiClient.callApi(
         '/fake/outer/boolean', 'POST',
@@ -87,7 +77,7 @@
      * @param {module:model/OuterBoolean} opts.body Input boolean as post body
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link module:model/OuterBoolean}
      */
-    this.fakeOuterBooleanSerialize = function(opts) {
+    fakeOuterBooleanSerialize(opts) {
       return this.fakeOuterBooleanSerializeWithHttpInfo(opts)
         .then(function(response_and_data) {
           return response_and_data.data;
@@ -101,24 +91,24 @@
      * @param {module:model/OuterComposite} opts.body Input composite as post body
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/OuterComposite} and HTTP response
      */
-    this.fakeOuterCompositeSerializeWithHttpInfo = function(opts) {
+    fakeOuterCompositeSerializeWithHttpInfo(opts) {
       opts = opts || {};
-      var postBody = opts['body'];
+      let postBody = opts['body'];
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = [];
-      var returnType = OuterComposite;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = [];
+      let returnType = OuterComposite;
 
       return this.apiClient.callApi(
         '/fake/outer/composite', 'POST',
@@ -133,7 +123,7 @@
      * @param {module:model/OuterComposite} opts.body Input composite as post body
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link module:model/OuterComposite}
      */
-    this.fakeOuterCompositeSerialize = function(opts) {
+    fakeOuterCompositeSerialize(opts) {
       return this.fakeOuterCompositeSerializeWithHttpInfo(opts)
         .then(function(response_and_data) {
           return response_and_data.data;
@@ -147,24 +137,24 @@
      * @param {module:model/OuterNumber} opts.body Input number as post body
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/OuterNumber} and HTTP response
      */
-    this.fakeOuterNumberSerializeWithHttpInfo = function(opts) {
+    fakeOuterNumberSerializeWithHttpInfo(opts) {
       opts = opts || {};
-      var postBody = opts['body'];
+      let postBody = opts['body'];
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = [];
-      var returnType = OuterNumber;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = [];
+      let returnType = OuterNumber;
 
       return this.apiClient.callApi(
         '/fake/outer/number', 'POST',
@@ -179,7 +169,7 @@
      * @param {module:model/OuterNumber} opts.body Input number as post body
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link module:model/OuterNumber}
      */
-    this.fakeOuterNumberSerialize = function(opts) {
+    fakeOuterNumberSerialize(opts) {
       return this.fakeOuterNumberSerializeWithHttpInfo(opts)
         .then(function(response_and_data) {
           return response_and_data.data;
@@ -193,24 +183,24 @@
      * @param {module:model/OuterString} opts.body Input string as post body
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/OuterString} and HTTP response
      */
-    this.fakeOuterStringSerializeWithHttpInfo = function(opts) {
+    fakeOuterStringSerializeWithHttpInfo(opts) {
       opts = opts || {};
-      var postBody = opts['body'];
+      let postBody = opts['body'];
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = [];
-      var returnType = OuterString;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = [];
+      let returnType = OuterString;
 
       return this.apiClient.callApi(
         '/fake/outer/string', 'POST',
@@ -225,7 +215,7 @@
      * @param {module:model/OuterString} opts.body Input string as post body
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link module:model/OuterString}
      */
-    this.fakeOuterStringSerialize = function(opts) {
+    fakeOuterStringSerialize(opts) {
       return this.fakeOuterStringSerializeWithHttpInfo(opts)
         .then(function(response_and_data) {
           return response_and_data.data;
@@ -239,8 +229,8 @@
      * @param {module:model/Client} body client model
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/Client} and HTTP response
      */
-    this.testClientModelWithHttpInfo = function(body) {
-      var postBody = body;
+    testClientModelWithHttpInfo(body) {
+      let postBody = body;
 
       // verify the required parameter 'body' is set
       if (body === undefined || body === null) {
@@ -248,19 +238,19 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = ['application/json'];
-      var accepts = ['application/json'];
-      var returnType = Client;
+      let authNames = [];
+      let contentTypes = ['application/json'];
+      let accepts = ['application/json'];
+      let returnType = Client;
 
       return this.apiClient.callApi(
         '/fake', 'PATCH',
@@ -275,7 +265,7 @@
      * @param {module:model/Client} body client model
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link module:model/Client}
      */
-    this.testClientModel = function(body) {
+    testClientModel(body) {
       return this.testClientModelWithHttpInfo(body)
         .then(function(response_and_data) {
           return response_and_data.data;
@@ -303,9 +293,9 @@
      * @param {String} opts.callback None
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response
      */
-    this.testEndpointParametersWithHttpInfo = function(_number, _double, patternWithoutDelimiter, _byte, opts) {
+    testEndpointParametersWithHttpInfo(_number, _double, patternWithoutDelimiter, _byte, opts) {
       opts = opts || {};
-      var postBody = null;
+      let postBody = null;
 
       // verify the required parameter '_number' is set
       if (_number === undefined || _number === null) {
@@ -328,13 +318,13 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
         'integer': opts['integer'],
         'int32': opts['int32'],
         'int64': opts['int64'],
@@ -351,10 +341,10 @@
         'callback': opts['callback']
       };
 
-      var authNames = ['http_basic_test'];
-      var contentTypes = ['application/xml; charset=utf-8', 'application/json; charset=utf-8'];
-      var accepts = ['application/xml; charset=utf-8', 'application/json; charset=utf-8'];
-      var returnType = null;
+      let authNames = ['http_basic_test'];
+      let contentTypes = ['application/xml; charset=utf-8', 'application/json; charset=utf-8'];
+      let accepts = ['application/xml; charset=utf-8', 'application/json; charset=utf-8'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/fake', 'POST',
@@ -383,7 +373,7 @@
      * @param {String} opts.callback None
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}
      */
-    this.testEndpointParameters = function(_number, _double, patternWithoutDelimiter, _byte, opts) {
+    testEndpointParameters(_number, _double, patternWithoutDelimiter, _byte, opts) {
       return this.testEndpointParametersWithHttpInfo(_number, _double, patternWithoutDelimiter, _byte, opts)
         .then(function(response_and_data) {
           return response_and_data.data;
@@ -405,32 +395,32 @@
      * @param {module:model/Number} opts.enumQueryDouble Query parameter enum test (double)
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response
      */
-    this.testEnumParametersWithHttpInfo = function(opts) {
+    testEnumParametersWithHttpInfo(opts) {
       opts = opts || {};
-      var postBody = null;
+      let postBody = null;
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
         'enum_query_string_array': this.apiClient.buildCollectionParam(opts['enumQueryStringArray'], 'csv'),
         'enum_query_string': opts['enumQueryString'],
         'enum_query_integer': opts['enumQueryInteger']
       };
-      var headerParams = {
+      let headerParams = {
         'enum_header_string_array': opts['enumHeaderStringArray'],
         'enum_header_string': opts['enumHeaderString']
       };
-      var formParams = {
+      let formParams = {
         'enum_form_string_array': this.apiClient.buildCollectionParam(opts['enumFormStringArray'], 'csv'),
         'enum_form_string': opts['enumFormString'],
         'enum_query_double': opts['enumQueryDouble']
       };
 
-      var authNames = [];
-      var contentTypes = ['*/*'];
-      var accepts = ['*/*'];
-      var returnType = null;
+      let authNames = [];
+      let contentTypes = ['*/*'];
+      let accepts = ['*/*'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/fake', 'GET',
@@ -453,13 +443,12 @@
      * @param {module:model/Number} opts.enumQueryDouble Query parameter enum test (double)
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}
      */
-    this.testEnumParameters = function(opts) {
+    testEnumParameters(opts) {
       return this.testEnumParametersWithHttpInfo(opts)
         .then(function(response_and_data) {
           return response_and_data.data;
         });
     }
-  };
 
-  return exports;
-}));
+
+}
diff --git a/samples/client/petstore/javascript-promise-es6/src/api/PetApi.js b/samples/client/petstore/javascript-promise-es6/src/api/PetApi.js
index fbf0ae9516a..53e385ef2cd 100644
--- a/samples/client/petstore/javascript-promise-es6/src/api/PetApi.js
+++ b/samples/client/petstore/javascript-promise-es6/src/api/PetApi.js
@@ -7,45 +7,32 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/ApiResponse', 'model/Pet'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('../model/ApiResponse'), require('../model/Pet'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from "../ApiClient";
+import ApiResponse from '../model/ApiResponse';
+import Pet from '../model/Pet';
+
+/**
+* Pet service.
+* @module api/PetApi
+* @version 1.0.0
+*/
+export default class PetApi {
+
+    /**
+    * Constructs a new PetApi. 
+    * @alias module:api/PetApi
+    * @class
+    * @param {module:ApiClient} apiClient Optional API client implementation to use,
+    * default to {@link module:ApiClient#instance} if unspecified.
+    */
+    constructor(apiClient) {
+        this.apiClient = apiClient || ApiClient.instance;
     }
-    root.SwaggerPetstore.PetApi = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.ApiResponse, root.SwaggerPetstore.Pet);
-  }
-}(this, function(ApiClient, ApiResponse, Pet) {
-  'use strict';
-
-  /**
-   * Pet service.
-   * @module api/PetApi
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new PetApi. 
-   * @alias module:api/PetApi
-   * @class
-   * @param {module:ApiClient} apiClient Optional API client implementation to use,
-   * default to {@link module:ApiClient#instance} if unspecified.
-   */
-  var exports = function(apiClient) {
-    this.apiClient = apiClient || ApiClient.instance;
 
 
 
@@ -55,8 +42,8 @@
      * @param {module:model/Pet} body Pet object that needs to be added to the store
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response
      */
-    this.addPetWithHttpInfo = function(body) {
-      var postBody = body;
+    addPetWithHttpInfo(body) {
+      let postBody = body;
 
       // verify the required parameter 'body' is set
       if (body === undefined || body === null) {
@@ -64,19 +51,19 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = ['petstore_auth'];
-      var contentTypes = ['application/json', 'application/xml'];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = ['petstore_auth'];
+      let contentTypes = ['application/json', 'application/xml'];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/pet', 'POST',
@@ -91,7 +78,7 @@
      * @param {module:model/Pet} body Pet object that needs to be added to the store
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}
      */
-    this.addPet = function(body) {
+    addPet(body) {
       return this.addPetWithHttpInfo(body)
         .then(function(response_and_data) {
           return response_and_data.data;
@@ -107,9 +94,9 @@
      * @param {String} opts.apiKey 
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response
      */
-    this.deletePetWithHttpInfo = function(petId, opts) {
+    deletePetWithHttpInfo(petId, opts) {
       opts = opts || {};
-      var postBody = null;
+      let postBody = null;
 
       // verify the required parameter 'petId' is set
       if (petId === undefined || petId === null) {
@@ -117,21 +104,21 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'petId': petId
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
         'api_key': opts['apiKey']
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = ['petstore_auth'];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = ['petstore_auth'];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/pet/{petId}', 'DELETE',
@@ -148,7 +135,7 @@
      * @param {String} opts.apiKey 
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}
      */
-    this.deletePet = function(petId, opts) {
+    deletePet(petId, opts) {
       return this.deletePetWithHttpInfo(petId, opts)
         .then(function(response_and_data) {
           return response_and_data.data;
@@ -162,8 +149,8 @@
      * @param {Array.<module:model/String>} status Status values that need to be considered for filter
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link Array.<module:model/Pet>} and HTTP response
      */
-    this.findPetsByStatusWithHttpInfo = function(status) {
-      var postBody = null;
+    findPetsByStatusWithHttpInfo(status) {
+      let postBody = null;
 
       // verify the required parameter 'status' is set
       if (status === undefined || status === null) {
@@ -171,20 +158,20 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
         'status': this.apiClient.buildCollectionParam(status, 'csv')
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = ['petstore_auth'];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = [Pet];
+      let authNames = ['petstore_auth'];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = [Pet];
 
       return this.apiClient.callApi(
         '/pet/findByStatus', 'GET',
@@ -199,7 +186,7 @@
      * @param {Array.<module:model/String>} status Status values that need to be considered for filter
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link Array.<module:model/Pet>}
      */
-    this.findPetsByStatus = function(status) {
+    findPetsByStatus(status) {
       return this.findPetsByStatusWithHttpInfo(status)
         .then(function(response_and_data) {
           return response_and_data.data;
@@ -213,8 +200,8 @@
      * @param {Array.<String>} tags Tags to filter by
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link Array.<module:model/Pet>} and HTTP response
      */
-    this.findPetsByTagsWithHttpInfo = function(tags) {
-      var postBody = null;
+    findPetsByTagsWithHttpInfo(tags) {
+      let postBody = null;
 
       // verify the required parameter 'tags' is set
       if (tags === undefined || tags === null) {
@@ -222,20 +209,20 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
         'tags': this.apiClient.buildCollectionParam(tags, 'csv')
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = ['petstore_auth'];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = [Pet];
+      let authNames = ['petstore_auth'];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = [Pet];
 
       return this.apiClient.callApi(
         '/pet/findByTags', 'GET',
@@ -250,7 +237,7 @@
      * @param {Array.<String>} tags Tags to filter by
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link Array.<module:model/Pet>}
      */
-    this.findPetsByTags = function(tags) {
+    findPetsByTags(tags) {
       return this.findPetsByTagsWithHttpInfo(tags)
         .then(function(response_and_data) {
           return response_and_data.data;
@@ -264,8 +251,8 @@
      * @param {Number} petId ID of pet to return
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/Pet} and HTTP response
      */
-    this.getPetByIdWithHttpInfo = function(petId) {
-      var postBody = null;
+    getPetByIdWithHttpInfo(petId) {
+      let postBody = null;
 
       // verify the required parameter 'petId' is set
       if (petId === undefined || petId === null) {
@@ -273,20 +260,20 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'petId': petId
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = ['api_key'];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = Pet;
+      let authNames = ['api_key'];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = Pet;
 
       return this.apiClient.callApi(
         '/pet/{petId}', 'GET',
@@ -301,7 +288,7 @@
      * @param {Number} petId ID of pet to return
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link module:model/Pet}
      */
-    this.getPetById = function(petId) {
+    getPetById(petId) {
       return this.getPetByIdWithHttpInfo(petId)
         .then(function(response_and_data) {
           return response_and_data.data;
@@ -315,8 +302,8 @@
      * @param {module:model/Pet} body Pet object that needs to be added to the store
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response
      */
-    this.updatePetWithHttpInfo = function(body) {
-      var postBody = body;
+    updatePetWithHttpInfo(body) {
+      let postBody = body;
 
       // verify the required parameter 'body' is set
       if (body === undefined || body === null) {
@@ -324,19 +311,19 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = ['petstore_auth'];
-      var contentTypes = ['application/json', 'application/xml'];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = ['petstore_auth'];
+      let contentTypes = ['application/json', 'application/xml'];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/pet', 'PUT',
@@ -351,7 +338,7 @@
      * @param {module:model/Pet} body Pet object that needs to be added to the store
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}
      */
-    this.updatePet = function(body) {
+    updatePet(body) {
       return this.updatePetWithHttpInfo(body)
         .then(function(response_and_data) {
           return response_and_data.data;
@@ -368,9 +355,9 @@
      * @param {String} opts.status Updated status of the pet
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response
      */
-    this.updatePetWithFormWithHttpInfo = function(petId, opts) {
+    updatePetWithFormWithHttpInfo(petId, opts) {
       opts = opts || {};
-      var postBody = null;
+      let postBody = null;
 
       // verify the required parameter 'petId' is set
       if (petId === undefined || petId === null) {
@@ -378,22 +365,22 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'petId': petId
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
         'name': opts['name'],
         'status': opts['status']
       };
 
-      var authNames = ['petstore_auth'];
-      var contentTypes = ['application/x-www-form-urlencoded'];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = ['petstore_auth'];
+      let contentTypes = ['application/x-www-form-urlencoded'];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/pet/{petId}', 'POST',
@@ -411,7 +398,7 @@
      * @param {String} opts.status Updated status of the pet
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}
      */
-    this.updatePetWithForm = function(petId, opts) {
+    updatePetWithForm(petId, opts) {
       return this.updatePetWithFormWithHttpInfo(petId, opts)
         .then(function(response_and_data) {
           return response_and_data.data;
@@ -428,9 +415,9 @@
      * @param {File} opts.file file to upload
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/ApiResponse} and HTTP response
      */
-    this.uploadFileWithHttpInfo = function(petId, opts) {
+    uploadFileWithHttpInfo(petId, opts) {
       opts = opts || {};
-      var postBody = null;
+      let postBody = null;
 
       // verify the required parameter 'petId' is set
       if (petId === undefined || petId === null) {
@@ -438,22 +425,22 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'petId': petId
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
         'additionalMetadata': opts['additionalMetadata'],
         'file': opts['file']
       };
 
-      var authNames = ['petstore_auth'];
-      var contentTypes = ['multipart/form-data'];
-      var accepts = ['application/json'];
-      var returnType = ApiResponse;
+      let authNames = ['petstore_auth'];
+      let contentTypes = ['multipart/form-data'];
+      let accepts = ['application/json'];
+      let returnType = ApiResponse;
 
       return this.apiClient.callApi(
         '/pet/{petId}/uploadImage', 'POST',
@@ -471,13 +458,12 @@
      * @param {File} opts.file file to upload
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link module:model/ApiResponse}
      */
-    this.uploadFile = function(petId, opts) {
+    uploadFile(petId, opts) {
       return this.uploadFileWithHttpInfo(petId, opts)
         .then(function(response_and_data) {
           return response_and_data.data;
         });
     }
-  };
 
-  return exports;
-}));
+
+}
diff --git a/samples/client/petstore/javascript-promise-es6/src/api/StoreApi.js b/samples/client/petstore/javascript-promise-es6/src/api/StoreApi.js
index fd07229b31f..0b55929a8a4 100644
--- a/samples/client/petstore/javascript-promise-es6/src/api/StoreApi.js
+++ b/samples/client/petstore/javascript-promise-es6/src/api/StoreApi.js
@@ -7,45 +7,31 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/Order'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('../model/Order'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from "../ApiClient";
+import Order from '../model/Order';
+
+/**
+* Store service.
+* @module api/StoreApi
+* @version 1.0.0
+*/
+export default class StoreApi {
+
+    /**
+    * Constructs a new StoreApi. 
+    * @alias module:api/StoreApi
+    * @class
+    * @param {module:ApiClient} apiClient Optional API client implementation to use,
+    * default to {@link module:ApiClient#instance} if unspecified.
+    */
+    constructor(apiClient) {
+        this.apiClient = apiClient || ApiClient.instance;
     }
-    root.SwaggerPetstore.StoreApi = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Order);
-  }
-}(this, function(ApiClient, Order) {
-  'use strict';
-
-  /**
-   * Store service.
-   * @module api/StoreApi
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new StoreApi. 
-   * @alias module:api/StoreApi
-   * @class
-   * @param {module:ApiClient} apiClient Optional API client implementation to use,
-   * default to {@link module:ApiClient#instance} if unspecified.
-   */
-  var exports = function(apiClient) {
-    this.apiClient = apiClient || ApiClient.instance;
 
 
 
@@ -55,8 +41,8 @@
      * @param {String} orderId ID of the order that needs to be deleted
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response
      */
-    this.deleteOrderWithHttpInfo = function(orderId) {
-      var postBody = null;
+    deleteOrderWithHttpInfo(orderId) {
+      let postBody = null;
 
       // verify the required parameter 'orderId' is set
       if (orderId === undefined || orderId === null) {
@@ -64,20 +50,20 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'order_id': orderId
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/store/order/{order_id}', 'DELETE',
@@ -92,7 +78,7 @@
      * @param {String} orderId ID of the order that needs to be deleted
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}
      */
-    this.deleteOrder = function(orderId) {
+    deleteOrder(orderId) {
       return this.deleteOrderWithHttpInfo(orderId)
         .then(function(response_and_data) {
           return response_and_data.data;
@@ -105,23 +91,23 @@
      * Returns a map of status codes to quantities
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link Object.<String, {'String': 'Number'}>} and HTTP response
      */
-    this.getInventoryWithHttpInfo = function() {
-      var postBody = null;
+    getInventoryWithHttpInfo() {
+      let postBody = null;
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = ['api_key'];
-      var contentTypes = [];
-      var accepts = ['application/json'];
-      var returnType = {'String': 'Number'};
+      let authNames = ['api_key'];
+      let contentTypes = [];
+      let accepts = ['application/json'];
+      let returnType = {'String': 'Number'};
 
       return this.apiClient.callApi(
         '/store/inventory', 'GET',
@@ -135,7 +121,7 @@
      * Returns a map of status codes to quantities
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link Object.<String, {'String': 'Number'}>}
      */
-    this.getInventory = function() {
+    getInventory() {
       return this.getInventoryWithHttpInfo()
         .then(function(response_and_data) {
           return response_and_data.data;
@@ -149,8 +135,8 @@
      * @param {Number} orderId ID of pet that needs to be fetched
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/Order} and HTTP response
      */
-    this.getOrderByIdWithHttpInfo = function(orderId) {
-      var postBody = null;
+    getOrderByIdWithHttpInfo(orderId) {
+      let postBody = null;
 
       // verify the required parameter 'orderId' is set
       if (orderId === undefined || orderId === null) {
@@ -158,20 +144,20 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'order_id': orderId
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = Order;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = Order;
 
       return this.apiClient.callApi(
         '/store/order/{order_id}', 'GET',
@@ -186,7 +172,7 @@
      * @param {Number} orderId ID of pet that needs to be fetched
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link module:model/Order}
      */
-    this.getOrderById = function(orderId) {
+    getOrderById(orderId) {
       return this.getOrderByIdWithHttpInfo(orderId)
         .then(function(response_and_data) {
           return response_and_data.data;
@@ -200,8 +186,8 @@
      * @param {module:model/Order} body order placed for purchasing the pet
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/Order} and HTTP response
      */
-    this.placeOrderWithHttpInfo = function(body) {
-      var postBody = body;
+    placeOrderWithHttpInfo(body) {
+      let postBody = body;
 
       // verify the required parameter 'body' is set
       if (body === undefined || body === null) {
@@ -209,19 +195,19 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = Order;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = Order;
 
       return this.apiClient.callApi(
         '/store/order', 'POST',
@@ -236,13 +222,12 @@
      * @param {module:model/Order} body order placed for purchasing the pet
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link module:model/Order}
      */
-    this.placeOrder = function(body) {
+    placeOrder(body) {
       return this.placeOrderWithHttpInfo(body)
         .then(function(response_and_data) {
           return response_and_data.data;
         });
     }
-  };
 
-  return exports;
-}));
+
+}
diff --git a/samples/client/petstore/javascript-promise-es6/src/api/UserApi.js b/samples/client/petstore/javascript-promise-es6/src/api/UserApi.js
index beac00797f9..1c1fe593e26 100644
--- a/samples/client/petstore/javascript-promise-es6/src/api/UserApi.js
+++ b/samples/client/petstore/javascript-promise-es6/src/api/UserApi.js
@@ -7,45 +7,31 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/User'], 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'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from "../ApiClient";
+import User from '../model/User';
+
+/**
+* User service.
+* @module api/UserApi
+* @version 1.0.0
+*/
+export default class UserApi {
+
+    /**
+    * Constructs a new UserApi. 
+    * @alias module:api/UserApi
+    * @class
+    * @param {module:ApiClient} apiClient Optional API client implementation to use,
+    * default to {@link module:ApiClient#instance} if unspecified.
+    */
+    constructor(apiClient) {
+        this.apiClient = apiClient || ApiClient.instance;
     }
-    root.SwaggerPetstore.UserApi = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.User);
-  }
-}(this, function(ApiClient, User) {
-  'use strict';
-
-  /**
-   * User service.
-   * @module api/UserApi
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new UserApi. 
-   * @alias module:api/UserApi
-   * @class
-   * @param {module:ApiClient} apiClient Optional API client implementation to use,
-   * default to {@link module:ApiClient#instance} if unspecified.
-   */
-  var exports = function(apiClient) {
-    this.apiClient = apiClient || ApiClient.instance;
 
 
 
@@ -55,8 +41,8 @@
      * @param {module:model/User} body Created user object
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response
      */
-    this.createUserWithHttpInfo = function(body) {
-      var postBody = body;
+    createUserWithHttpInfo(body) {
+      let postBody = body;
 
       // verify the required parameter 'body' is set
       if (body === undefined || body === null) {
@@ -64,19 +50,19 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/user', 'POST',
@@ -91,7 +77,7 @@
      * @param {module:model/User} body Created user object
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}
      */
-    this.createUser = function(body) {
+    createUser(body) {
       return this.createUserWithHttpInfo(body)
         .then(function(response_and_data) {
           return response_and_data.data;
@@ -105,8 +91,8 @@
      * @param {Array.<module:model/User>} body List of user object
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response
      */
-    this.createUsersWithArrayInputWithHttpInfo = function(body) {
-      var postBody = body;
+    createUsersWithArrayInputWithHttpInfo(body) {
+      let postBody = body;
 
       // verify the required parameter 'body' is set
       if (body === undefined || body === null) {
@@ -114,19 +100,19 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/user/createWithArray', 'POST',
@@ -141,7 +127,7 @@
      * @param {Array.<module:model/User>} body List of user object
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}
      */
-    this.createUsersWithArrayInput = function(body) {
+    createUsersWithArrayInput(body) {
       return this.createUsersWithArrayInputWithHttpInfo(body)
         .then(function(response_and_data) {
           return response_and_data.data;
@@ -155,8 +141,8 @@
      * @param {Array.<module:model/User>} body List of user object
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response
      */
-    this.createUsersWithListInputWithHttpInfo = function(body) {
-      var postBody = body;
+    createUsersWithListInputWithHttpInfo(body) {
+      let postBody = body;
 
       // verify the required parameter 'body' is set
       if (body === undefined || body === null) {
@@ -164,19 +150,19 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/user/createWithList', 'POST',
@@ -191,7 +177,7 @@
      * @param {Array.<module:model/User>} body List of user object
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}
      */
-    this.createUsersWithListInput = function(body) {
+    createUsersWithListInput(body) {
       return this.createUsersWithListInputWithHttpInfo(body)
         .then(function(response_and_data) {
           return response_and_data.data;
@@ -205,8 +191,8 @@
      * @param {String} username The name that needs to be deleted
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response
      */
-    this.deleteUserWithHttpInfo = function(username) {
-      var postBody = null;
+    deleteUserWithHttpInfo(username) {
+      let postBody = null;
 
       // verify the required parameter 'username' is set
       if (username === undefined || username === null) {
@@ -214,20 +200,20 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'username': username
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/user/{username}', 'DELETE',
@@ -242,7 +228,7 @@
      * @param {String} username The name that needs to be deleted
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}
      */
-    this.deleteUser = function(username) {
+    deleteUser(username) {
       return this.deleteUserWithHttpInfo(username)
         .then(function(response_and_data) {
           return response_and_data.data;
@@ -256,8 +242,8 @@
      * @param {String} username The name that needs to be fetched. Use user1 for testing. 
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/User} and HTTP response
      */
-    this.getUserByNameWithHttpInfo = function(username) {
-      var postBody = null;
+    getUserByNameWithHttpInfo(username) {
+      let postBody = null;
 
       // verify the required parameter 'username' is set
       if (username === undefined || username === null) {
@@ -265,20 +251,20 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'username': username
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = User;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = User;
 
       return this.apiClient.callApi(
         '/user/{username}', 'GET',
@@ -293,7 +279,7 @@
      * @param {String} username The name that needs to be fetched. Use user1 for testing. 
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link module:model/User}
      */
-    this.getUserByName = function(username) {
+    getUserByName(username) {
       return this.getUserByNameWithHttpInfo(username)
         .then(function(response_and_data) {
           return response_and_data.data;
@@ -308,8 +294,8 @@
      * @param {String} password The password for login in clear text
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link 'String'} and HTTP response
      */
-    this.loginUserWithHttpInfo = function(username, password) {
-      var postBody = null;
+    loginUserWithHttpInfo(username, password) {
+      let postBody = null;
 
       // verify the required parameter 'username' is set
       if (username === undefined || username === null) {
@@ -322,21 +308,21 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
         'username': username,
         'password': password
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = 'String';
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = 'String';
 
       return this.apiClient.callApi(
         '/user/login', 'GET',
@@ -352,7 +338,7 @@
      * @param {String} password The password for login in clear text
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link 'String'}
      */
-    this.loginUser = function(username, password) {
+    loginUser(username, password) {
       return this.loginUserWithHttpInfo(username, password)
         .then(function(response_and_data) {
           return response_and_data.data;
@@ -365,23 +351,23 @@
      * 
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response
      */
-    this.logoutUserWithHttpInfo = function() {
-      var postBody = null;
+    logoutUserWithHttpInfo() {
+      let postBody = null;
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/user/logout', 'GET',
@@ -395,7 +381,7 @@
      * 
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}
      */
-    this.logoutUser = function() {
+    logoutUser() {
       return this.logoutUserWithHttpInfo()
         .then(function(response_and_data) {
           return response_and_data.data;
@@ -410,8 +396,8 @@
      * @param {module:model/User} body Updated user object
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response
      */
-    this.updateUserWithHttpInfo = function(username, body) {
-      var postBody = body;
+    updateUserWithHttpInfo(username, body) {
+      let postBody = body;
 
       // verify the required parameter 'username' is set
       if (username === undefined || username === null) {
@@ -424,20 +410,20 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'username': username
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var headerParams = {
+      let headerParams = {
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/user/{username}', 'PUT',
@@ -453,13 +439,12 @@
      * @param {module:model/User} body Updated user object
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}
      */
-    this.updateUser = function(username, body) {
+    updateUser(username, body) {
       return this.updateUserWithHttpInfo(username, body)
         .then(function(response_and_data) {
           return response_and_data.data;
         });
     }
-  };
 
-  return exports;
-}));
+
+}
diff --git a/samples/client/petstore/javascript-promise-es6/src/index.js b/samples/client/petstore/javascript-promise-es6/src/index.js
index 6acae4aaaf4..3a016977a34 100644
--- a/samples/client/petstore/javascript-promise-es6/src/index.js
+++ b/samples/client/petstore/javascript-promise-es6/src/index.js
@@ -7,262 +7,329 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/AdditionalPropertiesClass', 'model/Animal', 'model/AnimalFarm', 'model/ApiResponse', 'model/ArrayOfArrayOfNumberOnly', 'model/ArrayOfNumberOnly', 'model/ArrayTest', 'model/Capitalization', 'model/Category', 'model/ClassModel', 'model/Client', 'model/EnumArrays', 'model/EnumClass', 'model/EnumTest', 'model/FormatTest', 'model/HasOnlyReadOnly', 'model/List', 'model/MapTest', 'model/MixedPropertiesAndAdditionalPropertiesClass', 'model/Model200Response', 'model/ModelReturn', 'model/Name', 'model/NumberOnly', 'model/Order', 'model/OuterBoolean', 'model/OuterComposite', 'model/OuterEnum', 'model/OuterNumber', 'model/OuterString', 'model/Pet', 'model/ReadOnlyFirst', 'model/SpecialModelName', 'model/Tag', 'model/User', 'model/Cat', 'model/Dog', '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/AdditionalPropertiesClass'), require('./model/Animal'), require('./model/AnimalFarm'), require('./model/ApiResponse'), require('./model/ArrayOfArrayOfNumberOnly'), require('./model/ArrayOfNumberOnly'), require('./model/ArrayTest'), require('./model/Capitalization'), require('./model/Category'), require('./model/ClassModel'), require('./model/Client'), require('./model/EnumArrays'), require('./model/EnumClass'), require('./model/EnumTest'), require('./model/FormatTest'), require('./model/HasOnlyReadOnly'), require('./model/List'), require('./model/MapTest'), require('./model/MixedPropertiesAndAdditionalPropertiesClass'), require('./model/Model200Response'), require('./model/ModelReturn'), require('./model/Name'), require('./model/NumberOnly'), require('./model/Order'), require('./model/OuterBoolean'), require('./model/OuterComposite'), require('./model/OuterEnum'), require('./model/OuterNumber'), require('./model/OuterString'), require('./model/Pet'), require('./model/ReadOnlyFirst'), require('./model/SpecialModelName'), require('./model/Tag'), require('./model/User'), require('./model/Cat'), require('./model/Dog'), require('./api/FakeApi'), require('./api/PetApi'), require('./api/StoreApi'), require('./api/UserApi'));
-  }
-}(function(ApiClient, AdditionalPropertiesClass, Animal, AnimalFarm, ApiResponse, ArrayOfArrayOfNumberOnly, ArrayOfNumberOnly, ArrayTest, Capitalization, Category, ClassModel, Client, EnumArrays, EnumClass, EnumTest, FormatTest, HasOnlyReadOnly, List, MapTest, MixedPropertiesAndAdditionalPropertiesClass, Model200Response, ModelReturn, Name, NumberOnly, Order, OuterBoolean, OuterComposite, OuterEnum, OuterNumber, OuterString, Pet, ReadOnlyFirst, SpecialModelName, Tag, User, Cat, Dog, 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__Special_characters__.<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:
-   * <pre>
-   * var SwaggerPetstore = require('index'); // See note below*.
-   * var xxxSvc = new SwaggerPetstore.XxxApi(); // Allocate the API class we're going to use.
-   * var yyyModel = new SwaggerPetstore.Yyy(); // Construct a model instance.
-   * yyyModel.someProperty = 'someValue';
-   * ...
-   * var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
-   * ...
-   * </pre>
-   * <em>*NOTE: For a top-level AMD script, use require(['index'], function(){...})
-   * and put the application logic within the callback function.</em>
-   * </p>
-   * <p>
-   * A non-AMD browser application (discouraged) might do something like this:
-   * <pre>
-   * var xxxSvc = new SwaggerPetstore.XxxApi(); // Allocate the API class we're going to use.
-   * var yyy = new SwaggerPetstore.Yyy(); // Construct a model instance.
-   * yyyModel.someProperty = 'someValue';
-   * ...
-   * var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
-   * ...
-   * </pre>
-   * </p>
-   * @module index
-   * @version 1.0.0
-   */
-  var exports = {
+import ApiClient from './ApiClient';
+import AdditionalPropertiesClass from './model/AdditionalPropertiesClass';
+import Animal from './model/Animal';
+import AnimalFarm from './model/AnimalFarm';
+import ApiResponse from './model/ApiResponse';
+import ArrayOfArrayOfNumberOnly from './model/ArrayOfArrayOfNumberOnly';
+import ArrayOfNumberOnly from './model/ArrayOfNumberOnly';
+import ArrayTest from './model/ArrayTest';
+import Capitalization from './model/Capitalization';
+import Category from './model/Category';
+import ClassModel from './model/ClassModel';
+import Client from './model/Client';
+import EnumArrays from './model/EnumArrays';
+import EnumClass from './model/EnumClass';
+import EnumTest from './model/EnumTest';
+import FormatTest from './model/FormatTest';
+import HasOnlyReadOnly from './model/HasOnlyReadOnly';
+import List from './model/List';
+import MapTest from './model/MapTest';
+import MixedPropertiesAndAdditionalPropertiesClass from './model/MixedPropertiesAndAdditionalPropertiesClass';
+import Model200Response from './model/Model200Response';
+import ModelReturn from './model/ModelReturn';
+import Name from './model/Name';
+import NumberOnly from './model/NumberOnly';
+import Order from './model/Order';
+import OuterBoolean from './model/OuterBoolean';
+import OuterComposite from './model/OuterComposite';
+import OuterEnum from './model/OuterEnum';
+import OuterNumber from './model/OuterNumber';
+import OuterString from './model/OuterString';
+import Pet from './model/Pet';
+import ReadOnlyFirst from './model/ReadOnlyFirst';
+import SpecialModelName from './model/SpecialModelName';
+import Tag from './model/Tag';
+import User from './model/User';
+import Cat from './model/Cat';
+import Dog from './model/Dog';
+import FakeApi from './api/FakeApi';
+import PetApi from './api/PetApi';
+import StoreApi from './api/StoreApi';
+import UserApi from './api/UserApi';
+
+
+/**
+* This_spec_is_mainly_for_testing_Petstore_server_and_contains_fake_endpoints_models__Please_do_not_use_this_for_any_other_purpose__Special_characters__.<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:
+* <pre>
+* var SwaggerPetstore = require('index'); // See note below*.
+* var xxxSvc = new SwaggerPetstore.XxxApi(); // Allocate the API class we're going to use.
+* var yyyModel = new SwaggerPetstore.Yyy(); // Construct a model instance.
+* yyyModel.someProperty = 'someValue';
+* ...
+* var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
+* ...
+* </pre>
+* <em>*NOTE: For a top-level AMD script, use require(['index'], function(){...})
+* and put the application logic within the callback function.</em>
+* </p>
+* <p>
+* A non-AMD browser application (discouraged) might do something like this:
+* <pre>
+* var xxxSvc = new SwaggerPetstore.XxxApi(); // Allocate the API class we're going to use.
+* var yyy = new SwaggerPetstore.Yyy(); // Construct a model instance.
+* yyyModel.someProperty = 'someValue';
+* ...
+* var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
+* ...
+* </pre>
+* </p>
+* @module index
+* @version 1.0.0
+*/
+export {
     /**
      * The ApiClient constructor.
      * @property {module:ApiClient}
      */
-    ApiClient: ApiClient,
+    ApiClient,
+
     /**
      * The AdditionalPropertiesClass model constructor.
      * @property {module:model/AdditionalPropertiesClass}
      */
-    AdditionalPropertiesClass: AdditionalPropertiesClass,
+    AdditionalPropertiesClass,
+
     /**
      * The Animal model constructor.
      * @property {module:model/Animal}
      */
-    Animal: Animal,
+    Animal,
+
     /**
      * The AnimalFarm model constructor.
      * @property {module:model/AnimalFarm}
      */
-    AnimalFarm: AnimalFarm,
+    AnimalFarm,
+
     /**
      * The ApiResponse model constructor.
      * @property {module:model/ApiResponse}
      */
-    ApiResponse: ApiResponse,
+    ApiResponse,
+
     /**
      * The ArrayOfArrayOfNumberOnly model constructor.
      * @property {module:model/ArrayOfArrayOfNumberOnly}
      */
-    ArrayOfArrayOfNumberOnly: ArrayOfArrayOfNumberOnly,
+    ArrayOfArrayOfNumberOnly,
+
     /**
      * The ArrayOfNumberOnly model constructor.
      * @property {module:model/ArrayOfNumberOnly}
      */
-    ArrayOfNumberOnly: ArrayOfNumberOnly,
+    ArrayOfNumberOnly,
+
     /**
      * The ArrayTest model constructor.
      * @property {module:model/ArrayTest}
      */
-    ArrayTest: ArrayTest,
+    ArrayTest,
+
     /**
      * The Capitalization model constructor.
      * @property {module:model/Capitalization}
      */
-    Capitalization: Capitalization,
+    Capitalization,
+
     /**
      * The Category model constructor.
      * @property {module:model/Category}
      */
-    Category: Category,
+    Category,
+
     /**
      * The ClassModel model constructor.
      * @property {module:model/ClassModel}
      */
-    ClassModel: ClassModel,
+    ClassModel,
+
     /**
      * The Client model constructor.
      * @property {module:model/Client}
      */
-    Client: Client,
+    Client,
+
     /**
      * The EnumArrays model constructor.
      * @property {module:model/EnumArrays}
      */
-    EnumArrays: EnumArrays,
+    EnumArrays,
+
     /**
      * The EnumClass model constructor.
      * @property {module:model/EnumClass}
      */
-    EnumClass: EnumClass,
+    EnumClass,
+
     /**
      * The EnumTest model constructor.
      * @property {module:model/EnumTest}
      */
-    EnumTest: EnumTest,
+    EnumTest,
+
     /**
      * The FormatTest model constructor.
      * @property {module:model/FormatTest}
      */
-    FormatTest: FormatTest,
+    FormatTest,
+
     /**
      * The HasOnlyReadOnly model constructor.
      * @property {module:model/HasOnlyReadOnly}
      */
-    HasOnlyReadOnly: HasOnlyReadOnly,
+    HasOnlyReadOnly,
+
     /**
      * The List model constructor.
      * @property {module:model/List}
      */
-    List: List,
+    List,
+
     /**
      * The MapTest model constructor.
      * @property {module:model/MapTest}
      */
-    MapTest: MapTest,
+    MapTest,
+
     /**
      * The MixedPropertiesAndAdditionalPropertiesClass model constructor.
      * @property {module:model/MixedPropertiesAndAdditionalPropertiesClass}
      */
-    MixedPropertiesAndAdditionalPropertiesClass: MixedPropertiesAndAdditionalPropertiesClass,
+    MixedPropertiesAndAdditionalPropertiesClass,
+
     /**
      * The Model200Response model constructor.
      * @property {module:model/Model200Response}
      */
-    Model200Response: Model200Response,
+    Model200Response,
+
     /**
      * The ModelReturn model constructor.
      * @property {module:model/ModelReturn}
      */
-    ModelReturn: ModelReturn,
+    ModelReturn,
+
     /**
      * The Name model constructor.
      * @property {module:model/Name}
      */
-    Name: Name,
+    Name,
+
     /**
      * The NumberOnly model constructor.
      * @property {module:model/NumberOnly}
      */
-    NumberOnly: NumberOnly,
+    NumberOnly,
+
     /**
      * The Order model constructor.
      * @property {module:model/Order}
      */
-    Order: Order,
+    Order,
+
     /**
      * The OuterBoolean model constructor.
      * @property {module:model/OuterBoolean}
      */
-    OuterBoolean: OuterBoolean,
+    OuterBoolean,
+
     /**
      * The OuterComposite model constructor.
      * @property {module:model/OuterComposite}
      */
-    OuterComposite: OuterComposite,
+    OuterComposite,
+
     /**
      * The OuterEnum model constructor.
      * @property {module:model/OuterEnum}
      */
-    OuterEnum: OuterEnum,
+    OuterEnum,
+
     /**
      * The OuterNumber model constructor.
      * @property {module:model/OuterNumber}
      */
-    OuterNumber: OuterNumber,
+    OuterNumber,
+
     /**
      * The OuterString model constructor.
      * @property {module:model/OuterString}
      */
-    OuterString: OuterString,
+    OuterString,
+
     /**
      * The Pet model constructor.
      * @property {module:model/Pet}
      */
-    Pet: Pet,
+    Pet,
+
     /**
      * The ReadOnlyFirst model constructor.
      * @property {module:model/ReadOnlyFirst}
      */
-    ReadOnlyFirst: ReadOnlyFirst,
+    ReadOnlyFirst,
+
     /**
      * The SpecialModelName model constructor.
      * @property {module:model/SpecialModelName}
      */
-    SpecialModelName: SpecialModelName,
+    SpecialModelName,
+
     /**
      * The Tag model constructor.
      * @property {module:model/Tag}
      */
-    Tag: Tag,
+    Tag,
+
     /**
      * The User model constructor.
      * @property {module:model/User}
      */
-    User: User,
+    User,
+
     /**
      * The Cat model constructor.
      * @property {module:model/Cat}
      */
-    Cat: Cat,
+    Cat,
+
     /**
      * The Dog model constructor.
      * @property {module:model/Dog}
      */
-    Dog: Dog,
-    /**
-     * The FakeApi service constructor.
-     * @property {module:api/FakeApi}
-     */
-    FakeApi: FakeApi,
-    /**
-     * The PetApi service constructor.
-     * @property {module:api/PetApi}
-     */
-    PetApi: PetApi,
-    /**
-     * The StoreApi service constructor.
-     * @property {module:api/StoreApi}
-     */
-    StoreApi: StoreApi,
-    /**
-     * The UserApi service constructor.
-     * @property {module:api/UserApi}
-     */
-    UserApi: UserApi
-  };
+    Dog,
 
-  return exports;
-}));
+    /**
+    * The FakeApi service constructor.
+    * @property {module:api/FakeApi}
+    */
+    FakeApi,
+
+    /**
+    * The PetApi service constructor.
+    * @property {module:api/PetApi}
+    */
+    PetApi,
+
+    /**
+    * The StoreApi service constructor.
+    * @property {module:api/StoreApi}
+    */
+    StoreApi,
+
+    /**
+    * The UserApi service constructor.
+    * @property {module:api/UserApi}
+    */
+    UserApi
+};
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/AdditionalPropertiesClass.js b/samples/client/petstore/javascript-promise-es6/src/model/AdditionalPropertiesClass.js
index 2744647b18a..088cbb29b35 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/AdditionalPropertiesClass.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/AdditionalPropertiesClass.js
@@ -7,84 +7,81 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The AdditionalPropertiesClass model module.
+* @module model/AdditionalPropertiesClass
+* @version 1.0.0
+*/
+export default class AdditionalPropertiesClass {
+    /**
+    * Constructs a new <code>AdditionalPropertiesClass</code>.
+    * @alias module:model/AdditionalPropertiesClass
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.AdditionalPropertiesClass = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>AdditionalPropertiesClass</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/AdditionalPropertiesClass} obj Optional instance to populate.
+    * @return {module:model/AdditionalPropertiesClass} The populated <code>AdditionalPropertiesClass</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new AdditionalPropertiesClass();
 
+            
+            
+            
 
-
-  /**
-   * The AdditionalPropertiesClass model module.
-   * @module model/AdditionalPropertiesClass
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>AdditionalPropertiesClass</code>.
-   * @alias module:model/AdditionalPropertiesClass
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-  };
-
-  /**
-   * Constructs a <code>AdditionalPropertiesClass</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/AdditionalPropertiesClass} obj Optional instance to populate.
-   * @return {module:model/AdditionalPropertiesClass} The populated <code>AdditionalPropertiesClass</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('map_property')) {
-        obj['map_property'] = ApiClient.convertToType(data['map_property'], {'String': 'String'});
-      }
-      if (data.hasOwnProperty('map_of_map_property')) {
-        obj['map_of_map_property'] = ApiClient.convertToType(data['map_of_map_property'], {'String': {'String': 'String'}});
-      }
+            if (data.hasOwnProperty('map_property')) {
+                obj['map_property'] = ApiClient.convertToType(data['map_property'], {'String': 'String'});
+            }
+            if (data.hasOwnProperty('map_of_map_property')) {
+                obj['map_of_map_property'] = ApiClient.convertToType(data['map_of_map_property'], {'String': {'String': 'String'}});
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Object.<String, String>} map_property
-   */
-  exports.prototype['map_property'] = undefined;
-  /**
-   * @member {Object.<String, Object.<String, String>>} map_of_map_property
-   */
-  exports.prototype['map_of_map_property'] = undefined;
+    /**
+    * @member {Object.<String, String>} map_property
+    */
+    map_property = undefined;
+    /**
+    * @member {Object.<String, Object.<String, String>>} map_of_map_property
+    */
+    map_of_map_property = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/Animal.js b/samples/client/petstore/javascript-promise-es6/src/model/Animal.js
index 09119420568..b3fb1a63f32 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/Animal.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/Animal.js
@@ -7,86 +7,83 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The Animal model module.
+* @module model/Animal
+* @version 1.0.0
+*/
+export default class Animal {
+    /**
+    * Constructs a new <code>Animal</code>.
+    * @alias module:model/Animal
+    * @class
+    * @param className {String} 
+    */
+
+    constructor(className) {
+        
+
+        
+        
+
+        this['className'] = className;
+
+        
     }
-    root.SwaggerPetstore.Animal = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Animal</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Animal} obj Optional instance to populate.
+    * @return {module:model/Animal} The populated <code>Animal</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Animal();
 
+            
+            
+            
 
-
-  /**
-   * The Animal model module.
-   * @module model/Animal
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Animal</code>.
-   * @alias module:model/Animal
-   * @class
-   * @param className {String} 
-   */
-  var exports = function(className) {
-    var _this = this;
-
-    _this['className'] = className;
-
-  };
-
-  /**
-   * Constructs a <code>Animal</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Animal} obj Optional instance to populate.
-   * @return {module:model/Animal} The populated <code>Animal</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('className')) {
-        obj['className'] = ApiClient.convertToType(data['className'], 'String');
-      }
-      if (data.hasOwnProperty('color')) {
-        obj['color'] = ApiClient.convertToType(data['color'], 'String');
-      }
+            if (data.hasOwnProperty('className')) {
+                obj['className'] = ApiClient.convertToType(data['className'], 'String');
+            }
+            if (data.hasOwnProperty('color')) {
+                obj['color'] = ApiClient.convertToType(data['color'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {String} className
-   */
-  exports.prototype['className'] = undefined;
-  /**
-   * @member {String} color
-   * @default 'red'
-   */
-  exports.prototype['color'] = 'red';
+    /**
+    * @member {String} className
+    */
+    className = undefined;
+    /**
+    * @member {String} color
+    * @default 'red'
+    */
+    color = 'red';
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/AnimalFarm.js b/samples/client/petstore/javascript-promise-es6/src/model/AnimalFarm.js
index 891009dab71..8dc9f00cadb 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/AnimalFarm.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/AnimalFarm.js
@@ -7,73 +7,72 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/Animal'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('./Animal'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+import Animal from './Animal';
+
+
+
+
+
+/**
+* The AnimalFarm model module.
+* @module model/AnimalFarm
+* @version 1.0.0
+*/
+export default class AnimalFarm {
+    /**
+    * Constructs a new <code>AnimalFarm</code>.
+    * @alias module:model/AnimalFarm
+    * @class
+    * @extends Array
+    */
+
+    constructor() {
+        
+        this = new Array();
+        Object.setPrototypeOf(this, AnimalFarm);
+
+        
+        
+
+        
+
+        return this;
     }
-    root.SwaggerPetstore.AnimalFarm = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Animal);
-  }
-}(this, function(ApiClient, Animal) {
-  'use strict';
 
+    /**
+    * Constructs a <code>AnimalFarm</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/AnimalFarm} obj Optional instance to populate.
+    * @return {module:model/AnimalFarm} The populated <code>AnimalFarm</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new AnimalFarm();
 
+            ApiClient.constructFromObject(data, obj, 'Animal');
 
+            
+            
 
-  /**
-   * The AnimalFarm model module.
-   * @module model/AnimalFarm
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>AnimalFarm</code>.
-   * @alias module:model/AnimalFarm
-   * @class
-   * @extends Array
-   */
-  var exports = function() {
-    var _this = this;
-    _this = new Array();
-    Object.setPrototypeOf(_this, exports);
-
-    return _this;
-  };
-
-  /**
-   * Constructs a <code>AnimalFarm</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/AnimalFarm} obj Optional instance to populate.
-   * @return {module:model/AnimalFarm} The populated <code>AnimalFarm</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-      ApiClient.constructFromObject(data, obj, 'Animal');
-
+        }
+        return obj;
     }
-    return obj;
-  }
 
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/ApiResponse.js b/samples/client/petstore/javascript-promise-es6/src/model/ApiResponse.js
index 12e9e16275f..49ddd1ac27f 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/ApiResponse.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/ApiResponse.js
@@ -7,92 +7,88 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The ApiResponse model module.
+* @module model/ApiResponse
+* @version 1.0.0
+*/
+export default class ApiResponse {
+    /**
+    * Constructs a new <code>ApiResponse</code>.
+    * @alias module:model/ApiResponse
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.ApiResponse = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>ApiResponse</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/ApiResponse} obj Optional instance to populate.
+    * @return {module:model/ApiResponse} The populated <code>ApiResponse</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new ApiResponse();
 
+            
+            
+            
 
-
-  /**
-   * The ApiResponse model module.
-   * @module model/ApiResponse
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>ApiResponse</code>.
-   * @alias module:model/ApiResponse
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-
-  };
-
-  /**
-   * Constructs a <code>ApiResponse</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/ApiResponse} obj Optional instance to populate.
-   * @return {module:model/ApiResponse} The populated <code>ApiResponse</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('code')) {
-        obj['code'] = ApiClient.convertToType(data['code'], 'Number');
-      }
-      if (data.hasOwnProperty('type')) {
-        obj['type'] = ApiClient.convertToType(data['type'], 'String');
-      }
-      if (data.hasOwnProperty('message')) {
-        obj['message'] = ApiClient.convertToType(data['message'], 'String');
-      }
+            if (data.hasOwnProperty('code')) {
+                obj['code'] = ApiClient.convertToType(data['code'], 'Number');
+            }
+            if (data.hasOwnProperty('type')) {
+                obj['type'] = ApiClient.convertToType(data['type'], 'String');
+            }
+            if (data.hasOwnProperty('message')) {
+                obj['message'] = ApiClient.convertToType(data['message'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} code
-   */
-  exports.prototype['code'] = undefined;
-  /**
-   * @member {String} type
-   */
-  exports.prototype['type'] = undefined;
-  /**
-   * @member {String} message
-   */
-  exports.prototype['message'] = undefined;
+    /**
+    * @member {Number} code
+    */
+    code = undefined;
+    /**
+    * @member {String} type
+    */
+    type = undefined;
+    /**
+    * @member {String} message
+    */
+    message = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/ArrayOfArrayOfNumberOnly.js b/samples/client/petstore/javascript-promise-es6/src/model/ArrayOfArrayOfNumberOnly.js
index c620c19e667..1dfd4487c62 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/ArrayOfArrayOfNumberOnly.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/ArrayOfArrayOfNumberOnly.js
@@ -7,76 +7,74 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The ArrayOfArrayOfNumberOnly model module.
+* @module model/ArrayOfArrayOfNumberOnly
+* @version 1.0.0
+*/
+export default class ArrayOfArrayOfNumberOnly {
+    /**
+    * Constructs a new <code>ArrayOfArrayOfNumberOnly</code>.
+    * @alias module:model/ArrayOfArrayOfNumberOnly
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.ArrayOfArrayOfNumberOnly = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>ArrayOfArrayOfNumberOnly</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/ArrayOfArrayOfNumberOnly} obj Optional instance to populate.
+    * @return {module:model/ArrayOfArrayOfNumberOnly} The populated <code>ArrayOfArrayOfNumberOnly</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new ArrayOfArrayOfNumberOnly();
 
+            
+            
+            
 
-
-  /**
-   * The ArrayOfArrayOfNumberOnly model module.
-   * @module model/ArrayOfArrayOfNumberOnly
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>ArrayOfArrayOfNumberOnly</code>.
-   * @alias module:model/ArrayOfArrayOfNumberOnly
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-  };
-
-  /**
-   * Constructs a <code>ArrayOfArrayOfNumberOnly</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/ArrayOfArrayOfNumberOnly} obj Optional instance to populate.
-   * @return {module:model/ArrayOfArrayOfNumberOnly} The populated <code>ArrayOfArrayOfNumberOnly</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('ArrayArrayNumber')) {
-        obj['ArrayArrayNumber'] = ApiClient.convertToType(data['ArrayArrayNumber'], [['Number']]);
-      }
+            if (data.hasOwnProperty('ArrayArrayNumber')) {
+                obj['ArrayArrayNumber'] = ApiClient.convertToType(data['ArrayArrayNumber'], [['Number']]);
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Array.<Array.<Number>>} ArrayArrayNumber
-   */
-  exports.prototype['ArrayArrayNumber'] = undefined;
+    /**
+    * @member {Array.<Array.<Number>>} ArrayArrayNumber
+    */
+    ArrayArrayNumber = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/ArrayOfNumberOnly.js b/samples/client/petstore/javascript-promise-es6/src/model/ArrayOfNumberOnly.js
index 66980b9b8d1..379a19ba3ff 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/ArrayOfNumberOnly.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/ArrayOfNumberOnly.js
@@ -7,76 +7,74 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The ArrayOfNumberOnly model module.
+* @module model/ArrayOfNumberOnly
+* @version 1.0.0
+*/
+export default class ArrayOfNumberOnly {
+    /**
+    * Constructs a new <code>ArrayOfNumberOnly</code>.
+    * @alias module:model/ArrayOfNumberOnly
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.ArrayOfNumberOnly = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>ArrayOfNumberOnly</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/ArrayOfNumberOnly} obj Optional instance to populate.
+    * @return {module:model/ArrayOfNumberOnly} The populated <code>ArrayOfNumberOnly</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new ArrayOfNumberOnly();
 
+            
+            
+            
 
-
-  /**
-   * The ArrayOfNumberOnly model module.
-   * @module model/ArrayOfNumberOnly
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>ArrayOfNumberOnly</code>.
-   * @alias module:model/ArrayOfNumberOnly
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-  };
-
-  /**
-   * Constructs a <code>ArrayOfNumberOnly</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/ArrayOfNumberOnly} obj Optional instance to populate.
-   * @return {module:model/ArrayOfNumberOnly} The populated <code>ArrayOfNumberOnly</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('ArrayNumber')) {
-        obj['ArrayNumber'] = ApiClient.convertToType(data['ArrayNumber'], ['Number']);
-      }
+            if (data.hasOwnProperty('ArrayNumber')) {
+                obj['ArrayNumber'] = ApiClient.convertToType(data['ArrayNumber'], ['Number']);
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Array.<Number>} ArrayNumber
-   */
-  exports.prototype['ArrayNumber'] = undefined;
+    /**
+    * @member {Array.<Number>} ArrayNumber
+    */
+    ArrayNumber = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/ArrayTest.js b/samples/client/petstore/javascript-promise-es6/src/model/ArrayTest.js
index 2fb4ecb6c24..58e9ac58840 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/ArrayTest.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/ArrayTest.js
@@ -7,92 +7,89 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/ReadOnlyFirst'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('./ReadOnlyFirst'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+import ReadOnlyFirst from './ReadOnlyFirst';
+
+
+
+
+
+/**
+* The ArrayTest model module.
+* @module model/ArrayTest
+* @version 1.0.0
+*/
+export default class ArrayTest {
+    /**
+    * Constructs a new <code>ArrayTest</code>.
+    * @alias module:model/ArrayTest
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.ArrayTest = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.ReadOnlyFirst);
-  }
-}(this, function(ApiClient, ReadOnlyFirst) {
-  'use strict';
 
+    /**
+    * Constructs a <code>ArrayTest</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/ArrayTest} obj Optional instance to populate.
+    * @return {module:model/ArrayTest} The populated <code>ArrayTest</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new ArrayTest();
 
+            
+            
+            
 
-
-  /**
-   * The ArrayTest model module.
-   * @module model/ArrayTest
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>ArrayTest</code>.
-   * @alias module:model/ArrayTest
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-
-  };
-
-  /**
-   * Constructs a <code>ArrayTest</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/ArrayTest} obj Optional instance to populate.
-   * @return {module:model/ArrayTest} The populated <code>ArrayTest</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('array_of_string')) {
-        obj['array_of_string'] = ApiClient.convertToType(data['array_of_string'], ['String']);
-      }
-      if (data.hasOwnProperty('array_array_of_integer')) {
-        obj['array_array_of_integer'] = ApiClient.convertToType(data['array_array_of_integer'], [['Number']]);
-      }
-      if (data.hasOwnProperty('array_array_of_model')) {
-        obj['array_array_of_model'] = ApiClient.convertToType(data['array_array_of_model'], [[ReadOnlyFirst]]);
-      }
+            if (data.hasOwnProperty('array_of_string')) {
+                obj['array_of_string'] = ApiClient.convertToType(data['array_of_string'], ['String']);
+            }
+            if (data.hasOwnProperty('array_array_of_integer')) {
+                obj['array_array_of_integer'] = ApiClient.convertToType(data['array_array_of_integer'], [['Number']]);
+            }
+            if (data.hasOwnProperty('array_array_of_model')) {
+                obj['array_array_of_model'] = ApiClient.convertToType(data['array_array_of_model'], [[ReadOnlyFirst]]);
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Array.<String>} array_of_string
-   */
-  exports.prototype['array_of_string'] = undefined;
-  /**
-   * @member {Array.<Array.<Number>>} array_array_of_integer
-   */
-  exports.prototype['array_array_of_integer'] = undefined;
-  /**
-   * @member {Array.<Array.<module:model/ReadOnlyFirst>>} array_array_of_model
-   */
-  exports.prototype['array_array_of_model'] = undefined;
+    /**
+    * @member {Array.<String>} array_of_string
+    */
+    array_of_string = undefined;
+    /**
+    * @member {Array.<Array.<Number>>} array_array_of_integer
+    */
+    array_array_of_integer = undefined;
+    /**
+    * @member {Array.<Array.<module:model/ReadOnlyFirst>>} array_array_of_model
+    */
+    array_array_of_model = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/Capitalization.js b/samples/client/petstore/javascript-promise-es6/src/model/Capitalization.js
index 54154d396f8..12f3f3f5593 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/Capitalization.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/Capitalization.js
@@ -7,117 +7,110 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The Capitalization model module.
+* @module model/Capitalization
+* @version 1.0.0
+*/
+export default class Capitalization {
+    /**
+    * Constructs a new <code>Capitalization</code>.
+    * @alias module:model/Capitalization
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.Capitalization = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Capitalization</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Capitalization} obj Optional instance to populate.
+    * @return {module:model/Capitalization} The populated <code>Capitalization</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Capitalization();
 
+            
+            
+            
 
-
-  /**
-   * The Capitalization model module.
-   * @module model/Capitalization
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Capitalization</code>.
-   * @alias module:model/Capitalization
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-
-
-
-
-  };
-
-  /**
-   * Constructs a <code>Capitalization</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Capitalization} obj Optional instance to populate.
-   * @return {module:model/Capitalization} The populated <code>Capitalization</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('smallCamel')) {
-        obj['smallCamel'] = ApiClient.convertToType(data['smallCamel'], 'String');
-      }
-      if (data.hasOwnProperty('CapitalCamel')) {
-        obj['CapitalCamel'] = ApiClient.convertToType(data['CapitalCamel'], 'String');
-      }
-      if (data.hasOwnProperty('small_Snake')) {
-        obj['small_Snake'] = ApiClient.convertToType(data['small_Snake'], 'String');
-      }
-      if (data.hasOwnProperty('Capital_Snake')) {
-        obj['Capital_Snake'] = ApiClient.convertToType(data['Capital_Snake'], 'String');
-      }
-      if (data.hasOwnProperty('SCA_ETH_Flow_Points')) {
-        obj['SCA_ETH_Flow_Points'] = ApiClient.convertToType(data['SCA_ETH_Flow_Points'], 'String');
-      }
-      if (data.hasOwnProperty('ATT_NAME')) {
-        obj['ATT_NAME'] = ApiClient.convertToType(data['ATT_NAME'], 'String');
-      }
+            if (data.hasOwnProperty('smallCamel')) {
+                obj['smallCamel'] = ApiClient.convertToType(data['smallCamel'], 'String');
+            }
+            if (data.hasOwnProperty('CapitalCamel')) {
+                obj['CapitalCamel'] = ApiClient.convertToType(data['CapitalCamel'], 'String');
+            }
+            if (data.hasOwnProperty('small_Snake')) {
+                obj['small_Snake'] = ApiClient.convertToType(data['small_Snake'], 'String');
+            }
+            if (data.hasOwnProperty('Capital_Snake')) {
+                obj['Capital_Snake'] = ApiClient.convertToType(data['Capital_Snake'], 'String');
+            }
+            if (data.hasOwnProperty('SCA_ETH_Flow_Points')) {
+                obj['SCA_ETH_Flow_Points'] = ApiClient.convertToType(data['SCA_ETH_Flow_Points'], 'String');
+            }
+            if (data.hasOwnProperty('ATT_NAME')) {
+                obj['ATT_NAME'] = ApiClient.convertToType(data['ATT_NAME'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {String} smallCamel
-   */
-  exports.prototype['smallCamel'] = undefined;
-  /**
-   * @member {String} CapitalCamel
-   */
-  exports.prototype['CapitalCamel'] = undefined;
-  /**
-   * @member {String} small_Snake
-   */
-  exports.prototype['small_Snake'] = undefined;
-  /**
-   * @member {String} Capital_Snake
-   */
-  exports.prototype['Capital_Snake'] = undefined;
-  /**
-   * @member {String} SCA_ETH_Flow_Points
-   */
-  exports.prototype['SCA_ETH_Flow_Points'] = undefined;
-  /**
-   * Name of the pet 
-   * @member {String} ATT_NAME
-   */
-  exports.prototype['ATT_NAME'] = undefined;
+    /**
+    * @member {String} smallCamel
+    */
+    smallCamel = undefined;
+    /**
+    * @member {String} CapitalCamel
+    */
+    CapitalCamel = undefined;
+    /**
+    * @member {String} small_Snake
+    */
+    small_Snake = undefined;
+    /**
+    * @member {String} Capital_Snake
+    */
+    Capital_Snake = undefined;
+    /**
+    * @member {String} SCA_ETH_Flow_Points
+    */
+    SCA_ETH_Flow_Points = undefined;
+    /**
+    * Name of the pet 
+    * @member {String} ATT_NAME
+    */
+    ATT_NAME = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/Cat.js b/samples/client/petstore/javascript-promise-es6/src/model/Cat.js
index 862e7b0c910..da946664d08 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/Cat.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/Cat.js
@@ -7,81 +7,78 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/Animal'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('./Animal'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+import Animal from './Animal';
+
+
+
+
+
+/**
+* The Cat model module.
+* @module model/Cat
+* @version 1.0.0
+*/
+export default class Cat {
+    /**
+    * Constructs a new <code>Cat</code>.
+    * @alias module:model/Cat
+    * @class
+    * @extends module:model/Animal
+    * @param className {String} 
+    */
+
+    constructor(className) {
+        
+
+        Animal.call(this, className);
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.Cat = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Animal);
-  }
-}(this, function(ApiClient, Animal) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Cat</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Cat} obj Optional instance to populate.
+    * @return {module:model/Cat} The populated <code>Cat</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Cat();
 
+            
 
+            Animal.constructFromObject(data, obj);
+            
 
-  /**
-   * The Cat model module.
-   * @module model/Cat
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Cat</code>.
-   * @alias module:model/Cat
-   * @class
-   * @extends module:model/Animal
-   * @param className {String} 
-   */
-  var exports = function(className) {
-    var _this = this;
-    Animal.call(_this, className);
-
-  };
-
-  /**
-   * Constructs a <code>Cat</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Cat} obj Optional instance to populate.
-   * @return {module:model/Cat} The populated <code>Cat</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-      Animal.constructFromObject(data, obj);
-      if (data.hasOwnProperty('declawed')) {
-        obj['declawed'] = ApiClient.convertToType(data['declawed'], 'Boolean');
-      }
+            if (data.hasOwnProperty('declawed')) {
+                obj['declawed'] = ApiClient.convertToType(data['declawed'], 'Boolean');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  exports.prototype = Object.create(Animal.prototype);
-  exports.prototype.constructor = exports;
-
-  /**
-   * @member {Boolean} declawed
-   */
-  exports.prototype['declawed'] = undefined;
+    /**
+    * @member {Boolean} declawed
+    */
+    declawed = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/Category.js b/samples/client/petstore/javascript-promise-es6/src/model/Category.js
index d7ecc2207da..a281817b72f 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/Category.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/Category.js
@@ -7,84 +7,81 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The Category model module.
+* @module model/Category
+* @version 1.0.0
+*/
+export default class Category {
+    /**
+    * Constructs a new <code>Category</code>.
+    * @alias module:model/Category
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.Category = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Category</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Category} obj Optional instance to populate.
+    * @return {module:model/Category} The populated <code>Category</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Category();
 
+            
+            
+            
 
-
-  /**
-   * The Category model module.
-   * @module model/Category
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Category</code>.
-   * @alias module:model/Category
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-  };
-
-  /**
-   * Constructs a <code>Category</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Category} obj Optional instance to populate.
-   * @return {module:model/Category} The populated <code>Category</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('id')) {
-        obj['id'] = ApiClient.convertToType(data['id'], 'Number');
-      }
-      if (data.hasOwnProperty('name')) {
-        obj['name'] = ApiClient.convertToType(data['name'], 'String');
-      }
+            if (data.hasOwnProperty('id')) {
+                obj['id'] = ApiClient.convertToType(data['id'], 'Number');
+            }
+            if (data.hasOwnProperty('name')) {
+                obj['name'] = ApiClient.convertToType(data['name'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} id
-   */
-  exports.prototype['id'] = undefined;
-  /**
-   * @member {String} name
-   */
-  exports.prototype['name'] = undefined;
+    /**
+    * @member {Number} id
+    */
+    id = undefined;
+    /**
+    * @member {String} name
+    */
+    name = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/ClassModel.js b/samples/client/petstore/javascript-promise-es6/src/model/ClassModel.js
index c3b7b83f9c5..6a558444ade 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/ClassModel.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/ClassModel.js
@@ -7,77 +7,75 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The ClassModel model module.
+* @module model/ClassModel
+* @version 1.0.0
+*/
+export default class ClassModel {
+    /**
+    * Constructs a new <code>ClassModel</code>.
+    * Model for testing model with \&quot;_class\&quot; property
+    * @alias module:model/ClassModel
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.ClassModel = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>ClassModel</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/ClassModel} obj Optional instance to populate.
+    * @return {module:model/ClassModel} The populated <code>ClassModel</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new ClassModel();
 
+            
+            
+            
 
-
-  /**
-   * The ClassModel model module.
-   * @module model/ClassModel
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>ClassModel</code>.
-   * Model for testing model with \&quot;_class\&quot; property
-   * @alias module:model/ClassModel
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-  };
-
-  /**
-   * Constructs a <code>ClassModel</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/ClassModel} obj Optional instance to populate.
-   * @return {module:model/ClassModel} The populated <code>ClassModel</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('_class')) {
-        obj['_class'] = ApiClient.convertToType(data['_class'], 'String');
-      }
+            if (data.hasOwnProperty('_class')) {
+                obj['_class'] = ApiClient.convertToType(data['_class'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {String} _class
-   */
-  exports.prototype['_class'] = undefined;
+    /**
+    * @member {String} _class
+    */
+    _class = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/Client.js b/samples/client/petstore/javascript-promise-es6/src/model/Client.js
index a2912224910..a4f9b235154 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/Client.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/Client.js
@@ -7,76 +7,74 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The Client model module.
+* @module model/Client
+* @version 1.0.0
+*/
+export default class Client {
+    /**
+    * Constructs a new <code>Client</code>.
+    * @alias module:model/Client
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.Client = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Client</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Client} obj Optional instance to populate.
+    * @return {module:model/Client} The populated <code>Client</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Client();
 
+            
+            
+            
 
-
-  /**
-   * The Client model module.
-   * @module model/Client
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Client</code>.
-   * @alias module:model/Client
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-  };
-
-  /**
-   * Constructs a <code>Client</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Client} obj Optional instance to populate.
-   * @return {module:model/Client} The populated <code>Client</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('client')) {
-        obj['client'] = ApiClient.convertToType(data['client'], 'String');
-      }
+            if (data.hasOwnProperty('client')) {
+                obj['client'] = ApiClient.convertToType(data['client'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {String} client
-   */
-  exports.prototype['client'] = undefined;
+    /**
+    * @member {String} client
+    */
+    client = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/Dog.js b/samples/client/petstore/javascript-promise-es6/src/model/Dog.js
index 2cd286fb741..e5bc0d3cecf 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/Dog.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/Dog.js
@@ -7,81 +7,78 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/Animal'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('./Animal'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+import Animal from './Animal';
+
+
+
+
+
+/**
+* The Dog model module.
+* @module model/Dog
+* @version 1.0.0
+*/
+export default class Dog {
+    /**
+    * Constructs a new <code>Dog</code>.
+    * @alias module:model/Dog
+    * @class
+    * @extends module:model/Animal
+    * @param className {String} 
+    */
+
+    constructor(className) {
+        
+
+        Animal.call(this, className);
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.Dog = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Animal);
-  }
-}(this, function(ApiClient, Animal) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Dog</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Dog} obj Optional instance to populate.
+    * @return {module:model/Dog} The populated <code>Dog</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Dog();
 
+            
 
+            Animal.constructFromObject(data, obj);
+            
 
-  /**
-   * The Dog model module.
-   * @module model/Dog
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Dog</code>.
-   * @alias module:model/Dog
-   * @class
-   * @extends module:model/Animal
-   * @param className {String} 
-   */
-  var exports = function(className) {
-    var _this = this;
-    Animal.call(_this, className);
-
-  };
-
-  /**
-   * Constructs a <code>Dog</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Dog} obj Optional instance to populate.
-   * @return {module:model/Dog} The populated <code>Dog</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-      Animal.constructFromObject(data, obj);
-      if (data.hasOwnProperty('breed')) {
-        obj['breed'] = ApiClient.convertToType(data['breed'], 'String');
-      }
+            if (data.hasOwnProperty('breed')) {
+                obj['breed'] = ApiClient.convertToType(data['breed'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  exports.prototype = Object.create(Animal.prototype);
-  exports.prototype.constructor = exports;
-
-  /**
-   * @member {String} breed
-   */
-  exports.prototype['breed'] = undefined;
+    /**
+    * @member {String} breed
+    */
+    breed = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/EnumArrays.js b/samples/client/petstore/javascript-promise-es6/src/model/EnumArrays.js
index 079cfe25084..20a74f0d883 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/EnumArrays.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/EnumArrays.js
@@ -7,118 +7,121 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The EnumArrays model module.
+* @module model/EnumArrays
+* @version 1.0.0
+*/
+export default class EnumArrays {
+    /**
+    * Constructs a new <code>EnumArrays</code>.
+    * @alias module:model/EnumArrays
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.EnumArrays = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>EnumArrays</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/EnumArrays} obj Optional instance to populate.
+    * @return {module:model/EnumArrays} The populated <code>EnumArrays</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new EnumArrays();
 
+            
+            
+            
 
-
-  /**
-   * The EnumArrays model module.
-   * @module model/EnumArrays
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>EnumArrays</code>.
-   * @alias module:model/EnumArrays
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-  };
-
-  /**
-   * Constructs a <code>EnumArrays</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/EnumArrays} obj Optional instance to populate.
-   * @return {module:model/EnumArrays} The populated <code>EnumArrays</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('just_symbol')) {
-        obj['just_symbol'] = ApiClient.convertToType(data['just_symbol'], 'String');
-      }
-      if (data.hasOwnProperty('array_enum')) {
-        obj['array_enum'] = ApiClient.convertToType(data['array_enum'], ['String']);
-      }
+            if (data.hasOwnProperty('just_symbol')) {
+                obj['just_symbol'] = ApiClient.convertToType(data['just_symbol'], 'String');
+            }
+            if (data.hasOwnProperty('array_enum')) {
+                obj['array_enum'] = ApiClient.convertToType(data['array_enum'], ['String']);
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {module:model/EnumArrays.JustSymbolEnum} just_symbol
-   */
-  exports.prototype['just_symbol'] = undefined;
-  /**
-   * @member {Array.<module:model/EnumArrays.ArrayEnumEnum>} array_enum
-   */
-  exports.prototype['array_enum'] = undefined;
-
-
-  /**
-   * Allowed values for the <code>just_symbol</code> property.
-   * @enum {String}
-   * @readonly
-   */
-  exports.JustSymbolEnum = {
     /**
-     * value: ">="
-     * @const
-     */
-    "GREATER_THAN_OR_EQUAL_TO": ">=",
+    * @member {module:model/EnumArrays.JustSymbolEnum} just_symbol
+    */
+    just_symbol = undefined;
     /**
-     * value: "$"
-     * @const
-     */
-    "DOLLAR": "$"  };
+    * @member {Array.<module:model/EnumArrays.ArrayEnumEnum>} array_enum
+    */
+    array_enum = undefined;
+
+
+
+
+
 
-  /**
-   * Allowed values for the <code>arrayEnum</code> property.
-   * @enum {String}
-   * @readonly
-   */
-  exports.ArrayEnumEnum = {
     /**
-     * value: "fish"
-     * @const
-     */
-    "fish": "fish",
+    * Allowed values for the <code>just_symbol</code> property.
+    * @enum {String}
+    * @readonly
+    */
+    static JustSymbolEnum = {
+    
+        /**
+         * value: ">="
+         * @const
+         */
+        "GREATER_THAN_OR_EQUAL_TO": ">=",
+    
+        /**
+         * value: "$"
+         * @const
+         */
+        "DOLLAR": "$"    
+    };
+
     /**
-     * value: "crab"
-     * @const
-     */
-    "crab": "crab"  };
+    * Allowed values for the <code>arrayEnum</code> property.
+    * @enum {String}
+    * @readonly
+    */
+    static ArrayEnumEnum = {
+    
+        /**
+         * value: "fish"
+         * @const
+         */
+        "fish": "fish",
+    
+        /**
+         * value: "crab"
+         * @const
+         */
+        "crab": "crab"    
+    };
 
 
-  return exports;
-}));
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/EnumClass.js b/samples/client/petstore/javascript-promise-es6/src/model/EnumClass.js
index 881a7503047..eeb08ca2864 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/EnumClass.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/EnumClass.js
@@ -7,63 +7,51 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+/**
+* Enum class EnumClass.
+* @enum {}
+* @readonly
+*/
+export default class EnumClass {
+    
+        /**
+         * value: "_abc"
+         * @const
+         */
+        _abc = "_abc";
+
+    
+        /**
+         * value: "-efg"
+         * @const
+         */
+        -efg = "-efg";
+
+    
+        /**
+         * value: "(xyz)"
+         * @const
+         */
+        (xyz) = "(xyz)";
+
+    
+
+    /**
+    * Returns a <code>EnumClass</code> enum value from a Javascript object name.
+    * @param {Object} data The plain JavaScript object containing the name of the enum value.
+    * @return {module:model/EnumClass} The enum <code>EnumClass</code> value.
+    */
+    static constructFromObject(object) {
+        return object;
     }
-    root.SwaggerPetstore.EnumClass = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
-
-
-  /**
-   * Enum class EnumClass.
-   * @enum {}
-   * @readonly
-   */
-  var exports = {
-    /**
-     * value: "_abc"
-     * @const
-     */
-    "_abc": "_abc",
-    /**
-     * value: "-efg"
-     * @const
-     */
-    "-efg": "-efg",
-    /**
-     * value: "(xyz)"
-     * @const
-     */
-    "(xyz)": "(xyz)"  };
-
-  /**
-   * Returns a <code>EnumClass</code> enum value from a Javascript object name.
-   * @param {Object} data The plain JavaScript object containing the name of the enum value.
-   * @return {module:model/EnumClass} The enum <code>EnumClass</code> value.
-   */
-  exports.constructFromObject = function(object) {
-    return object;
-  }
-
-  return exports;
-}));
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/EnumTest.js b/samples/client/petstore/javascript-promise-es6/src/model/EnumTest.js
index 215bea59d38..b1f9b0b6c69 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/EnumTest.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/EnumTest.js
@@ -7,156 +7,162 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/OuterEnum'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('./OuterEnum'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+import OuterEnum from './OuterEnum';
+
+
+
+
+
+/**
+* The EnumTest model module.
+* @module model/EnumTest
+* @version 1.0.0
+*/
+export default class EnumTest {
+    /**
+    * Constructs a new <code>EnumTest</code>.
+    * @alias module:model/EnumTest
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.EnumTest = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.OuterEnum);
-  }
-}(this, function(ApiClient, OuterEnum) {
-  'use strict';
 
+    /**
+    * Constructs a <code>EnumTest</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/EnumTest} obj Optional instance to populate.
+    * @return {module:model/EnumTest} The populated <code>EnumTest</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new EnumTest();
 
+            
+            
+            
 
-
-  /**
-   * The EnumTest model module.
-   * @module model/EnumTest
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>EnumTest</code>.
-   * @alias module:model/EnumTest
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-
-
-  };
-
-  /**
-   * Constructs a <code>EnumTest</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/EnumTest} obj Optional instance to populate.
-   * @return {module:model/EnumTest} The populated <code>EnumTest</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('enum_string')) {
-        obj['enum_string'] = ApiClient.convertToType(data['enum_string'], 'String');
-      }
-      if (data.hasOwnProperty('enum_integer')) {
-        obj['enum_integer'] = ApiClient.convertToType(data['enum_integer'], 'Number');
-      }
-      if (data.hasOwnProperty('enum_number')) {
-        obj['enum_number'] = ApiClient.convertToType(data['enum_number'], 'Number');
-      }
-      if (data.hasOwnProperty('outerEnum')) {
-        obj['outerEnum'] = OuterEnum.constructFromObject(data['outerEnum']);
-      }
+            if (data.hasOwnProperty('enum_string')) {
+                obj['enum_string'] = ApiClient.convertToType(data['enum_string'], 'String');
+            }
+            if (data.hasOwnProperty('enum_integer')) {
+                obj['enum_integer'] = ApiClient.convertToType(data['enum_integer'], 'Number');
+            }
+            if (data.hasOwnProperty('enum_number')) {
+                obj['enum_number'] = ApiClient.convertToType(data['enum_number'], 'Number');
+            }
+            if (data.hasOwnProperty('outerEnum')) {
+                obj['outerEnum'] = OuterEnum.constructFromObject(data['outerEnum']);
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {module:model/EnumTest.EnumStringEnum} enum_string
-   */
-  exports.prototype['enum_string'] = undefined;
-  /**
-   * @member {module:model/EnumTest.EnumIntegerEnum} enum_integer
-   */
-  exports.prototype['enum_integer'] = undefined;
-  /**
-   * @member {module:model/EnumTest.EnumNumberEnum} enum_number
-   */
-  exports.prototype['enum_number'] = undefined;
-  /**
-   * @member {module:model/OuterEnum} outerEnum
-   */
-  exports.prototype['outerEnum'] = undefined;
-
-
-  /**
-   * Allowed values for the <code>enum_string</code> property.
-   * @enum {String}
-   * @readonly
-   */
-  exports.EnumStringEnum = {
     /**
-     * value: "UPPER"
-     * @const
-     */
-    "UPPER": "UPPER",
+    * @member {module:model/EnumTest.EnumStringEnum} enum_string
+    */
+    enum_string = undefined;
     /**
-     * value: "lower"
-     * @const
-     */
-    "lower": "lower",
+    * @member {module:model/EnumTest.EnumIntegerEnum} enum_integer
+    */
+    enum_integer = undefined;
     /**
-     * value: ""
-     * @const
-     */
-    "empty": ""  };
-
-  /**
-   * Allowed values for the <code>enum_integer</code> property.
-   * @enum {Number}
-   * @readonly
-   */
-  exports.EnumIntegerEnum = {
+    * @member {module:model/EnumTest.EnumNumberEnum} enum_number
+    */
+    enum_number = undefined;
     /**
-     * value: 1
-     * @const
-     */
-    "1": 1,
-    /**
-     * value: -1
-     * @const
-     */
-    "-1": -1  };
-
-  /**
-   * Allowed values for the <code>enum_number</code> property.
-   * @enum {Number}
-   * @readonly
-   */
-  exports.EnumNumberEnum = {
-    /**
-     * value: 1.1
-     * @const
-     */
-    "1.1": 1.1,
-    /**
-     * value: -1.2
-     * @const
-     */
-    "-1.2": -1.2  };
+    * @member {module:model/OuterEnum} outerEnum
+    */
+    outerEnum = undefined;
 
 
-  return exports;
-}));
+
+
+
+
+    /**
+    * Allowed values for the <code>enum_string</code> property.
+    * @enum {String}
+    * @readonly
+    */
+    static EnumStringEnum = {
+    
+        /**
+         * value: "UPPER"
+         * @const
+         */
+        "UPPER": "UPPER",
+    
+        /**
+         * value: "lower"
+         * @const
+         */
+        "lower": "lower",
+    
+        /**
+         * value: ""
+         * @const
+         */
+        "empty": ""    
+    };
+
+    /**
+    * Allowed values for the <code>enum_integer</code> property.
+    * @enum {Number}
+    * @readonly
+    */
+    static EnumIntegerEnum = {
+    
+        /**
+         * value: 1
+         * @const
+         */
+        "1": 1,
+    
+        /**
+         * value: -1
+         * @const
+         */
+        "-1": -1    
+    };
+
+    /**
+    * Allowed values for the <code>enum_number</code> property.
+    * @enum {Number}
+    * @readonly
+    */
+    static EnumNumberEnum = {
+    
+        /**
+         * value: 1.1
+         * @const
+         */
+        "1.1": 1.1,
+    
+        /**
+         * value: -1.2
+         * @const
+         */
+        "-1.2": -1.2    
+    };
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/FormatTest.js b/samples/client/petstore/javascript-promise-es6/src/model/FormatTest.js
index 238224d0132..8773a3a7755 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/FormatTest.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/FormatTest.js
@@ -7,176 +7,162 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The FormatTest model module.
+* @module model/FormatTest
+* @version 1.0.0
+*/
+export default class FormatTest {
+    /**
+    * Constructs a new <code>FormatTest</code>.
+    * @alias module:model/FormatTest
+    * @class
+    * @param _number {Number} 
+    * @param _byte {Blob} 
+    * @param _date {Date} 
+    * @param password {String} 
+    */
+
+    constructor(_number, _byte, _date, password) {
+        
+
+        
+        
+
+        this['number'] = _number;this['byte'] = _byte;this['date'] = _date;this['password'] = password;
+
+        
     }
-    root.SwaggerPetstore.FormatTest = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>FormatTest</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/FormatTest} obj Optional instance to populate.
+    * @return {module:model/FormatTest} The populated <code>FormatTest</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new FormatTest();
 
+            
+            
+            
 
-
-  /**
-   * The FormatTest model module.
-   * @module model/FormatTest
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>FormatTest</code>.
-   * @alias module:model/FormatTest
-   * @class
-   * @param _number {Number} 
-   * @param _byte {Blob} 
-   * @param _date {Date} 
-   * @param password {String} 
-   */
-  var exports = function(_number, _byte, _date, password) {
-    var _this = this;
-
-
-
-
-    _this['number'] = _number;
-
-
-
-    _this['byte'] = _byte;
-
-    _this['date'] = _date;
-
-
-    _this['password'] = password;
-  };
-
-  /**
-   * Constructs a <code>FormatTest</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/FormatTest} obj Optional instance to populate.
-   * @return {module:model/FormatTest} The populated <code>FormatTest</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('integer')) {
-        obj['integer'] = ApiClient.convertToType(data['integer'], 'Number');
-      }
-      if (data.hasOwnProperty('int32')) {
-        obj['int32'] = ApiClient.convertToType(data['int32'], 'Number');
-      }
-      if (data.hasOwnProperty('int64')) {
-        obj['int64'] = ApiClient.convertToType(data['int64'], 'Number');
-      }
-      if (data.hasOwnProperty('number')) {
-        obj['number'] = ApiClient.convertToType(data['number'], 'Number');
-      }
-      if (data.hasOwnProperty('float')) {
-        obj['float'] = ApiClient.convertToType(data['float'], 'Number');
-      }
-      if (data.hasOwnProperty('double')) {
-        obj['double'] = ApiClient.convertToType(data['double'], 'Number');
-      }
-      if (data.hasOwnProperty('string')) {
-        obj['string'] = ApiClient.convertToType(data['string'], 'String');
-      }
-      if (data.hasOwnProperty('byte')) {
-        obj['byte'] = ApiClient.convertToType(data['byte'], 'Blob');
-      }
-      if (data.hasOwnProperty('binary')) {
-        obj['binary'] = ApiClient.convertToType(data['binary'], 'Blob');
-      }
-      if (data.hasOwnProperty('date')) {
-        obj['date'] = ApiClient.convertToType(data['date'], 'Date');
-      }
-      if (data.hasOwnProperty('dateTime')) {
-        obj['dateTime'] = ApiClient.convertToType(data['dateTime'], 'Date');
-      }
-      if (data.hasOwnProperty('uuid')) {
-        obj['uuid'] = ApiClient.convertToType(data['uuid'], 'String');
-      }
-      if (data.hasOwnProperty('password')) {
-        obj['password'] = ApiClient.convertToType(data['password'], 'String');
-      }
+            if (data.hasOwnProperty('integer')) {
+                obj['integer'] = ApiClient.convertToType(data['integer'], 'Number');
+            }
+            if (data.hasOwnProperty('int32')) {
+                obj['int32'] = ApiClient.convertToType(data['int32'], 'Number');
+            }
+            if (data.hasOwnProperty('int64')) {
+                obj['int64'] = ApiClient.convertToType(data['int64'], 'Number');
+            }
+            if (data.hasOwnProperty('number')) {
+                obj['number'] = ApiClient.convertToType(data['number'], 'Number');
+            }
+            if (data.hasOwnProperty('float')) {
+                obj['float'] = ApiClient.convertToType(data['float'], 'Number');
+            }
+            if (data.hasOwnProperty('double')) {
+                obj['double'] = ApiClient.convertToType(data['double'], 'Number');
+            }
+            if (data.hasOwnProperty('string')) {
+                obj['string'] = ApiClient.convertToType(data['string'], 'String');
+            }
+            if (data.hasOwnProperty('byte')) {
+                obj['byte'] = ApiClient.convertToType(data['byte'], 'Blob');
+            }
+            if (data.hasOwnProperty('binary')) {
+                obj['binary'] = ApiClient.convertToType(data['binary'], 'Blob');
+            }
+            if (data.hasOwnProperty('date')) {
+                obj['date'] = ApiClient.convertToType(data['date'], 'Date');
+            }
+            if (data.hasOwnProperty('dateTime')) {
+                obj['dateTime'] = ApiClient.convertToType(data['dateTime'], 'Date');
+            }
+            if (data.hasOwnProperty('uuid')) {
+                obj['uuid'] = ApiClient.convertToType(data['uuid'], 'String');
+            }
+            if (data.hasOwnProperty('password')) {
+                obj['password'] = ApiClient.convertToType(data['password'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} integer
-   */
-  exports.prototype['integer'] = undefined;
-  /**
-   * @member {Number} int32
-   */
-  exports.prototype['int32'] = undefined;
-  /**
-   * @member {Number} int64
-   */
-  exports.prototype['int64'] = undefined;
-  /**
-   * @member {Number} number
-   */
-  exports.prototype['number'] = undefined;
-  /**
-   * @member {Number} float
-   */
-  exports.prototype['float'] = undefined;
-  /**
-   * @member {Number} double
-   */
-  exports.prototype['double'] = undefined;
-  /**
-   * @member {String} string
-   */
-  exports.prototype['string'] = undefined;
-  /**
-   * @member {Blob} byte
-   */
-  exports.prototype['byte'] = undefined;
-  /**
-   * @member {Blob} binary
-   */
-  exports.prototype['binary'] = undefined;
-  /**
-   * @member {Date} date
-   */
-  exports.prototype['date'] = undefined;
-  /**
-   * @member {Date} dateTime
-   */
-  exports.prototype['dateTime'] = undefined;
-  /**
-   * @member {String} uuid
-   */
-  exports.prototype['uuid'] = undefined;
-  /**
-   * @member {String} password
-   */
-  exports.prototype['password'] = undefined;
+    /**
+    * @member {Number} integer
+    */
+    integer = undefined;
+    /**
+    * @member {Number} int32
+    */
+    int32 = undefined;
+    /**
+    * @member {Number} int64
+    */
+    int64 = undefined;
+    /**
+    * @member {Number} number
+    */
+    number = undefined;
+    /**
+    * @member {Number} float
+    */
+    float = undefined;
+    /**
+    * @member {Number} double
+    */
+    double = undefined;
+    /**
+    * @member {String} string
+    */
+    string = undefined;
+    /**
+    * @member {Blob} byte
+    */
+    byte = undefined;
+    /**
+    * @member {Blob} binary
+    */
+    binary = undefined;
+    /**
+    * @member {Date} date
+    */
+    date = undefined;
+    /**
+    * @member {Date} dateTime
+    */
+    dateTime = undefined;
+    /**
+    * @member {String} uuid
+    */
+    uuid = undefined;
+    /**
+    * @member {String} password
+    */
+    password = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/HasOnlyReadOnly.js b/samples/client/petstore/javascript-promise-es6/src/model/HasOnlyReadOnly.js
index 566e0663de0..cb859fe3e50 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/HasOnlyReadOnly.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/HasOnlyReadOnly.js
@@ -7,84 +7,81 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The HasOnlyReadOnly model module.
+* @module model/HasOnlyReadOnly
+* @version 1.0.0
+*/
+export default class HasOnlyReadOnly {
+    /**
+    * Constructs a new <code>HasOnlyReadOnly</code>.
+    * @alias module:model/HasOnlyReadOnly
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.HasOnlyReadOnly = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>HasOnlyReadOnly</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/HasOnlyReadOnly} obj Optional instance to populate.
+    * @return {module:model/HasOnlyReadOnly} The populated <code>HasOnlyReadOnly</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new HasOnlyReadOnly();
 
+            
+            
+            
 
-
-  /**
-   * The HasOnlyReadOnly model module.
-   * @module model/HasOnlyReadOnly
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>HasOnlyReadOnly</code>.
-   * @alias module:model/HasOnlyReadOnly
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-  };
-
-  /**
-   * Constructs a <code>HasOnlyReadOnly</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/HasOnlyReadOnly} obj Optional instance to populate.
-   * @return {module:model/HasOnlyReadOnly} The populated <code>HasOnlyReadOnly</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('bar')) {
-        obj['bar'] = ApiClient.convertToType(data['bar'], 'String');
-      }
-      if (data.hasOwnProperty('foo')) {
-        obj['foo'] = ApiClient.convertToType(data['foo'], 'String');
-      }
+            if (data.hasOwnProperty('bar')) {
+                obj['bar'] = ApiClient.convertToType(data['bar'], 'String');
+            }
+            if (data.hasOwnProperty('foo')) {
+                obj['foo'] = ApiClient.convertToType(data['foo'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {String} bar
-   */
-  exports.prototype['bar'] = undefined;
-  /**
-   * @member {String} foo
-   */
-  exports.prototype['foo'] = undefined;
+    /**
+    * @member {String} bar
+    */
+    bar = undefined;
+    /**
+    * @member {String} foo
+    */
+    foo = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/List.js b/samples/client/petstore/javascript-promise-es6/src/model/List.js
index b5db0490fe4..513acd45aff 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/List.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/List.js
@@ -7,76 +7,74 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The List model module.
+* @module model/List
+* @version 1.0.0
+*/
+export default class List {
+    /**
+    * Constructs a new <code>List</code>.
+    * @alias module:model/List
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.List = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>List</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/List} obj Optional instance to populate.
+    * @return {module:model/List} The populated <code>List</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new List();
 
+            
+            
+            
 
-
-  /**
-   * The List model module.
-   * @module model/List
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>List</code>.
-   * @alias module:model/List
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-  };
-
-  /**
-   * Constructs a <code>List</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/List} obj Optional instance to populate.
-   * @return {module:model/List} The populated <code>List</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('123-list')) {
-        obj['123-list'] = ApiClient.convertToType(data['123-list'], 'String');
-      }
+            if (data.hasOwnProperty('123-list')) {
+                obj['123-list'] = ApiClient.convertToType(data['123-list'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {String} 123-list
-   */
-  exports.prototype['123-list'] = undefined;
+    /**
+    * @member {String} 123-list
+    */
+    123-list = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/MapTest.js b/samples/client/petstore/javascript-promise-es6/src/model/MapTest.js
index 59f089976c1..b7a60cd8d9d 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/MapTest.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/MapTest.js
@@ -7,101 +7,101 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
-    }
-    root.SwaggerPetstore.MapTest = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
+
+import ApiClient from '../ApiClient';
 
 
 
 
-  /**
-   * The MapTest model module.
-   * @module model/MapTest
-   * @version 1.0.0
-   */
 
-  /**
-   * Constructs a new <code>MapTest</code>.
-   * @alias module:model/MapTest
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-  };
-
-  /**
-   * Constructs a <code>MapTest</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/MapTest} obj Optional instance to populate.
-   * @return {module:model/MapTest} The populated <code>MapTest</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('map_map_of_string')) {
-        obj['map_map_of_string'] = ApiClient.convertToType(data['map_map_of_string'], {'String': {'String': 'String'}});
-      }
-      if (data.hasOwnProperty('map_of_enum_string')) {
-        obj['map_of_enum_string'] = ApiClient.convertToType(data['map_of_enum_string'], {'String': 'String'});
-      }
-    }
-    return obj;
-  }
-
-  /**
-   * @member {Object.<String, Object.<String, String>>} map_map_of_string
-   */
-  exports.prototype['map_map_of_string'] = undefined;
-  /**
-   * @member {Object.<String, module:model/MapTest.InnerEnum>} map_of_enum_string
-   */
-  exports.prototype['map_of_enum_string'] = undefined;
-
-
-  /**
-   * Allowed values for the <code>inner</code> property.
-   * @enum {String}
-   * @readonly
-   */
-  exports.InnerEnum = {
+/**
+* The MapTest model module.
+* @module model/MapTest
+* @version 1.0.0
+*/
+export default class MapTest {
     /**
-     * value: "UPPER"
-     * @const
-     */
-    "UPPER": "UPPER",
+    * Constructs a new <code>MapTest</code>.
+    * @alias module:model/MapTest
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
+    }
+
     /**
-     * value: "lower"
-     * @const
-     */
-    "lower": "lower"  };
+    * Constructs a <code>MapTest</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/MapTest} obj Optional instance to populate.
+    * @return {module:model/MapTest} The populated <code>MapTest</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new MapTest();
+
+            
+            
+            
+
+            if (data.hasOwnProperty('map_map_of_string')) {
+                obj['map_map_of_string'] = ApiClient.convertToType(data['map_map_of_string'], {'String': {'String': 'String'}});
+            }
+            if (data.hasOwnProperty('map_of_enum_string')) {
+                obj['map_of_enum_string'] = ApiClient.convertToType(data['map_of_enum_string'], {'String': 'String'});
+            }
+        }
+        return obj;
+    }
+
+    /**
+    * @member {Object.<String, Object.<String, String>>} map_map_of_string
+    */
+    map_map_of_string = undefined;
+    /**
+    * @member {Object.<String, module:model/MapTest.InnerEnum>} map_of_enum_string
+    */
+    map_of_enum_string = undefined;
 
 
-  return exports;
-}));
+
+
+
+
+    /**
+    * Allowed values for the <code>inner</code> property.
+    * @enum {String}
+    * @readonly
+    */
+    static InnerEnum = {
+    
+        /**
+         * value: "UPPER"
+         * @const
+         */
+        "UPPER": "UPPER",
+    
+        /**
+         * value: "lower"
+         * @const
+         */
+        "lower": "lower"    
+    };
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/MixedPropertiesAndAdditionalPropertiesClass.js b/samples/client/petstore/javascript-promise-es6/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
index 334b0773a04..6d912ceeb9b 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
@@ -7,92 +7,89 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/Animal'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('./Animal'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+import Animal from './Animal';
+
+
+
+
+
+/**
+* The MixedPropertiesAndAdditionalPropertiesClass model module.
+* @module model/MixedPropertiesAndAdditionalPropertiesClass
+* @version 1.0.0
+*/
+export default class MixedPropertiesAndAdditionalPropertiesClass {
+    /**
+    * Constructs a new <code>MixedPropertiesAndAdditionalPropertiesClass</code>.
+    * @alias module:model/MixedPropertiesAndAdditionalPropertiesClass
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.MixedPropertiesAndAdditionalPropertiesClass = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Animal);
-  }
-}(this, function(ApiClient, Animal) {
-  'use strict';
 
+    /**
+    * Constructs a <code>MixedPropertiesAndAdditionalPropertiesClass</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/MixedPropertiesAndAdditionalPropertiesClass} obj Optional instance to populate.
+    * @return {module:model/MixedPropertiesAndAdditionalPropertiesClass} The populated <code>MixedPropertiesAndAdditionalPropertiesClass</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new MixedPropertiesAndAdditionalPropertiesClass();
 
+            
+            
+            
 
-
-  /**
-   * The MixedPropertiesAndAdditionalPropertiesClass model module.
-   * @module model/MixedPropertiesAndAdditionalPropertiesClass
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>MixedPropertiesAndAdditionalPropertiesClass</code>.
-   * @alias module:model/MixedPropertiesAndAdditionalPropertiesClass
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-
-  };
-
-  /**
-   * Constructs a <code>MixedPropertiesAndAdditionalPropertiesClass</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/MixedPropertiesAndAdditionalPropertiesClass} obj Optional instance to populate.
-   * @return {module:model/MixedPropertiesAndAdditionalPropertiesClass} The populated <code>MixedPropertiesAndAdditionalPropertiesClass</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('uuid')) {
-        obj['uuid'] = ApiClient.convertToType(data['uuid'], 'String');
-      }
-      if (data.hasOwnProperty('dateTime')) {
-        obj['dateTime'] = ApiClient.convertToType(data['dateTime'], 'Date');
-      }
-      if (data.hasOwnProperty('map')) {
-        obj['map'] = ApiClient.convertToType(data['map'], {'String': Animal});
-      }
+            if (data.hasOwnProperty('uuid')) {
+                obj['uuid'] = ApiClient.convertToType(data['uuid'], 'String');
+            }
+            if (data.hasOwnProperty('dateTime')) {
+                obj['dateTime'] = ApiClient.convertToType(data['dateTime'], 'Date');
+            }
+            if (data.hasOwnProperty('map')) {
+                obj['map'] = ApiClient.convertToType(data['map'], {'String': Animal});
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {String} uuid
-   */
-  exports.prototype['uuid'] = undefined;
-  /**
-   * @member {Date} dateTime
-   */
-  exports.prototype['dateTime'] = undefined;
-  /**
-   * @member {Object.<String, module:model/Animal>} map
-   */
-  exports.prototype['map'] = undefined;
+    /**
+    * @member {String} uuid
+    */
+    uuid = undefined;
+    /**
+    * @member {Date} dateTime
+    */
+    dateTime = undefined;
+    /**
+    * @member {Object.<String, module:model/Animal>} map
+    */
+    map = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/Model200Response.js b/samples/client/petstore/javascript-promise-es6/src/model/Model200Response.js
index a10e470be5c..df4d957df7c 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/Model200Response.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/Model200Response.js
@@ -7,85 +7,82 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The Model200Response model module.
+* @module model/Model200Response
+* @version 1.0.0
+*/
+export default class Model200Response {
+    /**
+    * Constructs a new <code>Model200Response</code>.
+    * Model for testing model name starting with number
+    * @alias module:model/Model200Response
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.Model200Response = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Model200Response</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Model200Response} obj Optional instance to populate.
+    * @return {module:model/Model200Response} The populated <code>Model200Response</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Model200Response();
 
+            
+            
+            
 
-
-  /**
-   * The Model200Response model module.
-   * @module model/Model200Response
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Model200Response</code>.
-   * Model for testing model name starting with number
-   * @alias module:model/Model200Response
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-  };
-
-  /**
-   * Constructs a <code>Model200Response</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Model200Response} obj Optional instance to populate.
-   * @return {module:model/Model200Response} The populated <code>Model200Response</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('name')) {
-        obj['name'] = ApiClient.convertToType(data['name'], 'Number');
-      }
-      if (data.hasOwnProperty('class')) {
-        obj['class'] = ApiClient.convertToType(data['class'], 'String');
-      }
+            if (data.hasOwnProperty('name')) {
+                obj['name'] = ApiClient.convertToType(data['name'], 'Number');
+            }
+            if (data.hasOwnProperty('class')) {
+                obj['class'] = ApiClient.convertToType(data['class'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} name
-   */
-  exports.prototype['name'] = undefined;
-  /**
-   * @member {String} class
-   */
-  exports.prototype['class'] = undefined;
+    /**
+    * @member {Number} name
+    */
+    name = undefined;
+    /**
+    * @member {String} class
+    */
+    class = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/ModelReturn.js b/samples/client/petstore/javascript-promise-es6/src/model/ModelReturn.js
index 07467bbaa63..88fd97ab85f 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/ModelReturn.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/ModelReturn.js
@@ -7,77 +7,75 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The ModelReturn model module.
+* @module model/ModelReturn
+* @version 1.0.0
+*/
+export default class ModelReturn {
+    /**
+    * Constructs a new <code>ModelReturn</code>.
+    * Model for testing reserved words
+    * @alias module:model/ModelReturn
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.ModelReturn = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>ModelReturn</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/ModelReturn} obj Optional instance to populate.
+    * @return {module:model/ModelReturn} The populated <code>ModelReturn</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new ModelReturn();
 
+            
+            
+            
 
-
-  /**
-   * The ModelReturn model module.
-   * @module model/ModelReturn
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>ModelReturn</code>.
-   * Model for testing reserved words
-   * @alias module:model/ModelReturn
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-  };
-
-  /**
-   * Constructs a <code>ModelReturn</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/ModelReturn} obj Optional instance to populate.
-   * @return {module:model/ModelReturn} The populated <code>ModelReturn</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('return')) {
-        obj['return'] = ApiClient.convertToType(data['return'], 'Number');
-      }
+            if (data.hasOwnProperty('return')) {
+                obj['return'] = ApiClient.convertToType(data['return'], 'Number');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} return
-   */
-  exports.prototype['return'] = undefined;
+    /**
+    * @member {Number} return
+    */
+    return = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/Name.js b/samples/client/petstore/javascript-promise-es6/src/model/Name.js
index d79c05387fe..f355fbdd403 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/Name.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/Name.js
@@ -7,102 +7,97 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The Name model module.
+* @module model/Name
+* @version 1.0.0
+*/
+export default class Name {
+    /**
+    * Constructs a new <code>Name</code>.
+    * Model for testing model name same as property name
+    * @alias module:model/Name
+    * @class
+    * @param name {Number} 
+    */
+
+    constructor(name) {
+        
+
+        
+        
+
+        this['name'] = name;
+
+        
     }
-    root.SwaggerPetstore.Name = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Name</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Name} obj Optional instance to populate.
+    * @return {module:model/Name} The populated <code>Name</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Name();
 
+            
+            
+            
 
-
-  /**
-   * The Name model module.
-   * @module model/Name
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Name</code>.
-   * Model for testing model name same as property name
-   * @alias module:model/Name
-   * @class
-   * @param name {Number} 
-   */
-  var exports = function(name) {
-    var _this = this;
-
-    _this['name'] = name;
-
-
-
-  };
-
-  /**
-   * Constructs a <code>Name</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Name} obj Optional instance to populate.
-   * @return {module:model/Name} The populated <code>Name</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('name')) {
-        obj['name'] = ApiClient.convertToType(data['name'], 'Number');
-      }
-      if (data.hasOwnProperty('snake_case')) {
-        obj['snake_case'] = ApiClient.convertToType(data['snake_case'], 'Number');
-      }
-      if (data.hasOwnProperty('property')) {
-        obj['property'] = ApiClient.convertToType(data['property'], 'String');
-      }
-      if (data.hasOwnProperty('123Number')) {
-        obj['123Number'] = ApiClient.convertToType(data['123Number'], 'Number');
-      }
+            if (data.hasOwnProperty('name')) {
+                obj['name'] = ApiClient.convertToType(data['name'], 'Number');
+            }
+            if (data.hasOwnProperty('snake_case')) {
+                obj['snake_case'] = ApiClient.convertToType(data['snake_case'], 'Number');
+            }
+            if (data.hasOwnProperty('property')) {
+                obj['property'] = ApiClient.convertToType(data['property'], 'String');
+            }
+            if (data.hasOwnProperty('123Number')) {
+                obj['123Number'] = ApiClient.convertToType(data['123Number'], 'Number');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} name
-   */
-  exports.prototype['name'] = undefined;
-  /**
-   * @member {Number} snake_case
-   */
-  exports.prototype['snake_case'] = undefined;
-  /**
-   * @member {String} property
-   */
-  exports.prototype['property'] = undefined;
-  /**
-   * @member {Number} 123Number
-   */
-  exports.prototype['123Number'] = undefined;
+    /**
+    * @member {Number} name
+    */
+    name = undefined;
+    /**
+    * @member {Number} snake_case
+    */
+    snake_case = undefined;
+    /**
+    * @member {String} property
+    */
+    property = undefined;
+    /**
+    * @member {Number} 123Number
+    */
+    123Number = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/NumberOnly.js b/samples/client/petstore/javascript-promise-es6/src/model/NumberOnly.js
index c5edb0b0a50..bee66870891 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/NumberOnly.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/NumberOnly.js
@@ -7,76 +7,74 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The NumberOnly model module.
+* @module model/NumberOnly
+* @version 1.0.0
+*/
+export default class NumberOnly {
+    /**
+    * Constructs a new <code>NumberOnly</code>.
+    * @alias module:model/NumberOnly
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.NumberOnly = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>NumberOnly</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/NumberOnly} obj Optional instance to populate.
+    * @return {module:model/NumberOnly} The populated <code>NumberOnly</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new NumberOnly();
 
+            
+            
+            
 
-
-  /**
-   * The NumberOnly model module.
-   * @module model/NumberOnly
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>NumberOnly</code>.
-   * @alias module:model/NumberOnly
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-  };
-
-  /**
-   * Constructs a <code>NumberOnly</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/NumberOnly} obj Optional instance to populate.
-   * @return {module:model/NumberOnly} The populated <code>NumberOnly</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('JustNumber')) {
-        obj['JustNumber'] = ApiClient.convertToType(data['JustNumber'], 'Number');
-      }
+            if (data.hasOwnProperty('JustNumber')) {
+                obj['JustNumber'] = ApiClient.convertToType(data['JustNumber'], 'Number');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} JustNumber
-   */
-  exports.prototype['JustNumber'] = undefined;
+    /**
+    * @member {Number} JustNumber
+    */
+    JustNumber = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/Order.js b/samples/client/petstore/javascript-promise-es6/src/model/Order.js
index f4f9087001d..ff704900bbc 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/Order.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/Order.js
@@ -7,140 +7,137 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The Order model module.
+* @module model/Order
+* @version 1.0.0
+*/
+export default class Order {
+    /**
+    * Constructs a new <code>Order</code>.
+    * @alias module:model/Order
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.Order = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Order</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Order} obj Optional instance to populate.
+    * @return {module:model/Order} The populated <code>Order</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Order();
 
+            
+            
+            
 
-
-  /**
-   * The Order model module.
-   * @module model/Order
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Order</code>.
-   * @alias module:model/Order
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-
-
-
-
-  };
-
-  /**
-   * Constructs a <code>Order</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Order} obj Optional instance to populate.
-   * @return {module:model/Order} The populated <code>Order</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('id')) {
-        obj['id'] = ApiClient.convertToType(data['id'], 'Number');
-      }
-      if (data.hasOwnProperty('petId')) {
-        obj['petId'] = ApiClient.convertToType(data['petId'], 'Number');
-      }
-      if (data.hasOwnProperty('quantity')) {
-        obj['quantity'] = ApiClient.convertToType(data['quantity'], 'Number');
-      }
-      if (data.hasOwnProperty('shipDate')) {
-        obj['shipDate'] = ApiClient.convertToType(data['shipDate'], 'Date');
-      }
-      if (data.hasOwnProperty('status')) {
-        obj['status'] = ApiClient.convertToType(data['status'], 'String');
-      }
-      if (data.hasOwnProperty('complete')) {
-        obj['complete'] = ApiClient.convertToType(data['complete'], 'Boolean');
-      }
+            if (data.hasOwnProperty('id')) {
+                obj['id'] = ApiClient.convertToType(data['id'], 'Number');
+            }
+            if (data.hasOwnProperty('petId')) {
+                obj['petId'] = ApiClient.convertToType(data['petId'], 'Number');
+            }
+            if (data.hasOwnProperty('quantity')) {
+                obj['quantity'] = ApiClient.convertToType(data['quantity'], 'Number');
+            }
+            if (data.hasOwnProperty('shipDate')) {
+                obj['shipDate'] = ApiClient.convertToType(data['shipDate'], 'Date');
+            }
+            if (data.hasOwnProperty('status')) {
+                obj['status'] = ApiClient.convertToType(data['status'], 'String');
+            }
+            if (data.hasOwnProperty('complete')) {
+                obj['complete'] = ApiClient.convertToType(data['complete'], 'Boolean');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} id
-   */
-  exports.prototype['id'] = undefined;
-  /**
-   * @member {Number} petId
-   */
-  exports.prototype['petId'] = undefined;
-  /**
-   * @member {Number} quantity
-   */
-  exports.prototype['quantity'] = undefined;
-  /**
-   * @member {Date} shipDate
-   */
-  exports.prototype['shipDate'] = undefined;
-  /**
-   * Order Status
-   * @member {module:model/Order.StatusEnum} status
-   */
-  exports.prototype['status'] = undefined;
-  /**
-   * @member {Boolean} complete
-   * @default false
-   */
-  exports.prototype['complete'] = false;
-
-
-  /**
-   * Allowed values for the <code>status</code> property.
-   * @enum {String}
-   * @readonly
-   */
-  exports.StatusEnum = {
     /**
-     * value: "placed"
-     * @const
-     */
-    "placed": "placed",
+    * @member {Number} id
+    */
+    id = undefined;
     /**
-     * value: "approved"
-     * @const
-     */
-    "approved": "approved",
+    * @member {Number} petId
+    */
+    petId = undefined;
     /**
-     * value: "delivered"
-     * @const
-     */
-    "delivered": "delivered"  };
+    * @member {Number} quantity
+    */
+    quantity = undefined;
+    /**
+    * @member {Date} shipDate
+    */
+    shipDate = undefined;
+    /**
+    * Order Status
+    * @member {module:model/Order.StatusEnum} status
+    */
+    status = undefined;
+    /**
+    * @member {Boolean} complete
+    * @default false
+    */
+    complete = false;
 
 
-  return exports;
-}));
+
+
+
+
+    /**
+    * Allowed values for the <code>status</code> property.
+    * @enum {String}
+    * @readonly
+    */
+    static StatusEnum = {
+    
+        /**
+         * value: "placed"
+         * @const
+         */
+        "placed": "placed",
+    
+        /**
+         * value: "approved"
+         * @const
+         */
+        "approved": "approved",
+    
+        /**
+         * value: "delivered"
+         * @const
+         */
+        "delivered": "delivered"    
+    };
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/OuterBoolean.js b/samples/client/petstore/javascript-promise-es6/src/model/OuterBoolean.js
index 80f1a64b99b..592a0b69864 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/OuterBoolean.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/OuterBoolean.js
@@ -7,68 +7,67 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The OuterBoolean model module.
+* @module model/OuterBoolean
+* @version 1.0.0
+*/
+export default class OuterBoolean {
+    /**
+    * Constructs a new <code>OuterBoolean</code>.
+    * @alias module:model/OuterBoolean
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.OuterBoolean = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>OuterBoolean</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/OuterBoolean} obj Optional instance to populate.
+    * @return {module:model/OuterBoolean} The populated <code>OuterBoolean</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new OuterBoolean();
 
+            
+            
+            
 
-
-  /**
-   * The OuterBoolean model module.
-   * @module model/OuterBoolean
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>OuterBoolean</code>.
-   * @alias module:model/OuterBoolean
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-  };
-
-  /**
-   * Constructs a <code>OuterBoolean</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/OuterBoolean} obj Optional instance to populate.
-   * @return {module:model/OuterBoolean} The populated <code>OuterBoolean</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
+        }
+        return obj;
     }
-    return obj;
-  }
 
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/OuterComposite.js b/samples/client/petstore/javascript-promise-es6/src/model/OuterComposite.js
index 2a40ec942b5..327e303467a 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/OuterComposite.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/OuterComposite.js
@@ -7,92 +7,91 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/OuterBoolean', 'model/OuterNumber', 'model/OuterString'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('./OuterBoolean'), require('./OuterNumber'), require('./OuterString'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+import OuterBoolean from './OuterBoolean';
+import OuterNumber from './OuterNumber';
+import OuterString from './OuterString';
+
+
+
+
+
+/**
+* The OuterComposite model module.
+* @module model/OuterComposite
+* @version 1.0.0
+*/
+export default class OuterComposite {
+    /**
+    * Constructs a new <code>OuterComposite</code>.
+    * @alias module:model/OuterComposite
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.OuterComposite = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.OuterBoolean, root.SwaggerPetstore.OuterNumber, root.SwaggerPetstore.OuterString);
-  }
-}(this, function(ApiClient, OuterBoolean, OuterNumber, OuterString) {
-  'use strict';
 
+    /**
+    * Constructs a <code>OuterComposite</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/OuterComposite} obj Optional instance to populate.
+    * @return {module:model/OuterComposite} The populated <code>OuterComposite</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new OuterComposite();
 
+            
+            
+            
 
-
-  /**
-   * The OuterComposite model module.
-   * @module model/OuterComposite
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>OuterComposite</code>.
-   * @alias module:model/OuterComposite
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-
-  };
-
-  /**
-   * Constructs a <code>OuterComposite</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/OuterComposite} obj Optional instance to populate.
-   * @return {module:model/OuterComposite} The populated <code>OuterComposite</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('my_number')) {
-        obj['my_number'] = OuterNumber.constructFromObject(data['my_number']);
-      }
-      if (data.hasOwnProperty('my_string')) {
-        obj['my_string'] = OuterString.constructFromObject(data['my_string']);
-      }
-      if (data.hasOwnProperty('my_boolean')) {
-        obj['my_boolean'] = OuterBoolean.constructFromObject(data['my_boolean']);
-      }
+            if (data.hasOwnProperty('my_number')) {
+                obj['my_number'] = OuterNumber.constructFromObject(data['my_number']);
+            }
+            if (data.hasOwnProperty('my_string')) {
+                obj['my_string'] = OuterString.constructFromObject(data['my_string']);
+            }
+            if (data.hasOwnProperty('my_boolean')) {
+                obj['my_boolean'] = OuterBoolean.constructFromObject(data['my_boolean']);
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {module:model/OuterNumber} my_number
-   */
-  exports.prototype['my_number'] = undefined;
-  /**
-   * @member {module:model/OuterString} my_string
-   */
-  exports.prototype['my_string'] = undefined;
-  /**
-   * @member {module:model/OuterBoolean} my_boolean
-   */
-  exports.prototype['my_boolean'] = undefined;
+    /**
+    * @member {module:model/OuterNumber} my_number
+    */
+    my_number = undefined;
+    /**
+    * @member {module:model/OuterString} my_string
+    */
+    my_string = undefined;
+    /**
+    * @member {module:model/OuterBoolean} my_boolean
+    */
+    my_boolean = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/OuterEnum.js b/samples/client/petstore/javascript-promise-es6/src/model/OuterEnum.js
index 4ba975cf97a..bf264fd8f64 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/OuterEnum.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/OuterEnum.js
@@ -7,63 +7,51 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+/**
+* Enum class OuterEnum.
+* @enum {}
+* @readonly
+*/
+export default class OuterEnum {
+    
+        /**
+         * value: "placed"
+         * @const
+         */
+        placed = "placed";
+
+    
+        /**
+         * value: "approved"
+         * @const
+         */
+        approved = "approved";
+
+    
+        /**
+         * value: "delivered"
+         * @const
+         */
+        delivered = "delivered";
+
+    
+
+    /**
+    * Returns a <code>OuterEnum</code> enum value from a Javascript object name.
+    * @param {Object} data The plain JavaScript object containing the name of the enum value.
+    * @return {module:model/OuterEnum} The enum <code>OuterEnum</code> value.
+    */
+    static constructFromObject(object) {
+        return object;
     }
-    root.SwaggerPetstore.OuterEnum = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
-
-
-  /**
-   * Enum class OuterEnum.
-   * @enum {}
-   * @readonly
-   */
-  var exports = {
-    /**
-     * value: "placed"
-     * @const
-     */
-    "placed": "placed",
-    /**
-     * value: "approved"
-     * @const
-     */
-    "approved": "approved",
-    /**
-     * value: "delivered"
-     * @const
-     */
-    "delivered": "delivered"  };
-
-  /**
-   * Returns a <code>OuterEnum</code> enum value from a Javascript object name.
-   * @param {Object} data The plain JavaScript object containing the name of the enum value.
-   * @return {module:model/OuterEnum} The enum <code>OuterEnum</code> value.
-   */
-  exports.constructFromObject = function(object) {
-    return object;
-  }
-
-  return exports;
-}));
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/OuterNumber.js b/samples/client/petstore/javascript-promise-es6/src/model/OuterNumber.js
index f3ab0768253..ff65b1588b7 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/OuterNumber.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/OuterNumber.js
@@ -7,68 +7,67 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The OuterNumber model module.
+* @module model/OuterNumber
+* @version 1.0.0
+*/
+export default class OuterNumber {
+    /**
+    * Constructs a new <code>OuterNumber</code>.
+    * @alias module:model/OuterNumber
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.OuterNumber = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>OuterNumber</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/OuterNumber} obj Optional instance to populate.
+    * @return {module:model/OuterNumber} The populated <code>OuterNumber</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new OuterNumber();
 
+            
+            
+            
 
-
-  /**
-   * The OuterNumber model module.
-   * @module model/OuterNumber
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>OuterNumber</code>.
-   * @alias module:model/OuterNumber
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-  };
-
-  /**
-   * Constructs a <code>OuterNumber</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/OuterNumber} obj Optional instance to populate.
-   * @return {module:model/OuterNumber} The populated <code>OuterNumber</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
+        }
+        return obj;
     }
-    return obj;
-  }
 
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/OuterString.js b/samples/client/petstore/javascript-promise-es6/src/model/OuterString.js
index 9edb9747a67..6921029ede1 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/OuterString.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/OuterString.js
@@ -7,68 +7,67 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The OuterString model module.
+* @module model/OuterString
+* @version 1.0.0
+*/
+export default class OuterString {
+    /**
+    * Constructs a new <code>OuterString</code>.
+    * @alias module:model/OuterString
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.OuterString = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>OuterString</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/OuterString} obj Optional instance to populate.
+    * @return {module:model/OuterString} The populated <code>OuterString</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new OuterString();
 
+            
+            
+            
 
-
-  /**
-   * The OuterString model module.
-   * @module model/OuterString
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>OuterString</code>.
-   * @alias module:model/OuterString
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-  };
-
-  /**
-   * Constructs a <code>OuterString</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/OuterString} obj Optional instance to populate.
-   * @return {module:model/OuterString} The populated <code>OuterString</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
+        }
+        return obj;
     }
-    return obj;
-  }
 
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/Pet.js b/samples/client/petstore/javascript-promise-es6/src/model/Pet.js
index d5e8d5010ac..bb849152027 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/Pet.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/Pet.js
@@ -7,141 +7,140 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/Category', 'model/Tag'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('./Category'), require('./Tag'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+import Category from './Category';
+import Tag from './Tag';
+
+
+
+
+
+/**
+* The Pet model module.
+* @module model/Pet
+* @version 1.0.0
+*/
+export default class Pet {
+    /**
+    * Constructs a new <code>Pet</code>.
+    * @alias module:model/Pet
+    * @class
+    * @param name {String} 
+    * @param photoUrls {Array.<String>} 
+    */
+
+    constructor(name, photoUrls) {
+        
+
+        
+        
+
+        this['name'] = name;this['photoUrls'] = photoUrls;
+
+        
     }
-    root.SwaggerPetstore.Pet = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Category, root.SwaggerPetstore.Tag);
-  }
-}(this, function(ApiClient, Category, Tag) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Pet</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Pet} obj Optional instance to populate.
+    * @return {module:model/Pet} The populated <code>Pet</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Pet();
 
+            
+            
+            
 
-
-  /**
-   * The Pet model module.
-   * @module model/Pet
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Pet</code>.
-   * @alias module:model/Pet
-   * @class
-   * @param name {String} 
-   * @param photoUrls {Array.<String>} 
-   */
-  var exports = function(name, photoUrls) {
-    var _this = this;
-
-
-
-    _this['name'] = name;
-    _this['photoUrls'] = photoUrls;
-
-
-  };
-
-  /**
-   * Constructs a <code>Pet</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Pet} obj Optional instance to populate.
-   * @return {module:model/Pet} The populated <code>Pet</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('id')) {
-        obj['id'] = ApiClient.convertToType(data['id'], 'Number');
-      }
-      if (data.hasOwnProperty('category')) {
-        obj['category'] = Category.constructFromObject(data['category']);
-      }
-      if (data.hasOwnProperty('name')) {
-        obj['name'] = ApiClient.convertToType(data['name'], 'String');
-      }
-      if (data.hasOwnProperty('photoUrls')) {
-        obj['photoUrls'] = ApiClient.convertToType(data['photoUrls'], ['String']);
-      }
-      if (data.hasOwnProperty('tags')) {
-        obj['tags'] = ApiClient.convertToType(data['tags'], [Tag]);
-      }
-      if (data.hasOwnProperty('status')) {
-        obj['status'] = ApiClient.convertToType(data['status'], 'String');
-      }
+            if (data.hasOwnProperty('id')) {
+                obj['id'] = ApiClient.convertToType(data['id'], 'Number');
+            }
+            if (data.hasOwnProperty('category')) {
+                obj['category'] = Category.constructFromObject(data['category']);
+            }
+            if (data.hasOwnProperty('name')) {
+                obj['name'] = ApiClient.convertToType(data['name'], 'String');
+            }
+            if (data.hasOwnProperty('photoUrls')) {
+                obj['photoUrls'] = ApiClient.convertToType(data['photoUrls'], ['String']);
+            }
+            if (data.hasOwnProperty('tags')) {
+                obj['tags'] = ApiClient.convertToType(data['tags'], [Tag]);
+            }
+            if (data.hasOwnProperty('status')) {
+                obj['status'] = ApiClient.convertToType(data['status'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} id
-   */
-  exports.prototype['id'] = undefined;
-  /**
-   * @member {module:model/Category} category
-   */
-  exports.prototype['category'] = undefined;
-  /**
-   * @member {String} name
-   */
-  exports.prototype['name'] = undefined;
-  /**
-   * @member {Array.<String>} photoUrls
-   */
-  exports.prototype['photoUrls'] = undefined;
-  /**
-   * @member {Array.<module:model/Tag>} tags
-   */
-  exports.prototype['tags'] = undefined;
-  /**
-   * pet status in the store
-   * @member {module:model/Pet.StatusEnum} status
-   */
-  exports.prototype['status'] = undefined;
-
-
-  /**
-   * Allowed values for the <code>status</code> property.
-   * @enum {String}
-   * @readonly
-   */
-  exports.StatusEnum = {
     /**
-     * value: "available"
-     * @const
-     */
-    "available": "available",
+    * @member {Number} id
+    */
+    id = undefined;
     /**
-     * value: "pending"
-     * @const
-     */
-    "pending": "pending",
+    * @member {module:model/Category} category
+    */
+    category = undefined;
     /**
-     * value: "sold"
-     * @const
-     */
-    "sold": "sold"  };
+    * @member {String} name
+    */
+    name = undefined;
+    /**
+    * @member {Array.<String>} photoUrls
+    */
+    photoUrls = undefined;
+    /**
+    * @member {Array.<module:model/Tag>} tags
+    */
+    tags = undefined;
+    /**
+    * pet status in the store
+    * @member {module:model/Pet.StatusEnum} status
+    */
+    status = undefined;
 
 
-  return exports;
-}));
+
+
+
+
+    /**
+    * Allowed values for the <code>status</code> property.
+    * @enum {String}
+    * @readonly
+    */
+    static StatusEnum = {
+    
+        /**
+         * value: "available"
+         * @const
+         */
+        "available": "available",
+    
+        /**
+         * value: "pending"
+         * @const
+         */
+        "pending": "pending",
+    
+        /**
+         * value: "sold"
+         * @const
+         */
+        "sold": "sold"    
+    };
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/ReadOnlyFirst.js b/samples/client/petstore/javascript-promise-es6/src/model/ReadOnlyFirst.js
index 91612f15351..143b34f3eb1 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/ReadOnlyFirst.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/ReadOnlyFirst.js
@@ -7,84 +7,81 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The ReadOnlyFirst model module.
+* @module model/ReadOnlyFirst
+* @version 1.0.0
+*/
+export default class ReadOnlyFirst {
+    /**
+    * Constructs a new <code>ReadOnlyFirst</code>.
+    * @alias module:model/ReadOnlyFirst
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.ReadOnlyFirst = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>ReadOnlyFirst</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/ReadOnlyFirst} obj Optional instance to populate.
+    * @return {module:model/ReadOnlyFirst} The populated <code>ReadOnlyFirst</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new ReadOnlyFirst();
 
+            
+            
+            
 
-
-  /**
-   * The ReadOnlyFirst model module.
-   * @module model/ReadOnlyFirst
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>ReadOnlyFirst</code>.
-   * @alias module:model/ReadOnlyFirst
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-  };
-
-  /**
-   * Constructs a <code>ReadOnlyFirst</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/ReadOnlyFirst} obj Optional instance to populate.
-   * @return {module:model/ReadOnlyFirst} The populated <code>ReadOnlyFirst</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('bar')) {
-        obj['bar'] = ApiClient.convertToType(data['bar'], 'String');
-      }
-      if (data.hasOwnProperty('baz')) {
-        obj['baz'] = ApiClient.convertToType(data['baz'], 'String');
-      }
+            if (data.hasOwnProperty('bar')) {
+                obj['bar'] = ApiClient.convertToType(data['bar'], 'String');
+            }
+            if (data.hasOwnProperty('baz')) {
+                obj['baz'] = ApiClient.convertToType(data['baz'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {String} bar
-   */
-  exports.prototype['bar'] = undefined;
-  /**
-   * @member {String} baz
-   */
-  exports.prototype['baz'] = undefined;
+    /**
+    * @member {String} bar
+    */
+    bar = undefined;
+    /**
+    * @member {String} baz
+    */
+    baz = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/SpecialModelName.js b/samples/client/petstore/javascript-promise-es6/src/model/SpecialModelName.js
index bb13c09d956..4e0dd379b19 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/SpecialModelName.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/SpecialModelName.js
@@ -7,76 +7,74 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The SpecialModelName model module.
+* @module model/SpecialModelName
+* @version 1.0.0
+*/
+export default class SpecialModelName {
+    /**
+    * Constructs a new <code>SpecialModelName</code>.
+    * @alias module:model/SpecialModelName
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.SpecialModelName = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>SpecialModelName</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/SpecialModelName} obj Optional instance to populate.
+    * @return {module:model/SpecialModelName} The populated <code>SpecialModelName</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new SpecialModelName();
 
+            
+            
+            
 
-
-  /**
-   * The SpecialModelName model module.
-   * @module model/SpecialModelName
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>SpecialModelName</code>.
-   * @alias module:model/SpecialModelName
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-  };
-
-  /**
-   * Constructs a <code>SpecialModelName</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/SpecialModelName} obj Optional instance to populate.
-   * @return {module:model/SpecialModelName} The populated <code>SpecialModelName</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('$special[property.name]')) {
-        obj['$special[property.name]'] = ApiClient.convertToType(data['$special[property.name]'], 'Number');
-      }
+            if (data.hasOwnProperty('$special[property.name]')) {
+                obj['$special[property.name]'] = ApiClient.convertToType(data['$special[property.name]'], 'Number');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} $special[property.name]
-   */
-  exports.prototype['$special[property.name]'] = undefined;
+    /**
+    * @member {Number} $special[property.name]
+    */
+    $special[property.name] = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/Tag.js b/samples/client/petstore/javascript-promise-es6/src/model/Tag.js
index 1066827e11e..759b3fa04e3 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/Tag.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/Tag.js
@@ -7,84 +7,81 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The Tag model module.
+* @module model/Tag
+* @version 1.0.0
+*/
+export default class Tag {
+    /**
+    * Constructs a new <code>Tag</code>.
+    * @alias module:model/Tag
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.Tag = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Tag</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Tag} obj Optional instance to populate.
+    * @return {module:model/Tag} The populated <code>Tag</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Tag();
 
+            
+            
+            
 
-
-  /**
-   * The Tag model module.
-   * @module model/Tag
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Tag</code>.
-   * @alias module:model/Tag
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-  };
-
-  /**
-   * Constructs a <code>Tag</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Tag} obj Optional instance to populate.
-   * @return {module:model/Tag} The populated <code>Tag</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('id')) {
-        obj['id'] = ApiClient.convertToType(data['id'], 'Number');
-      }
-      if (data.hasOwnProperty('name')) {
-        obj['name'] = ApiClient.convertToType(data['name'], 'String');
-      }
+            if (data.hasOwnProperty('id')) {
+                obj['id'] = ApiClient.convertToType(data['id'], 'Number');
+            }
+            if (data.hasOwnProperty('name')) {
+                obj['name'] = ApiClient.convertToType(data['name'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} id
-   */
-  exports.prototype['id'] = undefined;
-  /**
-   * @member {String} name
-   */
-  exports.prototype['name'] = undefined;
+    /**
+    * @member {Number} id
+    */
+    id = undefined;
+    /**
+    * @member {String} name
+    */
+    name = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/User.js b/samples/client/petstore/javascript-promise-es6/src/model/User.js
index e96af875697..36311e75938 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/User.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/User.js
@@ -7,133 +7,124 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.2.3-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The User model module.
+* @module model/User
+* @version 1.0.0
+*/
+export default class User {
+    /**
+    * Constructs a new <code>User</code>.
+    * @alias module:model/User
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.User = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>User</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/User} obj Optional instance to populate.
+    * @return {module:model/User} The populated <code>User</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new User();
 
+            
+            
+            
 
-
-  /**
-   * The User model module.
-   * @module model/User
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>User</code>.
-   * @alias module:model/User
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-
-
-
-
-
-
-  };
-
-  /**
-   * Constructs a <code>User</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/User} obj Optional instance to populate.
-   * @return {module:model/User} The populated <code>User</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('id')) {
-        obj['id'] = ApiClient.convertToType(data['id'], 'Number');
-      }
-      if (data.hasOwnProperty('username')) {
-        obj['username'] = ApiClient.convertToType(data['username'], 'String');
-      }
-      if (data.hasOwnProperty('firstName')) {
-        obj['firstName'] = ApiClient.convertToType(data['firstName'], 'String');
-      }
-      if (data.hasOwnProperty('lastName')) {
-        obj['lastName'] = ApiClient.convertToType(data['lastName'], 'String');
-      }
-      if (data.hasOwnProperty('email')) {
-        obj['email'] = ApiClient.convertToType(data['email'], 'String');
-      }
-      if (data.hasOwnProperty('password')) {
-        obj['password'] = ApiClient.convertToType(data['password'], 'String');
-      }
-      if (data.hasOwnProperty('phone')) {
-        obj['phone'] = ApiClient.convertToType(data['phone'], 'String');
-      }
-      if (data.hasOwnProperty('userStatus')) {
-        obj['userStatus'] = ApiClient.convertToType(data['userStatus'], 'Number');
-      }
+            if (data.hasOwnProperty('id')) {
+                obj['id'] = ApiClient.convertToType(data['id'], 'Number');
+            }
+            if (data.hasOwnProperty('username')) {
+                obj['username'] = ApiClient.convertToType(data['username'], 'String');
+            }
+            if (data.hasOwnProperty('firstName')) {
+                obj['firstName'] = ApiClient.convertToType(data['firstName'], 'String');
+            }
+            if (data.hasOwnProperty('lastName')) {
+                obj['lastName'] = ApiClient.convertToType(data['lastName'], 'String');
+            }
+            if (data.hasOwnProperty('email')) {
+                obj['email'] = ApiClient.convertToType(data['email'], 'String');
+            }
+            if (data.hasOwnProperty('password')) {
+                obj['password'] = ApiClient.convertToType(data['password'], 'String');
+            }
+            if (data.hasOwnProperty('phone')) {
+                obj['phone'] = ApiClient.convertToType(data['phone'], 'String');
+            }
+            if (data.hasOwnProperty('userStatus')) {
+                obj['userStatus'] = ApiClient.convertToType(data['userStatus'], 'Number');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} id
-   */
-  exports.prototype['id'] = undefined;
-  /**
-   * @member {String} username
-   */
-  exports.prototype['username'] = undefined;
-  /**
-   * @member {String} firstName
-   */
-  exports.prototype['firstName'] = undefined;
-  /**
-   * @member {String} lastName
-   */
-  exports.prototype['lastName'] = undefined;
-  /**
-   * @member {String} email
-   */
-  exports.prototype['email'] = undefined;
-  /**
-   * @member {String} password
-   */
-  exports.prototype['password'] = undefined;
-  /**
-   * @member {String} phone
-   */
-  exports.prototype['phone'] = undefined;
-  /**
-   * User Status
-   * @member {Number} userStatus
-   */
-  exports.prototype['userStatus'] = undefined;
+    /**
+    * @member {Number} id
+    */
+    id = undefined;
+    /**
+    * @member {String} username
+    */
+    username = undefined;
+    /**
+    * @member {String} firstName
+    */
+    firstName = undefined;
+    /**
+    * @member {String} lastName
+    */
+    lastName = undefined;
+    /**
+    * @member {String} email
+    */
+    email = undefined;
+    /**
+    * @member {String} password
+    */
+    password = undefined;
+    /**
+    * @member {String} phone
+    */
+    phone = undefined;
+    /**
+    * User Status
+    * @member {Number} userStatus
+    */
+    userStatus = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}