diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java index 3a9d43e8cb27..a2c946454091 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java +++ b/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,6 +328,11 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert } } + @Override + public ModelsMap postProcessModels(ModelsMap objs) { + return super.postProcessModels(objs); + } + @Override public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List allModels) { objs = super.postProcessOperationsWithModels(objs, allModels); @@ -334,4 +340,25 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List postProcessAllModels(Map objs) { + Map 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; + } } diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache index f1243be548da..079f695e9bc6 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache +++ b/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}} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java index e480e362025c..246366ec84ea 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java +++ b/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 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 properties = new HashMap<>(); diff --git a/modules/openapi-generator/src/test/resources/3_0/jaxrs/petstore.yaml b/modules/openapi-generator/src/test/resources/3_0/jaxrs/petstore.yaml index 43da2edac401..3521572b9203 100644 --- a/modules/openapi-generator/src/test/resources/3_0/jaxrs/petstore.yaml +++ b/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 diff --git a/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/FILES b/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/FILES index 27729fb03318..09789a30702c 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/FILES +++ b/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 diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java index 8d87a65a6752..86b42e370805 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java +++ b/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}") diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java index 1b7fc75bfd1d..5e10a5499469 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java +++ b/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 status, SecurityContext securityContext); @Deprecated public Response findPetsByTags(List tags, SecurityContext securityContext); diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/CatRequest.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/CatRequest.java new file mode 100644 index 000000000000..8846b0390b90 --- /dev/null +++ b/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 "); + } +} + diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/DogRequest.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/DogRequest.java new file mode 100644 index 000000000000..f1a23fc558df --- /dev/null +++ b/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 "); + } +} + diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/PetRequest.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/PetRequest.java new file mode 100644 index 000000000000..1142d2693aa8 --- /dev/null +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/PetRequest.java @@ -0,0 +1,151 @@ +package org.openapitools.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.model.CatRequest; +import org.openapitools.model.DogRequest; +import javax.validation.constraints.*; +import javax.validation.Valid; + + +import io.swagger.annotations.*; +import java.util.Objects; + + +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "petType", visible = true) +@JsonSubTypes({ + @JsonSubTypes.Type(value = CatRequest.class, name = "CAT"), + @JsonSubTypes.Type(value = DogRequest.class, name = "DOG"), +}) + +public class PetRequest { + + private String petType; + + private String name; + + private String bark; + + private Boolean indoor; + + /** + **/ + public PetRequest petType(String petType) { + this.petType = petType; + return this; + } + + + @ApiModelProperty(required = true, value = "") + @JsonProperty("petType") + @NotNull + public String getPetType() { + return petType; + } + public void setPetType(String petType) { + this.petType = petType; + } + + + /** + **/ + public PetRequest name(String name) { + this.name = name; + return this; + } + + + @ApiModelProperty(value = "") + @JsonProperty("name") + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + + + /** + **/ + public PetRequest 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; + } + + + /** + **/ + public PetRequest 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; + } + PetRequest petRequest = (PetRequest) o; + return Objects.equals(this.petType, petRequest.petType) && + Objects.equals(this.name, petRequest.name) && + Objects.equals(this.bark, petRequest.bark) && + Objects.equals(this.indoor, petRequest.indoor); + } + + @Override + public int hashCode() { + return Objects.hash(petType, name, bark, indoor); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class PetRequest {\n"); + + sb.append(" petType: ").append(toIndentedString(petType)).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" bark: ").append(toIndentedString(bark)).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 "); + } +} + diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 9f6390da6c88..dcf69c11ab5b 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -7,6 +7,7 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.PetRequest; import java.util.List; @@ -26,6 +27,11 @@ public class PetApiServiceImpl implements PetApiService { public Response addPet(Pet pet, SecurityContext securityContext) { // do some magic! return Response.ok().entity("magic!").build(); + } + @Override + public Response createPetRequest(PetRequest petRequest, SecurityContext securityContext) { + // do some magic! + return Response.ok().entity("magic!").build(); } @Override public Response deletePet(Long petId, SecurityContext securityContext) { diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Cat.java index 8cf339ab4504..d1a7cdbb91f5 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Cat.java @@ -15,7 +15,7 @@ @org.eclipse.microprofile.openapi.annotations.media.Schema(description="") -@JsonTypeName("Cat") +@JsonTypeName("CAT") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.22.0-SNAPSHOT") public class Cat extends Animal implements Serializable { private Boolean declawed; diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Dog.java index c5eb8135f064..7c062ae1b7d4 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Dog.java @@ -15,7 +15,7 @@ @org.eclipse.microprofile.openapi.annotations.media.Schema(description="") -@JsonTypeName("Dog") +@JsonTypeName("DOG") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.22.0-SNAPSHOT") public class Dog extends Animal implements Serializable { private String breed; diff --git a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/Cat.java index 097e57a416be..14ee58cf3492 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/Cat.java @@ -17,7 +17,7 @@ -@JsonTypeName("Cat") +@JsonTypeName("CAT") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.22.0-SNAPSHOT") public class Cat extends Animal implements Serializable { private Boolean declawed; diff --git a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/Dog.java index 03df2126d4b6..ea5d08070219 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/Dog.java @@ -17,7 +17,7 @@ -@JsonTypeName("Dog") +@JsonTypeName("DOG") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.22.0-SNAPSHOT") public class Dog extends Animal implements Serializable { private String breed; diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Cat.java index e73478ab8f03..ea6b063f342e 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Cat.java @@ -16,7 +16,7 @@ @Schema(description="") -@JsonTypeName("Cat") +@JsonTypeName("CAT") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.22.0-SNAPSHOT") public class Cat extends Animal implements Serializable { private Boolean declawed; diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Dog.java index 8cda3650594b..a876d8a1dfa4 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Dog.java @@ -16,7 +16,7 @@ @Schema(description="") -@JsonTypeName("Dog") +@JsonTypeName("DOG") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.22.0-SNAPSHOT") public class Dog extends Animal implements Serializable { private String breed; diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Cat.java index 7a2771634a8e..6bbebdcb3585 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Cat.java @@ -16,7 +16,7 @@ @Schema(description="") -@JsonTypeName("Cat") +@JsonTypeName("CAT") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.22.0-SNAPSHOT") public class Cat extends Animal implements Serializable { private Boolean declawed; diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Dog.java index f47ec30e2fe1..6e8ce3fd838f 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Dog.java @@ -16,7 +16,7 @@ @Schema(description="") -@JsonTypeName("Dog") +@JsonTypeName("DOG") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.22.0-SNAPSHOT") public class Dog extends Animal implements Serializable { private String breed; diff --git a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/Cat.java index 9863382abefc..09e6e99a3d08 100644 --- a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/Cat.java @@ -24,7 +24,7 @@ -@JsonTypeName("Cat") +@JsonTypeName("CAT") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.22.0-SNAPSHOT") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "Cat", propOrder = { "declawed" diff --git a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/Dog.java index 4abcd5f8cddc..075e4ae47831 100644 --- a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/Dog.java @@ -24,7 +24,7 @@ -@JsonTypeName("Dog") +@JsonTypeName("DOG") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.22.0-SNAPSHOT") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "Dog", propOrder = { "breed" diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Cat.java index 097e57a416be..14ee58cf3492 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Cat.java @@ -17,7 +17,7 @@ -@JsonTypeName("Cat") +@JsonTypeName("CAT") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.22.0-SNAPSHOT") public class Cat extends Animal implements Serializable { private Boolean declawed; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Dog.java index 03df2126d4b6..ea5d08070219 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Dog.java @@ -17,7 +17,7 @@ -@JsonTypeName("Dog") +@JsonTypeName("DOG") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.22.0-SNAPSHOT") public class Dog extends Animal implements Serializable { private String breed;