Merge pull request #285 from swagger-api/codegen-issue-8951

HugoMario · web-flow · commit a563194441b3 · 2019-01-26T16:30:48.000-05:00
fixed $ref property reading issue.
diff --git a/src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java b/src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java
@@ -1,5 +1,6 @@
 package io.swagger.codegen.v3.generators;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.github.jknack.handlebars.Handlebars;
 import com.samskivert.mustache.Mustache;
@@ -2008,7 +2009,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
                 }
 
                 if ("application/x-www-form-urlencoded".equalsIgnoreCase(contentType) || "multipart/form-data".equalsIgnoreCase(contentType)) {
-                    final CodegenContent codegenContent = new CodegenContent();
+                    final CodegenContent codegenContent = new CodegenContent(contentType);
                     codegenContent.getVendorExtensions().put(CodegenConstants.IS_FORM_EXT_NAME, Boolean.TRUE);
 
                     final Map<String, Schema> propertyMap = schema.getProperties();
@@ -2048,7 +2049,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
                         }
                     }
                     foundSchemas.add(schema);
-                    final CodegenContent codegenContent = new CodegenContent();
+                    final CodegenContent codegenContent = new CodegenContent(contentType);
                     codegenContent.getParameters().add(bodyParam.copy());
                     codegenContents.add(codegenContent);
                 }
@@ -2475,6 +2476,8 @@ public CodegenParameter fromRequestBody(RequestBody body, String name, Schema sc
         codegenParameter.required = body.getRequired() != null ? body.getRequired() : Boolean.FALSE;
         codegenParameter.getVendorExtensions().put(CodegenConstants.IS_BODY_PARAM_EXT_NAME, Boolean.TRUE);
 
+        codegenParameter.jsonSchema = Json.pretty(body);
+
         if (schema == null) {
             schema = getSchemaFromBody(body);
         }
diff --git a/src/main/resources/handlebars/htmlDocs2/index.mustache b/src/main/resources/handlebars/htmlDocs2/index.mustache
@@ -172,6 +172,8 @@
                 <section id="api-{{baseName}}">
                   <h1>{{baseName}}</h1>
                   {{#operation}}
+                  {{#contents}}
+                  {{#@first}}
                     <div id="api-{{baseName}}-{{nickname}}">
                       <article id="api-{{baseName}}-{{nickname}}-0" data-group="User" data-name="{{nickname}}" data-version="0">
                         <div class="pull-left">
@@ -342,11 +344,12 @@
                                     <script>
                                       $(document).ready(function() {
                                         var schemaWrapper = {{{jsonSchema}}};
-                                        var schema = schemaWrapper.schema;
+                                        var schema = schemaWrapper.content[{{contentType}}].schema;
                                         if (schema.$ref != null) {
                                           schema = defsParser.$refs.get(schema.$ref);
                                         } else {
-                                          schemaWrapper.definitions = Object.assign({}, defs);
+                                          schemaWrapper.components = {};
+                                          schemaWrapper.components.schemas = Object.assign({}, defs);
                                           $RefParser.dereference(schemaWrapper).catch(function(err) {
                                             console.log(err);
                                           });
@@ -395,6 +398,8 @@
                         </article>
                       </div>
                       <hr>
+                    {{/@first}}
+                    {{/contents}}
                     {{/operation}}
                   </section>
                 {{/operations}}
@@ -434,7 +439,8 @@
   {{>js_webfontloader}}
   <script>
     var schemaWrapper = {};
-    schemaWrapper.definitions = Object.assign({}, defs);
+    schemaWrapper.components = {};
+    schemaWrapper.components.schemas = Object.assign({}, defs);
     defsParser = new $RefParser();
     defsParser.dereference(schemaWrapper).catch(function(err) {
       console.log(err);
diff --git a/src/main/resources/handlebars/htmlDocs2/paramB.mustache b/src/main/resources/handlebars/htmlDocs2/paramB.mustache
@@ -5,11 +5,12 @@
 <script>
 $(document).ready(function() {
   var schemaWrapper = {{{jsonSchema}}};
-  var schema = schemaWrapper.schema;
+  var schema = schemaWrapper.content[{{contentType}}].schema;
   if (schema.$ref != null) {
     schema = defsParser.$refs.get(schema.$ref);
   } else {
-    schemaWrapper.definitions = Object.assign({}, defs);
+    schemaWrapper.components = {};
+    schemaWrapper.components.schemas = Object.assign({}, defs);
     $RefParser.dereference(schemaWrapper).catch(function(err) {
       console.log(err);
     });
diff --git a/src/main/resources/mustache/htmlDocs2/index.mustache b/src/main/resources/mustache/htmlDocs2/index.mustache
@@ -172,6 +172,8 @@
                 <section id="api-{{baseName}}">
                   <h1>{{baseName}}</h1>
                   {{#operation}}
+                  {{#contents}}
+                  {{#-first}}
                     <div id="api-{{baseName}}-{{nickname}}">
                       <article id="api-{{baseName}}-{{nickname}}-0" data-group="User" data-name="{{nickname}}" data-version="0">
                         <div class="pull-left">
@@ -342,6 +344,7 @@
                                     <script>
                                       $(document).ready(function() {
                                         var schemaWrapper = {{{jsonSchema}}};
+                                        var schema = schemaWrapper.content[{{contentType}}].schema;
                                         var schema = schemaWrapper.schema;
                                         if (schema.$ref != null) {
                                           schema = defsParser.$refs.get(schema.$ref);
@@ -395,6 +398,8 @@
                         </article>
                       </div>
                       <hr>
+                    {{/-first}}
+                    {{/contents}}
                     {{/operation}}
                   </section>
                 {{/operations}}
@@ -434,7 +439,8 @@
   {{>js_webfontloader}}
   <script>
     var schemaWrapper = {};
-    schemaWrapper.definitions = defs;
+    schemaWrapper.components = {};
+    schemaWrapper.components.schemas = Object.assign({}, defs);
     defsParser = new $RefParser();
     defsParser.dereference(schemaWrapper).catch(function(err) {
       console.log(err);
diff --git a/src/main/resources/mustache/htmlDocs2/paramB.mustache b/src/main/resources/mustache/htmlDocs2/paramB.mustache
@@ -5,11 +5,12 @@
 <script>
 $(document).ready(function() {
   var schemaWrapper = {{{jsonSchema}}};
-  var schema = schemaWrapper.schema;
+  var schema = schemaWrapper.content[{{contentType}}].schema;
   if (schema.$ref != null) {
     schema = defsParser.$refs.get(schema.$ref);
   } else {
-    schemaWrapper.definitions = Object.assign({}, defs);
+    schemaWrapper.components = {};
+    schemaWrapper.components.schemas = Object.assign({}, defs);
     $RefParser.dereference(schemaWrapper).catch(function(err) {
       console.log(err);
     });

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package io.swagger.codegen.v3.generators;`
`2`	`2`
	`3`	`+import com.fasterxml.jackson.core.JsonProcessingException;`
`3`	`4`	`import com.fasterxml.jackson.databind.JsonNode;`
`4`	`5`	`import com.github.jknack.handlebars.Handlebars;`
`5`	`6`	`import com.samskivert.mustache.Mustache;`
`@@ -2008,7 +2009,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation`
`2008`	`2009`	`}`
`2009`	`2010`
`2010`	`2011`	`if ("application/x-www-form-urlencoded".equalsIgnoreCase(contentType) \|\| "multipart/form-data".equalsIgnoreCase(contentType)) {`
`2011`		`- final CodegenContent codegenContent = new CodegenContent();`
	`2012`	`+ final CodegenContent codegenContent = new CodegenContent(contentType);`
`2012`	`2013`	`codegenContent.getVendorExtensions().put(CodegenConstants.IS_FORM_EXT_NAME, Boolean.TRUE);`
`2013`	`2014`
`2014`	`2015`	`final Map<String, Schema> propertyMap = schema.getProperties();`
`@@ -2048,7 +2049,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation`
`2048`	`2049`	`}`
`2049`	`2050`	`}`
`2050`	`2051`	`foundSchemas.add(schema);`
`2051`		`- final CodegenContent codegenContent = new CodegenContent();`
	`2052`	`+ final CodegenContent codegenContent = new CodegenContent(contentType);`
`2052`	`2053`	`codegenContent.getParameters().add(bodyParam.copy());`
`2053`	`2054`	`codegenContents.add(codegenContent);`
`2054`	`2055`	`}`
`@@ -2475,6 +2476,8 @@ public CodegenParameter fromRequestBody(RequestBody body, String name, Schema sc`
`2475`	`2476`	`codegenParameter.required = body.getRequired() != null ? body.getRequired() : Boolean.FALSE;`
`2476`	`2477`	`codegenParameter.getVendorExtensions().put(CodegenConstants.IS_BODY_PARAM_EXT_NAME, Boolean.TRUE);`
`2477`	`2478`
	`2479`	`+ codegenParameter.jsonSchema = Json.pretty(body);`
	`2480`	`+`
`2478`	`2481`	`if (schema == null) {`
`2479`	`2482`	`schema = getSchemaFromBody(body);`
`2480`	`2483`	`}`