fix allOf handling in 3.1 spec

Author: wing328

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

@@ -2950,7 +2950,7 @@ private void mergeProperties(Map<String, Schema> existingProperties, Map<String,
             newProperties.forEach((key, value) ->
                     existingProperties.put(
                             key,
-                            AnnotationsUtils.clone(value, specVersionGreaterThanOrEqualTo310(openAPI))
+                            ModelUtils.cloneSchema(value, specVersionGreaterThanOrEqualTo310(openAPI))
                     ));
             if (null != existingType && null != newType && null != newType.getEnum() && !newType.getEnum().isEmpty()) {
                 for (Object e : newType.getEnum()) {

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

@@ -19,6 +19,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.swagger.v3.core.util.AnnotationsUtils;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.PathItem;
@@ -2068,6 +2069,26 @@ public static boolean isParent(Schema schema) {
         return false;
     }
 
+    /**
+     * Returns a clone of the schema.
+     *
+     * @param schema the schema.
+     * @param specVersionGreaterThanOrEqualTo310 true if spec version is 3.1.0 or later.
+     * @return a clone of the schema.
+     */
+    public static Schema cloneSchema(Schema schema, boolean specVersionGreaterThanOrEqualTo310) {
+        Schema clone = AnnotationsUtils.clone(schema, specVersionGreaterThanOrEqualTo310);
+
+        // check to see if type is set and clone it if needed
+        // in openapi-generator, we also store type in `type` for 3.1 schema
+        // to make it backward compatible with the rest of the code base.
+        if (schema.getType() != null) {
+            clone.setType(schema.getType());
+        }
+
+        return clone;
+    }
+
     @FunctionalInterface
     private interface OpenAPISchemaVisitor {
 

modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml

@@ -2652,3 +2652,6 @@ components:
             - available
             - pending
             - sold
+    PetComposition:
+      allOf:
+        - $ref: '#/components/schemas/Pet'

samples/client/petstore/java/okhttp-gson/.openapi-generator/FILES

@@ -78,6 +78,7 @@ docs/OuterEnumIntegerDefaultValue.md
 docs/ParentPet.md
 docs/Pet.md
 docs/PetApi.md
+docs/PetComposition.md
 docs/PetUsingAllOf.md
 docs/PetWithRequiredTags.md
 docs/Pig.md
@@ -211,6 +212,7 @@ src/main/java/org/openapitools/client/model/OuterEnumInteger.java
 src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java
 src/main/java/org/openapitools/client/model/ParentPet.java
 src/main/java/org/openapitools/client/model/Pet.java
+src/main/java/org/openapitools/client/model/PetComposition.java
 src/main/java/org/openapitools/client/model/PetUsingAllOf.java
 src/main/java/org/openapitools/client/model/PetWithRequiredTags.java
 src/main/java/org/openapitools/client/model/Pig.java
@@ -235,3 +237,4 @@ src/main/java/org/openapitools/client/model/Value.java
 src/main/java/org/openapitools/client/model/Variable.java
 src/main/java/org/openapitools/client/model/Whale.java
 src/main/java/org/openapitools/client/model/Zebra.java
+src/test/java/org/openapitools/client/model/PetCompositionTest.java

samples/client/petstore/java/okhttp-gson/README.md

@@ -234,6 +234,7 @@ Class | Method | HTTP request | Description
  - [OuterEnumIntegerDefaultValue](docs/OuterEnumIntegerDefaultValue.md)
  - [ParentPet](docs/ParentPet.md)
  - [Pet](docs/Pet.md)
+ - [PetComposition](docs/PetComposition.md)
  - [PetUsingAllOf](docs/PetUsingAllOf.md)
  - [PetWithRequiredTags](docs/PetWithRequiredTags.md)
  - [Pig](docs/Pig.md)

samples/client/petstore/java/okhttp-gson/api/openapi.yaml

@@ -2688,6 +2688,9 @@ components:
       - name
       - photoUrls
       type: object
+    PetComposition:
+      allOf:
+      - $ref: '#/components/schemas/Pet'
     _foo_get_default_response:
       example:
         string:

samples/client/petstore/java/okhttp-gson/docs/PetComposition.md

@@ -0,0 +1,28 @@
+
+
+# PetComposition
+
+
+## Properties
+
+| Name | Type | Description | Notes |
+|------------ | ------------- | ------------- | -------------|
+|**id** | **Long** |  |  [optional] |
+|**category** | [**Category**](Category.md) |  |  [optional] |
+|**name** | **String** |  |  |
+|**photoUrls** | **List<String>** |  |  |
+|**tags** | [**List<Tag>**](Tag.md) |  |  [optional] |
+|**status** | [**StatusEnum**](#StatusEnum) | pet status in the store |  [optional] |
+
+
+
+## Enum: StatusEnum
+
+| Name | Value |
+|---- | -----|
+| AVAILABLE | "available" |
+| PENDING | "pending" |
+| SOLD | "sold" |
+
+
+

samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java

@@ -297,6 +297,7 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri
         gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.OuterComposite.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.ParentPet.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.Pet.CustomTypeAdapterFactory());
+        gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.PetComposition.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.PetUsingAllOf.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.PetWithRequiredTags.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.Pig.CustomTypeAdapterFactory());