Merge pull request #453 from swagger-api/codegen-issue-9569

avoid create composed models for non object schemas

Author: HugoMario

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

@@ -1,8 +1,12 @@
 package io.swagger.codegen.v3.generators;
 
-import io.swagger.codegen.v3.*;
+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.util.OpenAPIUtil;
 import io.swagger.v3.oas.models.media.ComposedSchema;
+import io.swagger.v3.oas.models.media.ObjectSchema;
 import io.swagger.v3.oas.models.media.Schema;
 import org.apache.commons.lang3.StringUtils;
 
@@ -28,12 +32,16 @@ public void createCodegenModel(ComposedSchema composedProperty, CodegenProperty
         final List<Schema> anyOf = composedProperty.getAnyOf();
 
         if (oneOf != null && !oneOf.isEmpty()) {
-             final CodegenModel oneOfModel = createFromOneOfSchemas(oneOf);
-            codegenProperty.vendorExtensions.put("oneOf-model", oneOfModel);
+            if (!hasNonObjectSchema(oneOf)) {
+                final CodegenModel oneOfModel = createFromOneOfSchemas(oneOf);
+                codegenProperty.vendorExtensions.put("oneOf-model", oneOfModel);
+            }
         }
         if (anyOf != null && !anyOf.isEmpty()) {
-            final CodegenModel anyOfModel = createFromOneOfSchemas(anyOf);
-            codegenProperty.vendorExtensions.put("anyOf-model", anyOfModel);
+            if (!hasNonObjectSchema(anyOf)) {
+                final CodegenModel anyOfModel = createFromOneOfSchemas(anyOf);
+                codegenProperty.vendorExtensions.put("anyOf-model", anyOfModel);
+            }
         }
 
     }
@@ -173,4 +181,14 @@ private void configureModel(CodegenModel codegenModel, String name) {
         codegenModel.classFilename = codegenConfig.toModelFilename(name);
         codegenModel.vendorExtensions.put("x-is-composed-model", Boolean.TRUE);
     }
+
+    private boolean hasNonObjectSchema(List<Schema> schemas) {
+        for  (Schema schema : schemas) {
+            boolean hasNonObjectSchema = (!(schema instanceof ObjectSchema)) ||  (schema.getProperties() != null && !schema.getProperties().isEmpty());
+            if (hasNonObjectSchema) {
+                return true;
+            }
+        }
+        return false;
+    }
 }