Convert a ComposedSchema to a Schema if there is no oneOf/allOf/anyOf

-> avoid side effects with bugs in InlineModelResolver

Author: jpfinne

modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java

@@ -747,7 +747,7 @@ public Schema normalizeSchema(Schema schema, Set<Schema> visitedSchemas) {
         if (ModelUtils.isNullTypeSchema(openAPI, schema)) {
             return schema;
         }
-
+        schema = decomposeSchema(schema);
         markSchemaAsVisited(schema, visitedSchemas);
 
         processNormalizeOtherThanObjectWithProperties(schema);
@@ -1062,8 +1062,6 @@ protected Schema normalizeOneOf(Schema schema, Set<Schema> visitedSchemas) {
         // simplify first as the schema may no longer be a oneOf after processing the rule below
         schema = processSimplifyOneOf(schema);
 
-        schema = processReplaceOneOfByMapping(schema);
-
         // if it's still a oneOf, loop through the sub-schemas
         if (schema.getOneOf() != null) {
             for (int i = 0; i < schema.getOneOf().size(); i++) {
@@ -1080,19 +1078,20 @@ protected Schema normalizeOneOf(Schema schema, Set<Schema> visitedSchemas) {
                 // update sub-schema with the updated schema
                 schema.getOneOf().set(i, normalizeSchema((Schema) item, visitedSchemas));
             }
+            schema = processReplaceOneOfByMapping(schema);
         } else {
             // normalize it as it's no longer an oneOf
             schema = normalizeSchema(schema, visitedSchemas);
         }
-
+        schema = decomposeSchema(schema);
         return schema;
     }
 
     protected Schema normalizeAnyOf(Schema schema, Set<Schema> visitedSchemas) {
         //transform anyOf into enums if needed
         schema = processSimplifyAnyOfEnum(schema);
         if (schema.getAnyOf() == null) {
-            return schema;
+            return decomposeSchema(schema);
         }
 
         for (int i = 0; i < schema.getAnyOf().size(); i++) {
@@ -1620,21 +1619,34 @@ protected Schema processReplaceOneOfByMapping(Schema schema) {
 
                 }
                 // remove oneOf and only keep the new discriminator mapping
-                schema.setOneOf(null);
+                schema.oneOf(null);
             } else if (discriminator.getPropertyName() == null) {
                 LOGGER.warn("Missing property name in discriminator");
             } else if (discriminator.getMapping() != null && discriminator.getMapping().size() != schema.getOneOf().size()) {
                 LOGGER.warn("Discriminator mapping size " + discriminator.getMapping().size() + " mismatch with oneOf size " + schema.getOneOf().size());
             } else {
                 // remove oneOf and only keep the discriminator mapping
                 LOGGER.info("Removing oneOf, discriminator mapping takes precedences on OneOfs");
-                schema.setOneOf(null);
+                schema.oneOf(null);
             }
         }
 
         return schema;
     }
 
+    /**
+     * Replace a ComposeSchema into a Simple Schema if no OneOf/AnyOf/AllOf.
+     *
+     * This allows side effects with ModelUtils.isComposedSchema() that returns true for a ComposedSchema.
+     * For example the InlineModelResolver does not inline properties of a ComposedSchema (a bug to be fixed in another PR)
+     */
+    private Schema decomposeSchema(Schema schema) {
+        if (schema instanceof ComposedSchema && schema.getOneOf() == null && schema.getAnyOf() == null && schema.getAllOf() == null) {
+            schema = ModelUtils.shallowCopy(schema, new Schema());
+        }
+        return schema;
+    }
+
     private boolean isInlineSchema(Schema schema) {
         if (openAPI.getComponents()!=null && openAPI.getComponents().getSchemas()!=null) {
             int identity = System.identityHashCode(schema);

modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java

@@ -25,6 +25,7 @@
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.PathItem;
+import io.swagger.v3.oas.models.SpecVersion;
 import io.swagger.v3.oas.models.callbacks.Callback;
 import io.swagger.v3.oas.models.headers.Header;
 import io.swagger.v3.oas.models.media.*;
@@ -2270,6 +2271,88 @@ public static boolean isParent(Schema schema) {
         return false;
     }
 
+    /**
+     * copy all the fields from the origin schema to the destination schema.
+     * @param schema original schema
+     * @param dest the destination schema
+     * @return dest
+     */
+
+    public static Schema shallowCopy(Schema schema, Schema dest) {
+        // cloneSchema does not work because it does conversions for some attributes (enums, default...)
+        // the intermediate JSON can convert between integer and BigInteger for example.
+        // so copy all the fields individually
+        dest.setDefault(schema.getDefault());
+        dest.setName(schema.getName());
+        dest.setTitle(schema.getTitle());
+        dest.setMultipleOf(schema.getMultipleOf());
+        dest.setMaximum(schema.getMaximum());
+        dest.setExclusiveMaximum(schema.getExclusiveMaximum());
+        dest.setMinimum(schema.getMinimum());
+        dest.setExclusiveMinimum(schema.getExclusiveMinimum());
+        dest.setMaxLength(schema.getMaxLength());
+        dest.setPattern(schema.getPattern());
+        dest.setMaxItems(schema.getMaxItems());
+        dest.setMinItems(schema.getMinItems());
+        dest.setUnevaluatedItems(schema.getUnevaluatedItems());
+        dest.setMaxProperties(schema.getMaxProperties());
+        dest.setMinProperties(schema.getMinProperties());
+        dest.setRequired(schema.getRequired());
+        dest.setType(schema.getType());
+        dest.setNot(schema.getNot());
+        dest.setProperties(schema.getProperties());
+        dest.setDescription(schema.getDescription());
+        dest.setFormat(schema.getFormat());
+        dest.set$ref(schema.get$ref());
+        dest.setNullable(schema.getNullable());
+        dest.setReadOnly(schema.getReadOnly());
+        dest.setWriteOnly(schema.getWriteOnly());
+        dest.setExample(schema.getExample());
+        dest.setExternalDocs(schema.getExternalDocs());
+        dest.setDeprecated(schema.getDeprecated());
+        dest.setXml(schema.getXml());
+        dest.setExtensions(schema.getExtensions());
+        dest.setEnum(schema.getEnum());
+        dest.setDiscriminator(schema.getDiscriminator());
+        dest.setExampleSetFlag(schema.getExampleSetFlag());
+        dest.setPrefixItems(schema.getPrefixItems());
+        dest.setAllOf(schema.getAllOf());
+        dest.setAnyOf(schema.getAnyOf());
+        dest.setOneOf(schema.getOneOf());
+        dest.setItems(schema.getItems());
+        dest.setConst(schema.getConst());
+        dest.setSpecVersion(schema.getSpecVersion());
+        dest.setPatternProperties(schema.getPatternProperties());
+        dest.setExclusiveMaximumValue(schema.getExclusiveMaximumValue());
+        dest.setExclusiveMinimumValue(schema.getExclusiveMinimumValue());
+        dest.setContains(schema.getContains());
+        dest.set$id(schema.get$id());
+        dest.set$schema(schema.get$schema());
+        dest.set$anchor(schema.get$anchor());
+        dest.set$vocabulary(schema.get$vocabulary());
+        dest.set$dynamicAnchor(schema.get$dynamicAnchor());
+        dest.set$dynamicRef(schema.get$dynamicRef());
+        dest.setContentEncoding(schema.getContentEncoding());
+        dest.setContentMediaType(schema.getContentMediaType());
+        dest.setPropertyNames(schema.getPropertyNames());
+        dest.setUnevaluatedProperties(schema.getUnevaluatedProperties());
+        dest.setMaxContains(schema.getMaxContains());
+        dest.setMinContains(schema.getMinContains());
+        dest.setAdditionalItems(schema.getAdditionalItems());
+        dest.setUnevaluatedItems(schema.getUnevaluatedItems());
+        dest.setIf(schema.getIf());
+        dest.setElse(schema.getElse());
+        dest.setThen(schema.getThen());
+        dest.setDependentSchemas(schema.getDependentSchemas());
+        dest.setDependentRequired(schema.getDependentRequired());
+        dest.set$comment(schema.get$comment());
+        dest.setExamples(schema.getExamples());
+        dest.setBooleanSchemaValue(schema.getBooleanSchemaValue());
+        dest.setJsonSchema(schema.getJsonSchema());
+        dest.setJsonSchemaImpl(schema.getJsonSchemaImpl());
+        return dest;
+    }
+
     public static Schema cloneSchema(Schema schema, boolean openapi31) {
         if (openapi31) {
             return AnnotationsUtils.clone(schema, openapi31);