Set isModel appropriately for referenced schemas

Author: jimschubert

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

@@ -2304,7 +2304,8 @@ public CodegenProperty fromProperty(String name, Schema p) {
             //}
             // --END of revision
             setNonArrayMapProperty(property, type);
-            property.isModel = ModelUtils.isObjectSchema(p) && ModelUtils.isModel(p);
+            Schema refOrCurrent = ModelUtils.getReferencedSchema(this.openAPI, p);
+            property.isModel = (ModelUtils.isComposedSchema(refOrCurrent) || ModelUtils.isObjectSchema(refOrCurrent)) && ModelUtils.isModel(refOrCurrent);
         }
 
         LOGGER.debug("debugging from property return: " + property);

modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java

@@ -27,6 +27,7 @@
 import io.swagger.v3.oas.models.PathItem;
 import io.swagger.v3.oas.models.headers.Header;
 import io.swagger.v3.oas.models.media.*;
+import io.swagger.v3.oas.models.parameters.Parameter;
 import io.swagger.v3.oas.models.parameters.QueryParameter;
 import io.swagger.v3.oas.models.parameters.RequestBody;
 import io.swagger.v3.oas.models.responses.ApiResponse;
@@ -911,6 +912,41 @@ public void modelWithSuffixDoNotContainInheritedVars() {
         Assert.assertEquals(codegenModel.vars.size(), 1);
     }
 
+    @Test
+    public void arrayInnerReferencedSchemaMarkedAsModel_20() {
+        final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/arrayRefBody.yaml");
+        final DefaultCodegen codegen = new DefaultCodegen();
+        codegen.setOpenAPI(openAPI);
+
+        Set<String> imports = new HashSet<>();
+
+        RequestBody body = openAPI.getPaths().get("/examples").getPost().getRequestBody();
+
+        CodegenParameter codegenParameter = codegen.fromRequestBody(body, imports, "");
+
+        Assert.assertTrue(codegenParameter.isContainer);
+        Assert.assertTrue(codegenParameter.items.isModel);
+        Assert.assertFalse(codegenParameter.items.isContainer);
+    }
+
+    @Test
+    public void arrayInnerReferencedSchemaMarkedAsModel_30() {
+        final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/arrayRefBody.yaml");
+        new InlineModelResolver().flatten(openAPI);
+        final DefaultCodegen codegen = new DefaultCodegen();
+        codegen.setOpenAPI(openAPI);
+
+        Set<String> imports = new HashSet<>();
+
+        RequestBody body = openAPI.getPaths().get("/examples").getPost().getRequestBody();
+
+        CodegenParameter codegenParameter = codegen.fromRequestBody(body, imports, "");
+
+        Assert.assertTrue(codegenParameter.isContainer);
+        Assert.assertTrue(codegenParameter.items.isModel);
+        Assert.assertFalse(codegenParameter.items.isContainer);
+    }
+
     @Test
     @SuppressWarnings("unchecked")
     public void commonLambdasRegistrationTest() {

modules/openapi-generator/src/test/resources/2_0/arrayRefBody.yaml

@@ -0,0 +1,52 @@
+swagger: '2.0'
+info:
+  version: ''
+  title: arrayRefBody
+  contact: {}
+host: www.example.com
+basePath: /
+schemes:
+  - https
+consumes:
+  - application/json
+produces:
+  - application/json
+paths:
+  /examples:
+    post:
+      description: Create an array of inputs
+      summary: ''
+      tags:
+        - Examples
+      operationId: createExamples
+      produces:
+        - application/json
+      parameters:
+        - name: body
+          in: body
+          required: true
+          description: inputs description
+          schema:
+            type: array
+            items:
+              $ref: '#/definitions/Input'
+      responses:
+        200:
+          description: successful operation
+          headers: {}
+definitions:
+  Input:
+    title: Input
+    type: object
+    properties:
+      id:
+        type: string
+      age:
+        type: integer
+        format: int32
+      dt:
+        type: string
+        format: date-time
+tags:
+  - name: Examples
+    description: 'Example inputs'

modules/openapi-generator/src/test/resources/3_0/arrayRefBody.yaml

@@ -0,0 +1,35 @@
+openapi: 3.0.0
+info:
+  title: ''
+  version: ''
+paths:
+  /examples:
+    post:
+      tags:
+        - Examples
+      summary: Get a list of transactions
+      operationId: getFilteredTransactions
+      responses:
+        default:
+          description: successful operation
+      requestBody:
+        description: subscription payload
+        content:
+          application/json:
+            schema:
+              type: array
+              items:
+                $ref: '#/components/schemas/Input'
+components:
+  schemas:
+    Input:
+      type: object
+      properties:
+        id:
+          type: string
+        age:
+          type: integer
+          format: int32
+        dt:
+          type: string
+          format: date-time