Skip to content

[Java][jaxrs-spec] Fix generated JsonTypeName when using underscore in schema names #23689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BB223 wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −4
Open

[Java][jaxrs-spec] Fix generated JsonTypeName when using underscore in schema names #23689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...enerator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
CodegenDiscriminator discriminator = model.parentModel.getDiscriminator();
if (discriminator != null) {
for (CodegenDiscriminator.MappedModel mappedModel : discriminator.getMappedModels()) {
if (mappedModel.getModelName().equals(model.name)) {
if (mappedModel.getSchemaName().equals(model.schemaName)) {
model.getVendorExtensions().put("x-discriminator-value", mappedModel.getMappingName());
break;
}
Expand Down
6 changes: 3 additions & 3 deletions modules/openapi-generator/src/test/resources/3_0/jaxrs/petstore.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,20 +771,20 @@ components:
type: string
oneOf:
- $ref: '#/components/schemas/CatRequest'
- $ref: '#/components/schemas/DogRequest'
- $ref: '#/components/schemas/Dog_Request'
discriminator:
propertyName: petType
mapping:
CAT: '#/components/schemas/CatRequest'
DOG: '#/components/schemas/DogRequest'
DOG: '#/components/schemas/Dog_Request'
CatRequest:
allOf:
- $ref: '#/components/schemas/PetRequest'
- type: object
properties:
indoor:
type: boolean
DogRequest:
Dog_Request:
allOf:
- $ref: '#/components/schemas/PetRequest'
- type: object
Expand Down
1 change: 1 addition & 0 deletions samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/DogRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.openapitools.model.PetRequest;
Expand Down