diff --git a/modules/openapi-generator/src/main/resources/Javascript/partial_model_generic.mustache b/modules/openapi-generator/src/main/resources/Javascript/partial_model_generic.mustache
index 74d410ddec8..cc6dab688c4 100644
--- a/modules/openapi-generator/src/main/resources/Javascript/partial_model_generic.mustache
+++ b/modules/openapi-generator/src/main/resources/Javascript/partial_model_generic.mustache
@@ -1,4 +1,3 @@
-
 {{#models}}{{#model}}
 {{#emitJSDoc}}
   /**
@@ -21,11 +20,28 @@
     var _this = this;
 {{#parent}}{{^parentModel}}{{#vendorExtensions.x-isArray}}    _this = new Array();
     Object.setPrototypeOf(_this, exports);
-{{/vendorExtensions.x-isArray}}{{/parentModel}}{{/parent}}{{#useInheritance}}{{#parentModel}}    {{classname}}.call(_this{{#vendorExtensions.x-all-required}}, {{name}}{{/vendorExtensions.x-all-required}});{{/parentModel}}
-{{#interfaceModels}}    {{classname}}.call(_this{{#vendorExtensions.x-all-required}}, {{name}}{{/vendorExtensions.x-all-required}});
-{{/interfaceModels}}{{/useInheritance}}{{#vars}}{{#required}}    _this['{{baseName}}'] = {{name}};{{/required}}
-{{/vars}}{{#parent}}{{^parentModel}}    return _this;
-{{/parentModel}}{{/parent}}  };
+{{/vendorExtensions.x-isArray}}{{/parentModel}}{{/parent}}
+    {{#useInheritance}}
+    {{#parentModel}}
+    {{classname}}.call(_this{{#vendorExtensions.x-all-required}}, {{name}}{{/vendorExtensions.x-all-required}});
+    {{/parentModel}}
+    {{^parentModel}}
+    {{#interfaceModels}}
+    {{classname}}.call(_this{{#vendorExtensions.x-all-required}}, {{name}}{{/vendorExtensions.x-all-required}});
+    {{/interfaceModels}}
+    {{/parentModel}}
+    {{/useInheritance}}
+    {{#vars}}
+    {{#required}}
+    _this['{{baseName}}'] = {{name}};
+    {{/required}}
+    {{/vars}}
+    {{#parent}}
+    {{^parentModel}}
+    return _this;
+    {{/parentModel}}
+    {{/parent}}
+  };
 
 {{#emitJSDoc}}
   /**
@@ -45,13 +61,27 @@
   exports.constructFromObject = function(data, obj) {
     if (data){{! TODO: support polymorphism: discriminator property on data determines class to instantiate.}} {
       obj = obj || new exports();
-{{#parent}}{{^parentModel}}      ApiClient.constructFromObject(data, obj, '{{vendorExtensions.x-itemType}}');
-{{/parentModel}}{{/parent}}{{#useInheritance}}{{#parentModel}}      {{classname}}.constructFromObject(data, obj);{{/parentModel}}
-{{#interfaces}}      {{.}}.constructFromObject(data, obj);
-{{/interfaces}}{{/useInheritance}}{{#vars}}      if (data.hasOwnProperty('{{baseName}}')) {
+      {{#parent}}
+      {{^parentModel}}
+      ApiClient.constructFromObject(data, obj, '{{vendorExtensions.x-itemType}}');
+      {{/parentModel}}
+      {{/parent}}
+      {{#useInheritance}}
+      {{#parentModel}}
+      {{classname}}.constructFromObject(data, obj);
+      {{/parentModel}}
+      {{^parentModel}}
+      {{#interfaces}}
+      {{.}}.constructFromObject(data, obj);
+      {{/interfaces}}
+      {{/parentModel}}
+      {{/useInheritance}}
+      {{#vars}}
+      if (data.hasOwnProperty('{{baseName}}')) {
         obj['{{baseName}}']{{{defaultValueWithParam}}}
       }
-{{/vars}}    }
+      {{/vars}}
+    }
     return obj;
   }
 {{/vendorExtensions.x-isPrimitive}}
diff --git a/samples/client/petstore/javascript-es6/.openapi-generator/VERSION b/samples/client/petstore/javascript-es6/.openapi-generator/VERSION
index 6d94c9c2e12..a6527129083 100644
--- a/samples/client/petstore/javascript-es6/.openapi-generator/VERSION
+++ b/samples/client/petstore/javascript-es6/.openapi-generator/VERSION
@@ -1 +1 @@
-3.3.0-SNAPSHOT
\ No newline at end of file
+3.3.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/javascript-es6/docs/FakeApi.md b/samples/client/petstore/javascript-es6/docs/FakeApi.md
index b51de14ceaa..0407a450fff 100644
--- a/samples/client/petstore/javascript-es6/docs/FakeApi.md
+++ b/samples/client/petstore/javascript-es6/docs/FakeApi.md
@@ -464,7 +464,7 @@ test inline additionalProperties
 import OpenApiPetstore from 'open_api_petstore';
 
 let apiInstance = new OpenApiPetstore.FakeApi();
-let requestBody = {key: "inner_example"}; // {String: String} | request body
+let requestBody = {key: "null"}; // {String: String} | request body
 apiInstance.testInlineAdditionalProperties(requestBody, (error, data, response) => {
   if (error) {
     console.error(error);
diff --git a/samples/client/petstore/javascript-es6/docs/MapTest.md b/samples/client/petstore/javascript-es6/docs/MapTest.md
index f1075bf0681..152d3fbe8c7 100644
--- a/samples/client/petstore/javascript-es6/docs/MapTest.md
+++ b/samples/client/petstore/javascript-es6/docs/MapTest.md
@@ -6,7 +6,7 @@ Name | Type | Description | Notes
 **mapMapOfString** | **{String: {String: String}}** |  | [optional] 
 **mapOfEnumString** | **{String: String}** |  | [optional] 
 **directMap** | **{String: Boolean}** |  | [optional] 
-**indirectMap** | [**StringBooleanMap**](StringBooleanMap.md) |  | [optional] 
+**indirectMap** | **{String: Boolean}** |  | [optional] 
 
 
 <a name="{String: String}"></a>
diff --git a/samples/client/petstore/javascript-es6/docs/PetApi.md b/samples/client/petstore/javascript-es6/docs/PetApi.md
index 76dabe26aed..a9457f7ca5c 100644
--- a/samples/client/petstore/javascript-es6/docs/PetApi.md
+++ b/samples/client/petstore/javascript-es6/docs/PetApi.md
@@ -174,7 +174,7 @@ let petstore_auth = defaultClient.authentications['petstore_auth'];
 petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
 
 let apiInstance = new OpenApiPetstore.PetApi();
-let tags = ["inner_example"]; // [String] | Tags to filter by
+let tags = ["null"]; // [String] | Tags to filter by
 apiInstance.findPetsByTags(tags, (error, data, response) => {
   if (error) {
     console.error(error);
diff --git a/samples/client/petstore/javascript-es6/src/model/MapTest.js b/samples/client/petstore/javascript-es6/src/model/MapTest.js
index 31c37d601ce..683ca05ebc2 100644
--- a/samples/client/petstore/javascript-es6/src/model/MapTest.js
+++ b/samples/client/petstore/javascript-es6/src/model/MapTest.js
@@ -12,7 +12,6 @@
  */
 
 import ApiClient from '../ApiClient';
-import StringBooleanMap from './StringBooleanMap';
 
 /**
  * The MapTest model module.
@@ -58,7 +57,7 @@ class MapTest {
                 obj['direct_map'] = ApiClient.convertToType(data['direct_map'], {'String': 'Boolean'});
             }
             if (data.hasOwnProperty('indirect_map')) {
-                obj['indirect_map'] = StringBooleanMap.constructFromObject(data['indirect_map']);
+                obj['indirect_map'] = ApiClient.convertToType(data['indirect_map'], {'String': 'Boolean'});
             }
         }
         return obj;
@@ -83,7 +82,7 @@ MapTest.prototype['map_of_enum_string'] = undefined;
 MapTest.prototype['direct_map'] = undefined;
 
 /**
- * @member {module:model/StringBooleanMap} indirect_map
+ * @member {Object.<String, Boolean>} indirect_map
  */
 MapTest.prototype['indirect_map'] = undefined;
 
diff --git a/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION b/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION
index 6d94c9c2e12..a6527129083 100644
--- a/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION
+++ b/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION
@@ -1 +1 @@
-3.3.0-SNAPSHOT
\ No newline at end of file
+3.3.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md b/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md
index bb62b487674..a9e7e06545d 100644
--- a/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md
+++ b/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md
@@ -455,7 +455,7 @@ test inline additionalProperties
 import OpenApiPetstore from 'open_api_petstore';
 
 let apiInstance = new OpenApiPetstore.FakeApi();
-let requestBody = {key: "inner_example"}; // {String: String} | request body
+let requestBody = {key: "null"}; // {String: String} | request body
 apiInstance.testInlineAdditionalProperties(requestBody).then(() => {
   console.log('API called successfully.');
 }, (error) => {
diff --git a/samples/client/petstore/javascript-promise-es6/docs/MapTest.md b/samples/client/petstore/javascript-promise-es6/docs/MapTest.md
index f1075bf0681..152d3fbe8c7 100644
--- a/samples/client/petstore/javascript-promise-es6/docs/MapTest.md
+++ b/samples/client/petstore/javascript-promise-es6/docs/MapTest.md
@@ -6,7 +6,7 @@ Name | Type | Description | Notes
 **mapMapOfString** | **{String: {String: String}}** |  | [optional] 
 **mapOfEnumString** | **{String: String}** |  | [optional] 
 **directMap** | **{String: Boolean}** |  | [optional] 
-**indirectMap** | [**StringBooleanMap**](StringBooleanMap.md) |  | [optional] 
+**indirectMap** | **{String: Boolean}** |  | [optional] 
 
 
 <a name="{String: String}"></a>
diff --git a/samples/client/petstore/javascript-promise-es6/docs/PetApi.md b/samples/client/petstore/javascript-promise-es6/docs/PetApi.md
index 1978431440f..d80f41b2c8e 100644
--- a/samples/client/petstore/javascript-promise-es6/docs/PetApi.md
+++ b/samples/client/petstore/javascript-promise-es6/docs/PetApi.md
@@ -171,7 +171,7 @@ let petstore_auth = defaultClient.authentications['petstore_auth'];
 petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
 
 let apiInstance = new OpenApiPetstore.PetApi();
-let tags = ["inner_example"]; // [String] | Tags to filter by
+let tags = ["null"]; // [String] | Tags to filter by
 apiInstance.findPetsByTags(tags).then((data) => {
   console.log('API called successfully. Returned data: ' + data);
 }, (error) => {
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 31c37d601ce..683ca05ebc2 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/MapTest.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/MapTest.js
@@ -12,7 +12,6 @@
  */
 
 import ApiClient from '../ApiClient';
-import StringBooleanMap from './StringBooleanMap';
 
 /**
  * The MapTest model module.
@@ -58,7 +57,7 @@ class MapTest {
                 obj['direct_map'] = ApiClient.convertToType(data['direct_map'], {'String': 'Boolean'});
             }
             if (data.hasOwnProperty('indirect_map')) {
-                obj['indirect_map'] = StringBooleanMap.constructFromObject(data['indirect_map']);
+                obj['indirect_map'] = ApiClient.convertToType(data['indirect_map'], {'String': 'Boolean'});
             }
         }
         return obj;
@@ -83,7 +82,7 @@ MapTest.prototype['map_of_enum_string'] = undefined;
 MapTest.prototype['direct_map'] = undefined;
 
 /**
- * @member {module:model/StringBooleanMap} indirect_map
+ * @member {Object.<String, Boolean>} indirect_map
  */
 MapTest.prototype['indirect_map'] = undefined;
 
diff --git a/samples/client/petstore/javascript-promise/.openapi-generator/VERSION b/samples/client/petstore/javascript-promise/.openapi-generator/VERSION
index 6d94c9c2e12..a6527129083 100644
--- a/samples/client/petstore/javascript-promise/.openapi-generator/VERSION
+++ b/samples/client/petstore/javascript-promise/.openapi-generator/VERSION
@@ -1 +1 @@
-3.3.0-SNAPSHOT
\ No newline at end of file
+3.3.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/javascript-promise/docs/FakeApi.md b/samples/client/petstore/javascript-promise/docs/FakeApi.md
index cb50ee6de64..d582de17b0a 100644
--- a/samples/client/petstore/javascript-promise/docs/FakeApi.md
+++ b/samples/client/petstore/javascript-promise/docs/FakeApi.md
@@ -455,7 +455,7 @@ test inline additionalProperties
 var OpenApiPetstore = require('open_api_petstore');
 
 var apiInstance = new OpenApiPetstore.FakeApi();
-var requestBody = {key: "inner_example"}; // {String: String} | request body
+var requestBody = {key: "null"}; // {String: String} | request body
 apiInstance.testInlineAdditionalProperties(requestBody).then(function() {
   console.log('API called successfully.');
 }, function(error) {
diff --git a/samples/client/petstore/javascript-promise/docs/MapTest.md b/samples/client/petstore/javascript-promise/docs/MapTest.md
index f1075bf0681..152d3fbe8c7 100644
--- a/samples/client/petstore/javascript-promise/docs/MapTest.md
+++ b/samples/client/petstore/javascript-promise/docs/MapTest.md
@@ -6,7 +6,7 @@ Name | Type | Description | Notes
 **mapMapOfString** | **{String: {String: String}}** |  | [optional] 
 **mapOfEnumString** | **{String: String}** |  | [optional] 
 **directMap** | **{String: Boolean}** |  | [optional] 
-**indirectMap** | [**StringBooleanMap**](StringBooleanMap.md) |  | [optional] 
+**indirectMap** | **{String: Boolean}** |  | [optional] 
 
 
 <a name="{String: String}"></a>
diff --git a/samples/client/petstore/javascript-promise/docs/PetApi.md b/samples/client/petstore/javascript-promise/docs/PetApi.md
index 30f008958ff..99a95f64a38 100644
--- a/samples/client/petstore/javascript-promise/docs/PetApi.md
+++ b/samples/client/petstore/javascript-promise/docs/PetApi.md
@@ -167,7 +167,7 @@ var petstore_auth = defaultClient.authentications['petstore_auth'];
 petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
 
 var apiInstance = new OpenApiPetstore.PetApi();
-var tags = ["inner_example"]; // [String] | Tags to filter by
+var tags = ["null"]; // [String] | Tags to filter by
 apiInstance.findPetsByTags(tags).then(function(data) {
   console.log('API called successfully. Returned data: ' + data);
 }, function(error) {
diff --git a/samples/client/petstore/javascript-promise/src/ApiClient.js b/samples/client/petstore/javascript-promise/src/ApiClient.js
index dd286d4987c..fd9b273f1c4 100644
--- a/samples/client/petstore/javascript-promise/src/ApiClient.js
+++ b/samples/client/petstore/javascript-promise/src/ApiClient.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/api/AnotherFakeApi.js b/samples/client/petstore/javascript-promise/src/api/AnotherFakeApi.js
index d744580ecdd..4eda5bcca47 100644
--- a/samples/client/petstore/javascript-promise/src/api/AnotherFakeApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/AnotherFakeApi.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/api/FakeApi.js b/samples/client/petstore/javascript-promise/src/api/FakeApi.js
index a26b09ce175..9ce1caaeae7 100644
--- a/samples/client/petstore/javascript-promise/src/api/FakeApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/FakeApi.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/api/FakeClassnameTags123Api.js b/samples/client/petstore/javascript-promise/src/api/FakeClassnameTags123Api.js
index b626387882b..a7afa739af3 100644
--- a/samples/client/petstore/javascript-promise/src/api/FakeClassnameTags123Api.js
+++ b/samples/client/petstore/javascript-promise/src/api/FakeClassnameTags123Api.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/api/PetApi.js b/samples/client/petstore/javascript-promise/src/api/PetApi.js
index 68519c5a1d5..f1ec4381556 100644
--- a/samples/client/petstore/javascript-promise/src/api/PetApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/PetApi.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/api/StoreApi.js b/samples/client/petstore/javascript-promise/src/api/StoreApi.js
index d00779af1a2..c84d1e93c7f 100644
--- a/samples/client/petstore/javascript-promise/src/api/StoreApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/StoreApi.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/api/UserApi.js b/samples/client/petstore/javascript-promise/src/api/UserApi.js
index 82f0c1a06a6..88e15f0386d 100644
--- a/samples/client/petstore/javascript-promise/src/api/UserApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/UserApi.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/index.js b/samples/client/petstore/javascript-promise/src/index.js
index 1eebdbf5ff3..f7de11f4e55 100644
--- a/samples/client/petstore/javascript-promise/src/index.js
+++ b/samples/client/petstore/javascript-promise/src/index.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesClass.js b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesClass.js
index e41dca8e660..aa85406e6a6 100644
--- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesClass.js
+++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesClass.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The AdditionalPropertiesClass model module.
    * @module model/AdditionalPropertiesClass
@@ -47,8 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
   };
 
   /**
@@ -61,7 +58,6 @@
   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'});
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/Animal.js b/samples/client/petstore/javascript-promise/src/model/Animal.js
index 43aaacc12b5..1c26f336515 100644
--- a/samples/client/petstore/javascript-promise/src/model/Animal.js
+++ b/samples/client/petstore/javascript-promise/src/model/Animal.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The Animal model module.
    * @module model/Animal
@@ -49,7 +48,6 @@
     var _this = this;
 
     _this['className'] = className;
-
   };
 
   /**
@@ -62,7 +60,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('className')) {
         obj['className'] = ApiClient.convertToType(data['className'], 'String');
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/AnimalFarm.js b/samples/client/petstore/javascript-promise/src/model/AnimalFarm.js
index f3d2c132d12..1186bb4b207 100644
--- a/samples/client/petstore/javascript-promise/src/model/AnimalFarm.js
+++ b/samples/client/petstore/javascript-promise/src/model/AnimalFarm.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The AnimalFarm model module.
    * @module model/AnimalFarm
@@ -64,7 +63,6 @@
     if (data) {
       obj = obj || new exports();
       ApiClient.constructFromObject(data, obj, 'Animal');
-
     }
     return obj;
   }
diff --git a/samples/client/petstore/javascript-promise/src/model/ApiResponse.js b/samples/client/petstore/javascript-promise/src/model/ApiResponse.js
index 2d33b0b7a23..8a5161ed12d 100644
--- a/samples/client/petstore/javascript-promise/src/model/ApiResponse.js
+++ b/samples/client/petstore/javascript-promise/src/model/ApiResponse.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The ApiResponse model module.
    * @module model/ApiResponse
@@ -47,9 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
-
   };
 
   /**
@@ -62,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('code')) {
         obj['code'] = ApiClient.convertToType(data['code'], 'Number');
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/ArrayOfArrayOfNumberOnly.js b/samples/client/petstore/javascript-promise/src/model/ArrayOfArrayOfNumberOnly.js
index 41463b0e371..aa150c35acc 100644
--- a/samples/client/petstore/javascript-promise/src/model/ArrayOfArrayOfNumberOnly.js
+++ b/samples/client/petstore/javascript-promise/src/model/ArrayOfArrayOfNumberOnly.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The ArrayOfArrayOfNumberOnly model module.
    * @module model/ArrayOfArrayOfNumberOnly
@@ -47,7 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
   };
 
   /**
@@ -60,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('ArrayArrayNumber')) {
         obj['ArrayArrayNumber'] = ApiClient.convertToType(data['ArrayArrayNumber'], [['Number']]);
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/ArrayOfNumberOnly.js b/samples/client/petstore/javascript-promise/src/model/ArrayOfNumberOnly.js
index f3b0ac217e1..c0a345a76b1 100644
--- a/samples/client/petstore/javascript-promise/src/model/ArrayOfNumberOnly.js
+++ b/samples/client/petstore/javascript-promise/src/model/ArrayOfNumberOnly.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The ArrayOfNumberOnly model module.
    * @module model/ArrayOfNumberOnly
@@ -47,7 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
   };
 
   /**
@@ -60,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('ArrayNumber')) {
         obj['ArrayNumber'] = ApiClient.convertToType(data['ArrayNumber'], ['Number']);
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/ArrayTest.js b/samples/client/petstore/javascript-promise/src/model/ArrayTest.js
index 6b8aeade8b0..955463cf2ce 100644
--- a/samples/client/petstore/javascript-promise/src/model/ArrayTest.js
+++ b/samples/client/petstore/javascript-promise/src/model/ArrayTest.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The ArrayTest model module.
    * @module model/ArrayTest
@@ -47,9 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
-
   };
 
   /**
@@ -62,7 +58,6 @@
   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']);
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/Capitalization.js b/samples/client/petstore/javascript-promise/src/model/Capitalization.js
index 67c027686a9..2f960c5b9ef 100644
--- a/samples/client/petstore/javascript-promise/src/model/Capitalization.js
+++ b/samples/client/petstore/javascript-promise/src/model/Capitalization.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The Capitalization model module.
    * @module model/Capitalization
@@ -47,12 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
-
-
-
-
   };
 
   /**
@@ -65,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('smallCamel')) {
         obj['smallCamel'] = ApiClient.convertToType(data['smallCamel'], 'String');
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/Cat.js b/samples/client/petstore/javascript-promise/src/model/Cat.js
index 6f8ca2e91fd..20131cfe2d1 100644
--- a/samples/client/petstore/javascript-promise/src/model/Cat.js
+++ b/samples/client/petstore/javascript-promise/src/model/Cat.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The Cat model module.
    * @module model/Cat
@@ -49,9 +48,8 @@
    */
   var exports = function(className) {
     var _this = this;
-    Animal.call(_this, className);
-    Animal.call(_this, className);
 
+    Animal.call(_this, className);
   };
 
   /**
@@ -65,7 +63,6 @@
     if (data) {
       obj = obj || new exports();
       Animal.constructFromObject(data, obj);
-      Animal.constructFromObject(data, obj);
       if (data.hasOwnProperty('declawed')) {
         obj['declawed'] = ApiClient.convertToType(data['declawed'], 'Boolean');
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/Category.js b/samples/client/petstore/javascript-promise/src/model/Category.js
index ba82e88bd49..bd9d7e54685 100644
--- a/samples/client/petstore/javascript-promise/src/model/Category.js
+++ b/samples/client/petstore/javascript-promise/src/model/Category.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The Category model module.
    * @module model/Category
@@ -47,8 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
   };
 
   /**
@@ -61,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('id')) {
         obj['id'] = ApiClient.convertToType(data['id'], 'Number');
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/ClassModel.js b/samples/client/petstore/javascript-promise/src/model/ClassModel.js
index 6592fdeebc9..a1208fdd575 100644
--- a/samples/client/petstore/javascript-promise/src/model/ClassModel.js
+++ b/samples/client/petstore/javascript-promise/src/model/ClassModel.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The ClassModel model module.
    * @module model/ClassModel
@@ -48,7 +47,6 @@
   var exports = function() {
     var _this = this;
 
-
   };
 
   /**
@@ -61,7 +59,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('_class')) {
         obj['_class'] = ApiClient.convertToType(data['_class'], 'String');
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/Client.js b/samples/client/petstore/javascript-promise/src/model/Client.js
index 00fe25ca2d7..e2af3bfa10f 100644
--- a/samples/client/petstore/javascript-promise/src/model/Client.js
+++ b/samples/client/petstore/javascript-promise/src/model/Client.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The Client model module.
    * @module model/Client
@@ -47,7 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
   };
 
   /**
@@ -60,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('client')) {
         obj['client'] = ApiClient.convertToType(data['client'], 'String');
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/Dog.js b/samples/client/petstore/javascript-promise/src/model/Dog.js
index 7a74ef477b4..f5a73c3bca8 100644
--- a/samples/client/petstore/javascript-promise/src/model/Dog.js
+++ b/samples/client/petstore/javascript-promise/src/model/Dog.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The Dog model module.
    * @module model/Dog
@@ -49,9 +48,8 @@
    */
   var exports = function(className) {
     var _this = this;
-    Animal.call(_this, className);
-    Animal.call(_this, className);
 
+    Animal.call(_this, className);
   };
 
   /**
@@ -65,7 +63,6 @@
     if (data) {
       obj = obj || new exports();
       Animal.constructFromObject(data, obj);
-      Animal.constructFromObject(data, obj);
       if (data.hasOwnProperty('breed')) {
         obj['breed'] = ApiClient.convertToType(data['breed'], 'String');
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/EnumArrays.js b/samples/client/petstore/javascript-promise/src/model/EnumArrays.js
index 7bbb3af35d2..c0c93dfecb7 100644
--- a/samples/client/petstore/javascript-promise/src/model/EnumArrays.js
+++ b/samples/client/petstore/javascript-promise/src/model/EnumArrays.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The EnumArrays model module.
    * @module model/EnumArrays
@@ -47,8 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
   };
 
   /**
@@ -61,7 +58,6 @@
   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');
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/EnumClass.js b/samples/client/petstore/javascript-promise/src/model/EnumClass.js
index 3a8a7f52d94..be0e548d3ff 100644
--- a/samples/client/petstore/javascript-promise/src/model/EnumClass.js
+++ b/samples/client/petstore/javascript-promise/src/model/EnumClass.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/EnumTest.js b/samples/client/petstore/javascript-promise/src/model/EnumTest.js
index 25d166c5c8a..b0c37e129bc 100644
--- a/samples/client/petstore/javascript-promise/src/model/EnumTest.js
+++ b/samples/client/petstore/javascript-promise/src/model/EnumTest.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The EnumTest model module.
    * @module model/EnumTest
@@ -48,11 +47,7 @@
   var exports = function(enumStringRequired) {
     var _this = this;
 
-
     _this['enum_string_required'] = enumStringRequired;
-
-
-
   };
 
   /**
@@ -65,7 +60,6 @@
   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');
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/File.js b/samples/client/petstore/javascript-promise/src/model/File.js
index 706f20eff08..eb5bd17d80b 100644
--- a/samples/client/petstore/javascript-promise/src/model/File.js
+++ b/samples/client/petstore/javascript-promise/src/model/File.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The File model module.
    * @module model/File
@@ -48,7 +47,6 @@
   var exports = function() {
     var _this = this;
 
-
   };
 
   /**
@@ -61,7 +59,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('sourceURI')) {
         obj['sourceURI'] = ApiClient.convertToType(data['sourceURI'], 'String');
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/FileSchemaTestClass.js b/samples/client/petstore/javascript-promise/src/model/FileSchemaTestClass.js
index 2bc85b700b0..93a23dcbd7b 100644
--- a/samples/client/petstore/javascript-promise/src/model/FileSchemaTestClass.js
+++ b/samples/client/petstore/javascript-promise/src/model/FileSchemaTestClass.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The FileSchemaTestClass model module.
    * @module model/FileSchemaTestClass
@@ -47,8 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
   };
 
   /**
@@ -61,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('file')) {
         obj['file'] = File.constructFromObject(data['file']);
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/FormatTest.js b/samples/client/petstore/javascript-promise/src/model/FormatTest.js
index 679e769b5b2..63b9b283299 100644
--- a/samples/client/petstore/javascript-promise/src/model/FormatTest.js
+++ b/samples/client/petstore/javascript-promise/src/model/FormatTest.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The FormatTest model module.
    * @module model/FormatTest
@@ -51,18 +50,9 @@
   var exports = function(_number, _byte, _date, password) {
     var _this = this;
 
-
-
-
     _this['number'] = _number;
-
-
-
     _this['byte'] = _byte;
-
     _this['date'] = _date;
-
-
     _this['password'] = password;
   };
 
@@ -76,7 +66,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('integer')) {
         obj['integer'] = ApiClient.convertToType(data['integer'], 'Number');
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/HasOnlyReadOnly.js b/samples/client/petstore/javascript-promise/src/model/HasOnlyReadOnly.js
index 6b42db4416e..817af5d86b7 100644
--- a/samples/client/petstore/javascript-promise/src/model/HasOnlyReadOnly.js
+++ b/samples/client/petstore/javascript-promise/src/model/HasOnlyReadOnly.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The HasOnlyReadOnly model module.
    * @module model/HasOnlyReadOnly
@@ -47,8 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
   };
 
   /**
@@ -61,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('bar')) {
         obj['bar'] = ApiClient.convertToType(data['bar'], 'String');
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/List.js b/samples/client/petstore/javascript-promise/src/model/List.js
index 05c95f2613a..4412a32c822 100644
--- a/samples/client/petstore/javascript-promise/src/model/List.js
+++ b/samples/client/petstore/javascript-promise/src/model/List.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The List model module.
    * @module model/List
@@ -47,7 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
   };
 
   /**
@@ -60,7 +58,6 @@
   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');
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/MapTest.js b/samples/client/petstore/javascript-promise/src/model/MapTest.js
index 65b317db8b5..f5499f47517 100644
--- a/samples/client/petstore/javascript-promise/src/model/MapTest.js
+++ b/samples/client/petstore/javascript-promise/src/model/MapTest.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -16,23 +16,22 @@
 (function(root, factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/StringBooleanMap'], factory);
+    define(['ApiClient'], factory);
   } else if (typeof module === 'object' && module.exports) {
     // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('./StringBooleanMap'));
+    module.exports = factory(require('../ApiClient'));
   } else {
     // Browser globals (root is window)
     if (!root.OpenApiPetstore) {
       root.OpenApiPetstore = {};
     }
-    root.OpenApiPetstore.MapTest = factory(root.OpenApiPetstore.ApiClient, root.OpenApiPetstore.StringBooleanMap);
+    root.OpenApiPetstore.MapTest = factory(root.OpenApiPetstore.ApiClient);
   }
-}(this, function(ApiClient, StringBooleanMap) {
+}(this, function(ApiClient) {
   'use strict';
 
 
 
-
   /**
    * The MapTest model module.
    * @module model/MapTest
@@ -47,10 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
-
-
   };
 
   /**
@@ -63,7 +58,6 @@
   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'}});
       }
@@ -74,7 +68,7 @@
         obj['direct_map'] = ApiClient.convertToType(data['direct_map'], {'String': 'Boolean'});
       }
       if (data.hasOwnProperty('indirect_map')) {
-        obj['indirect_map'] = StringBooleanMap.constructFromObject(data['indirect_map']);
+        obj['indirect_map'] = ApiClient.convertToType(data['indirect_map'], {'String': 'Boolean'});
       }
     }
     return obj;
@@ -93,7 +87,7 @@
    */
   exports.prototype['direct_map'] = undefined;
   /**
-   * @member {module:model/StringBooleanMap} indirect_map
+   * @member {Object.<String, Boolean>} indirect_map
    */
   exports.prototype['indirect_map'] = undefined;
 
diff --git a/samples/client/petstore/javascript-promise/src/model/MixedPropertiesAndAdditionalPropertiesClass.js b/samples/client/petstore/javascript-promise/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
index 9291b7ba8a4..e92184fcf2d 100644
--- a/samples/client/petstore/javascript-promise/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
+++ b/samples/client/petstore/javascript-promise/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The MixedPropertiesAndAdditionalPropertiesClass model module.
    * @module model/MixedPropertiesAndAdditionalPropertiesClass
@@ -47,9 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
-
   };
 
   /**
@@ -62,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('uuid')) {
         obj['uuid'] = ApiClient.convertToType(data['uuid'], 'String');
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/Model200Response.js b/samples/client/petstore/javascript-promise/src/model/Model200Response.js
index 82d0b362160..45ecd7bcbc3 100644
--- a/samples/client/petstore/javascript-promise/src/model/Model200Response.js
+++ b/samples/client/petstore/javascript-promise/src/model/Model200Response.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The Model200Response model module.
    * @module model/Model200Response
@@ -48,8 +47,6 @@
   var exports = function() {
     var _this = this;
 
-
-
   };
 
   /**
@@ -62,7 +59,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('name')) {
         obj['name'] = ApiClient.convertToType(data['name'], 'Number');
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/ModelReturn.js b/samples/client/petstore/javascript-promise/src/model/ModelReturn.js
index b4ca8a7875d..ba50a193fca 100644
--- a/samples/client/petstore/javascript-promise/src/model/ModelReturn.js
+++ b/samples/client/petstore/javascript-promise/src/model/ModelReturn.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The ModelReturn model module.
    * @module model/ModelReturn
@@ -48,7 +47,6 @@
   var exports = function() {
     var _this = this;
 
-
   };
 
   /**
@@ -61,7 +59,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('return')) {
         obj['return'] = ApiClient.convertToType(data['return'], 'Number');
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/Name.js b/samples/client/petstore/javascript-promise/src/model/Name.js
index a18ddecd8d9..77fe28677aa 100644
--- a/samples/client/petstore/javascript-promise/src/model/Name.js
+++ b/samples/client/petstore/javascript-promise/src/model/Name.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The Name model module.
    * @module model/Name
@@ -50,9 +49,6 @@
     var _this = this;
 
     _this['name'] = name;
-
-
-
   };
 
   /**
@@ -65,7 +61,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('name')) {
         obj['name'] = ApiClient.convertToType(data['name'], 'Number');
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/NumberOnly.js b/samples/client/petstore/javascript-promise/src/model/NumberOnly.js
index f25c7bbc8b2..dd082b35f36 100644
--- a/samples/client/petstore/javascript-promise/src/model/NumberOnly.js
+++ b/samples/client/petstore/javascript-promise/src/model/NumberOnly.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The NumberOnly model module.
    * @module model/NumberOnly
@@ -47,7 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
   };
 
   /**
@@ -60,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('JustNumber')) {
         obj['JustNumber'] = ApiClient.convertToType(data['JustNumber'], 'Number');
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/Order.js b/samples/client/petstore/javascript-promise/src/model/Order.js
index a65a0024885..6e5659cfce0 100644
--- a/samples/client/petstore/javascript-promise/src/model/Order.js
+++ b/samples/client/petstore/javascript-promise/src/model/Order.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The Order model module.
    * @module model/Order
@@ -47,12 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
-
-
-
-
   };
 
   /**
@@ -65,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('id')) {
         obj['id'] = ApiClient.convertToType(data['id'], 'Number');
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/OuterComposite.js b/samples/client/petstore/javascript-promise/src/model/OuterComposite.js
index e9c23b1e619..3660cda183d 100644
--- a/samples/client/petstore/javascript-promise/src/model/OuterComposite.js
+++ b/samples/client/petstore/javascript-promise/src/model/OuterComposite.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The OuterComposite model module.
    * @module model/OuterComposite
@@ -47,9 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
-
   };
 
   /**
@@ -62,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('my_number')) {
         obj['my_number'] = ApiClient.convertToType(data['my_number'], 'Number');
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/OuterEnum.js b/samples/client/petstore/javascript-promise/src/model/OuterEnum.js
index bca0fdf08ce..77242917208 100644
--- a/samples/client/petstore/javascript-promise/src/model/OuterEnum.js
+++ b/samples/client/petstore/javascript-promise/src/model/OuterEnum.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript-promise/src/model/Pet.js b/samples/client/petstore/javascript-promise/src/model/Pet.js
index a4edb988958..422bab25fd1 100644
--- a/samples/client/petstore/javascript-promise/src/model/Pet.js
+++ b/samples/client/petstore/javascript-promise/src/model/Pet.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The Pet model module.
    * @module model/Pet
@@ -49,12 +48,8 @@
   var exports = function(name, photoUrls) {
     var _this = this;
 
-
-
     _this['name'] = name;
     _this['photoUrls'] = photoUrls;
-
-
   };
 
   /**
@@ -67,7 +62,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('id')) {
         obj['id'] = ApiClient.convertToType(data['id'], 'Number');
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/ReadOnlyFirst.js b/samples/client/petstore/javascript-promise/src/model/ReadOnlyFirst.js
index f05c53ebab3..2c0cb780282 100644
--- a/samples/client/petstore/javascript-promise/src/model/ReadOnlyFirst.js
+++ b/samples/client/petstore/javascript-promise/src/model/ReadOnlyFirst.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The ReadOnlyFirst model module.
    * @module model/ReadOnlyFirst
@@ -47,8 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
   };
 
   /**
@@ -61,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('bar')) {
         obj['bar'] = ApiClient.convertToType(data['bar'], 'String');
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/SpecialModelName.js b/samples/client/petstore/javascript-promise/src/model/SpecialModelName.js
index 3de755a7986..b694729ee2a 100644
--- a/samples/client/petstore/javascript-promise/src/model/SpecialModelName.js
+++ b/samples/client/petstore/javascript-promise/src/model/SpecialModelName.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The SpecialModelName model module.
    * @module model/SpecialModelName
@@ -47,7 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
   };
 
   /**
@@ -60,7 +58,6 @@
   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');
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/StringBooleanMap.js b/samples/client/petstore/javascript-promise/src/model/StringBooleanMap.js
index 8a82f9d99ba..aa287f6cdc9 100644
--- a/samples/client/petstore/javascript-promise/src/model/StringBooleanMap.js
+++ b/samples/client/petstore/javascript-promise/src/model/StringBooleanMap.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The StringBooleanMap model module.
    * @module model/StringBooleanMap
@@ -62,7 +61,6 @@
     if (data) {
       obj = obj || new exports();
       ApiClient.constructFromObject(data, obj, 'Boolean');
-
     }
     return obj;
   }
diff --git a/samples/client/petstore/javascript-promise/src/model/Tag.js b/samples/client/petstore/javascript-promise/src/model/Tag.js
index c57bfb9ca07..3ba4159ebb6 100644
--- a/samples/client/petstore/javascript-promise/src/model/Tag.js
+++ b/samples/client/petstore/javascript-promise/src/model/Tag.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The Tag model module.
    * @module model/Tag
@@ -47,8 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
   };
 
   /**
@@ -61,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('id')) {
         obj['id'] = ApiClient.convertToType(data['id'], 'Number');
       }
diff --git a/samples/client/petstore/javascript-promise/src/model/User.js b/samples/client/petstore/javascript-promise/src/model/User.js
index 6f2f6910f4d..8c500d4ae3c 100644
--- a/samples/client/petstore/javascript-promise/src/model/User.js
+++ b/samples/client/petstore/javascript-promise/src/model/User.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The User model module.
    * @module model/User
@@ -47,14 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
-
-
-
-
-
-
   };
 
   /**
@@ -67,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('id')) {
         obj['id'] = ApiClient.convertToType(data['id'], 'Number');
       }
diff --git a/samples/client/petstore/javascript/.openapi-generator/VERSION b/samples/client/petstore/javascript/.openapi-generator/VERSION
index 6d94c9c2e12..a6527129083 100644
--- a/samples/client/petstore/javascript/.openapi-generator/VERSION
+++ b/samples/client/petstore/javascript/.openapi-generator/VERSION
@@ -1 +1 @@
-3.3.0-SNAPSHOT
\ No newline at end of file
+3.3.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/javascript/docs/FakeApi.md b/samples/client/petstore/javascript/docs/FakeApi.md
index 73f3740d199..c7d9c6de6c7 100644
--- a/samples/client/petstore/javascript/docs/FakeApi.md
+++ b/samples/client/petstore/javascript/docs/FakeApi.md
@@ -473,7 +473,7 @@ test inline additionalProperties
 var OpenApiPetstore = require('open_api_petstore');
 
 var apiInstance = new OpenApiPetstore.FakeApi();
-var requestBody = {key: "inner_example"}; // {String: String} | request body
+var requestBody = {key: "null"}; // {String: String} | request body
 var callback = function(error, data, response) {
   if (error) {
     console.error(error);
diff --git a/samples/client/petstore/javascript/docs/MapTest.md b/samples/client/petstore/javascript/docs/MapTest.md
index f1075bf0681..152d3fbe8c7 100644
--- a/samples/client/petstore/javascript/docs/MapTest.md
+++ b/samples/client/petstore/javascript/docs/MapTest.md
@@ -6,7 +6,7 @@ Name | Type | Description | Notes
 **mapMapOfString** | **{String: {String: String}}** |  | [optional] 
 **mapOfEnumString** | **{String: String}** |  | [optional] 
 **directMap** | **{String: Boolean}** |  | [optional] 
-**indirectMap** | [**StringBooleanMap**](StringBooleanMap.md) |  | [optional] 
+**indirectMap** | **{String: Boolean}** |  | [optional] 
 
 
 <a name="{String: String}"></a>
diff --git a/samples/client/petstore/javascript/docs/PetApi.md b/samples/client/petstore/javascript/docs/PetApi.md
index 265fc5a9b25..3bd45fe4f7a 100644
--- a/samples/client/petstore/javascript/docs/PetApi.md
+++ b/samples/client/petstore/javascript/docs/PetApi.md
@@ -173,7 +173,7 @@ var petstore_auth = defaultClient.authentications['petstore_auth'];
 petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
 
 var apiInstance = new OpenApiPetstore.PetApi();
-var tags = ["inner_example"]; // [String] | Tags to filter by
+var tags = ["null"]; // [String] | Tags to filter by
 var callback = function(error, data, response) {
   if (error) {
     console.error(error);
diff --git a/samples/client/petstore/javascript/src/ApiClient.js b/samples/client/petstore/javascript/src/ApiClient.js
index 2e1ad976bf7..e5d21515ca0 100644
--- a/samples/client/petstore/javascript/src/ApiClient.js
+++ b/samples/client/petstore/javascript/src/ApiClient.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/api/AnotherFakeApi.js b/samples/client/petstore/javascript/src/api/AnotherFakeApi.js
index 4761e83415d..3b2af03572a 100644
--- a/samples/client/petstore/javascript/src/api/AnotherFakeApi.js
+++ b/samples/client/petstore/javascript/src/api/AnotherFakeApi.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/api/FakeApi.js b/samples/client/petstore/javascript/src/api/FakeApi.js
index 3f19f090267..9f3e8d2ebe2 100644
--- a/samples/client/petstore/javascript/src/api/FakeApi.js
+++ b/samples/client/petstore/javascript/src/api/FakeApi.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/api/FakeClassnameTags123Api.js b/samples/client/petstore/javascript/src/api/FakeClassnameTags123Api.js
index 1fda0fa1451..ca878d474b1 100644
--- a/samples/client/petstore/javascript/src/api/FakeClassnameTags123Api.js
+++ b/samples/client/petstore/javascript/src/api/FakeClassnameTags123Api.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/api/PetApi.js b/samples/client/petstore/javascript/src/api/PetApi.js
index 36243ed29e1..834ab1f71aa 100644
--- a/samples/client/petstore/javascript/src/api/PetApi.js
+++ b/samples/client/petstore/javascript/src/api/PetApi.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/api/StoreApi.js b/samples/client/petstore/javascript/src/api/StoreApi.js
index 32ce6e83cfc..658de0dd20b 100644
--- a/samples/client/petstore/javascript/src/api/StoreApi.js
+++ b/samples/client/petstore/javascript/src/api/StoreApi.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/api/UserApi.js b/samples/client/petstore/javascript/src/api/UserApi.js
index 13c24345f72..f5daf5012d2 100644
--- a/samples/client/petstore/javascript/src/api/UserApi.js
+++ b/samples/client/petstore/javascript/src/api/UserApi.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/index.js b/samples/client/petstore/javascript/src/index.js
index 1eebdbf5ff3..f7de11f4e55 100644
--- a/samples/client/petstore/javascript/src/index.js
+++ b/samples/client/petstore/javascript/src/index.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js
index e41dca8e660..aa85406e6a6 100644
--- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js
+++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The AdditionalPropertiesClass model module.
    * @module model/AdditionalPropertiesClass
@@ -47,8 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
   };
 
   /**
@@ -61,7 +58,6 @@
   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'});
       }
diff --git a/samples/client/petstore/javascript/src/model/Animal.js b/samples/client/petstore/javascript/src/model/Animal.js
index 43aaacc12b5..1c26f336515 100644
--- a/samples/client/petstore/javascript/src/model/Animal.js
+++ b/samples/client/petstore/javascript/src/model/Animal.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The Animal model module.
    * @module model/Animal
@@ -49,7 +48,6 @@
     var _this = this;
 
     _this['className'] = className;
-
   };
 
   /**
@@ -62,7 +60,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('className')) {
         obj['className'] = ApiClient.convertToType(data['className'], 'String');
       }
diff --git a/samples/client/petstore/javascript/src/model/AnimalFarm.js b/samples/client/petstore/javascript/src/model/AnimalFarm.js
index f3d2c132d12..1186bb4b207 100644
--- a/samples/client/petstore/javascript/src/model/AnimalFarm.js
+++ b/samples/client/petstore/javascript/src/model/AnimalFarm.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The AnimalFarm model module.
    * @module model/AnimalFarm
@@ -64,7 +63,6 @@
     if (data) {
       obj = obj || new exports();
       ApiClient.constructFromObject(data, obj, 'Animal');
-
     }
     return obj;
   }
diff --git a/samples/client/petstore/javascript/src/model/ApiResponse.js b/samples/client/petstore/javascript/src/model/ApiResponse.js
index 2d33b0b7a23..8a5161ed12d 100644
--- a/samples/client/petstore/javascript/src/model/ApiResponse.js
+++ b/samples/client/petstore/javascript/src/model/ApiResponse.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The ApiResponse model module.
    * @module model/ApiResponse
@@ -47,9 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
-
   };
 
   /**
@@ -62,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('code')) {
         obj['code'] = ApiClient.convertToType(data['code'], 'Number');
       }
diff --git a/samples/client/petstore/javascript/src/model/ArrayOfArrayOfNumberOnly.js b/samples/client/petstore/javascript/src/model/ArrayOfArrayOfNumberOnly.js
index 41463b0e371..aa150c35acc 100644
--- a/samples/client/petstore/javascript/src/model/ArrayOfArrayOfNumberOnly.js
+++ b/samples/client/petstore/javascript/src/model/ArrayOfArrayOfNumberOnly.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The ArrayOfArrayOfNumberOnly model module.
    * @module model/ArrayOfArrayOfNumberOnly
@@ -47,7 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
   };
 
   /**
@@ -60,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('ArrayArrayNumber')) {
         obj['ArrayArrayNumber'] = ApiClient.convertToType(data['ArrayArrayNumber'], [['Number']]);
       }
diff --git a/samples/client/petstore/javascript/src/model/ArrayOfNumberOnly.js b/samples/client/petstore/javascript/src/model/ArrayOfNumberOnly.js
index f3b0ac217e1..c0a345a76b1 100644
--- a/samples/client/petstore/javascript/src/model/ArrayOfNumberOnly.js
+++ b/samples/client/petstore/javascript/src/model/ArrayOfNumberOnly.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The ArrayOfNumberOnly model module.
    * @module model/ArrayOfNumberOnly
@@ -47,7 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
   };
 
   /**
@@ -60,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('ArrayNumber')) {
         obj['ArrayNumber'] = ApiClient.convertToType(data['ArrayNumber'], ['Number']);
       }
diff --git a/samples/client/petstore/javascript/src/model/ArrayTest.js b/samples/client/petstore/javascript/src/model/ArrayTest.js
index 6b8aeade8b0..955463cf2ce 100644
--- a/samples/client/petstore/javascript/src/model/ArrayTest.js
+++ b/samples/client/petstore/javascript/src/model/ArrayTest.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The ArrayTest model module.
    * @module model/ArrayTest
@@ -47,9 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
-
   };
 
   /**
@@ -62,7 +58,6 @@
   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']);
       }
diff --git a/samples/client/petstore/javascript/src/model/Capitalization.js b/samples/client/petstore/javascript/src/model/Capitalization.js
index 67c027686a9..2f960c5b9ef 100644
--- a/samples/client/petstore/javascript/src/model/Capitalization.js
+++ b/samples/client/petstore/javascript/src/model/Capitalization.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The Capitalization model module.
    * @module model/Capitalization
@@ -47,12 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
-
-
-
-
   };
 
   /**
@@ -65,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('smallCamel')) {
         obj['smallCamel'] = ApiClient.convertToType(data['smallCamel'], 'String');
       }
diff --git a/samples/client/petstore/javascript/src/model/Cat.js b/samples/client/petstore/javascript/src/model/Cat.js
index 6f8ca2e91fd..20131cfe2d1 100644
--- a/samples/client/petstore/javascript/src/model/Cat.js
+++ b/samples/client/petstore/javascript/src/model/Cat.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The Cat model module.
    * @module model/Cat
@@ -49,9 +48,8 @@
    */
   var exports = function(className) {
     var _this = this;
-    Animal.call(_this, className);
-    Animal.call(_this, className);
 
+    Animal.call(_this, className);
   };
 
   /**
@@ -65,7 +63,6 @@
     if (data) {
       obj = obj || new exports();
       Animal.constructFromObject(data, obj);
-      Animal.constructFromObject(data, obj);
       if (data.hasOwnProperty('declawed')) {
         obj['declawed'] = ApiClient.convertToType(data['declawed'], 'Boolean');
       }
diff --git a/samples/client/petstore/javascript/src/model/Category.js b/samples/client/petstore/javascript/src/model/Category.js
index ba82e88bd49..bd9d7e54685 100644
--- a/samples/client/petstore/javascript/src/model/Category.js
+++ b/samples/client/petstore/javascript/src/model/Category.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The Category model module.
    * @module model/Category
@@ -47,8 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
   };
 
   /**
@@ -61,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('id')) {
         obj['id'] = ApiClient.convertToType(data['id'], 'Number');
       }
diff --git a/samples/client/petstore/javascript/src/model/ClassModel.js b/samples/client/petstore/javascript/src/model/ClassModel.js
index 6592fdeebc9..a1208fdd575 100644
--- a/samples/client/petstore/javascript/src/model/ClassModel.js
+++ b/samples/client/petstore/javascript/src/model/ClassModel.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The ClassModel model module.
    * @module model/ClassModel
@@ -48,7 +47,6 @@
   var exports = function() {
     var _this = this;
 
-
   };
 
   /**
@@ -61,7 +59,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('_class')) {
         obj['_class'] = ApiClient.convertToType(data['_class'], 'String');
       }
diff --git a/samples/client/petstore/javascript/src/model/Client.js b/samples/client/petstore/javascript/src/model/Client.js
index 00fe25ca2d7..e2af3bfa10f 100644
--- a/samples/client/petstore/javascript/src/model/Client.js
+++ b/samples/client/petstore/javascript/src/model/Client.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The Client model module.
    * @module model/Client
@@ -47,7 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
   };
 
   /**
@@ -60,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('client')) {
         obj['client'] = ApiClient.convertToType(data['client'], 'String');
       }
diff --git a/samples/client/petstore/javascript/src/model/Dog.js b/samples/client/petstore/javascript/src/model/Dog.js
index 7a74ef477b4..f5a73c3bca8 100644
--- a/samples/client/petstore/javascript/src/model/Dog.js
+++ b/samples/client/petstore/javascript/src/model/Dog.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The Dog model module.
    * @module model/Dog
@@ -49,9 +48,8 @@
    */
   var exports = function(className) {
     var _this = this;
-    Animal.call(_this, className);
-    Animal.call(_this, className);
 
+    Animal.call(_this, className);
   };
 
   /**
@@ -65,7 +63,6 @@
     if (data) {
       obj = obj || new exports();
       Animal.constructFromObject(data, obj);
-      Animal.constructFromObject(data, obj);
       if (data.hasOwnProperty('breed')) {
         obj['breed'] = ApiClient.convertToType(data['breed'], 'String');
       }
diff --git a/samples/client/petstore/javascript/src/model/EnumArrays.js b/samples/client/petstore/javascript/src/model/EnumArrays.js
index 7bbb3af35d2..c0c93dfecb7 100644
--- a/samples/client/petstore/javascript/src/model/EnumArrays.js
+++ b/samples/client/petstore/javascript/src/model/EnumArrays.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The EnumArrays model module.
    * @module model/EnumArrays
@@ -47,8 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
   };
 
   /**
@@ -61,7 +58,6 @@
   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');
       }
diff --git a/samples/client/petstore/javascript/src/model/EnumClass.js b/samples/client/petstore/javascript/src/model/EnumClass.js
index 3a8a7f52d94..be0e548d3ff 100644
--- a/samples/client/petstore/javascript/src/model/EnumClass.js
+++ b/samples/client/petstore/javascript/src/model/EnumClass.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/EnumTest.js b/samples/client/petstore/javascript/src/model/EnumTest.js
index 25d166c5c8a..b0c37e129bc 100644
--- a/samples/client/petstore/javascript/src/model/EnumTest.js
+++ b/samples/client/petstore/javascript/src/model/EnumTest.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The EnumTest model module.
    * @module model/EnumTest
@@ -48,11 +47,7 @@
   var exports = function(enumStringRequired) {
     var _this = this;
 
-
     _this['enum_string_required'] = enumStringRequired;
-
-
-
   };
 
   /**
@@ -65,7 +60,6 @@
   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');
       }
diff --git a/samples/client/petstore/javascript/src/model/File.js b/samples/client/petstore/javascript/src/model/File.js
index 706f20eff08..eb5bd17d80b 100644
--- a/samples/client/petstore/javascript/src/model/File.js
+++ b/samples/client/petstore/javascript/src/model/File.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The File model module.
    * @module model/File
@@ -48,7 +47,6 @@
   var exports = function() {
     var _this = this;
 
-
   };
 
   /**
@@ -61,7 +59,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('sourceURI')) {
         obj['sourceURI'] = ApiClient.convertToType(data['sourceURI'], 'String');
       }
diff --git a/samples/client/petstore/javascript/src/model/FileSchemaTestClass.js b/samples/client/petstore/javascript/src/model/FileSchemaTestClass.js
index 2bc85b700b0..93a23dcbd7b 100644
--- a/samples/client/petstore/javascript/src/model/FileSchemaTestClass.js
+++ b/samples/client/petstore/javascript/src/model/FileSchemaTestClass.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The FileSchemaTestClass model module.
    * @module model/FileSchemaTestClass
@@ -47,8 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
   };
 
   /**
@@ -61,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('file')) {
         obj['file'] = File.constructFromObject(data['file']);
       }
diff --git a/samples/client/petstore/javascript/src/model/FormatTest.js b/samples/client/petstore/javascript/src/model/FormatTest.js
index 679e769b5b2..63b9b283299 100644
--- a/samples/client/petstore/javascript/src/model/FormatTest.js
+++ b/samples/client/petstore/javascript/src/model/FormatTest.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The FormatTest model module.
    * @module model/FormatTest
@@ -51,18 +50,9 @@
   var exports = function(_number, _byte, _date, password) {
     var _this = this;
 
-
-
-
     _this['number'] = _number;
-
-
-
     _this['byte'] = _byte;
-
     _this['date'] = _date;
-
-
     _this['password'] = password;
   };
 
@@ -76,7 +66,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('integer')) {
         obj['integer'] = ApiClient.convertToType(data['integer'], 'Number');
       }
diff --git a/samples/client/petstore/javascript/src/model/HasOnlyReadOnly.js b/samples/client/petstore/javascript/src/model/HasOnlyReadOnly.js
index 6b42db4416e..817af5d86b7 100644
--- a/samples/client/petstore/javascript/src/model/HasOnlyReadOnly.js
+++ b/samples/client/petstore/javascript/src/model/HasOnlyReadOnly.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The HasOnlyReadOnly model module.
    * @module model/HasOnlyReadOnly
@@ -47,8 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
   };
 
   /**
@@ -61,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('bar')) {
         obj['bar'] = ApiClient.convertToType(data['bar'], 'String');
       }
diff --git a/samples/client/petstore/javascript/src/model/List.js b/samples/client/petstore/javascript/src/model/List.js
index 05c95f2613a..4412a32c822 100644
--- a/samples/client/petstore/javascript/src/model/List.js
+++ b/samples/client/petstore/javascript/src/model/List.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The List model module.
    * @module model/List
@@ -47,7 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
   };
 
   /**
@@ -60,7 +58,6 @@
   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');
       }
diff --git a/samples/client/petstore/javascript/src/model/MapTest.js b/samples/client/petstore/javascript/src/model/MapTest.js
index 65b317db8b5..f5499f47517 100644
--- a/samples/client/petstore/javascript/src/model/MapTest.js
+++ b/samples/client/petstore/javascript/src/model/MapTest.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -16,23 +16,22 @@
 (function(root, factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/StringBooleanMap'], factory);
+    define(['ApiClient'], factory);
   } else if (typeof module === 'object' && module.exports) {
     // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('./StringBooleanMap'));
+    module.exports = factory(require('../ApiClient'));
   } else {
     // Browser globals (root is window)
     if (!root.OpenApiPetstore) {
       root.OpenApiPetstore = {};
     }
-    root.OpenApiPetstore.MapTest = factory(root.OpenApiPetstore.ApiClient, root.OpenApiPetstore.StringBooleanMap);
+    root.OpenApiPetstore.MapTest = factory(root.OpenApiPetstore.ApiClient);
   }
-}(this, function(ApiClient, StringBooleanMap) {
+}(this, function(ApiClient) {
   'use strict';
 
 
 
-
   /**
    * The MapTest model module.
    * @module model/MapTest
@@ -47,10 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
-
-
   };
 
   /**
@@ -63,7 +58,6 @@
   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'}});
       }
@@ -74,7 +68,7 @@
         obj['direct_map'] = ApiClient.convertToType(data['direct_map'], {'String': 'Boolean'});
       }
       if (data.hasOwnProperty('indirect_map')) {
-        obj['indirect_map'] = StringBooleanMap.constructFromObject(data['indirect_map']);
+        obj['indirect_map'] = ApiClient.convertToType(data['indirect_map'], {'String': 'Boolean'});
       }
     }
     return obj;
@@ -93,7 +87,7 @@
    */
   exports.prototype['direct_map'] = undefined;
   /**
-   * @member {module:model/StringBooleanMap} indirect_map
+   * @member {Object.<String, Boolean>} indirect_map
    */
   exports.prototype['indirect_map'] = undefined;
 
diff --git a/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js b/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
index 9291b7ba8a4..e92184fcf2d 100644
--- a/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
+++ b/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The MixedPropertiesAndAdditionalPropertiesClass model module.
    * @module model/MixedPropertiesAndAdditionalPropertiesClass
@@ -47,9 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
-
   };
 
   /**
@@ -62,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('uuid')) {
         obj['uuid'] = ApiClient.convertToType(data['uuid'], 'String');
       }
diff --git a/samples/client/petstore/javascript/src/model/Model200Response.js b/samples/client/petstore/javascript/src/model/Model200Response.js
index 82d0b362160..45ecd7bcbc3 100644
--- a/samples/client/petstore/javascript/src/model/Model200Response.js
+++ b/samples/client/petstore/javascript/src/model/Model200Response.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The Model200Response model module.
    * @module model/Model200Response
@@ -48,8 +47,6 @@
   var exports = function() {
     var _this = this;
 
-
-
   };
 
   /**
@@ -62,7 +59,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('name')) {
         obj['name'] = ApiClient.convertToType(data['name'], 'Number');
       }
diff --git a/samples/client/petstore/javascript/src/model/ModelReturn.js b/samples/client/petstore/javascript/src/model/ModelReturn.js
index b4ca8a7875d..ba50a193fca 100644
--- a/samples/client/petstore/javascript/src/model/ModelReturn.js
+++ b/samples/client/petstore/javascript/src/model/ModelReturn.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The ModelReturn model module.
    * @module model/ModelReturn
@@ -48,7 +47,6 @@
   var exports = function() {
     var _this = this;
 
-
   };
 
   /**
@@ -61,7 +59,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('return')) {
         obj['return'] = ApiClient.convertToType(data['return'], 'Number');
       }
diff --git a/samples/client/petstore/javascript/src/model/Name.js b/samples/client/petstore/javascript/src/model/Name.js
index a18ddecd8d9..77fe28677aa 100644
--- a/samples/client/petstore/javascript/src/model/Name.js
+++ b/samples/client/petstore/javascript/src/model/Name.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The Name model module.
    * @module model/Name
@@ -50,9 +49,6 @@
     var _this = this;
 
     _this['name'] = name;
-
-
-
   };
 
   /**
@@ -65,7 +61,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('name')) {
         obj['name'] = ApiClient.convertToType(data['name'], 'Number');
       }
diff --git a/samples/client/petstore/javascript/src/model/NumberOnly.js b/samples/client/petstore/javascript/src/model/NumberOnly.js
index f25c7bbc8b2..dd082b35f36 100644
--- a/samples/client/petstore/javascript/src/model/NumberOnly.js
+++ b/samples/client/petstore/javascript/src/model/NumberOnly.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The NumberOnly model module.
    * @module model/NumberOnly
@@ -47,7 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
   };
 
   /**
@@ -60,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('JustNumber')) {
         obj['JustNumber'] = ApiClient.convertToType(data['JustNumber'], 'Number');
       }
diff --git a/samples/client/petstore/javascript/src/model/Order.js b/samples/client/petstore/javascript/src/model/Order.js
index a65a0024885..6e5659cfce0 100644
--- a/samples/client/petstore/javascript/src/model/Order.js
+++ b/samples/client/petstore/javascript/src/model/Order.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The Order model module.
    * @module model/Order
@@ -47,12 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
-
-
-
-
   };
 
   /**
@@ -65,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('id')) {
         obj['id'] = ApiClient.convertToType(data['id'], 'Number');
       }
diff --git a/samples/client/petstore/javascript/src/model/OuterComposite.js b/samples/client/petstore/javascript/src/model/OuterComposite.js
index e9c23b1e619..3660cda183d 100644
--- a/samples/client/petstore/javascript/src/model/OuterComposite.js
+++ b/samples/client/petstore/javascript/src/model/OuterComposite.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The OuterComposite model module.
    * @module model/OuterComposite
@@ -47,9 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
-
   };
 
   /**
@@ -62,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('my_number')) {
         obj['my_number'] = ApiClient.convertToType(data['my_number'], 'Number');
       }
diff --git a/samples/client/petstore/javascript/src/model/OuterEnum.js b/samples/client/petstore/javascript/src/model/OuterEnum.js
index bca0fdf08ce..77242917208 100644
--- a/samples/client/petstore/javascript/src/model/OuterEnum.js
+++ b/samples/client/petstore/javascript/src/model/OuterEnum.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
diff --git a/samples/client/petstore/javascript/src/model/Pet.js b/samples/client/petstore/javascript/src/model/Pet.js
index a4edb988958..422bab25fd1 100644
--- a/samples/client/petstore/javascript/src/model/Pet.js
+++ b/samples/client/petstore/javascript/src/model/Pet.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The Pet model module.
    * @module model/Pet
@@ -49,12 +48,8 @@
   var exports = function(name, photoUrls) {
     var _this = this;
 
-
-
     _this['name'] = name;
     _this['photoUrls'] = photoUrls;
-
-
   };
 
   /**
@@ -67,7 +62,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('id')) {
         obj['id'] = ApiClient.convertToType(data['id'], 'Number');
       }
diff --git a/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js b/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js
index f05c53ebab3..2c0cb780282 100644
--- a/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js
+++ b/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The ReadOnlyFirst model module.
    * @module model/ReadOnlyFirst
@@ -47,8 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
   };
 
   /**
@@ -61,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('bar')) {
         obj['bar'] = ApiClient.convertToType(data['bar'], 'String');
       }
diff --git a/samples/client/petstore/javascript/src/model/SpecialModelName.js b/samples/client/petstore/javascript/src/model/SpecialModelName.js
index 3de755a7986..b694729ee2a 100644
--- a/samples/client/petstore/javascript/src/model/SpecialModelName.js
+++ b/samples/client/petstore/javascript/src/model/SpecialModelName.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The SpecialModelName model module.
    * @module model/SpecialModelName
@@ -47,7 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
   };
 
   /**
@@ -60,7 +58,6 @@
   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');
       }
diff --git a/samples/client/petstore/javascript/src/model/StringBooleanMap.js b/samples/client/petstore/javascript/src/model/StringBooleanMap.js
index 8a82f9d99ba..aa287f6cdc9 100644
--- a/samples/client/petstore/javascript/src/model/StringBooleanMap.js
+++ b/samples/client/petstore/javascript/src/model/StringBooleanMap.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The StringBooleanMap model module.
    * @module model/StringBooleanMap
@@ -62,7 +61,6 @@
     if (data) {
       obj = obj || new exports();
       ApiClient.constructFromObject(data, obj, 'Boolean');
-
     }
     return obj;
   }
diff --git a/samples/client/petstore/javascript/src/model/Tag.js b/samples/client/petstore/javascript/src/model/Tag.js
index c57bfb9ca07..3ba4159ebb6 100644
--- a/samples/client/petstore/javascript/src/model/Tag.js
+++ b/samples/client/petstore/javascript/src/model/Tag.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The Tag model module.
    * @module model/Tag
@@ -47,8 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
   };
 
   /**
@@ -61,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('id')) {
         obj['id'] = ApiClient.convertToType(data['id'], 'Number');
       }
diff --git a/samples/client/petstore/javascript/src/model/User.js b/samples/client/petstore/javascript/src/model/User.js
index 6f2f6910f4d..8c500d4ae3c 100644
--- a/samples/client/petstore/javascript/src/model/User.js
+++ b/samples/client/petstore/javascript/src/model/User.js
@@ -7,7 +7,7 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  *
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.2-SNAPSHOT
  *
  * Do not edit the class manually.
  *
@@ -32,7 +32,6 @@
 
 
 
-
   /**
    * The User model module.
    * @module model/User
@@ -47,14 +46,6 @@
   var exports = function() {
     var _this = this;
 
-
-
-
-
-
-
-
-
   };
 
   /**
@@ -67,7 +58,6 @@
   exports.constructFromObject = function(data, obj) {
     if (data) {
       obj = obj || new exports();
-
       if (data.hasOwnProperty('id')) {
         obj['id'] = ApiClient.convertToType(data['id'], 'Number');
       }