return the new codegen object on methods where is created

Author: HugoMario

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

@@ -32,11 +32,11 @@ public SchemaHandler(DefaultCodegenConfig codegenConfig) {
     @Override
     public void processComposedSchemas(CodegenModel codegenModel, Schema schema, Map<String, CodegenModel> allModels) {
         if (schema instanceof ComposedSchema) {
-            this.processComposedSchema(codegenModel, (ComposedSchema) schema, allModels);
+            this.addComposedModel(this.processComposedSchema(codegenModel, (ComposedSchema) schema, allModels));
             return;
         }
         if (schema instanceof ArraySchema) {
-            this.processArrayItemSchema(codegenModel, (ArraySchema) schema, allModels);
+            this.addComposedModel(this.processArrayItemSchema(codegenModel, (ArraySchema) schema, allModels));
             return;
         }
         final Map<String, Schema> properties = schema.getProperties();
@@ -55,11 +55,11 @@ public void processComposedSchemas(CodegenModel codegenModel, Schema schema, Map
             final CodegenProperty codegenProperty = optionalCodegenProperty.get();
             final String codegenName = codegenModel.getName() + codegenConfig.toModelName(codegenProperty.getName());
             if (property instanceof ComposedSchema) {
-                processComposedSchema(codegenName, codegenProperty, (ComposedSchema) property, allModels);
+                this.addComposedModel(this.processComposedSchema(codegenName, codegenProperty, (ComposedSchema) property, allModels));
                 continue;
             }
             if (property instanceof ArraySchema) {
-                this.processArrayItemSchema(codegenName, codegenProperty, (ArraySchema) property, allModels);
+                this.addComposedModel(this.processArrayItemSchema(codegenName, codegenProperty, (ArraySchema) property, allModels));
                 continue;
             }
         }
@@ -70,54 +70,67 @@ public List<CodegenModel> getModels() {
         return composedModels;
     }
 
-    protected void processComposedSchema(CodegenModel codegenModel, ComposedSchema composedSchema, Map<String, CodegenModel> allModels) {
+    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);
         if (composedModel == null) {
             schemas = composedSchema.getAnyOf();
             composedModel = this.createComposedModel(ANY_OF_PREFFIX + codegenModel.getName(), schemas);
             if (composedModel == null) {
-                return;
+                return null;
             }
         }
         this.addInterfaceModel(codegenModel, composedModel);
         this.addInterfaces(schemas, composedModel, allModels);
-        composedModels.add(composedModel);
+        return composedModel;
+    }
+
+    protected CodegenModel processComposedSchema(String name, ComposedSchema composedSchema, Map<String, CodegenModel> allModels) {
+        List<Schema> schemas = composedSchema.getOneOf();
+        CodegenModel composedModel = this.createComposedModel(ONE_OF_PREFFIX + name, schemas);
+        if (composedModel == null) {
+            schemas = composedSchema.getAnyOf();
+            composedModel = this.createComposedModel(ANY_OF_PREFFIX + name, schemas);
+            if (composedModel == null) {
+                return null;
+            }
+        }
+        this.addInterfaces(schemas, composedModel, allModels);
+        return composedModel;
     }
 
-    protected void processComposedSchema(String codegenModelName, CodegenProperty codegenProperty, ComposedSchema composedSchema, Map<String, CodegenModel> allModels) {
+    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);
         if (composedModel == null) {
             schemas = composedSchema.getAnyOf();
             composedModel = this.createComposedModel(ANY_OF_PREFFIX + codegenModelName, schemas);
             if (composedModel == null) {
-                return;
+                return null;
             }
         }
         this.addInterfaces(schemas, composedModel, allModels);
         codegenProperty.datatype = composedModel.getName();
         codegenProperty.datatypeWithEnum = composedModel.getName();
         codegenProperty.baseType = composedModel.getName();
         codegenProperty.complexType = composedModel.getName();
-
-        composedModels.add(composedModel);
+        return composedModel;
     }
 
-    protected void processArrayItemSchema(CodegenModel codegenModel, ArraySchema arraySchema, Map<String, CodegenModel> allModels) {
+    protected CodegenModel processArrayItemSchema(CodegenModel codegenModel, ArraySchema arraySchema, Map<String, CodegenModel> allModels) {
         final Schema itemsSchema = arraySchema.getItems();
         if (itemsSchema instanceof ComposedSchema) {
-            final CodegenModel itemsModel = CodegenModelFactory.newInstance(CodegenModelType.MODEL);
-            itemsModel.setName(codegenModel.name + ARRAY_ITEMS_SUFFIX);
-            this.processComposedSchema(itemsModel, (ComposedSchema) itemsSchema, allModels);
+            return this.processComposedSchema(codegenModel.name + ARRAY_ITEMS_SUFFIX, (ComposedSchema) itemsSchema, allModels);
         }
+        return null;
     }
 
-    protected void processArrayItemSchema(String codegenModelName, CodegenProperty codegenProperty, ArraySchema arraySchema, Map<String, CodegenModel> allModels) {
+    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, (ComposedSchema) itemsSchema, allModels);
+            return this.processComposedSchema(codegenModelName, codegenProperty, (ComposedSchema) itemsSchema, allModels);
         }
+        return null;
     }
 
     protected CodegenModel createComposedModel(String name, List<Schema> schemas) {
@@ -168,4 +181,11 @@ protected boolean hasNonObjectSchema(List<Schema> schemas) {
         }
         return false;
     }
+
+    protected void addComposedModel(CodegenModel composedModel) {
+        if (composedModel == null) {
+            return;
+        }
+        this.composedModels.add(composedModel);
+    }
 }

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

@@ -22,14 +22,14 @@ public HtmlSchemaHandler(DefaultCodegenConfig codegenConfig) {
         super(codegenConfig);
     }
 
-    protected void processComposedSchema(CodegenModel codegenModel, ComposedSchema composedSchema, Map<String, CodegenModel> allModels) {
+    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);
         if (composedModel == null) {
             schemas = composedSchema.getAnyOf();
             composedModel = this.createComposedModel(ANY_OF_PREFFIX + codegenModel.getName(), schemas);
             if (composedModel == null) {
-                return;
+                return null;
             }
         }
         this.addInterfaceModel(codegenModel, composedModel);
@@ -40,16 +40,17 @@ protected void processComposedSchema(CodegenModel codegenModel, ComposedSchema c
         } else if (composedModel.getName().startsWith(ONE_OF_PREFFIX)) {
             codegenModel.vendorExtensions.put("anyOf-model", composedModel);
         }
+        return null;
     }
 
-    protected void processComposedSchema(String codegenModelName, CodegenProperty codegenProperty, ComposedSchema composedSchema, Map<String, CodegenModel> allModels) {
+    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);
         if (composedModel == null) {
             schemas = composedSchema.getAnyOf();
             composedModel = this.createComposedModel(ANY_OF_PREFFIX + codegenModelName, schemas);
             if (composedModel == null) {
-                return;
+                return null;
             }
         }
         if (composedModel.getName().startsWith(ONE_OF_PREFFIX)) {
@@ -66,5 +67,6 @@ protected void processComposedSchema(String codegenModelName, CodegenProperty co
             }
         }
         composedModel.vendorExtensions.put("x-model-names", modelNames);
+        return null;
     }
 }