From 4decc1a2736fdc7c919f958bbe9c2efca22262b8 Mon Sep 17 00:00:00 2001
From: Malachi Jones <malachi.jones@metaswitch.com>
Date: Thu, 7 Mar 2019 10:38:26 +0000
Subject: [PATCH] [HTML2] Rendered docs are incomplete

- Simple aliased types are now passed to the generator

- Body parameters are now provided with their schemas

- Schema block is now visibile in the generated documentation
---
 .../openapitools/codegen/DefaultCodegen.java  |   4 +-
 .../codegen/DefaultGenerator.java             |  12 +-
 .../main/resources/htmlDocs2/index.mustache   |  36 +-
 .../main/resources/htmlDocs2/paramB.mustache  |   6 +-
 .../html2/.openapi-generator/VERSION          |   2 +-
 samples/documentation/html2/index.html        | 668 +++++++++++-------
 6 files changed, 470 insertions(+), 258 deletions(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
index acb24f48f361..6fa2e8aa0fc3 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -4947,7 +4947,9 @@ public CodegenParameter fromRequestBody(RequestBody body, Set<String> imports, S
             // set nullable
             setParameterNullable(codegenParameter, codegenProperty);
         }
-
+        // Adding JsonSchema for body request in case that is not present.
+        if(codegenParameter.jsonSchema == null)
+            codegenParameter.jsonSchema = Json.pretty(body);
         // set the parameter's example value
         // should be overridden by lang codegen
         setParameterExampleValue(codegenParameter, body);
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
index 8e1e40d79f3c..996d91fe6aa4 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
@@ -488,12 +488,12 @@ private Model getParent(Model model) {
                 // TODO revise below as we've already performed unaliasing so that the isAlias check may be removed
                 Map<String, Object> modelTemplate = (Map<String, Object>) ((List<Object>) models.get("models")).get(0);
                 // Special handling of aliases only applies to Java
-                if (modelTemplate != null && modelTemplate.containsKey("model")) {
-                    CodegenModel m = (CodegenModel) modelTemplate.get("model");
-                    if (m.isAlias) {
-                        continue;  // Don't create user-defined classes for aliases
-                    }
-                }
+                // if (modelTemplate != null && modelTemplate.containsKey("model")) {
+                //     CodegenModel m = (CodegenModel) modelTemplate.get("model");
+                //     if (m.isAlias) {
+                //         continue;  // Don't create user-defined classes for aliases
+                //     }
+                // }
 
                 allModels.add(modelTemplate);
 
diff --git a/modules/openapi-generator/src/main/resources/htmlDocs2/index.mustache b/modules/openapi-generator/src/main/resources/htmlDocs2/index.mustache
index 577ab978d2b1..0ad5141f852b 100644
--- a/modules/openapi-generator/src/main/resources/htmlDocs2/index.mustache
+++ b/modules/openapi-generator/src/main/resources/htmlDocs2/index.mustache
@@ -101,6 +101,33 @@
       //Convert elements with "marked" class to markdown
       processMarked();
     });
+
+    function findNode(id, currentNode) {
+        var currentChild,
+            result;
+
+        if ( Object.keys(currentNode)[0] == id) {
+            return currentNode;
+        } else {
+            // Use a for loop instead of forEach to avoid nested functions
+            // Otherwise "return" will not work properly
+            for(var propt in currentNode){
+                currentChild = currentNode[propt]
+                if (id == propt) {
+                    return currentChild;
+                } else {
+                    // Search in the current child
+                    if (typeof(currentNode[propt]) === 'object') {
+                        result = findNode(id, currentChild);
+                        if (result != false)
+                            return result;
+                    }
+                }
+            }
+            // The node has not been found and we have no more options
+           return false;
+        }
+    }
   </script>
   <style type="text/css">
     {{>fonts}}
@@ -416,7 +443,11 @@
                                     <script>
                                       $(document).ready(function() {
                                         var schemaWrapper = {{{jsonSchema}}};
-                                        var schema = schemaWrapper.schema;
+
+                                        var schema = findNode('schema',schemaWrapper).schema;
+                                        if (!schema) {
+                                          schema = schemaWrapper.schema;
+                                        }
                                         if (schema.$ref != null) {
                                           schema = defsParser.$refs.get(schema.$ref);
                                         } else {
@@ -505,8 +536,7 @@
   {{>js_json_stringify_safe}}
   {{>js_webfontloader}}
   <script>
-    var schemaWrapper = {};
-    schemaWrapper.definitions = Object.assign({}, defs);
+    var schemaWrapper = { "components": { "schemas" : defs}};
     defsParser = new $RefParser();
     defsParser.dereference(schemaWrapper).catch(function(err) {
       console.log(err);
diff --git a/modules/openapi-generator/src/main/resources/htmlDocs2/paramB.mustache b/modules/openapi-generator/src/main/resources/htmlDocs2/paramB.mustache
index 5fbf2b4b1917..e584bcb129c2 100644
--- a/modules/openapi-generator/src/main/resources/htmlDocs2/paramB.mustache
+++ b/modules/openapi-generator/src/main/resources/htmlDocs2/paramB.mustache
@@ -4,7 +4,11 @@
 <script>
 $(document).ready(function() {
   var schemaWrapper = {{{jsonSchema}}};
-  var schema = schemaWrapper.schema;
+
+  var schema = findNode('schema',schemaWrapper).schema;
+  if (!schema) {
+    schema = schemaWrapper.schema;
+  }
   if (schema.$ref != null) {
     schema = defsParser.$refs.get(schema.$ref);
   } else {
diff --git a/samples/documentation/html2/.openapi-generator/VERSION b/samples/documentation/html2/.openapi-generator/VERSION
index 14900cee60e8..83a328a9227e 100644
--- a/samples/documentation/html2/.openapi-generator/VERSION
+++ b/samples/documentation/html2/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/documentation/html2/index.html b/samples/documentation/html2/index.html
index 5b9ce2fe173c..da91ae03abff 100644
--- a/samples/documentation/html2/index.html
+++ b/samples/documentation/html2/index.html
@@ -155,6 +155,33 @@
       //Convert elements with "marked" class to markdown
       processMarked();
     });
+
+    function findNode(id, currentNode) {
+        var currentChild,
+            result;
+
+        if ( Object.keys(currentNode)[0] == id) {
+            return currentNode;
+        } else {
+            // Use a for loop instead of forEach to avoid nested functions
+            // Otherwise "return" will not work properly
+            for(var propt in currentNode){
+                currentChild = currentNode[propt]
+                if (id == propt) {
+                    return currentChild;
+                } else {
+                    // Search in the current child
+                    if (typeof(currentNode[propt]) === 'object') {
+                        result = findNode(id, currentChild);
+                        if (result != false)
+                            return result;
+                    }
+                }
+            }
+            // The node has not been found and we have no more options
+           return false;
+        }
+    }
   </script>
   <style type="text/css">
     @import url('https://fonts.googleapis.com/css?family=Source+Code+Pro');
@@ -1144,9 +1171,9 @@ <h3>Usage and SDK Samples</h3>
         petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
 
         PetApi apiInstance = new PetApi();
-        Pet pet = ; // Pet | 
+        Pet body = ; // Pet | 
         try {
-            apiInstance.addPet(pet);
+            apiInstance.addPet(body);
         } catch (ApiException e) {
             System.err.println("Exception when calling PetApi#addPet");
             e.printStackTrace();
@@ -1162,9 +1189,9 @@ <h3>Usage and SDK Samples</h3>
 
     public static void main(String[] args) {
         PetApi apiInstance = new PetApi();
-        Pet pet = ; // Pet | 
+        Pet body = ; // Pet | 
         try {
-            apiInstance.addPet(pet);
+            apiInstance.addPet(body);
         } catch (ApiException e) {
             System.err.println("Exception when calling PetApi#addPet");
             e.printStackTrace();
@@ -1182,12 +1209,12 @@ <h3>Usage and SDK Samples</h3>
 // Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
 [apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
 
-Pet *pet = ; // 
+Pet *body = ; // 
 
 PetApi *apiInstance = [[PetApi alloc] init];
 
 // Add a new pet to the store
-[apiInstance addPetWith:pet
+[apiInstance addPetWith:body
               completionHandler: ^(NSError* error) {
                             if (error) {
                                 NSLog(@"Error: %@", error);
@@ -1205,7 +1232,7 @@ <h3>Usage and SDK Samples</h3>
 petstore_auth.accessToken = "YOUR ACCESS TOKEN"
 
 var api = new OpenApiPetstore.PetApi()
-var pet = ; // {Pet} 
+var body = ; // {Pet} 
 
 var callback = function(error, data, response) {
   if (error) {
@@ -1214,7 +1241,7 @@ <h3>Usage and SDK Samples</h3>
     console.log('API called successfully.');
   }
 };
-api.addPet(pet, callback);
+api.addPet(body, callback);
 </code></pre>
                             </div>
 
@@ -1239,12 +1266,12 @@ <h3>Usage and SDK Samples</h3>
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new PetApi();
-            var pet = new Pet(); // Pet | 
+            var body = new Pet(); // Pet | 
 
             try
             {
                 // Add a new pet to the store
-                apiInstance.addPet(pet);
+                apiInstance.addPet(body);
             }
             catch (Exception e)
             {
@@ -1264,10 +1291,10 @@ <h3>Usage and SDK Samples</h3>
 OpenAPITools\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
 
 $api_instance = new OpenAPITools\Client\Api\PetApi();
-$pet = ; // Pet | 
+$body = ; // Pet | 
 
 try {
-    $api_instance->addPet($pet);
+    $api_instance->addPet($body);
 } catch (Exception $e) {
     echo 'Exception when calling PetApi->addPet: ', $e->getMessage(), PHP_EOL;
 }
@@ -1283,10 +1310,10 @@ <h3>Usage and SDK Samples</h3>
 $WWW::OPenAPIClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
 
 my $api_instance = WWW::OPenAPIClient::PetApi->new();
-my $pet = WWW::OPenAPIClient::Object::Pet->new(); # Pet | 
+my $body = WWW::OPenAPIClient::Object::Pet->new(); # Pet | 
 
 eval { 
-    $api_instance->addPet(pet => $pet);
+    $api_instance->addPet(body => $body);
 };
 if ($@) {
     warn "Exception when calling PetApi->addPet: $@\n";
@@ -1305,11 +1332,11 @@ <h3>Usage and SDK Samples</h3>
 
 # create an instance of the API class
 api_instance = openapi_client.PetApi()
-pet =  # Pet | 
+body =  # Pet | 
 
 try: 
     # Add a new pet to the store
-    api_instance.add_pet(pet)
+    api_instance.add_pet(body)
 except ApiException as e:
     print("Exception when calling PetApi->addPet: %s\n" % e)</code></pre>
                             </div>
@@ -1318,10 +1345,10 @@ <h3>Usage and SDK Samples</h3>
                               <pre class="prettyprint"><code class="language-rust">extern crate PetApi;
 
 pub fn main() {
-    let pet = ; // Pet
+    let body = ; // Pet
 
     let mut context = PetApi::Context::default();
-    let result = client.addPet(pet, &context).wait();
+    let result = client.addPet(body, &context).wait();
     println!("{:?}", result);
 
 }
@@ -1354,29 +1381,48 @@ <h2>Parameters</h2>
                                 <th width="150px">Name</th>
                                 <th>Description</th>
                               </tr>
-                                <tr><td style="width:150px;">pet <span style="color:red;">*</span></td>
+                                <tr><td style="width:150px;">body <span style="color:red;">*</span></td>
 <td>
 <p class="marked">Pet object that needs to be added to the store</p>
 <script>
 $(document).ready(function() {
-  var schemaWrapper = ;
-  var schema = schemaWrapper.schema;
+  var schemaWrapper = {
+  "description" : "Pet object that needs to be added to the store",
+  "content" : {
+    "application/json" : {
+      "schema" : {
+        "$ref" : "#/components/schemas/Pet"
+      }
+    },
+    "application/xml" : {
+      "schema" : {
+        "$ref" : "#/components/schemas/Pet"
+      }
+    }
+  },
+  "required" : true
+};
+
+  var schema = findNode('schema',schemaWrapper).schema;                                                                              
+  if (!schema) {
+    schema = schemaWrapper.schema;
+  }
   if (schema.$ref != null) {
     schema = defsParser.$refs.get(schema.$ref);
-  } else {
+  } else {                                          
     schemaWrapper.definitions = Object.assign({}, defs);
     $RefParser.dereference(schemaWrapper).catch(function(err) {
       console.log(err);
     });
   }
-
+  
   var view = new JSONSchemaView(schema,2,{isBodyParam: true});
-  var result = $('#d2e199_addPet_pet');
+  var result = $('#d2e199_addPet_body');
   result.empty();
   result.append(view.render());
 });
 </script>
-<div id="d2e199_addPet_pet"></div>
+<div id="d2e199_addPet_body"></div>
 </td>
 </tr>
 
@@ -1504,8 +1550,8 @@ <h3>Usage and SDK Samples</h3>
 // Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
 [apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
 
-Long *petId = 789; // Pet id to delete
-String *apiKey = apiKey_example; //  (optional)
+Long *petId = 789; // Pet id to delete (default to null)
+String *apiKey = apiKey_example; //  (optional) (default to null)
 
 PetApi *apiInstance = [[PetApi alloc] init];
 
@@ -1566,8 +1612,8 @@ <h3>Usage and SDK Samples</h3>
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new PetApi();
-            var petId = 789;  // Long | Pet id to delete
-            var apiKey = apiKey_example;  // String |  (optional) 
+            var petId = 789;  // Long | Pet id to delete (default to null)
+            var apiKey = apiKey_example;  // String |  (optional)  (default to null)
 
             try
             {
@@ -1635,8 +1681,8 @@ <h3>Usage and SDK Samples</h3>
 
 # create an instance of the API class
 api_instance = openapi_client.PetApi()
-petId = 789 # Long | Pet id to delete
-apiKey = apiKey_example # String |  (optional)
+petId = 789 # Long | Pet id to delete (default to null)
+apiKey = apiKey_example # String |  (optional) (default to null)
 
 try: 
     # Deletes a pet
@@ -1860,7 +1906,7 @@ <h3>Usage and SDK Samples</h3>
 // Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
 [apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
 
-array[String] *status = ; // Status values that need to be considered for filter
+array[String] *status = ; // Status values that need to be considered for filter (default to null)
 
 PetApi *apiInstance = [[PetApi alloc] init];
 
@@ -1920,7 +1966,7 @@ <h3>Usage and SDK Samples</h3>
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new PetApi();
-            var status = new array[String](); // array[String] | Status values that need to be considered for filter
+            var status = new array[String](); // array[String] | Status values that need to be considered for filter (default to null)
 
             try
             {
@@ -1989,7 +2035,7 @@ <h3>Usage and SDK Samples</h3>
 
 # create an instance of the API class
 api_instance = openapi_client.PetApi()
-status =  # array[String] | Status values that need to be considered for filter
+status =  # array[String] | Status values that need to be considered for filter (default to null)
 
 try: 
     # Finds Pets by status
@@ -2117,11 +2163,15 @@ <h3 id="examples-Pet-findPetsByStatus-title-200"></h3>
       }
     }
   }
-};
-                                        var schema = schemaWrapper.schema;
+};                                                                              
+
+                                        var schema = findNode('schema',schemaWrapper).schema;                                                                              
+                                        if (!schema) {
+                                          schema = schemaWrapper.schema;
+                                        }
                                         if (schema.$ref != null) {
                                           schema = defsParser.$refs.get(schema.$ref);
-                                        } else {
+                                        } else {                                          
                                           schemaWrapper.definitions = Object.assign({}, defs);
                                           $RefParser.dereference(schemaWrapper).catch(function(err) {
                                             console.log(err);
@@ -2258,7 +2308,7 @@ <h3>Usage and SDK Samples</h3>
 // Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
 [apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
 
-array[String] *tags = ; // Tags to filter by
+array[String] *tags = ; // Tags to filter by (default to null)
 
 PetApi *apiInstance = [[PetApi alloc] init];
 
@@ -2318,7 +2368,7 @@ <h3>Usage and SDK Samples</h3>
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new PetApi();
-            var tags = new array[String](); // array[String] | Tags to filter by
+            var tags = new array[String](); // array[String] | Tags to filter by (default to null)
 
             try
             {
@@ -2387,7 +2437,7 @@ <h3>Usage and SDK Samples</h3>
 
 # create an instance of the API class
 api_instance = openapi_client.PetApi()
-tags =  # array[String] | Tags to filter by
+tags =  # array[String] | Tags to filter by (default to null)
 
 try: 
     # Finds Pets by tags
@@ -2515,11 +2565,15 @@ <h3 id="examples-Pet-findPetsByTags-title-200"></h3>
       }
     }
   }
-};
-                                        var schema = schemaWrapper.schema;
+};                                                                              
+
+                                        var schema = findNode('schema',schemaWrapper).schema;                                                                              
+                                        if (!schema) {
+                                          schema = schemaWrapper.schema;
+                                        }
                                         if (schema.$ref != null) {
                                           schema = defsParser.$refs.get(schema.$ref);
-                                        } else {
+                                        } else {                                          
                                           schemaWrapper.definitions = Object.assign({}, defs);
                                           $RefParser.dereference(schemaWrapper).catch(function(err) {
                                             console.log(err);
@@ -2660,7 +2714,7 @@ <h3>Usage and SDK Samples</h3>
 // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 //[apiConfig setApiKeyPrefix:@"Bearer" forApiKeyIdentifier:@"api_key"];
 
-Long *petId = 789; // ID of pet to return
+Long *petId = 789; // ID of pet to return (default to null)
 
 PetApi *apiInstance = [[PetApi alloc] init];
 
@@ -2724,7 +2778,7 @@ <h3>Usage and SDK Samples</h3>
             // Configuration.Default.ApiKeyPrefix.Add("api_key", "Bearer");
 
             var apiInstance = new PetApi();
-            var petId = 789;  // Long | ID of pet to return
+            var petId = 789;  // Long | ID of pet to return (default to null)
 
             try
             {
@@ -2799,7 +2853,7 @@ <h3>Usage and SDK Samples</h3>
 
 # create an instance of the API class
 api_instance = openapi_client.PetApi()
-petId = 789 # Long | ID of pet to return
+petId = 789 # Long | ID of pet to return (default to null)
 
 try: 
     # Find pet by ID
@@ -2914,11 +2968,15 @@ <h3 id="examples-Pet-getPetById-title-200"></h3>
       }
     }
   }
-};
-                                        var schema = schemaWrapper.schema;
+};                                                                              
+
+                                        var schema = findNode('schema',schemaWrapper).schema;                                                                              
+                                        if (!schema) {
+                                          schema = schemaWrapper.schema;
+                                        }
                                         if (schema.$ref != null) {
                                           schema = defsParser.$refs.get(schema.$ref);
-                                        } else {
+                                        } else {                                          
                                           schemaWrapper.definitions = Object.assign({}, defs);
                                           $RefParser.dereference(schemaWrapper).catch(function(err) {
                                             console.log(err);
@@ -3037,9 +3095,9 @@ <h3>Usage and SDK Samples</h3>
         petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
 
         PetApi apiInstance = new PetApi();
-        Pet pet = ; // Pet | 
+        Pet body = ; // Pet | 
         try {
-            apiInstance.updatePet(pet);
+            apiInstance.updatePet(body);
         } catch (ApiException e) {
             System.err.println("Exception when calling PetApi#updatePet");
             e.printStackTrace();
@@ -3055,9 +3113,9 @@ <h3>Usage and SDK Samples</h3>
 
     public static void main(String[] args) {
         PetApi apiInstance = new PetApi();
-        Pet pet = ; // Pet | 
+        Pet body = ; // Pet | 
         try {
-            apiInstance.updatePet(pet);
+            apiInstance.updatePet(body);
         } catch (ApiException e) {
             System.err.println("Exception when calling PetApi#updatePet");
             e.printStackTrace();
@@ -3075,12 +3133,12 @@ <h3>Usage and SDK Samples</h3>
 // Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
 [apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
 
-Pet *pet = ; // 
+Pet *body = ; // 
 
 PetApi *apiInstance = [[PetApi alloc] init];
 
 // Update an existing pet
-[apiInstance updatePetWith:pet
+[apiInstance updatePetWith:body
               completionHandler: ^(NSError* error) {
                             if (error) {
                                 NSLog(@"Error: %@", error);
@@ -3098,7 +3156,7 @@ <h3>Usage and SDK Samples</h3>
 petstore_auth.accessToken = "YOUR ACCESS TOKEN"
 
 var api = new OpenApiPetstore.PetApi()
-var pet = ; // {Pet} 
+var body = ; // {Pet} 
 
 var callback = function(error, data, response) {
   if (error) {
@@ -3107,7 +3165,7 @@ <h3>Usage and SDK Samples</h3>
     console.log('API called successfully.');
   }
 };
-api.updatePet(pet, callback);
+api.updatePet(body, callback);
 </code></pre>
                             </div>
 
@@ -3132,12 +3190,12 @@ <h3>Usage and SDK Samples</h3>
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new PetApi();
-            var pet = new Pet(); // Pet | 
+            var body = new Pet(); // Pet | 
 
             try
             {
                 // Update an existing pet
-                apiInstance.updatePet(pet);
+                apiInstance.updatePet(body);
             }
             catch (Exception e)
             {
@@ -3157,10 +3215,10 @@ <h3>Usage and SDK Samples</h3>
 OpenAPITools\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
 
 $api_instance = new OpenAPITools\Client\Api\PetApi();
-$pet = ; // Pet | 
+$body = ; // Pet | 
 
 try {
-    $api_instance->updatePet($pet);
+    $api_instance->updatePet($body);
 } catch (Exception $e) {
     echo 'Exception when calling PetApi->updatePet: ', $e->getMessage(), PHP_EOL;
 }
@@ -3176,10 +3234,10 @@ <h3>Usage and SDK Samples</h3>
 $WWW::OPenAPIClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
 
 my $api_instance = WWW::OPenAPIClient::PetApi->new();
-my $pet = WWW::OPenAPIClient::Object::Pet->new(); # Pet | 
+my $body = WWW::OPenAPIClient::Object::Pet->new(); # Pet | 
 
 eval { 
-    $api_instance->updatePet(pet => $pet);
+    $api_instance->updatePet(body => $body);
 };
 if ($@) {
     warn "Exception when calling PetApi->updatePet: $@\n";
@@ -3198,11 +3256,11 @@ <h3>Usage and SDK Samples</h3>
 
 # create an instance of the API class
 api_instance = openapi_client.PetApi()
-pet =  # Pet | 
+body =  # Pet | 
 
 try: 
     # Update an existing pet
-    api_instance.update_pet(pet)
+    api_instance.update_pet(body)
 except ApiException as e:
     print("Exception when calling PetApi->updatePet: %s\n" % e)</code></pre>
                             </div>
@@ -3211,10 +3269,10 @@ <h3>Usage and SDK Samples</h3>
                               <pre class="prettyprint"><code class="language-rust">extern crate PetApi;
 
 pub fn main() {
-    let pet = ; // Pet
+    let body = ; // Pet
 
     let mut context = PetApi::Context::default();
-    let result = client.updatePet(pet, &context).wait();
+    let result = client.updatePet(body, &context).wait();
     println!("{:?}", result);
 
 }
@@ -3247,29 +3305,48 @@ <h2>Parameters</h2>
                                 <th width="150px">Name</th>
                                 <th>Description</th>
                               </tr>
-                                <tr><td style="width:150px;">pet <span style="color:red;">*</span></td>
+                                <tr><td style="width:150px;">body <span style="color:red;">*</span></td>
 <td>
 <p class="marked">Pet object that needs to be added to the store</p>
 <script>
 $(document).ready(function() {
-  var schemaWrapper = ;
-  var schema = schemaWrapper.schema;
+  var schemaWrapper = {
+  "description" : "Pet object that needs to be added to the store",
+  "content" : {
+    "application/json" : {
+      "schema" : {
+        "$ref" : "#/components/schemas/Pet"
+      }
+    },
+    "application/xml" : {
+      "schema" : {
+        "$ref" : "#/components/schemas/Pet"
+      }
+    }
+  },
+  "required" : true
+};
+
+  var schema = findNode('schema',schemaWrapper).schema;                                                                              
+  if (!schema) {
+    schema = schemaWrapper.schema;
+  }
   if (schema.$ref != null) {
     schema = defsParser.$refs.get(schema.$ref);
-  } else {
+  } else {                                          
     schemaWrapper.definitions = Object.assign({}, defs);
     $RefParser.dereference(schemaWrapper).catch(function(err) {
       console.log(err);
     });
   }
-
+  
   var view = new JSONSchemaView(schema,2,{isBodyParam: true});
-  var result = $('#d2e199_updatePet_pet');
+  var result = $('#d2e199_updatePet_body');
   result.empty();
   result.append(view.render());
 });
 </script>
-<div id="d2e199_updatePet_pet"></div>
+<div id="d2e199_updatePet_body"></div>
 </td>
 </tr>
 
@@ -3443,7 +3520,7 @@ <h3>Usage and SDK Samples</h3>
 // Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
 [apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
 
-Long *petId = 789; // ID of pet that needs to be updated
+Long *petId = 789; // ID of pet that needs to be updated (default to null)
 String *name = name_example; // Updated name of the pet (optional) (default to null)
 String *status = status_example; // Updated status of the pet (optional) (default to null)
 
@@ -3508,7 +3585,7 @@ <h3>Usage and SDK Samples</h3>
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new PetApi();
-            var petId = 789;  // Long | ID of pet that needs to be updated
+            var petId = 789;  // Long | ID of pet that needs to be updated (default to null)
             var name = name_example;  // String | Updated name of the pet (optional)  (default to null)
             var status = status_example;  // String | Updated status of the pet (optional)  (default to null)
 
@@ -3580,7 +3657,7 @@ <h3>Usage and SDK Samples</h3>
 
 # create an instance of the API class
 api_instance = openapi_client.PetApi()
-petId = 789 # Long | ID of pet that needs to be updated
+petId = 789 # Long | ID of pet that needs to be updated (default to null)
 name = name_example # String | Updated name of the pet (optional) (default to null)
 status = status_example # String | Updated status of the pet (optional) (default to null)
 
@@ -3834,7 +3911,7 @@ <h3>Usage and SDK Samples</h3>
 // Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
 [apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
 
-Long *petId = 789; // ID of pet to update
+Long *petId = 789; // ID of pet to update (default to null)
 String *additionalMetadata = additionalMetadata_example; // Additional data to pass to server (optional) (default to null)
 File *file = BINARY_DATA_HERE; // file to upload (optional) (default to null)
 
@@ -3902,7 +3979,7 @@ <h3>Usage and SDK Samples</h3>
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new PetApi();
-            var petId = 789;  // Long | ID of pet to update
+            var petId = 789;  // Long | ID of pet to update (default to null)
             var additionalMetadata = additionalMetadata_example;  // String | Additional data to pass to server (optional)  (default to null)
             var file = BINARY_DATA_HERE;  // File | file to upload (optional)  (default to null)
 
@@ -3977,7 +4054,7 @@ <h3>Usage and SDK Samples</h3>
 
 # create an instance of the API class
 api_instance = openapi_client.PetApi()
-petId = 789 # Long | ID of pet to update
+petId = 789 # Long | ID of pet to update (default to null)
 additionalMetadata = additionalMetadata_example # String | Additional data to pass to server (optional) (default to null)
 file = BINARY_DATA_HERE # File | file to upload (optional) (default to null)
 
@@ -4151,11 +4228,15 @@ <h3 id="examples-Pet-uploadFile-title-200"></h3>
       }
     }
   }
-};
-                                        var schema = schemaWrapper.schema;
+};                                                                              
+
+                                        var schema = findNode('schema',schemaWrapper).schema;                                                                              
+                                        if (!schema) {
+                                          schema = schemaWrapper.schema;
+                                        }
                                         if (schema.$ref != null) {
                                           schema = defsParser.$refs.get(schema.$ref);
-                                        } else {
+                                        } else {                                          
                                           schemaWrapper.definitions = Object.assign({}, defs);
                                           $RefParser.dereference(schemaWrapper).catch(function(err) {
                                             console.log(err);
@@ -4261,7 +4342,7 @@ <h3>Usage and SDK Samples</h3>
   <pre class="prettyprint language-json prettyprinted" data-type="json"><code>Coming Soon!</code></pre>
   </div> -->
                             <div class="tab-pane" id="examples-Store-deleteOrder-0-objc">
-                              <pre class="prettyprint"><code class="language-cpp">String *orderId = orderId_example; // ID of the order that needs to be deleted
+                              <pre class="prettyprint"><code class="language-cpp">String *orderId = orderId_example; // ID of the order that needs to be deleted (default to null)
 
 StoreApi *apiInstance = [[StoreApi alloc] init];
 
@@ -4310,7 +4391,7 @@ <h3>Usage and SDK Samples</h3>
         {
             
             var apiInstance = new StoreApi();
-            var orderId = orderId_example;  // String | ID of the order that needs to be deleted
+            var orderId = orderId_example;  // String | ID of the order that needs to be deleted (default to null)
 
             try
             {
@@ -4367,7 +4448,7 @@ <h3>Usage and SDK Samples</h3>
 
 # create an instance of the API class
 api_instance = openapi_client.StoreApi()
-orderId = orderId_example # String | ID of the order that needs to be deleted
+orderId = orderId_example # String | ID of the order that needs to be deleted (default to null)
 
 try: 
     # Delete purchase order by ID
@@ -4789,11 +4870,15 @@ <h3 id="examples-Store-getInventory-title-200"></h3>
       }
     }
   }
-};
-                                        var schema = schemaWrapper.schema;
+};                                                                              
+
+                                        var schema = findNode('schema',schemaWrapper).schema;                                                                              
+                                        if (!schema) {
+                                          schema = schemaWrapper.schema;
+                                        }
                                         if (schema.$ref != null) {
                                           schema = defsParser.$refs.get(schema.$ref);
-                                        } else {
+                                        } else {                                          
                                           schemaWrapper.definitions = Object.assign({}, defs);
                                           $RefParser.dereference(schemaWrapper).catch(function(err) {
                                             console.log(err);
@@ -4898,7 +4983,7 @@ <h3>Usage and SDK Samples</h3>
   <pre class="prettyprint language-json prettyprinted" data-type="json"><code>Coming Soon!</code></pre>
   </div> -->
                             <div class="tab-pane" id="examples-Store-getOrderById-0-objc">
-                              <pre class="prettyprint"><code class="language-cpp">Long *orderId = 789; // ID of pet that needs to be fetched
+                              <pre class="prettyprint"><code class="language-cpp">Long *orderId = 789; // ID of pet that needs to be fetched (default to null)
 
 StoreApi *apiInstance = [[StoreApi alloc] init];
 
@@ -4950,7 +5035,7 @@ <h3>Usage and SDK Samples</h3>
         {
             
             var apiInstance = new StoreApi();
-            var orderId = 789;  // Long | ID of pet that needs to be fetched
+            var orderId = 789;  // Long | ID of pet that needs to be fetched (default to null)
 
             try
             {
@@ -5010,7 +5095,7 @@ <h3>Usage and SDK Samples</h3>
 
 # create an instance of the API class
 api_instance = openapi_client.StoreApi()
-orderId = 789 # Long | ID of pet that needs to be fetched
+orderId = 789 # Long | ID of pet that needs to be fetched (default to null)
 
 try: 
     # Find purchase order by ID
@@ -5125,11 +5210,15 @@ <h3 id="examples-Store-getOrderById-title-200"></h3>
       }
     }
   }
-};
-                                        var schema = schemaWrapper.schema;
+};                                                                              
+
+                                        var schema = findNode('schema',schemaWrapper).schema;                                                                              
+                                        if (!schema) {
+                                          schema = schemaWrapper.schema;
+                                        }
                                         if (schema.$ref != null) {
                                           schema = defsParser.$refs.get(schema.$ref);
-                                        } else {
+                                        } else {                                          
                                           schemaWrapper.definitions = Object.assign({}, defs);
                                           $RefParser.dereference(schemaWrapper).catch(function(err) {
                                             console.log(err);
@@ -5243,9 +5332,9 @@ <h3>Usage and SDK Samples</h3>
     public static void main(String[] args) {
         
         StoreApi apiInstance = new StoreApi();
-        Order order = ; // Order | 
+        Order body = ; // Order | 
         try {
-            Order result = apiInstance.placeOrder(order);
+            Order result = apiInstance.placeOrder(body);
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling StoreApi#placeOrder");
@@ -5262,9 +5351,9 @@ <h3>Usage and SDK Samples</h3>
 
     public static void main(String[] args) {
         StoreApi apiInstance = new StoreApi();
-        Order order = ; // Order | 
+        Order body = ; // Order | 
         try {
-            Order result = apiInstance.placeOrder(order);
+            Order result = apiInstance.placeOrder(body);
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling StoreApi#placeOrder");
@@ -5278,12 +5367,12 @@ <h3>Usage and SDK Samples</h3>
   <pre class="prettyprint language-json prettyprinted" data-type="json"><code>Coming Soon!</code></pre>
   </div> -->
                             <div class="tab-pane" id="examples-Store-placeOrder-0-objc">
-                              <pre class="prettyprint"><code class="language-cpp">Order *order = ; // 
+                              <pre class="prettyprint"><code class="language-cpp">Order *body = ; // 
 
 StoreApi *apiInstance = [[StoreApi alloc] init];
 
 // Place an order for a pet
-[apiInstance placeOrderWith:order
+[apiInstance placeOrderWith:body
               completionHandler: ^(Order output, NSError* error) {
                             if (output) {
                                 NSLog(@"%@", output);
@@ -5299,7 +5388,7 @@ <h3>Usage and SDK Samples</h3>
                               <pre class="prettyprint"><code class="language-js">var OpenApiPetstore = require('open_api_petstore');
 
 var api = new OpenApiPetstore.StoreApi()
-var order = ; // {Order} 
+var body = ; // {Order} 
 
 var callback = function(error, data, response) {
   if (error) {
@@ -5308,7 +5397,7 @@ <h3>Usage and SDK Samples</h3>
     console.log('API called successfully. Returned data: ' + data);
   }
 };
-api.placeOrder(order, callback);
+api.placeOrder(body, callback);
 </code></pre>
                             </div>
 
@@ -5330,12 +5419,12 @@ <h3>Usage and SDK Samples</h3>
         {
             
             var apiInstance = new StoreApi();
-            var order = new Order(); // Order | 
+            var body = new Order(); // Order | 
 
             try
             {
                 // Place an order for a pet
-                Order result = apiInstance.placeOrder(order);
+                Order result = apiInstance.placeOrder(body);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
@@ -5353,10 +5442,10 @@ <h3>Usage and SDK Samples</h3>
 require_once(__DIR__ . '/vendor/autoload.php');
 
 $api_instance = new OpenAPITools\Client\Api\StoreApi();
-$order = ; // Order | 
+$body = ; // Order | 
 
 try {
-    $result = $api_instance->placeOrder($order);
+    $result = $api_instance->placeOrder($body);
     print_r($result);
 } catch (Exception $e) {
     echo 'Exception when calling StoreApi->placeOrder: ', $e->getMessage(), PHP_EOL;
@@ -5370,10 +5459,10 @@ <h3>Usage and SDK Samples</h3>
 use WWW::OPenAPIClient::StoreApi;
 
 my $api_instance = WWW::OPenAPIClient::StoreApi->new();
-my $order = WWW::OPenAPIClient::Object::Order->new(); # Order | 
+my $body = WWW::OPenAPIClient::Object::Order->new(); # Order | 
 
 eval { 
-    my $result = $api_instance->placeOrder(order => $order);
+    my $result = $api_instance->placeOrder(body => $body);
     print Dumper($result);
 };
 if ($@) {
@@ -5390,11 +5479,11 @@ <h3>Usage and SDK Samples</h3>
 
 # create an instance of the API class
 api_instance = openapi_client.StoreApi()
-order =  # Order | 
+body =  # Order | 
 
 try: 
     # Place an order for a pet
-    api_response = api_instance.place_order(order)
+    api_response = api_instance.place_order(body)
     pprint(api_response)
 except ApiException as e:
     print("Exception when calling StoreApi->placeOrder: %s\n" % e)</code></pre>
@@ -5404,10 +5493,10 @@ <h3>Usage and SDK Samples</h3>
                               <pre class="prettyprint"><code class="language-rust">extern crate StoreApi;
 
 pub fn main() {
-    let order = ; // Order
+    let body = ; // Order
 
     let mut context = StoreApi::Context::default();
-    let result = client.placeOrder(order, &context).wait();
+    let result = client.placeOrder(body, &context).wait();
     println!("{:?}", result);
 
 }
@@ -5430,29 +5519,43 @@ <h2>Parameters</h2>
                                 <th width="150px">Name</th>
                                 <th>Description</th>
                               </tr>
-                                <tr><td style="width:150px;">order <span style="color:red;">*</span></td>
+                                <tr><td style="width:150px;">body <span style="color:red;">*</span></td>
 <td>
 <p class="marked">order placed for purchasing the pet</p>
 <script>
 $(document).ready(function() {
-  var schemaWrapper = ;
-  var schema = schemaWrapper.schema;
+  var schemaWrapper = {
+  "description" : "order placed for purchasing the pet",
+  "content" : {
+    "*/*" : {
+      "schema" : {
+        "$ref" : "#/components/schemas/Order"
+      }
+    }
+  },
+  "required" : true
+};
+
+  var schema = findNode('schema',schemaWrapper).schema;                                                                              
+  if (!schema) {
+    schema = schemaWrapper.schema;
+  }
   if (schema.$ref != null) {
     schema = defsParser.$refs.get(schema.$ref);
-  } else {
+  } else {                                          
     schemaWrapper.definitions = Object.assign({}, defs);
     $RefParser.dereference(schemaWrapper).catch(function(err) {
       console.log(err);
     });
   }
-
+  
   var view = new JSONSchemaView(schema,2,{isBodyParam: true});
-  var result = $('#d2e199_placeOrder_order');
+  var result = $('#d2e199_placeOrder_body');
   result.empty();
   result.append(view.render());
 });
 </script>
-<div id="d2e199_placeOrder_order"></div>
+<div id="d2e199_placeOrder_body"></div>
 </td>
 </tr>
 
@@ -5505,11 +5608,15 @@ <h3 id="examples-Store-placeOrder-title-200"></h3>
       }
     }
   }
-};
-                                        var schema = schemaWrapper.schema;
+};                                                                              
+
+                                        var schema = findNode('schema',schemaWrapper).schema;                                                                              
+                                        if (!schema) {
+                                          schema = schemaWrapper.schema;
+                                        }
                                         if (schema.$ref != null) {
                                           schema = defsParser.$refs.get(schema.$ref);
-                                        } else {
+                                        } else {                                          
                                           schemaWrapper.definitions = Object.assign({}, defs);
                                           $RefParser.dereference(schemaWrapper).catch(function(err) {
                                             console.log(err);
@@ -5604,9 +5711,9 @@ <h3>Usage and SDK Samples</h3>
     public static void main(String[] args) {
         
         UserApi apiInstance = new UserApi();
-        User user = ; // User | 
+        User body = ; // User | 
         try {
-            apiInstance.createUser(user);
+            apiInstance.createUser(body);
         } catch (ApiException e) {
             System.err.println("Exception when calling UserApi#createUser");
             e.printStackTrace();
@@ -5622,9 +5729,9 @@ <h3>Usage and SDK Samples</h3>
 
     public static void main(String[] args) {
         UserApi apiInstance = new UserApi();
-        User user = ; // User | 
+        User body = ; // User | 
         try {
-            apiInstance.createUser(user);
+            apiInstance.createUser(body);
         } catch (ApiException e) {
             System.err.println("Exception when calling UserApi#createUser");
             e.printStackTrace();
@@ -5637,12 +5744,12 @@ <h3>Usage and SDK Samples</h3>
   <pre class="prettyprint language-json prettyprinted" data-type="json"><code>Coming Soon!</code></pre>
   </div> -->
                             <div class="tab-pane" id="examples-User-createUser-0-objc">
-                              <pre class="prettyprint"><code class="language-cpp">User *user = ; // 
+                              <pre class="prettyprint"><code class="language-cpp">User *body = ; // 
 
 UserApi *apiInstance = [[UserApi alloc] init];
 
 // Create user
-[apiInstance createUserWith:user
+[apiInstance createUserWith:body
               completionHandler: ^(NSError* error) {
                             if (error) {
                                 NSLog(@"Error: %@", error);
@@ -5655,7 +5762,7 @@ <h3>Usage and SDK Samples</h3>
                               <pre class="prettyprint"><code class="language-js">var OpenApiPetstore = require('open_api_petstore');
 
 var api = new OpenApiPetstore.UserApi()
-var user = ; // {User} 
+var body = ; // {User} 
 
 var callback = function(error, data, response) {
   if (error) {
@@ -5664,7 +5771,7 @@ <h3>Usage and SDK Samples</h3>
     console.log('API called successfully.');
   }
 };
-api.createUser(user, callback);
+api.createUser(body, callback);
 </code></pre>
                             </div>
 
@@ -5686,12 +5793,12 @@ <h3>Usage and SDK Samples</h3>
         {
             
             var apiInstance = new UserApi();
-            var user = new User(); // User | 
+            var body = new User(); // User | 
 
             try
             {
                 // Create user
-                apiInstance.createUser(user);
+                apiInstance.createUser(body);
             }
             catch (Exception e)
             {
@@ -5708,10 +5815,10 @@ <h3>Usage and SDK Samples</h3>
 require_once(__DIR__ . '/vendor/autoload.php');
 
 $api_instance = new OpenAPITools\Client\Api\UserApi();
-$user = ; // User | 
+$body = ; // User | 
 
 try {
-    $api_instance->createUser($user);
+    $api_instance->createUser($body);
 } catch (Exception $e) {
     echo 'Exception when calling UserApi->createUser: ', $e->getMessage(), PHP_EOL;
 }
@@ -5724,10 +5831,10 @@ <h3>Usage and SDK Samples</h3>
 use WWW::OPenAPIClient::UserApi;
 
 my $api_instance = WWW::OPenAPIClient::UserApi->new();
-my $user = WWW::OPenAPIClient::Object::User->new(); # User | 
+my $body = WWW::OPenAPIClient::Object::User->new(); # User | 
 
 eval { 
-    $api_instance->createUser(user => $user);
+    $api_instance->createUser(body => $body);
 };
 if ($@) {
     warn "Exception when calling UserApi->createUser: $@\n";
@@ -5743,11 +5850,11 @@ <h3>Usage and SDK Samples</h3>
 
 # create an instance of the API class
 api_instance = openapi_client.UserApi()
-user =  # User | 
+body =  # User | 
 
 try: 
     # Create user
-    api_instance.create_user(user)
+    api_instance.create_user(body)
 except ApiException as e:
     print("Exception when calling UserApi->createUser: %s\n" % e)</code></pre>
                             </div>
@@ -5756,10 +5863,10 @@ <h3>Usage and SDK Samples</h3>
                               <pre class="prettyprint"><code class="language-rust">extern crate UserApi;
 
 pub fn main() {
-    let user = ; // User
+    let body = ; // User
 
     let mut context = UserApi::Context::default();
-    let result = client.createUser(user, &context).wait();
+    let result = client.createUser(body, &context).wait();
     println!("{:?}", result);
 
 }
@@ -5782,29 +5889,43 @@ <h2>Parameters</h2>
                                 <th width="150px">Name</th>
                                 <th>Description</th>
                               </tr>
-                                <tr><td style="width:150px;">user <span style="color:red;">*</span></td>
+                                <tr><td style="width:150px;">body <span style="color:red;">*</span></td>
 <td>
 <p class="marked">Created user object</p>
 <script>
 $(document).ready(function() {
-  var schemaWrapper = ;
-  var schema = schemaWrapper.schema;
+  var schemaWrapper = {
+  "description" : "Created user object",
+  "content" : {
+    "*/*" : {
+      "schema" : {
+        "$ref" : "#/components/schemas/User"
+      }
+    }
+  },
+  "required" : true
+};
+
+  var schema = findNode('schema',schemaWrapper).schema;                                                                              
+  if (!schema) {
+    schema = schemaWrapper.schema;
+  }
   if (schema.$ref != null) {
     schema = defsParser.$refs.get(schema.$ref);
-  } else {
+  } else {                                          
     schemaWrapper.definitions = Object.assign({}, defs);
     $RefParser.dereference(schemaWrapper).catch(function(err) {
       console.log(err);
     });
   }
-
+  
   var view = new JSONSchemaView(schema,2,{isBodyParam: true});
-  var result = $('#d2e199_createUser_user');
+  var result = $('#d2e199_createUser_body');
   result.empty();
   result.append(view.render());
 });
 </script>
-<div id="d2e199_createUser_user"></div>
+<div id="d2e199_createUser_body"></div>
 </td>
 </tr>
 
@@ -5887,9 +6008,9 @@ <h3>Usage and SDK Samples</h3>
     public static void main(String[] args) {
         
         UserApi apiInstance = new UserApi();
-        array[User] user = ; // array[User] | 
+        array[User] body = ; // array[User] | 
         try {
-            apiInstance.createUsersWithArrayInput(user);
+            apiInstance.createUsersWithArrayInput(body);
         } catch (ApiException e) {
             System.err.println("Exception when calling UserApi#createUsersWithArrayInput");
             e.printStackTrace();
@@ -5905,9 +6026,9 @@ <h3>Usage and SDK Samples</h3>
 
     public static void main(String[] args) {
         UserApi apiInstance = new UserApi();
-        array[User] user = ; // array[User] | 
+        array[User] body = ; // array[User] | 
         try {
-            apiInstance.createUsersWithArrayInput(user);
+            apiInstance.createUsersWithArrayInput(body);
         } catch (ApiException e) {
             System.err.println("Exception when calling UserApi#createUsersWithArrayInput");
             e.printStackTrace();
@@ -5920,12 +6041,12 @@ <h3>Usage and SDK Samples</h3>
   <pre class="prettyprint language-json prettyprinted" data-type="json"><code>Coming Soon!</code></pre>
   </div> -->
                             <div class="tab-pane" id="examples-User-createUsersWithArrayInput-0-objc">
-                              <pre class="prettyprint"><code class="language-cpp">array[User] *user = ; // 
+                              <pre class="prettyprint"><code class="language-cpp">array[User] *body = ; // 
 
 UserApi *apiInstance = [[UserApi alloc] init];
 
 // Creates list of users with given input array
-[apiInstance createUsersWithArrayInputWith:user
+[apiInstance createUsersWithArrayInputWith:body
               completionHandler: ^(NSError* error) {
                             if (error) {
                                 NSLog(@"Error: %@", error);
@@ -5938,7 +6059,7 @@ <h3>Usage and SDK Samples</h3>
                               <pre class="prettyprint"><code class="language-js">var OpenApiPetstore = require('open_api_petstore');
 
 var api = new OpenApiPetstore.UserApi()
-var user = ; // {array[User]} 
+var body = ; // {array[User]} 
 
 var callback = function(error, data, response) {
   if (error) {
@@ -5947,7 +6068,7 @@ <h3>Usage and SDK Samples</h3>
     console.log('API called successfully.');
   }
 };
-api.createUsersWithArrayInput(user, callback);
+api.createUsersWithArrayInput(body, callback);
 </code></pre>
                             </div>
 
@@ -5969,12 +6090,12 @@ <h3>Usage and SDK Samples</h3>
         {
             
             var apiInstance = new UserApi();
-            var user = new array[User](); // array[User] | 
+            var body = new array[User](); // array[User] | 
 
             try
             {
                 // Creates list of users with given input array
-                apiInstance.createUsersWithArrayInput(user);
+                apiInstance.createUsersWithArrayInput(body);
             }
             catch (Exception e)
             {
@@ -5991,10 +6112,10 @@ <h3>Usage and SDK Samples</h3>
 require_once(__DIR__ . '/vendor/autoload.php');
 
 $api_instance = new OpenAPITools\Client\Api\UserApi();
-$user = ; // array[User] | 
+$body = ; // array[User] | 
 
 try {
-    $api_instance->createUsersWithArrayInput($user);
+    $api_instance->createUsersWithArrayInput($body);
 } catch (Exception $e) {
     echo 'Exception when calling UserApi->createUsersWithArrayInput: ', $e->getMessage(), PHP_EOL;
 }
@@ -6007,10 +6128,10 @@ <h3>Usage and SDK Samples</h3>
 use WWW::OPenAPIClient::UserApi;
 
 my $api_instance = WWW::OPenAPIClient::UserApi->new();
-my $user = [WWW::OPenAPIClient::Object::array[User]->new()]; # array[User] | 
+my $body = [WWW::OPenAPIClient::Object::array[User]->new()]; # array[User] | 
 
 eval { 
-    $api_instance->createUsersWithArrayInput(user => $user);
+    $api_instance->createUsersWithArrayInput(body => $body);
 };
 if ($@) {
     warn "Exception when calling UserApi->createUsersWithArrayInput: $@\n";
@@ -6026,11 +6147,11 @@ <h3>Usage and SDK Samples</h3>
 
 # create an instance of the API class
 api_instance = openapi_client.UserApi()
-user =  # array[User] | 
+body =  # array[User] | 
 
 try: 
     # Creates list of users with given input array
-    api_instance.create_users_with_array_input(user)
+    api_instance.create_users_with_array_input(body)
 except ApiException as e:
     print("Exception when calling UserApi->createUsersWithArrayInput: %s\n" % e)</code></pre>
                             </div>
@@ -6039,10 +6160,10 @@ <h3>Usage and SDK Samples</h3>
                               <pre class="prettyprint"><code class="language-rust">extern crate UserApi;
 
 pub fn main() {
-    let user = ; // array[User]
+    let body = ; // array[User]
 
     let mut context = UserApi::Context::default();
-    let result = client.createUsersWithArrayInput(user, &context).wait();
+    let result = client.createUsersWithArrayInput(body, &context).wait();
     println!("{:?}", result);
 
 }
@@ -6065,29 +6186,46 @@ <h2>Parameters</h2>
                                 <th width="150px">Name</th>
                                 <th>Description</th>
                               </tr>
-                                <tr><td style="width:150px;">user <span style="color:red;">*</span></td>
+                                <tr><td style="width:150px;">body <span style="color:red;">*</span></td>
 <td>
 <p class="marked">List of user object</p>
 <script>
 $(document).ready(function() {
-  var schemaWrapper = ;
-  var schema = schemaWrapper.schema;
+  var schemaWrapper = {
+  "description" : "List of user object",
+  "content" : {
+    "*/*" : {
+      "schema" : {
+        "type" : "array",
+        "items" : {
+          "$ref" : "#/components/schemas/User"
+        }
+      }
+    }
+  },
+  "required" : true
+};
+
+  var schema = findNode('schema',schemaWrapper).schema;                                                                              
+  if (!schema) {
+    schema = schemaWrapper.schema;
+  }
   if (schema.$ref != null) {
     schema = defsParser.$refs.get(schema.$ref);
-  } else {
+  } else {                                          
     schemaWrapper.definitions = Object.assign({}, defs);
     $RefParser.dereference(schemaWrapper).catch(function(err) {
       console.log(err);
     });
   }
-
+  
   var view = new JSONSchemaView(schema,2,{isBodyParam: true});
-  var result = $('#d2e199_createUsersWithArrayInput_user');
+  var result = $('#d2e199_createUsersWithArrayInput_body');
   result.empty();
   result.append(view.render());
 });
 </script>
-<div id="d2e199_createUsersWithArrayInput_user"></div>
+<div id="d2e199_createUsersWithArrayInput_body"></div>
 </td>
 </tr>
 
@@ -6170,9 +6308,9 @@ <h3>Usage and SDK Samples</h3>
     public static void main(String[] args) {
         
         UserApi apiInstance = new UserApi();
-        array[User] user = ; // array[User] | 
+        array[User] body = ; // array[User] | 
         try {
-            apiInstance.createUsersWithListInput(user);
+            apiInstance.createUsersWithListInput(body);
         } catch (ApiException e) {
             System.err.println("Exception when calling UserApi#createUsersWithListInput");
             e.printStackTrace();
@@ -6188,9 +6326,9 @@ <h3>Usage and SDK Samples</h3>
 
     public static void main(String[] args) {
         UserApi apiInstance = new UserApi();
-        array[User] user = ; // array[User] | 
+        array[User] body = ; // array[User] | 
         try {
-            apiInstance.createUsersWithListInput(user);
+            apiInstance.createUsersWithListInput(body);
         } catch (ApiException e) {
             System.err.println("Exception when calling UserApi#createUsersWithListInput");
             e.printStackTrace();
@@ -6203,12 +6341,12 @@ <h3>Usage and SDK Samples</h3>
   <pre class="prettyprint language-json prettyprinted" data-type="json"><code>Coming Soon!</code></pre>
   </div> -->
                             <div class="tab-pane" id="examples-User-createUsersWithListInput-0-objc">
-                              <pre class="prettyprint"><code class="language-cpp">array[User] *user = ; // 
+                              <pre class="prettyprint"><code class="language-cpp">array[User] *body = ; // 
 
 UserApi *apiInstance = [[UserApi alloc] init];
 
 // Creates list of users with given input array
-[apiInstance createUsersWithListInputWith:user
+[apiInstance createUsersWithListInputWith:body
               completionHandler: ^(NSError* error) {
                             if (error) {
                                 NSLog(@"Error: %@", error);
@@ -6221,7 +6359,7 @@ <h3>Usage and SDK Samples</h3>
                               <pre class="prettyprint"><code class="language-js">var OpenApiPetstore = require('open_api_petstore');
 
 var api = new OpenApiPetstore.UserApi()
-var user = ; // {array[User]} 
+var body = ; // {array[User]} 
 
 var callback = function(error, data, response) {
   if (error) {
@@ -6230,7 +6368,7 @@ <h3>Usage and SDK Samples</h3>
     console.log('API called successfully.');
   }
 };
-api.createUsersWithListInput(user, callback);
+api.createUsersWithListInput(body, callback);
 </code></pre>
                             </div>
 
@@ -6252,12 +6390,12 @@ <h3>Usage and SDK Samples</h3>
         {
             
             var apiInstance = new UserApi();
-            var user = new array[User](); // array[User] | 
+            var body = new array[User](); // array[User] | 
 
             try
             {
                 // Creates list of users with given input array
-                apiInstance.createUsersWithListInput(user);
+                apiInstance.createUsersWithListInput(body);
             }
             catch (Exception e)
             {
@@ -6274,10 +6412,10 @@ <h3>Usage and SDK Samples</h3>
 require_once(__DIR__ . '/vendor/autoload.php');
 
 $api_instance = new OpenAPITools\Client\Api\UserApi();
-$user = ; // array[User] | 
+$body = ; // array[User] | 
 
 try {
-    $api_instance->createUsersWithListInput($user);
+    $api_instance->createUsersWithListInput($body);
 } catch (Exception $e) {
     echo 'Exception when calling UserApi->createUsersWithListInput: ', $e->getMessage(), PHP_EOL;
 }
@@ -6290,10 +6428,10 @@ <h3>Usage and SDK Samples</h3>
 use WWW::OPenAPIClient::UserApi;
 
 my $api_instance = WWW::OPenAPIClient::UserApi->new();
-my $user = [WWW::OPenAPIClient::Object::array[User]->new()]; # array[User] | 
+my $body = [WWW::OPenAPIClient::Object::array[User]->new()]; # array[User] | 
 
 eval { 
-    $api_instance->createUsersWithListInput(user => $user);
+    $api_instance->createUsersWithListInput(body => $body);
 };
 if ($@) {
     warn "Exception when calling UserApi->createUsersWithListInput: $@\n";
@@ -6309,11 +6447,11 @@ <h3>Usage and SDK Samples</h3>
 
 # create an instance of the API class
 api_instance = openapi_client.UserApi()
-user =  # array[User] | 
+body =  # array[User] | 
 
 try: 
     # Creates list of users with given input array
-    api_instance.create_users_with_list_input(user)
+    api_instance.create_users_with_list_input(body)
 except ApiException as e:
     print("Exception when calling UserApi->createUsersWithListInput: %s\n" % e)</code></pre>
                             </div>
@@ -6322,10 +6460,10 @@ <h3>Usage and SDK Samples</h3>
                               <pre class="prettyprint"><code class="language-rust">extern crate UserApi;
 
 pub fn main() {
-    let user = ; // array[User]
+    let body = ; // array[User]
 
     let mut context = UserApi::Context::default();
-    let result = client.createUsersWithListInput(user, &context).wait();
+    let result = client.createUsersWithListInput(body, &context).wait();
     println!("{:?}", result);
 
 }
@@ -6348,29 +6486,46 @@ <h2>Parameters</h2>
                                 <th width="150px">Name</th>
                                 <th>Description</th>
                               </tr>
-                                <tr><td style="width:150px;">user <span style="color:red;">*</span></td>
+                                <tr><td style="width:150px;">body <span style="color:red;">*</span></td>
 <td>
 <p class="marked">List of user object</p>
 <script>
 $(document).ready(function() {
-  var schemaWrapper = ;
-  var schema = schemaWrapper.schema;
+  var schemaWrapper = {
+  "description" : "List of user object",
+  "content" : {
+    "*/*" : {
+      "schema" : {
+        "type" : "array",
+        "items" : {
+          "$ref" : "#/components/schemas/User"
+        }
+      }
+    }
+  },
+  "required" : true
+};
+
+  var schema = findNode('schema',schemaWrapper).schema;                                                                              
+  if (!schema) {
+    schema = schemaWrapper.schema;
+  }
   if (schema.$ref != null) {
     schema = defsParser.$refs.get(schema.$ref);
-  } else {
+  } else {                                          
     schemaWrapper.definitions = Object.assign({}, defs);
     $RefParser.dereference(schemaWrapper).catch(function(err) {
       console.log(err);
     });
   }
-
+  
   var view = new JSONSchemaView(schema,2,{isBodyParam: true});
-  var result = $('#d2e199_createUsersWithListInput_user');
+  var result = $('#d2e199_createUsersWithListInput_body');
   result.empty();
   result.append(view.render());
 });
 </script>
-<div id="d2e199_createUsersWithListInput_user"></div>
+<div id="d2e199_createUsersWithListInput_body"></div>
 </td>
 </tr>
 
@@ -6486,7 +6641,7 @@ <h3>Usage and SDK Samples</h3>
   <pre class="prettyprint language-json prettyprinted" data-type="json"><code>Coming Soon!</code></pre>
   </div> -->
                             <div class="tab-pane" id="examples-User-deleteUser-0-objc">
-                              <pre class="prettyprint"><code class="language-cpp">String *username = username_example; // The name that needs to be deleted
+                              <pre class="prettyprint"><code class="language-cpp">String *username = username_example; // The name that needs to be deleted (default to null)
 
 UserApi *apiInstance = [[UserApi alloc] init];
 
@@ -6535,7 +6690,7 @@ <h3>Usage and SDK Samples</h3>
         {
             
             var apiInstance = new UserApi();
-            var username = username_example;  // String | The name that needs to be deleted
+            var username = username_example;  // String | The name that needs to be deleted (default to null)
 
             try
             {
@@ -6592,7 +6747,7 @@ <h3>Usage and SDK Samples</h3>
 
 # create an instance of the API class
 api_instance = openapi_client.UserApi()
-username = username_example # String | The name that needs to be deleted
+username = username_example # String | The name that needs to be deleted (default to null)
 
 try: 
     # Delete user
@@ -6790,7 +6945,7 @@ <h3>Usage and SDK Samples</h3>
   <pre class="prettyprint language-json prettyprinted" data-type="json"><code>Coming Soon!</code></pre>
   </div> -->
                             <div class="tab-pane" id="examples-User-getUserByName-0-objc">
-                              <pre class="prettyprint"><code class="language-cpp">String *username = username_example; // The name that needs to be fetched. Use user1 for testing.
+                              <pre class="prettyprint"><code class="language-cpp">String *username = username_example; // The name that needs to be fetched. Use user1 for testing. (default to null)
 
 UserApi *apiInstance = [[UserApi alloc] init];
 
@@ -6842,7 +6997,7 @@ <h3>Usage and SDK Samples</h3>
         {
             
             var apiInstance = new UserApi();
-            var username = username_example;  // String | The name that needs to be fetched. Use user1 for testing.
+            var username = username_example;  // String | The name that needs to be fetched. Use user1 for testing. (default to null)
 
             try
             {
@@ -6902,7 +7057,7 @@ <h3>Usage and SDK Samples</h3>
 
 # create an instance of the API class
 api_instance = openapi_client.UserApi()
-username = username_example # String | The name that needs to be fetched. Use user1 for testing.
+username = username_example # String | The name that needs to be fetched. Use user1 for testing. (default to null)
 
 try: 
     # Get user by user name
@@ -7014,11 +7169,15 @@ <h3 id="examples-User-getUserByName-title-200"></h3>
       }
     }
   }
-};
-                                        var schema = schemaWrapper.schema;
+};                                                                              
+
+                                        var schema = findNode('schema',schemaWrapper).schema;                                                                              
+                                        if (!schema) {
+                                          schema = schemaWrapper.schema;
+                                        }
                                         if (schema.$ref != null) {
                                           schema = defsParser.$refs.get(schema.$ref);
-                                        } else {
+                                        } else {                                          
                                           schemaWrapper.definitions = Object.assign({}, defs);
                                           $RefParser.dereference(schemaWrapper).catch(function(err) {
                                             console.log(err);
@@ -7169,8 +7328,8 @@ <h3>Usage and SDK Samples</h3>
   <pre class="prettyprint language-json prettyprinted" data-type="json"><code>Coming Soon!</code></pre>
   </div> -->
                             <div class="tab-pane" id="examples-User-loginUser-0-objc">
-                              <pre class="prettyprint"><code class="language-cpp">String *username = username_example; // The user name for login
-String *password = password_example; // The password for login in clear text
+                              <pre class="prettyprint"><code class="language-cpp">String *username = username_example; // The user name for login (default to null)
+String *password = password_example; // The password for login in clear text (default to null)
 
 UserApi *apiInstance = [[UserApi alloc] init];
 
@@ -7224,8 +7383,8 @@ <h3>Usage and SDK Samples</h3>
         {
             
             var apiInstance = new UserApi();
-            var username = username_example;  // String | The user name for login
-            var password = password_example;  // String | The password for login in clear text
+            var username = username_example;  // String | The user name for login (default to null)
+            var password = password_example;  // String | The password for login in clear text (default to null)
 
             try
             {
@@ -7287,8 +7446,8 @@ <h3>Usage and SDK Samples</h3>
 
 # create an instance of the API class
 api_instance = openapi_client.UserApi()
-username = username_example # String | The user name for login
-password = password_example # String | The password for login in clear text
+username = username_example # String | The user name for login (default to null)
+password = password_example # String | The password for login in clear text (default to null)
 
 try: 
     # Logs user into the system
@@ -7443,11 +7602,15 @@ <h3 id="examples-User-loginUser-title-200"></h3>
       }
     }
   }
-};
-                                        var schema = schemaWrapper.schema;
+};                                                                              
+
+                                        var schema = findNode('schema',schemaWrapper).schema;                                                                              
+                                        if (!schema) {
+                                          schema = schemaWrapper.schema;
+                                        }
                                         if (schema.$ref != null) {
                                           schema = defsParser.$refs.get(schema.$ref);
-                                        } else {
+                                        } else {                                          
                                           schemaWrapper.definitions = Object.assign({}, defs);
                                           $RefParser.dereference(schemaWrapper).catch(function(err) {
                                             console.log(err);
@@ -7802,9 +7965,9 @@ <h3>Usage and SDK Samples</h3>
         
         UserApi apiInstance = new UserApi();
         String username = username_example; // String | name that need to be deleted
-        User user = ; // User | 
+        User body = ; // User | 
         try {
-            apiInstance.updateUser(username, user);
+            apiInstance.updateUser(username, body);
         } catch (ApiException e) {
             System.err.println("Exception when calling UserApi#updateUser");
             e.printStackTrace();
@@ -7821,9 +7984,9 @@ <h3>Usage and SDK Samples</h3>
     public static void main(String[] args) {
         UserApi apiInstance = new UserApi();
         String username = username_example; // String | name that need to be deleted
-        User user = ; // User | 
+        User body = ; // User | 
         try {
-            apiInstance.updateUser(username, user);
+            apiInstance.updateUser(username, body);
         } catch (ApiException e) {
             System.err.println("Exception when calling UserApi#updateUser");
             e.printStackTrace();
@@ -7836,14 +7999,14 @@ <h3>Usage and SDK Samples</h3>
   <pre class="prettyprint language-json prettyprinted" data-type="json"><code>Coming Soon!</code></pre>
   </div> -->
                             <div class="tab-pane" id="examples-User-updateUser-0-objc">
-                              <pre class="prettyprint"><code class="language-cpp">String *username = username_example; // name that need to be deleted
-User *user = ; // 
+                              <pre class="prettyprint"><code class="language-cpp">String *username = username_example; // name that need to be deleted (default to null)
+User *body = ; // 
 
 UserApi *apiInstance = [[UserApi alloc] init];
 
 // Updated user
 [apiInstance updateUserWith:username
-    user:user
+    body:body
               completionHandler: ^(NSError* error) {
                             if (error) {
                                 NSLog(@"Error: %@", error);
@@ -7857,7 +8020,7 @@ <h3>Usage and SDK Samples</h3>
 
 var api = new OpenApiPetstore.UserApi()
 var username = username_example; // {String} name that need to be deleted
-var user = ; // {User} 
+var body = ; // {User} 
 
 var callback = function(error, data, response) {
   if (error) {
@@ -7866,7 +8029,7 @@ <h3>Usage and SDK Samples</h3>
     console.log('API called successfully.');
   }
 };
-api.updateUser(username, user, callback);
+api.updateUser(username, body, callback);
 </code></pre>
                             </div>
 
@@ -7888,13 +8051,13 @@ <h3>Usage and SDK Samples</h3>
         {
             
             var apiInstance = new UserApi();
-            var username = username_example;  // String | name that need to be deleted
-            var user = new User(); // User | 
+            var username = username_example;  // String | name that need to be deleted (default to null)
+            var body = new User(); // User | 
 
             try
             {
                 // Updated user
-                apiInstance.updateUser(username, user);
+                apiInstance.updateUser(username, body);
             }
             catch (Exception e)
             {
@@ -7912,10 +8075,10 @@ <h3>Usage and SDK Samples</h3>
 
 $api_instance = new OpenAPITools\Client\Api\UserApi();
 $username = username_example; // String | name that need to be deleted
-$user = ; // User | 
+$body = ; // User | 
 
 try {
-    $api_instance->updateUser($username, $user);
+    $api_instance->updateUser($username, $body);
 } catch (Exception $e) {
     echo 'Exception when calling UserApi->updateUser: ', $e->getMessage(), PHP_EOL;
 }
@@ -7929,10 +8092,10 @@ <h3>Usage and SDK Samples</h3>
 
 my $api_instance = WWW::OPenAPIClient::UserApi->new();
 my $username = username_example; # String | name that need to be deleted
-my $user = WWW::OPenAPIClient::Object::User->new(); # User | 
+my $body = WWW::OPenAPIClient::Object::User->new(); # User | 
 
 eval { 
-    $api_instance->updateUser(username => $username, user => $user);
+    $api_instance->updateUser(username => $username, body => $body);
 };
 if ($@) {
     warn "Exception when calling UserApi->updateUser: $@\n";
@@ -7948,12 +8111,12 @@ <h3>Usage and SDK Samples</h3>
 
 # create an instance of the API class
 api_instance = openapi_client.UserApi()
-username = username_example # String | name that need to be deleted
-user =  # User | 
+username = username_example # String | name that need to be deleted (default to null)
+body =  # User | 
 
 try: 
     # Updated user
-    api_instance.update_user(username, user)
+    api_instance.update_user(username, body)
 except ApiException as e:
     print("Exception when calling UserApi->updateUser: %s\n" % e)</code></pre>
                             </div>
@@ -7963,10 +8126,10 @@ <h3>Usage and SDK Samples</h3>
 
 pub fn main() {
     let username = username_example; // String
-    let user = ; // User
+    let body = ; // User
 
     let mut context = UserApi::Context::default();
-    let result = client.updateUser(username, user, &context).wait();
+    let result = client.updateUser(username, body, &context).wait();
     println!("{:?}", result);
 
 }
@@ -8019,29 +8182,43 @@ <h2>Parameters</h2>
                                 <th width="150px">Name</th>
                                 <th>Description</th>
                               </tr>
-                                <tr><td style="width:150px;">user <span style="color:red;">*</span></td>
+                                <tr><td style="width:150px;">body <span style="color:red;">*</span></td>
 <td>
 <p class="marked">Updated user object</p>
 <script>
 $(document).ready(function() {
-  var schemaWrapper = ;
-  var schema = schemaWrapper.schema;
+  var schemaWrapper = {
+  "description" : "Updated user object",
+  "content" : {
+    "*/*" : {
+      "schema" : {
+        "$ref" : "#/components/schemas/User"
+      }
+    }
+  },
+  "required" : true
+};
+
+  var schema = findNode('schema',schemaWrapper).schema;                                                                              
+  if (!schema) {
+    schema = schemaWrapper.schema;
+  }
   if (schema.$ref != null) {
     schema = defsParser.$refs.get(schema.$ref);
-  } else {
+  } else {                                          
     schemaWrapper.definitions = Object.assign({}, defs);
     $RefParser.dereference(schemaWrapper).catch(function(err) {
       console.log(err);
     });
   }
-
+  
   var view = new JSONSchemaView(schema,2,{isBodyParam: true});
-  var result = $('#d2e199_updateUser_user');
+  var result = $('#d2e199_updateUser_body');
   result.empty();
   result.append(view.render());
 });
 </script>
-<div id="d2e199_updateUser_user"></div>
+<div id="d2e199_updateUser_body"></div>
 </td>
 </tr>
 
@@ -9838,8 +10015,7 @@ <h3 id="examples-User-updateUser-title-404"></h3>
 </script>
 
   <script>
-    var schemaWrapper = {};
-    schemaWrapper.definitions = Object.assign({}, defs);
+    var schemaWrapper = { "components": { "schemas" : defs}};
     defsParser = new $RefParser();
     defsParser.dereference(schemaWrapper).catch(function(err) {
       console.log(err);