Merge pull request #601 from swagger-api/html_generator_regresion_fix

fixed composed schema in arrays

Author: HugoMario

src/main/java/io/swagger/codegen/v3/generators/SchemaHandler.java

@@ -58,7 +58,7 @@ public void processComposedSchemas(CodegenModel codegenModel, Schema schema, Map
                 processComposedSchema(codegenName, codegenProperty, (ComposedSchema) property, allModels);
                 continue;
             }
-            if (schema instanceof ArraySchema) {
+            if (property instanceof ArraySchema) {
                 this.processArrayItemSchema(codegenName, codegenProperty, (ArraySchema) property, allModels);
                 continue;
             }
@@ -132,7 +132,7 @@ protected CodegenModel createComposedModel(String name, List<Schema> schemas) {
         return composedModel;
     }
 
-    private void addInterfaceModel(CodegenModel codegenModel, CodegenModel interfaceModel) {
+    protected void addInterfaceModel(CodegenModel codegenModel, CodegenModel interfaceModel) {
         if (codegenModel == null) {
             return;
         }
@@ -142,7 +142,7 @@ private void addInterfaceModel(CodegenModel codegenModel, CodegenModel interface
         codegenModel.getInterfaceModels().add(interfaceModel);
     }
 
-    private void addInterfaces(List<Schema> schemas, CodegenModel codegenModel, Map<String, CodegenModel> allModels) {
+    protected void addInterfaces(List<Schema> schemas, CodegenModel codegenModel, Map<String, CodegenModel> allModels) {
         for (Schema interfaceSchema : schemas) {
             final String ref = interfaceSchema.get$ref();
             if (StringUtils.isBlank(ref)) {

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

@@ -3,12 +3,17 @@
 import io.swagger.codegen.v3.CodegenModel;
 import io.swagger.codegen.v3.CodegenModelFactory;
 import io.swagger.codegen.v3.CodegenModelType;
+import io.swagger.codegen.v3.CodegenProperty;
 import io.swagger.codegen.v3.generators.DefaultCodegenConfig;
 import io.swagger.codegen.v3.generators.SchemaHandler;
+import io.swagger.codegen.v3.generators.util.OpenAPIUtil;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.ComposedSchema;
 import io.swagger.v3.oas.models.media.Schema;
+import org.apache.commons.lang3.StringUtils;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 public class HtmlSchemaHandler extends SchemaHandler {
@@ -17,8 +22,49 @@ public HtmlSchemaHandler(DefaultCodegenConfig codegenConfig) {
         super(codegenConfig);
     }
 
-    @Override
-    public void processComposedSchemas(CodegenModel codegenModel, Schema schema, Map<String, CodegenModel> allModels) {
-        // no ops for html generator
+    protected void processComposedSchema(CodegenModel codegenModel, ComposedSchema composedSchema, Map<String, CodegenModel> allModels) {
+        List<Schema> schemas = composedSchema.getOneOf();
+        CodegenModel composedModel = this.createComposedModel(ONE_OF_PREFFIX + codegenModel.getName(), schemas);
+        if (composedModel == null) {
+            schemas = composedSchema.getAnyOf();
+            composedModel = this.createComposedModel(ANY_OF_PREFFIX + codegenModel.getName(), schemas);
+            if (composedModel == null) {
+                return;
+            }
+        }
+        this.addInterfaceModel(codegenModel, composedModel);
+        this.addInterfaces(schemas, composedModel, allModels);
+
+        if (composedModel.getName().startsWith(ONE_OF_PREFFIX)) {
+            codegenModel.vendorExtensions.put("oneOf-model", composedModel);
+        } else if (composedModel.getName().startsWith(ONE_OF_PREFFIX)) {
+            codegenModel.vendorExtensions.put("anyOf-model", composedModel);
+        }
+    }
+
+    protected void processComposedSchema(String codegenModelName, CodegenProperty codegenProperty, ComposedSchema composedSchema, Map<String, CodegenModel> allModels) {
+        List<Schema> schemas = composedSchema.getOneOf();
+        CodegenModel composedModel = this.createComposedModel(ONE_OF_PREFFIX + codegenModelName, schemas);
+        if (composedModel == null) {
+            schemas = composedSchema.getAnyOf();
+            composedModel = this.createComposedModel(ANY_OF_PREFFIX + codegenModelName, schemas);
+            if (composedModel == null) {
+                return;
+            }
+        }
+        if (composedModel.getName().startsWith(ONE_OF_PREFFIX)) {
+            codegenProperty.vendorExtensions.put("oneOf-model", composedModel);
+
+        } else if (composedModel.getName().startsWith(ONE_OF_PREFFIX)) {
+            codegenProperty.vendorExtensions.put("anyOf-model", composedModel);
+        }
+        final List<String> modelNames = new ArrayList<>();
+        for (Schema interfaceSchema : schemas) {
+            if (StringUtils.isNotBlank(interfaceSchema.get$ref())) {
+                String schemaName = OpenAPIUtil.getSimpleRef(interfaceSchema.get$ref());
+                modelNames.add(codegenConfig.toModelName(schemaName));
+            }
+        }
+        composedModel.vendorExtensions.put("x-model-names", modelNames);
     }
 }