Fixed incorrect contructors with discriminator and readonly in generator.

Fixed #1206
Fixed #1208

Author: altro3

openapi-generator/src/main/java/io/micronaut/openapi/generator/AbstractMicronautJavaCodegen.java

@@ -839,38 +839,21 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
 
             var hasParent = model.getParentModel() != null;
             var requiredVarsWithoutDiscriminator = new ArrayList<CodegenProperty>();
-            for (var v : model.requiredVars) {
-                boolean isDiscriminator = false;
-                if (hasParent) {
-                    for (var pv : model.getParentModel().getAllVars()) {
-                        if (pv.required && pv.getName().equals(v.getName())) {
-                            isDiscriminator = pv.isDiscriminator;
-                            break;
-                        }
-                    }
-                } else {
-                    isDiscriminator = v.isDiscriminator;
-                }
-                if (!isDiscriminator) {
-                    requiredVarsWithoutDiscriminator.add(v);
-                }
-            }
+            var requiredParentVarsWithoutDiscriminator = new ArrayList<CodegenProperty>();
 
-            if (hasParent) {
-                var parentRequiredVarsWithoutDiscriminator = new ArrayList<CodegenProperty>();
-                for (var v : model.getParentModel().vars) {
-                    if (v.required && !v.isDiscriminator) {
-                        parentRequiredVarsWithoutDiscriminator.add(v);
-                    }
-                }
-                model.vendorExtensions.put("requiredParentVarsWithoutDiscriminator", parentRequiredVarsWithoutDiscriminator);
-                model.parentVars = model.getParentModel().allVars;
-            }
+            processParentModel(model, requiredVarsWithoutDiscriminator, requiredParentVarsWithoutDiscriminator);
 
-            List<CodegenProperty> requiredVars = model.vars.stream().filter(v -> v.required).collect(Collectors.toList());
+            List<CodegenProperty> requiredVars = model.vars.stream()
+                .filter(v -> v.required)
+                .toList();
 
             model.vendorExtensions.put("withMultipleVars", model.vars.size() > 1);
-            model.vendorExtensions.put("requiredVarsWithoutDiscriminator", requiredVarsWithoutDiscriminator);
+            if (!requiredParentVarsWithoutDiscriminator.isEmpty()) {
+                model.vendorExtensions.put("requiredParentVarsWithoutDiscriminator", requiredParentVarsWithoutDiscriminator);
+            }
+            if (!requiredVarsWithoutDiscriminator.isEmpty()) {
+                model.vendorExtensions.put("requiredVarsWithoutDiscriminator", requiredVarsWithoutDiscriminator);
+            }
             model.vendorExtensions.put("requiredVars", requiredVars);
             model.vendorExtensions.put("areRequiredVarsAndReadOnlyVars", !requiredVarsWithoutDiscriminator.isEmpty() && !model.readOnlyVars.isEmpty());
             model.vendorExtensions.put("serialId", random.nextLong());
@@ -894,6 +877,75 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
         return objs;
     }
 
+    private void processParentModel(CodegenModel model, List<CodegenProperty> requiredVarsWithoutDiscriminator, List<CodegenProperty> requiredParentVarsWithoutDiscriminator) {
+        var parent = model.getParentModel();
+        var hasParent = parent != null;
+
+        for (var v : model.requiredVars) {
+            boolean isDiscriminator = isDiscriminator(v, model);
+            if (!isDiscriminator(v, model) && !containsProp(v, requiredVarsWithoutDiscriminator)) {
+                requiredVarsWithoutDiscriminator.add(v);
+            }
+        }
+
+        requiredParentVarsWithoutDiscriminator(model, requiredParentVarsWithoutDiscriminator);
+        if (hasParent) {
+            model.parentVars = parent.allVars;
+        }
+        if (hasParent) {
+            processParentModel(parent, requiredVarsWithoutDiscriminator, requiredParentVarsWithoutDiscriminator);
+        }
+    }
+
+    private void requiredParentVarsWithoutDiscriminator(CodegenModel model, List<CodegenProperty> requiredParentVarsWithoutDiscriminator) {
+
+        var parent = model.parentModel;
+        if (parent == null) {
+            return;
+        }
+
+        for (var v : parent.vars) {
+            boolean isDiscriminator = isDiscriminator(v, model);
+            if (v.required && !isDiscriminator) {
+                v.vendorExtensions.put("isServerOrNotReadOnly", !v.isReadOnly || isServer());
+                if (!containsProp(v, requiredParentVarsWithoutDiscriminator)) {
+                    requiredParentVarsWithoutDiscriminator.add(v);
+                }
+            }
+        }
+    }
+
+    private boolean containsProp(CodegenProperty prop, List<CodegenProperty> props) {
+        for (var p : props) {
+            if (prop.name.equals(p.name)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean isDiscriminator(CodegenProperty prop, CodegenModel model) {
+        var isDiscriminator = prop.isDiscriminator;
+        if (isDiscriminator) {
+            return true;
+        }
+        if (model.parentModel == null) {
+            return false;
+        }
+        CodegenProperty parentProp = null;
+        for (var pv : model.parentModel.allVars) {
+            if (pv.required && pv.name.equals(prop.name)) {
+                isDiscriminator = pv.isDiscriminator;
+                parentProp = pv;
+                break;
+            }
+        }
+        if (isDiscriminator) {
+            return true;
+        }
+        return parentProp != null && isDiscriminator(parentProp, model.parentModel);
+    }
+
     @Override
     public void setParameterExampleValue(CodegenParameter p) {
         p.vendorExtensions.put("groovyExample", getParameterExampleValue(p, true));

openapi-generator/src/main/resources/templates/java-micronaut/common/model/pojo.mustache

@@ -134,7 +134,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE
         {{#vendorExtensions.withRequiredVars}}
     public {{classname}}({{#vendorExtensions.requiredVarsWithoutDiscriminator}}{{#isReadOnly}}{{#vendorExtensions.isServer}}{{^-first}}, {{/-first}}{{{datatypeWithEnum}}} {{name}}{{/vendorExtensions.isServer}}{{/isReadOnly}}{{^isReadOnly}}{{^-first}}, {{/-first}}{{{datatypeWithEnum}}} {{name}}{{/isReadOnly}}{{/vendorExtensions.requiredVarsWithoutDiscriminator}}) {
         {{#parent}}
-        super({{#vendorExtensions.requiredParentVarsWithoutDiscriminator}}{{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.requiredParentVarsWithoutDiscriminator}});
+        super({{#vendorExtensions.requiredParentVarsWithoutDiscriminator}}{{#vendorExtensions.isServerOrNotReadOnly}}{{^-first}}, {{/-first}}{{name}}{{/vendorExtensions.isServerOrNotReadOnly}}{{/vendorExtensions.requiredParentVarsWithoutDiscriminator}});
         {{/parent}}
         {{#vendorExtensions.requiredVars}}
             {{^isDiscriminator}}

openapi-generator/src/test/java/io/micronaut/openapi/generator/MicronautClientCodegenTest.java

@@ -268,4 +268,27 @@ void testConfigurePathSeparator() {
         // Micronaut declarative http client should use the provided path separator
         assertFileContains(outputPath + "/src/main/java/org/openapitools/api/PetApi.java", "@Client(\"${openapi-micronaut-client.base-path}\")");
     }
+
+    @Test
+    void testReadOnlyConstructorBug() {
+
+        var codegen = new JavaMicronautClientCodegen();
+        String outputPath = generateFiles(codegen, "src/test/resources/3_0/readonlyconstructorbug.yml", CodegenConstants.MODELS);
+        String apiPath = outputPath + "src/main/java/org/openapitools/model/";
+
+        assertFileContains(apiPath + "BookInfo.java", "public BookInfo(String name)");
+        assertFileContains(apiPath + "ExtendedBookInfo.java", "public ExtendedBookInfo(String isbn, String name)", "super(name)");
+    }
+
+    @Test
+    void testDiscriminatorConstructorBug() {
+
+        var codegen = new JavaMicronautClientCodegen();
+        String outputPath = generateFiles(codegen, "src/test/resources/3_0/discriminatorconstructorbug.yml", CodegenConstants.MODELS);
+        String apiPath = outputPath + "src/main/java/org/openapitools/model/";
+
+        assertFileContains(apiPath + "BookInfo.java", "public BookInfo(String name)");
+        assertFileContains(apiPath + "BasicBookInfo.java", "public BasicBookInfo(String author, String name)", "super(name)");
+        assertFileContains(apiPath + "DetailedBookInfo.java", "public DetailedBookInfo(String isbn, String name, String author)", "super(author, name)");
+    }
 }

openapi-generator/src/test/java/io/micronaut/openapi/generator/MicronautServerCodegenTest.java

@@ -305,4 +305,27 @@ void doRepeatOperationForAllTags() {
         assertFileContains(apiPath + "SearchApi.java",
             "authorSearchGet", "bookSearchGet");
     }
+
+    @Test
+    void testReadOnlyConstructorBug() {
+
+        var codegen = new JavaMicronautServerCodegen();
+        String outputPath = generateFiles(codegen, "src/test/resources/3_0/readonlyconstructorbug.yml", CodegenConstants.MODELS);
+        String apiPath = outputPath + "src/main/java/org/openapitools/model/";
+
+        assertFileContains(apiPath + "BookInfo.java", "public BookInfo(String name, String requiredReadOnly)");
+        assertFileContains(apiPath + "ExtendedBookInfo.java", "public ExtendedBookInfo(String isbn, String name, String requiredReadOnly)", "super(name, requiredReadOnly)");
+    }
+
+    @Test
+    void testDiscriminatorConstructorBug() {
+
+        var codegen = new JavaMicronautServerCodegen();
+        String outputPath = generateFiles(codegen, "src/test/resources/3_0/discriminatorconstructorbug.yml", CodegenConstants.MODELS);
+        String apiPath = outputPath + "src/main/java/org/openapitools/model/";
+
+        assertFileContains(apiPath + "BookInfo.java", "public BookInfo(String name)");
+        assertFileContains(apiPath + "BasicBookInfo.java", "public BasicBookInfo(String author, String name)", "super(name)");
+        assertFileContains(apiPath + "DetailedBookInfo.java", "public DetailedBookInfo(String isbn, String name, String author)", "super(author, name)");
+    }
 }

openapi-generator/src/test/resources/3_0/discriminatorconstructorbug.yml

@@ -0,0 +1,100 @@
+#tag::info[]
+openapi: 3.0.0 # <1>
+info: # <2>
+  description: This is a library API
+  version: 1.0.0
+  title: Library
+  license:
+    name: Apache-2.0
+    url: "https://www.apache.org/licenses/LICENSE-2.0.html"
+tags: # <3>
+  - name: books
+    description: Search for books and add new ones
+#end::info[]
+#tag::paths[]
+paths:
+  #end::paths[]
+  #tag::search[]
+  /search:
+    get: # <1>
+      tags:
+        - books # <2>
+      summary: Search for a book
+      operationId: search # <3>
+      parameters: # <4>
+        - name: book-name
+          in: query
+          schema:
+            type: string
+            minLength: 3 # <5>
+        - name: author-name
+          in: query
+          schema:
+            type: string
+      responses: # <6>
+        "200": # <7>
+          description: Success
+          content:
+            "application/json":
+              schema:
+                type: array,
+                items:
+                  $ref: "#/components/schemas/BookInfo"
+        "400": # <8>
+          description: Bad Request
+  #end::search[]
+  #tag::add[]
+  /add:
+    post: # <1>
+      tags: [books]
+      summary: Add a new book
+      operationId: addBook
+      requestBody: # <2>
+        required: true
+        content:
+          "application/json":
+            schema:
+              $ref: "#/components/schemas/BookInfo" # <3>
+      responses:
+        "200":
+          description: Success
+        "400":
+          description: Bad Request
+#end::add[]
+#tag::components[]
+components:
+  schemas:
+    BookInfo:
+      title: Book Info # <1>
+      description: Object containg all the info about a book
+      type: object
+      properties: # <2>
+        name: {type: string}
+        type:
+          type: string
+          enum:
+            - BASIC
+            - DETAILED
+      required: ["name", "availability", "type"]
+      discriminator:
+        propertyName: type
+        mapping:
+          BASIC: "#/components/schemas/BasicBookInfo"
+          DETAILED: "#/components/schemas/DetailedBookInfo"
+    BasicBookInfo:
+      x-all-of-name: BasicBookInfo
+      allOf:
+        - $ref: '#/components/schemas/BookInfo'
+        - type: object
+          properties: # <2>
+            author: {type: string, minLength: 3}
+          required: ["author"]
+    DetailedBookInfo:
+      x-all-of-name: DetailedBookInfo
+      allOf:
+        - $ref: '#/components/schemas/BasicBookInfo'
+        - type: object
+          properties: # <2>
+            isbn: {type: string, pattern: "[0-9]{13}"}
+          required: ["isbn"]
+#end::components[]

openapi-generator/src/test/resources/3_0/readonlyconstructorbug.yml

@@ -0,0 +1,93 @@
+#tag::info[]
+openapi: 3.0.0 # <1>
+info: # <2>
+  description: This is a library API
+  version: 1.0.0
+  title: Library
+  license:
+    name: Apache-2.0
+    url: "https://www.apache.org/licenses/LICENSE-2.0.html"
+tags: # <3>
+  - name: books
+    description: Search for books and add new ones
+#end::info[]
+#tag::paths[]
+paths:
+  #end::paths[]
+  #tag::search[]
+  /search:
+    get: # <1>
+      tags:
+        - books # <2>
+      summary: Search for a book
+      operationId: search # <3>
+      parameters: # <4>
+        - name: book-name
+          in: query
+          schema:
+            type: string
+            minLength: 3 # <5>
+        - name: author-name
+          in: query
+          schema:
+            type: string
+      responses: # <6>
+        "200": # <7>
+          description: Success
+          content:
+            "application/json":
+              schema:
+                type: array
+                items:
+                  $ref: "#/components/schemas/BookInfo"
+        "400": # <8>
+          description: Bad Request
+  #end::search[]
+  #tag::add[]
+  /add:
+    post: # <1>
+      tags: [books]
+      summary: Add a new book
+      operationId: addBook
+      requestBody: # <2>
+        required: true
+        content:
+          "application/json":
+            schema:
+              $ref: "#/components/schemas/BookInfo" # <3>
+      responses:
+        "200":
+          description: Success
+        "400":
+          description: Bad Request
+#end::add[]
+#tag::components[]
+components:
+  schemas:
+    BookInfo:
+      title: Book Info # <1>
+      description: Object containg all the info about a book
+      type: object
+      properties: # <2>
+        name: {type: string}
+        author: {type: string, minLength: 3}
+        optionalReadOnly: {type: string, readOnly: true}
+        requiredReadOnly: {type: string, readOnly: true}
+        type:
+          type: string
+          enum:
+            - EXTENDED
+      required: ["name", "requiredReadOnly"]
+      discriminator:
+        propertyName: type
+        mapping:
+          EXTENDED: "#/components/schemas/ExtendedBookInfo"
+    ExtendedBookInfo:
+      x-all-of-name: ExtendedBookInfo
+      allOf:
+        - $ref: '#/components/schemas/BookInfo'
+        - type: object
+          properties: # <2>
+            isbn: {type: string, pattern: "[0-9]{13}"}
+          required: ["isbn"]
+#end::components[]