Fix discriminator override

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

@@ -228,9 +228,9 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE
     @Override
         {{/parent}}
         {{^parent}}
-            {{#isOverridden}}
+            {{#vendorExtensions.overridden}}
     @Override
-            {{/isOverridden}}
+            {{/vendorExtensions.overridden}}
         {{/parent}}
     {{/isDiscriminator}}
     public {{{vendorExtensions.typeWithEnumWithGenericAnnotations}}} {{getter}}() {

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

@@ -1363,4 +1363,71 @@ void testSwaggerAnnotations() {
                     );
                 """);
     }
+
+    @Test
+    void testDiscriminatorOverride() {
+
+        var codegen = new JavaMicronautClientCodegen();
+        codegen.setGenerateSwaggerAnnotations(true);
+        String outputPath = generateFiles(codegen, "src/test/resources/3_0/test-override-discriminator.yml", CodegenConstants.APIS, CodegenConstants.MODELS);
+        String path = outputPath + "src/main/java/org/openapitools/";
+
+        assertFileContains(path + "model/AnimalRequest.java",
+            """
+                    /**
+                     * @return the valueType property value
+                     */
+                    public String getValueType() {
+                        return valueType;
+                    }
+
+                    /**
+                     * Set the valueType property value
+                     *
+                     * @param valueType property value to set
+                     */
+                    public void setValueType(String valueType) {
+                        this.valueType = valueType;
+                    }
+
+                    /**
+                     * Set valueType in a chainable fashion.
+                     *
+                     * @return The same instance of AnimalRequest for chaining.
+                     */
+                    public AnimalRequest valueType(String valueType) {
+                        this.valueType = valueType;
+                        return this;
+                    }
+                """);
+
+        assertFileContains(path + "model/AnimalResponse.java",
+            """
+                        /**
+                         * @return the valueType property value
+                         */
+                        public String getValueType() {
+                            return valueType;
+                        }
+
+                        /**
+                         * Set the valueType property value
+                         *
+                         * @param valueType property value to set
+                         */
+                        public void setValueType(String valueType) {
+                            this.valueType = valueType;
+                        }
+
+                        /**
+                         * Set valueType in a chainable fashion.
+                         *
+                         * @return The same instance of AnimalResponse for chaining.
+                         */
+                        public AnimalResponse valueType(String valueType) {
+                            this.valueType = valueType;
+                            return this;
+                        }
+                    """);
+    }
 }

openapi-generator/src/test/resources/3_0/test-override-discriminator.yml

@@ -0,0 +1,98 @@
+openapi: 3.1.0
+info:
+  version: '1.0.0'
+  title: 'OpenAPI BUG REST API'
+servers:
+  - url: 'localhost:3000'
+
+paths:
+  /api/v1/animals:
+    get:
+      tags: [ my-custom ]
+      operationId: "findAnimals"
+      responses:
+        "200":
+          description: "OK"
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/AnimalResponse'
+    post:
+      tags: [ my-custom ]
+      operationId: "saveAnimal"
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/AnimalRequest"
+      responses:
+        "200":
+          description: "OK"
+
+components:
+  schemas:
+
+    AnimalRequest:
+      type: object
+      properties:
+        name:
+          type: string
+        valueType:
+          type: string
+      discriminator:
+        propertyName: valueType
+        mapping:
+          catRq: '#/components/schemas/DogRequest'
+          dogRq: '#/components/schemas/CatRequest'
+
+    DogRequest:
+      allOf:
+        - $ref: '#/components/schemas/AnimalRequest'
+        - type: object
+      properties:
+        dogProperty:
+          type: string
+
+    CatRequest:
+      allOf:
+        - $ref: '#/components/schemas/AnimalRequest'
+        - type: object
+      properties:
+        catProperty:
+          type: string
+
+    AnimalResponse:
+      type: object
+      properties:
+        name:
+          type: string
+        valueType:
+          type: string
+      discriminator:
+        propertyName: valueType
+        mapping:
+          catRs: '#/components/schemas/DogResponse'
+          dogRs: '#/components/schemas/CatResponse'
+
+    DogResponse:
+      allOf:
+        - $ref: '#/components/schemas/AnimalResponse'
+        - type: object
+      properties:
+        dogProperty:
+          type: string
+
+    CatResponse:
+      allOf:
+        - $ref: '#/components/schemas/AnimalResponse'
+        - type: object
+      properties:
+        catProperty:
+          type: string
+
+tags:
+  - name: my-custom
+    description: 'All API operations'

openapi/src/main/java/io/micronaut/openapi/visitor/ElementUtils.java

@@ -296,6 +296,7 @@ public static boolean isIgnoredParameterType(ClassElement parameterType) {
             // jax-rs
             || parameterType.isAssignable("jakarta.ws.rs.core.Application")
             || parameterType.isAssignable("jakarta.ws.rs.core.HttpHeaders")
+            || parameterType.isAssignable("jakarta.ws.rs.core.Cookie")
             || parameterType.isAssignable("jakarta.ws.rs.core.Request")
             || parameterType.isAssignable("jakarta.ws.rs.core.SecurityContext")
             || parameterType.isAssignable("jakarta.ws.rs.core.UriInfo")