Reverted attempts to reuse recursive type-finding code.

OpenAPITools · Jan 7, 2022 · 96a6ecd · 96a6ecd
1 parent 61263ff
commit 96a6ecd
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -2490,7 +2490,13 @@ protected void updateModelForComposedSchema(CodegenModel m, Schema schema, Map<S
                 if (StringUtils.isBlank(interfaceSchema.get$ref())) {
                     // primitive type
                     String languageType = getTypeDeclaration(interfaceSchema);
-                    addImports(m.imports, fromProperty(languageType, interfaceSchema));
+                    CodegenProperty interfaceProperty = fromProperty(languageType, interfaceSchema);
+                    if (ModelUtils.isArraySchema(interfaceSchema) || ModelUtils.isMapSchema(interfaceSchema)) {
+                        while (interfaceProperty != null) {
+                            addImport(m, interfaceProperty.complexType);
+                            interfaceProperty = interfaceProperty.items;
+                        }
+                    }
 
                     if (composed.getAnyOf() != null) {
                         if (m.anyOf.contains(languageType)) {
@@ -6371,7 +6377,11 @@ public CodegenParameter fromFormProperty(String name, Schema propertySchema, Set
             // default to csv:
             codegenParameter.collectionFormat = StringUtils.isEmpty(collectionFormat) ? "csv" : collectionFormat;
 
-            addImports(imports, arrayInnerProperty);
+            // recursively add import
+            while (arrayInnerProperty != null) {
+                imports.add(arrayInnerProperty.baseType);
+                arrayInnerProperty = arrayInnerProperty.items;
+            }
         } else {
             // referenced schemas
             ;
@@ -6398,7 +6408,10 @@ public CodegenParameter fromFormProperty(String name, Schema propertySchema, Set
             codegenParameter.enumName = codegenProperty.enumName;
         }
 
-        addImports(imports, codegenProperty);
+        // import
+        if (codegenProperty.complexType != null) {
+            imports.add(codegenProperty.complexType);
+        }
 
         setParameterExampleValue(codegenParameter);
         // set nullable