fixed new datatype and parent container name

Author: HugoMario

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

@@ -2932,7 +2932,7 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera
         co.baseName = tag;
     }
 
-    protected void addParentContainer(CodegenModel codegenModel, String name, Schema schema) {
+    public void addParentContainer(CodegenModel codegenModel, String name, Schema schema) {
         final CodegenProperty codegenProperty = fromProperty(name, schema);
         addImport(codegenModel, codegenProperty.complexType);
         codegenModel.parent = toInstantiationType(schema);

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

@@ -110,17 +110,19 @@ protected CodegenModel processComposedSchema(String codegenModelName, CodegenPro
             }
         }
         this.addInterfaces(schemas, composedModel, allModels);
-        codegenProperty.datatype = composedModel.getName();
-        codegenProperty.datatypeWithEnum = composedModel.getName();
-        codegenProperty.baseType = composedModel.getName();
-        codegenProperty.complexType = composedModel.getName();
+        codegenProperty.datatype = composedModel.getClassname();
+        codegenProperty.datatypeWithEnum = composedModel.getClassname();
+        codegenProperty.baseType = composedModel.getClassname();
+        codegenProperty.complexType = composedModel.getClassname();
         return composedModel;
     }
 
     protected CodegenModel processArrayItemSchema(CodegenModel codegenModel, ArraySchema arraySchema, Map<String, CodegenModel> allModels) {
         final Schema itemsSchema = arraySchema.getItems();
         if (itemsSchema instanceof ComposedSchema) {
-            return this.processComposedSchema(codegenModel.name + ARRAY_ITEMS_SUFFIX, (ComposedSchema) itemsSchema, allModels);
+            final CodegenModel composedModel = this.processComposedSchema(codegenModel.name + ARRAY_ITEMS_SUFFIX, (ComposedSchema) itemsSchema, allModels);
+            this.updateParentModel(codegenModel, composedModel.name, arraySchema);
+            return composedModel;
         }
         return null;
     }
@@ -129,6 +131,9 @@ protected CodegenModel processArrayItemSchema(String codegenModelName, CodegenPr
         final Schema itemsSchema = arraySchema.getItems();
         if (itemsSchema instanceof ComposedSchema) {
             final CodegenModel composedModel = this.processComposedSchema(codegenModelName + ARRAY_ITEMS_SUFFIX, codegenProperty.items, (ComposedSchema) itemsSchema, allModels);
+            if (composedModel == null) {
+                return null;
+            }
             this.updatePropertyDataType(codegenProperty, composedModel.name, arraySchema);
             return composedModel;
         }
@@ -199,6 +204,21 @@ protected void updatePropertyDataType(CodegenProperty codegenProperty, String sc
         codegenProperty.setDatatype(this.codegenConfig.getTypeDeclaration(arraySchema));
         codegenProperty.setDatatypeWithEnum(codegenProperty.getDatatype());
 
+        codegenProperty.defaultValue = this.codegenConfig.toDefaultValue(arraySchema);
+        codegenProperty.defaultValueWithParam = this.codegenConfig.toDefaultValueWithParam(codegenProperty.baseName, arraySchema);
+
+        arraySchema.setItems(items);
+    }
+
+    protected void updateParentModel(CodegenModel codegenModel, String schemaName, ArraySchema arraySchema) {
+        final Schema items = arraySchema.getItems();
+        final Schema refSchema = new Schema();
+        refSchema.set$ref("#/components/schemas/" + schemaName);
+        arraySchema.setItems(refSchema);
+
+        this.codegenConfig.addParentContainer(codegenModel, codegenModel.name, arraySchema);
+        codegenModel.defaultValue = this.codegenConfig.toDefaultValue(arraySchema);
+
         arraySchema.setItems(items);
     }
 }