[Java][jaxrs] support disableDiscriminatorJsonIgnoreProperties in typeInfoAnnotation (#24532)

* [jaxrs-spec] honor disableDiscriminatorJsonIgnoreProperties in typeInfoAnnotation

* update samples

Author: antoncuranz

modules/openapi-generator/src/main/resources/JavaJaxRS/spec/typeInfoAnnotation.mustache

@@ -1,9 +1,14 @@
 {{#jackson}}
+{{^disableDiscriminatorJsonIgnoreProperties}}
 @JsonIgnoreProperties(
   value = "{{{discriminator.propertyBaseName}}}", // ignore manually set {{{discriminator.propertyBaseName}}}, it will be automatically generated by Jackson during serialization
   allowSetters = true // allows the {{{discriminator.propertyBaseName}}} to be set during deserialization
 )
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "{{{discriminator.propertyBaseName}}}", visible = true)
+{{/disableDiscriminatorJsonIgnoreProperties}}
+{{#disableDiscriminatorJsonIgnoreProperties}}
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "{{{discriminator.propertyBaseName}}}", visible = true)
+{{/disableDiscriminatorJsonIgnoreProperties}}
 @JsonSubTypes({
   {{#discriminator.mappedModels}}
   @JsonSubTypes.Type(value = {{modelName}}.class, name = "{{^vendorExtensions.x-discriminator-value}}{{mappingName}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{vendorExtensions.x-discriminator-value}}}{{/vendorExtensions.x-discriminator-value}}"),

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

@@ -30,6 +30,7 @@
 import java.util.stream.Collectors;
 
 import static org.openapitools.codegen.TestUtils.*;
+import static org.openapitools.codegen.languages.AbstractJavaCodegen.DISABLE_DISCRIMINATOR_JSON_IGNORE_PROPERTIES;
 import static org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen.*;
 import static org.openapitools.codegen.languages.features.GzipFeatures.USE_GZIP_FEATURE;
 import static org.testng.Assert.assertTrue;
@@ -1403,6 +1404,71 @@ public void testDiscriminatorJsonIgnorePropertiesPropagatesToChildren_whenLegacy
         }
     }
 
+    /**
+     * With {@code disableDiscriminatorJsonIgnoreProperties=false} (the default) the jaxrs-spec
+     * template emits {@code @JsonIgnoreProperties} on the discriminated model and uses
+     * {@code JsonTypeInfo.As.PROPERTY}. Regression guard mirroring the Java/Spring template behaviour.
+     */
+    @Test
+    public void disableDiscriminatorJsonIgnorePropertiesIsFalseThenJsonIgnorePropertiesShouldBeAdded() throws Exception {
+        File output = Files.createTempDirectory("test").toFile().getCanonicalFile();
+        output.deleteOnExit();
+
+        Map<String, Object> properties = new HashMap<>();
+        properties.put("legacyDiscriminatorBehavior", "false");
+        properties.put(DISABLE_DISCRIMINATOR_JSON_IGNORE_PROPERTIES, "false");
+
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setGeneratorName("jaxrs-spec")
+                .setAdditionalProperties(properties)
+                .setInputSpec("src/test/resources/3_0/jaxrs-spec/discriminator-mapping-children.yaml")
+                .setOutputDir(output.getAbsolutePath().replace("\\", "/"));
+
+        DefaultGenerator generator = new DefaultGenerator();
+        Map<String, File> files = generator.opts(configurator.toClientOptInput()).generate().stream()
+                .collect(Collectors.toMap(File::getName, Function.identity()));
+
+        JavaFileAssert.assertThat(files.get("PetResponse.java"))
+                .fileContains(
+                        "@JsonIgnoreProperties(",
+                        "value = \"petType\"",
+                        "allowSetters = true",
+                        "include = JsonTypeInfo.As.PROPERTY")
+                .fileDoesNotContain("include = JsonTypeInfo.As.EXISTING_PROPERTY");
+    }
+
+    /**
+     * With {@code disableDiscriminatorJsonIgnoreProperties=true} the jaxrs-spec template must OMIT
+     * {@code @JsonIgnoreProperties} (so a user-supplied one does not collide — Jackson forbids
+     * duplicate annotations) and switch {@code @JsonTypeInfo} to {@code JsonTypeInfo.As.EXISTING_PROPERTY}
+     * so the discriminator is not serialized twice. Aligns JavaJaxRS/spec/typeInfoAnnotation.mustache
+     * with Java/typeInfoAnnotation.mustache (PRs #22528 / #22924).
+     */
+    @Test
+    public void disableDiscriminatorJsonIgnorePropertiesIsTrueThenJsonIgnorePropertiesShouldBeNotAdded() throws Exception {
+        File output = Files.createTempDirectory("test").toFile().getCanonicalFile();
+        output.deleteOnExit();
+
+        Map<String, Object> properties = new HashMap<>();
+        properties.put("legacyDiscriminatorBehavior", "false");
+        properties.put(DISABLE_DISCRIMINATOR_JSON_IGNORE_PROPERTIES, "true");
+
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setGeneratorName("jaxrs-spec")
+                .setAdditionalProperties(properties)
+                .setInputSpec("src/test/resources/3_0/jaxrs-spec/discriminator-mapping-children.yaml")
+                .setOutputDir(output.getAbsolutePath().replace("\\", "/"));
+
+        DefaultGenerator generator = new DefaultGenerator();
+        Map<String, File> files = generator.opts(configurator.toClientOptInput()).generate().stream()
+                .collect(Collectors.toMap(File::getName, Function.identity()));
+
+        JavaFileAssert.assertThat(files.get("PetResponse.java"))
+                .fileDoesNotContain("@JsonIgnoreProperties(")
+                .fileContains("include = JsonTypeInfo.As.EXISTING_PROPERTY")
+                .fileDoesNotContain("include = JsonTypeInfo.As.PROPERTY");
+    }
+
     /**
      * With {@code useOneOfInterfaces=true} a oneOf schema is generated as a Java interface, and the
      * concrete subtypes implement it. With {@code useSealed=true} the interface is {@code sealed} and

samples/server/petstore/kotlin-spring-cloud-4/build.gradle.kts

@@ -43,7 +43,7 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-webmvc")
 
     implementation("com.google.code.findbugs:jsr305:3.0.2")
-    val jackson3Version = "3.1.0"
+    val jackson3Version = "3.1.5"
     implementation("tools.jackson.dataformat:jackson-dataformat-yaml:$jackson3Version")
     implementation("tools.jackson.dataformat:jackson-dataformat-xml:$jackson3Version")
     implementation("tools.jackson.module:jackson-module-kotlin:$jackson3Version")

samples/server/petstore/kotlin-spring-cloud-4/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

samples/server/petstore/kotlin-spring-cloud-4/pom.xml

@@ -8,7 +8,7 @@
     <version>1.0.0</version>
     <properties>
         <findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
-        <jackson3.version>3.1.0</jackson3.version>
+        <jackson3.version>3.1.5</jackson3.version>
         <jakarta-annotation.version>3.0.0</jakarta-annotation.version>
         <kotlin-test-junit5.version>2.2.0</kotlin-test-junit5.version>