[Java][jaxrs-spec] Fix JsonTypeName Generation With allOf and oneOf Combination to Match Key Instead of Schema Name

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

@@ -26,6 +26,7 @@
 import org.openapitools.codegen.meta.features.DocumentationFeature;
 import org.openapitools.codegen.meta.features.SecurityFeature;
 import org.openapitools.codegen.model.ModelMap;
+import org.openapitools.codegen.model.ModelsMap;
 import org.openapitools.codegen.model.OperationsMap;
 
 import java.io.File;
@@ -327,11 +328,37 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert
         }
     }
 
+    @Override
+    public ModelsMap postProcessModels(ModelsMap objs) {
+        return super.postProcessModels(objs);
+    }
+
     @Override
     public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> allModels) {
         objs = super.postProcessOperationsWithModels(objs, allModels);
         removeImport(objs, "java.util.List");
         return objs;
     }
 
+    @Override
+    public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs) {
+        Map<String, ModelsMap> result = super.postProcessAllModels(objs);
+        for (ModelsMap modelsMap : result.values()) {
+            for (ModelMap modelMap : modelsMap.getModels()) {
+                CodegenModel model = modelMap.getModel();
+                if (model.parentModel != null) {
+                    CodegenDiscriminator discriminator = model.parentModel.getDiscriminator();
+                    if (discriminator != null) {
+                        for (CodegenDiscriminator.MappedModel mappedModel : discriminator.getMappedModels()) {
+                            if (mappedModel.getModelName().equals(model.name)) {
+                                model.getVendorExtensions().put("x-discriminator-value", mappedModel.getMappingName());
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return result;
+    }
 }

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

@@ -38,7 +38,7 @@ import {{javaxPackage}}.xml.bind.annotation.XmlEnumValue;
 @Schema({{#title}}title="{{{.}}}", {{/title}}{{#description}}description="{{{.}}}"{{/description}}{{^description}}description=""{{/description}}){{/useSwaggerV3Annotations}}{{#useMicroProfileOpenAPIAnnotations}}
 @org.eclipse.microprofile.openapi.annotations.media.Schema({{#title}}title="{{{.}}}", {{/title}}{{#description}}description="{{{.}}}"{{/description}}{{^description}}description=""{{/description}}){{/useMicroProfileOpenAPIAnnotations}}
 {{#jackson}}
-@JsonTypeName("{{name}}")
+@JsonTypeName("{{#vendorExtensions.x-discriminator-value}}{{{vendorExtensions.x-discriminator-value}}}{{/vendorExtensions.x-discriminator-value}}{{^vendorExtensions.x-discriminator-value}}{{name}}{{/vendorExtensions.x-discriminator-value}}")
 {{#additionalProperties}}
 @JsonFormat(shape=JsonFormat.Shape.OBJECT)
 {{/additionalProperties}}

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

@@ -1237,6 +1237,38 @@ public void disableGenerateJsonCreator() throws Exception {
         assertFileNotContains(files.get("RequiredProperties.java").toPath(), "@JsonCreator");
     }
 
+    @Test
+    public void testDiscriminatorMappingUsedInJsonTypeName() throws Exception {
+        File output = Files.createTempDirectory("test").toFile().getCanonicalFile();
+        output.deleteOnExit();
+
+        OpenAPI openAPI = new OpenAPIParser()
+                .readLocation("src/test/resources/3_0/jaxrs/petstore.yaml", null, new ParseOptions()).getOpenAPI();
+
+        codegen.setOutputDir(output.getAbsolutePath());
+
+        ClientOptInput input = new ClientOptInput()
+                .openAPI(openAPI)
+                .config(codegen);
+
+        DefaultGenerator generator = new DefaultGenerator();
+        Map<String, File> files = generator.opts(input).generate().stream()
+                .collect(Collectors.toMap(File::getName, Function.identity()));
+
+        // Parent model uses its own name
+        JavaFileAssert.assertThat(files.get("PetRequest.java"))
+                .fileContains("@JsonTypeName(\"PetRequest\")");
+
+        // Child models must use the discriminator mapping value (e.g. "CAT"), not the class name (e.g. "CatRequest")
+        JavaFileAssert.assertThat(files.get("CatRequest.java"))
+                .fileContains("@JsonTypeName(\"CAT\")")
+                .fileDoesNotContain("@JsonTypeName(\"CatRequest\")");
+
+        JavaFileAssert.assertThat(files.get("DogRequest.java"))
+                .fileContains("@JsonTypeName(\"DOG\")")
+                .fileDoesNotContain("@JsonTypeName(\"DogRequest\")");
+    }
+
     @Test
     public void testGenerateJsonNullableListFieldsHelperMethodReferences_issue23251() throws Exception {
         Map<String, Object> properties = new HashMap<>();

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

@@ -157,6 +157,24 @@ paths:
         - petstore_auth:
             - 'read:pets'
       deprecated: true
+  '/pet/request':
+      post:
+          operationId: createPetRequest
+          security: []
+          tags: [ pet ]
+          requestBody:
+            required: true
+            content:
+              application/json:
+                schema:
+                  $ref: '#/components/schemas/PetRequest'
+          responses:
+            '201':
+              description: Pet created successfully
+              content:
+                application/json:
+                  schema:
+                    $ref: '#/components/schemas/PetRequest'
   '/pet/{petId}':
     get:
       tags:
@@ -742,6 +760,37 @@ components:
             - sold
       xml:
         name: Pet
+    PetRequest:
+      type: object
+      required:
+        - petType
+      properties:
+        petType:
+          type: string
+        name:
+          type: string
+      oneOf:
+        - $ref: '#/components/schemas/CatRequest'
+        - $ref: '#/components/schemas/DogRequest'
+      discriminator:
+        propertyName: petType
+        mapping:
+          CAT: '#/components/schemas/CatRequest'
+          DOG: '#/components/schemas/DogRequest'
+    CatRequest:
+      allOf:
+        - $ref: '#/components/schemas/PetRequest'
+        - type: object
+          properties:
+            indoor:
+              type: boolean
+    DogRequest:
+      allOf:
+        - $ref: '#/components/schemas/PetRequest'
+        - type: object
+          properties:
+            bark:
+              type: string
     ApiResponse:
       title: An uploaded response
       description: Describes the result of uploading an image resource

samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/FILES

@@ -7,10 +7,13 @@ src/gen/java/org/openapitools/api/TestApi.java
 src/gen/java/org/openapitools/api/TestApiService.java
 src/gen/java/org/openapitools/api/UserApi.java
 src/gen/java/org/openapitools/api/UserApiService.java
+src/gen/java/org/openapitools/model/CatRequest.java
 src/gen/java/org/openapitools/model/Category.java
+src/gen/java/org/openapitools/model/DogRequest.java
 src/gen/java/org/openapitools/model/ModelApiResponse.java
 src/gen/java/org/openapitools/model/Order.java
 src/gen/java/org/openapitools/model/Pet.java
+src/gen/java/org/openapitools/model/PetRequest.java
 src/gen/java/org/openapitools/model/Tag.java
 src/gen/java/org/openapitools/model/User.java
 src/main/java/org/openapitools/api/RestApplication.java

samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java

@@ -2,6 +2,7 @@
 
 import org.openapitools.model.ModelApiResponse;
 import org.openapitools.model.Pet;
+import org.openapitools.model.PetRequest;
 import org.openapitools.api.PetApiService;
 
 import javax.ws.rs.*;
@@ -53,6 +54,17 @@ public Response addPet(@ApiParam(value = "Pet object that needs to be added to t
         return delegate.addPet(pet, securityContext);
     }
 
+    @POST
+    @Path("/request")
+    @Consumes({ "application/json" })
+    @Produces({ "application/json" })
+    @ApiOperation(value = "", notes = "", response = PetRequest.class, tags={ "pet" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 201, message = "Pet created successfully", response = PetRequest.class) })
+    public Response createPetRequest(@ApiParam(value = "" ,required=true) PetRequest petRequest) {
+        return delegate.createPetRequest(petRequest, securityContext);
+    }
+
     @DELETE
     @Path("/{petId}")
 

samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java

@@ -8,6 +8,7 @@
 
 import org.openapitools.model.ModelApiResponse;
 import org.openapitools.model.Pet;
+import org.openapitools.model.PetRequest;
 
 import java.util.List;
 
@@ -22,6 +23,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSCXFCDIServerCodegen", comments = "Generator version: 7.22.0-SNAPSHOT")
 public interface PetApiService {
       public Response addPet(Pet pet, SecurityContext securityContext);
+      public Response createPetRequest(PetRequest petRequest, SecurityContext securityContext);
       public Response deletePet(Long petId, SecurityContext securityContext);
       public Response findPetsByStatus(List<String> status, SecurityContext securityContext);
       @Deprecated public Response findPetsByTags(List<String> tags, SecurityContext securityContext);

samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/CatRequest.java

@@ -0,0 +1,75 @@
+package org.openapitools.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.model.PetRequest;
+import javax.validation.constraints.*;
+import javax.validation.Valid;
+
+
+import io.swagger.annotations.*;
+import java.util.Objects;
+
+
+
+public class CatRequest extends PetRequest  {
+
+  private Boolean indoor;
+
+  /**
+   **/
+  public CatRequest indoor(Boolean indoor) {
+    this.indoor = indoor;
+    return this;
+  }
+
+
+  @ApiModelProperty(value = "")
+  @JsonProperty("indoor")
+  public Boolean getIndoor() {
+    return indoor;
+  }
+  public void setIndoor(Boolean indoor) {
+    this.indoor = indoor;
+  }
+
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    CatRequest catRequest = (CatRequest) o;
+    return super.equals(o) && Objects.equals(this.indoor, catRequest.indoor);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), indoor);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CatRequest {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    indoor: ").append(toIndentedString(indoor)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    return o == null ? "null" : o.toString().replace("\n", "\n    ");
+  }
+}
+

samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/DogRequest.java

@@ -0,0 +1,75 @@
+package org.openapitools.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.model.PetRequest;
+import javax.validation.constraints.*;
+import javax.validation.Valid;
+
+
+import io.swagger.annotations.*;
+import java.util.Objects;
+
+
+
+public class DogRequest extends PetRequest  {
+
+  private String bark;
+
+  /**
+   **/
+  public DogRequest bark(String bark) {
+    this.bark = bark;
+    return this;
+  }
+
+
+  @ApiModelProperty(value = "")
+  @JsonProperty("bark")
+  public String getBark() {
+    return bark;
+  }
+  public void setBark(String bark) {
+    this.bark = bark;
+  }
+
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DogRequest dogRequest = (DogRequest) o;
+    return super.equals(o) && Objects.equals(this.bark, dogRequest.bark);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), bark);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DogRequest {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    bark: ").append(toIndentedString(bark)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    return o == null ? "null" : o.toString().replace("\n", "\n    ");
+  }
+}
+