Fix handling of composed schema in inline model resolver (OpenAPITool…

…s#17138) * fix handling of composed schema in inline model resolver * update samples
dabdirb · Nov 19, 2023 · 6d93b0e · 6d93b0e
1 parent 8e36014
commit 6d93b0e
Show file tree

Hide file tree

Showing 15 changed files with 1,310 additions and 0 deletions.
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java
@@ -811,6 +811,15 @@ private void flattenProperties(OpenAPI openAPI, Map<String, Schema> properties,
                             ap.setItems(schema);
                         }
                     }
+                } else if (ModelUtils.isComposedSchema(inner)) {
+                    String innerModelName = resolveModelName(inner.getTitle(), path + "_" + key);
+                    gatherInlineModels(inner, innerModelName);
+                    innerModelName = addSchemas(innerModelName, inner);
+                    Schema schema = new Schema().$ref(innerModelName);
+                    schema.setRequired(inner.getRequired());
+                    ap.setItems(schema);
+                } else {
+                    LOGGER.debug("Schema not yet handled in model resolver: {}", inner);
                 }
             }
             if (ModelUtils.isMapSchema(property)) {
@@ -833,6 +842,15 @@ private void flattenProperties(OpenAPI openAPI, Map<String, Schema> properties,
                             property.setAdditionalProperties(schema);
                         }
                     }
+                } else if (ModelUtils.isComposedSchema(inner)) {
+                    String innerModelName = resolveModelName(inner.getTitle(), path + "_" + key);
+                    gatherInlineModels(inner, innerModelName);
+                    innerModelName = addSchemas(innerModelName, inner);
+                    Schema schema = new Schema().$ref(innerModelName);
+                    schema.setRequired(inner.getRequired());
+                    property.setAdditionalProperties(schema);
+                } else {
+                    LOGGER.debug("Schema not yet handled in model resolver: {}", inner);
                 }
             }
         }

diff --git a/.../test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml b/.../test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml
@@ -2477,3 +2477,19 @@ components:
           type: string
         type_:
           type: string
+    AllOfModelArrayAnyOf:
+      allOf:
+        - $ref: "#/components/schemas/Category"
+        - type: object
+          properties:
+            linkListColumn1:
+              type: object
+              properties:
+                value:
+                  type: array
+                  items:
+                    anyOf:
+                      - $ref: '#/components/schemas/User'
+                      - $ref: '#/components/schemas/Tag'
+              required:
+                - value
diff --git a/samples/client/petstore/java/okhttp-gson/.openapi-generator/FILES b/samples/client/petstore/java/okhttp-gson/.openapi-generator/FILES
@@ -6,6 +6,9 @@ api/openapi.yaml
 build.gradle
 build.sbt
 docs/AdditionalPropertiesClass.md
+docs/AllOfModelArrayAnyOf.md
+docs/AllOfModelArrayAnyOfAllOfLinkListColumn1.md
+docs/AllOfModelArrayAnyOfAllOfLinkListColumn1Value.md
 docs/Animal.md
 docs/AnotherFakeApi.md
 docs/Apple.md
@@ -138,6 +141,9 @@ src/main/java/org/openapitools/client/auth/OAuthOkHttpClient.java
 src/main/java/org/openapitools/client/auth/RetryingOAuth.java
 src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
 src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+src/main/java/org/openapitools/client/model/AllOfModelArrayAnyOf.java
+src/main/java/org/openapitools/client/model/AllOfModelArrayAnyOfAllOfLinkListColumn1.java
+src/main/java/org/openapitools/client/model/AllOfModelArrayAnyOfAllOfLinkListColumn1Value.java
 src/main/java/org/openapitools/client/model/Animal.java
 src/main/java/org/openapitools/client/model/Apple.java
 src/main/java/org/openapitools/client/model/AppleReq.java

diff --git a/samples/client/petstore/java/okhttp-gson/README.md b/samples/client/petstore/java/okhttp-gson/README.md
@@ -163,6 +163,9 @@ Class | Method | HTTP request | Description
 ## Documentation for Models
 
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AllOfModelArrayAnyOf](docs/AllOfModelArrayAnyOf.md)
+ - [AllOfModelArrayAnyOfAllOfLinkListColumn1](docs/AllOfModelArrayAnyOfAllOfLinkListColumn1.md)
+ - [AllOfModelArrayAnyOfAllOfLinkListColumn1Value](docs/AllOfModelArrayAnyOfAllOfLinkListColumn1Value.md)
  - [Animal](docs/Animal.md)
  - [Apple](docs/Apple.md)
  - [AppleReq](docs/AppleReq.md)

diff --git a/samples/client/petstore/java/okhttp-gson/api/openapi.yaml b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml
@@ -2471,6 +2471,13 @@ components:
         type_:
           type: string
       type: object
+    AllOfModelArrayAnyOf:
+      allOf:
+      - $ref: '#/components/schemas/Category'
+      - properties:
+          linkListColumn1:
+            $ref: '#/components/schemas/AllOfModelArrayAnyOf_allOf_linkListColumn1'
+        type: object
     _foo_get_default_response:
       example:
         string:
@@ -2654,6 +2661,20 @@ components:
         required:
         - name
         type: object
+    AllOfModelArrayAnyOf_allOf_linkListColumn1_value:
+      anyOf:
+      - $ref: '#/components/schemas/User'
+      - $ref: '#/components/schemas/Tag'
+    AllOfModelArrayAnyOf_allOf_linkListColumn1:
+      properties:
+        value:
+          items:
+            $ref: '#/components/schemas/AllOfModelArrayAnyOf_allOf_linkListColumn1_value'
+          type: array
+      required:
+      - value
+      type: object
+      example: null
   securitySchemes:
     petstore_auth:
       flows:

diff --git a/samples/client/petstore/java/okhttp-gson/docs/AllOfModelArrayAnyOf.md b/samples/client/petstore/java/okhttp-gson/docs/AllOfModelArrayAnyOf.md
@@ -0,0 +1,15 @@
+
+
+# AllOfModelArrayAnyOf
+
+
+## Properties
+
+| Name | Type | Description | Notes |
+|------------ | ------------- | ------------- | -------------|
+|**id** | **Long** |  |  [optional] |
+|**name** | **String** |  |  |
+|**linkListColumn1** | [**AllOfModelArrayAnyOfAllOfLinkListColumn1**](AllOfModelArrayAnyOfAllOfLinkListColumn1.md) |  |  [optional] |
+
+
+
diff --git a/...ient/petstore/java/okhttp-gson/docs/AllOfModelArrayAnyOfAllOfLinkListColumn1.md b/...ient/petstore/java/okhttp-gson/docs/AllOfModelArrayAnyOfAllOfLinkListColumn1.md
@@ -0,0 +1,13 @@
+
+
+# AllOfModelArrayAnyOfAllOfLinkListColumn1
+
+
+## Properties
+
+| Name | Type | Description | Notes |
+|------------ | ------------- | ------------- | -------------|
+|**value** | [**List&lt;AllOfModelArrayAnyOfAllOfLinkListColumn1Value&gt;**](AllOfModelArrayAnyOfAllOfLinkListColumn1Value.md) |  |  |
+
+
+
diff --git a/...petstore/java/okhttp-gson/docs/AllOfModelArrayAnyOfAllOfLinkListColumn1Value.md b/...petstore/java/okhttp-gson/docs/AllOfModelArrayAnyOfAllOfLinkListColumn1Value.md
@@ -0,0 +1,25 @@
+
+
+# AllOfModelArrayAnyOfAllOfLinkListColumn1Value
+
+
+## Properties
+
+| Name | Type | Description | Notes |
+|------------ | ------------- | ------------- | -------------|
+|**id** | **Long** |  |  [optional] |
+|**username** | **String** |  |  [optional] |
+|**firstName** | **String** |  |  [optional] |
+|**lastName** | **String** |  |  [optional] |
+|**email** | **String** |  |  [optional] |
+|**password** | **String** |  |  [optional] |
+|**phone** | **String** |  |  [optional] |
+|**userStatus** | **Integer** | User Status |  [optional] |
+|**objectWithNoDeclaredProps** | **Object** | test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value. |  [optional] |
+|**objectWithNoDeclaredPropsNullable** | **Object** | test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value. |  [optional] |
+|**anyTypeProp** | **Object** | test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389 |  [optional] |
+|**anyTypePropNullable** | **Object** | test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. The &#39;nullable&#39; attribute does not change the allowed values. |  [optional] |
+|**name** | **String** |  |  [optional] |
+
+
+
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java
@@ -230,6 +230,9 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri
         gsonBuilder.registerTypeAdapter(LocalDate.class, localDateTypeAdapter);
         gsonBuilder.registerTypeAdapter(byte[].class, byteArrayAdapter);
         gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.AdditionalPropertiesClass.CustomTypeAdapterFactory());
+        gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.AllOfModelArrayAnyOf.CustomTypeAdapterFactory());
+        gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.AllOfModelArrayAnyOfAllOfLinkListColumn1.CustomTypeAdapterFactory());
+        gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.AllOfModelArrayAnyOfAllOfLinkListColumn1Value.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.Apple.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.AppleReq.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.ArrayDefault.CustomTypeAdapterFactory());