[Core, HTML2] Rendered docs are incomplete

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);

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);
 

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);

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 {

samples/documentation/html2/.openapi-generator/VERSION

@@ -1 +1 @@
-3.2.1-SNAPSHOT
+4.1.0-SNAPSHOT