Merge branch 'master' into fix.di.compilation

Author: reta

src/main/java/io/swagger/codegen/v3/generators/html/StaticHtmlCodegen.java

@@ -11,22 +11,23 @@
 import io.swagger.codegen.v3.ISchemaHandler;
 import io.swagger.codegen.v3.SupportingFile;
 import io.swagger.codegen.v3.generators.DefaultCodegenConfig;
-import io.swagger.codegen.v3.generators.SchemaHandler;
 import io.swagger.codegen.v3.utils.Markdown;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.MapSchema;
 import io.swagger.v3.oas.models.media.ObjectSchema;
 import io.swagger.v3.oas.models.media.Schema;
-import org.apache.commons.lang3.StringUtils;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
 public class StaticHtmlCodegen extends DefaultCodegenConfig {
+
+    public static final String DOCUMENT_NO_OBJECTS = "docNoObjects";
+
     protected String invokerPackage = "io.swagger.client";
     protected String groupId = "io.swagger";
     protected String artifactId = "swagger-client";
@@ -67,6 +68,17 @@ public StaticHtmlCodegen() {
         importMapping = new HashMap<String, String>();
     }
 
+    @Override
+    public void processOpts() {
+        super.processOpts();
+        if (additionalProperties.get(DOCUMENT_NO_OBJECTS) != null) {
+            final String value = additionalProperties.get(DOCUMENT_NO_OBJECTS).toString();
+            additionalProperties.put(DOCUMENT_NO_OBJECTS, Boolean.parseBoolean(value));
+        } else {
+            additionalProperties.put(DOCUMENT_NO_OBJECTS, Boolean.FALSE);
+        }
+    }
+
     /**
      * Convert Markdown (CommonMark) to HTML. This class also disables normal HTML
      * escaping in the Mustache engine (see processCompiler(Compiler) above.)

src/main/resources/handlebars/htmlDocs/index.mustache

@@ -205,6 +205,19 @@
           {{/vendorExtensions.anyOf-model}}
       {{/items}}
       {{/vars}}
+      {{#docNoObjects}}
+      {{#isEnum}}
+        <div class="param-enum-header">Enum:</div>
+        {{#allowableValues}}
+        {{#values}}
+        <div class="param-enum">{{{this}}}</div>
+        {{/values}}
+        {{/allowableValues}}
+      {{/isEnum}}
+      {{#arrayModelType}}
+      <div class="param-desc"><span class="param-type"><a href="#{{arrayModelType}}">array[{{arrayModelType}}]</a></span></div>
+      {{/arrayModelType}}
+      {{/docNoObjects}}
     </div>  <!-- field-items -->
   </div>
   {{/model}}