fixed array of oneof on html generator

Author: HugoMario

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

@@ -4259,4 +4259,8 @@ public boolean defaultIgnoreImportMappingOption() {
     public ISchemaHandler getSchemaHandler() {
         return new SchemaHandler(this);
     }
+
+    public OpenAPI getOpenAPI() {
+        return this.openAPI;
+    }
 }

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

@@ -7,6 +7,7 @@
 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.util.Json;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.ComposedSchema;
 import io.swagger.v3.oas.models.media.Schema;
@@ -22,6 +23,33 @@ public HtmlSchemaHandler(DefaultCodegenConfig codegenConfig) {
         super(codegenConfig);
     }
 
+    public void processComposedSchemas(CodegenModel codegenModel, Schema schema, Map<String, CodegenModel> allModels) {
+        if(!(schema instanceof ComposedSchema)) {
+            super.processComposedSchemas(codegenModel, schema, allModels);
+            return;
+        }
+        final ComposedSchema composedSchema = (ComposedSchema) schema;
+        if (composedSchema.getAllOf() == null || composedSchema.getAllOf().isEmpty()) {
+            super.processComposedSchemas(codegenModel, composedSchema, allModels);
+            return;
+        }
+        final List<CodegenProperty> codegenProperties = codegenModel.vars;
+        if (codegenProperties == null || codegenProperties.isEmpty()) {
+            return;
+        }
+        for (CodegenProperty codegenProperty : codegenProperties) {
+            if (codegenProperty.getIsListContainer()) {
+                Schema schemaProperty = OpenAPIUtil.getPropertyFromAllOfSchema(codegenProperty.baseName, composedSchema.getAllOf(), this.codegenConfig.getOpenAPI());
+                if (schemaProperty == null || !(schemaProperty instanceof ArraySchema)) {
+                    continue;
+                }
+                this.processArrayItemSchema(StringUtils.EMPTY, codegenProperty, (ArraySchema) schemaProperty, allModels);
+                break;
+            }
+        }
+    }
+
+    @Override
     protected CodegenModel processComposedSchema(CodegenModel codegenModel, ComposedSchema composedSchema, Map<String, CodegenModel> allModels) {
         List<Schema> schemas = composedSchema.getOneOf();
         CodegenModel composedModel = this.createComposedModel(ONE_OF_PREFFIX + codegenModel.getName(), schemas);
@@ -43,6 +71,7 @@ protected CodegenModel processComposedSchema(CodegenModel codegenModel, Composed
         return null;
     }
 
+    @Override
     protected CodegenModel 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);
@@ -56,7 +85,7 @@ protected CodegenModel processComposedSchema(String codegenModelName, CodegenPro
         if (composedModel.getName().startsWith(ONE_OF_PREFFIX)) {
             codegenProperty.vendorExtensions.put("oneOf-model", composedModel);
 
-        } else if (composedModel.getName().startsWith(ONE_OF_PREFFIX)) {
+        } else if (composedModel.getName().startsWith(ANY_OF_PREFFIX)) {
             codegenProperty.vendorExtensions.put("anyOf-model", composedModel);
         }
         final List<String> modelNames = new ArrayList<>();
@@ -69,4 +98,22 @@ protected CodegenModel processComposedSchema(String codegenModelName, CodegenPro
         composedModel.vendorExtensions.put("x-model-names", modelNames);
         return null;
     }
+
+    @Override
+    protected CodegenModel processArrayItemSchema(CodegenModel codegenModel, ArraySchema arraySchema, Map<String, CodegenModel> allModels) {
+        final Schema itemsSchema = arraySchema.getItems();
+        if (itemsSchema instanceof ComposedSchema) {
+            this.processComposedSchema(codegenModel, (ComposedSchema) itemsSchema, allModels);
+        }
+        return null;
+    }
+
+    @Override
+    protected CodegenModel processArrayItemSchema(String codegenModelName, CodegenProperty codegenProperty, ArraySchema arraySchema, Map<String, CodegenModel> allModels) {
+        final Schema itemsSchema = arraySchema.getItems();
+        if (itemsSchema instanceof ComposedSchema) {
+            this.processComposedSchema(codegenModelName, codegenProperty.items, (ComposedSchema) itemsSchema, allModels);
+        }
+        return null;
+    }
 }

src/main/java/io/swagger/codegen/v3/generators/util/OpenAPIUtil.java

@@ -6,6 +6,7 @@
 import io.swagger.v3.oas.models.media.Schema;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.List;
 import java.util.Map;
 
 import static io.swagger.codegen.v3.CodegenConstants.HAS_VALIDATION_EXT_NAME;
@@ -57,4 +58,20 @@ public static Schema getSchemaFromRefSchema(Schema refSchema, OpenAPI openAPI) {
         final String name = getSimpleRef(refSchema.get$ref());
         return getSchemaFromName(name, openAPI);
     }
+
+    public static Schema getPropertyFromAllOfSchema(String propertyName, List<Schema> schemas, OpenAPI openAPI) {
+        for (Schema schema : schemas) {
+            if (StringUtils.isNotBlank(schema.get$ref())) {
+                schema = getSchemaFromRefSchema(schema, openAPI);
+            }
+            final Map<String, Schema> schemaProperties = schema.getProperties();
+            if (schemaProperties == null) {
+                continue;
+            }
+            if (schemaProperties.containsKey(propertyName)) {
+                return schemaProperties.get(propertyName);
+            }
+        }
+        return null;
+    }
 }