diff --git a/bin/configs/spring-boot-3.yaml b/bin/configs/spring-boot-3.yaml
index 5c8b97cdad1d..5dea2cbda5ee 100644
--- a/bin/configs/spring-boot-3.yaml
+++ b/bin/configs/spring-boot-3.yaml
@@ -9,4 +9,5 @@ additionalProperties:
snapshotVersion: "true"
useSpringBoot3: true
useBeanValidation: true
+ withXml: true
hideGenerationTimestamp: "true"
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
index 8874448a597d..ad231d532543 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
@@ -48,11 +48,6 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}}
{{/mostInnerItems}}
{{/isContainer}}
{{/isEnum}}
- {{#jackson}}
- {{#withXml}}
- @JacksonXmlProperty({{#isXmlAttribute}}isAttribute = true, {{/isXmlAttribute}}{{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
- {{/withXml}}
- {{/jackson}}
{{#gson}}
@SerializedName("{{baseName}}")
{{/gson}}
@@ -199,6 +194,9 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}}
{{/swagger1AnnotationLibrary}}
{{#jackson}}
@JsonProperty("{{baseName}}")
+ {{#withXml}}
+ @JacksonXmlProperty({{#isXmlAttribute}}isAttribute = true, {{/isXmlAttribute}}{{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
+ {{/withXml}}
{{/jackson}}
{{#deprecated}}
@Deprecated
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java
index 9d5288406071..15001d61f104 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java
@@ -2550,6 +2550,7 @@ public void shouldGenerateJsonPropertyAnnotationLocatedInGetters_issue5705() thr
.readLocation("src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml", null, new ParseOptions()).getOpenAPI();
SpringCodegen codegen = new SpringCodegen();
codegen.setLibrary(SPRING_BOOT);
+ codegen.setWithXml(true);
codegen.setOutputDir(output.getAbsolutePath());
ClientOptInput input = new ClientOptInput()
@@ -2564,34 +2565,42 @@ public void shouldGenerateJsonPropertyAnnotationLocatedInGetters_issue5705() thr
.hasProperty("normalPropertyName")
.assertPropertyAnnotations()
.doesNotContainsWithName("JsonProperty")
+ .doesNotContainsWithName("JacksonXmlProperty")
.toProperty().toType()
.hasProperty("UPPER_CASE_PROPERTY_SNAKE")
.assertPropertyAnnotations()
.doesNotContainsWithName("JsonProperty")
+ .doesNotContainsWithName("JacksonXmlProperty")
.toProperty().toType()
.hasProperty("lowerCasePropertyDashes")
.assertPropertyAnnotations()
.doesNotContainsWithName("JsonProperty")
+ .doesNotContainsWithName("JacksonXmlProperty")
.toProperty().toType()
.hasProperty("propertyNameWithSpaces")
.assertPropertyAnnotations()
.doesNotContainsWithName("JsonProperty")
+ .doesNotContainsWithName("JacksonXmlProperty")
.toProperty().toType()
.assertMethod("getNormalPropertyName")
.assertMethodAnnotations()
.containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"normalPropertyName\""))
+ .containsWithNameAndAttributes("JacksonXmlProperty", ImmutableMap.of("localName", "\"normalPropertyName\""))
.toMethod().toFileAssert()
.assertMethod("getUPPERCASEPROPERTYSNAKE")
.assertMethodAnnotations()
.containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"UPPER_CASE_PROPERTY_SNAKE\""))
+ .containsWithNameAndAttributes("JacksonXmlProperty", ImmutableMap.of("localName", "\"UPPER_CASE_PROPERTY_SNAKE\""))
.toMethod().toFileAssert()
.assertMethod("getLowerCasePropertyDashes")
.assertMethodAnnotations()
.containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"lower-case-property-dashes\""))
+ .containsWithNameAndAttributes("JacksonXmlProperty", ImmutableMap.of("localName", "\"lower-case-property-dashes\""))
.toMethod().toFileAssert()
.assertMethod("getPropertyNameWithSpaces")
.assertMethodAnnotations()
- .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"property name with spaces\""));
+ .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"property name with spaces\""))
+ .containsWithNameAndAttributes("JacksonXmlProperty", ImmutableMap.of("localName", "\"property name with spaces\""));
}
@Test
diff --git a/samples/openapi3/server/petstore/springboot-3/pom.xml b/samples/openapi3/server/petstore/springboot-3/pom.xml
index d43a0e5dd4b4..478e3a2a2669 100644
--- a/samples/openapi3/server/petstore/springboot-3/pom.xml
+++ b/samples/openapi3/server/petstore/springboot-3/pom.xml
@@ -68,6 +68,15 @@
com.fasterxml.jackson.dataformat
jackson-dataformat-yaml
+
+
+ jakarta.xml.bind
+ jakarta.xml.bind-api
+
+
+ com.fasterxml.jackson.dataformat
+ jackson-dataformat-xml
+
com.fasterxml.jackson.datatype
jackson-datatype-jsr310
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java
index f288a0edde9d..ef872174203c 100644
--- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java
@@ -8,8 +8,11 @@
import java.time.OffsetDateTime;
import jakarta.validation.Valid;
import jakarta.validation.constraints.*;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.xml.bind.annotation.*;
import java.util.*;
import jakarta.annotation.Generated;
@@ -19,6 +22,10 @@
*/
@Schema(name = "Category", description = "A category for a pet")
+@JacksonXmlRootElement(localName = "Category")
+@XmlRootElement(name = "Category")
+@XmlAccessorType(XmlAccessType.FIELD)
+
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
public class Category {
@@ -38,6 +45,7 @@ public Category id(Long id) {
@Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("id")
+ @JacksonXmlProperty(localName = "id")
public Long getId() {
return id;
}
@@ -58,6 +66,7 @@ public Category name(String name) {
@Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$")
@Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("name")
+ @JacksonXmlProperty(localName = "name")
public String getName() {
return name;
}
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java
index 369df105a62e..40a8c0bbeeff 100644
--- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -9,8 +9,11 @@
import java.time.OffsetDateTime;
import jakarta.validation.Valid;
import jakarta.validation.constraints.*;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.xml.bind.annotation.*;
import java.util.*;
import jakarta.annotation.Generated;
@@ -21,6 +24,10 @@
@Schema(name = "ApiResponse", description = "Describes the result of uploading an image resource")
@JsonTypeName("ApiResponse")
+@JacksonXmlRootElement(localName = "ModelApiResponse")
+@XmlRootElement(name = "ModelApiResponse")
+@XmlAccessorType(XmlAccessType.FIELD)
+
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
public class ModelApiResponse {
@@ -42,6 +49,7 @@ public ModelApiResponse code(Integer code) {
@Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("code")
+ @JacksonXmlProperty(localName = "code")
public Integer getCode() {
return code;
}
@@ -62,6 +70,7 @@ public ModelApiResponse type(String type) {
@Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("type")
+ @JacksonXmlProperty(localName = "type")
public String getType() {
return type;
}
@@ -82,6 +91,7 @@ public ModelApiResponse message(String message) {
@Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("message")
+ @JacksonXmlProperty(localName = "message")
public String getMessage() {
return message;
}
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java
index 906d04ddd72a..427dd3db5f1e 100644
--- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java
@@ -11,8 +11,11 @@
import java.time.OffsetDateTime;
import jakarta.validation.Valid;
import jakarta.validation.constraints.*;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.xml.bind.annotation.*;
import java.util.*;
import jakarta.annotation.Generated;
@@ -22,6 +25,10 @@
*/
@Schema(name = "Order", description = "An order for a pets from the pet store")
+@JacksonXmlRootElement(localName = "Order")
+@XmlRootElement(name = "Order")
+@XmlAccessorType(XmlAccessType.FIELD)
+
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
public class Order {
@@ -87,6 +94,7 @@ public Order id(Long id) {
@Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("id")
+ @JacksonXmlProperty(localName = "id")
public Long getId() {
return id;
}
@@ -107,6 +115,7 @@ public Order petId(Long petId) {
@Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("petId")
+ @JacksonXmlProperty(localName = "petId")
public Long getPetId() {
return petId;
}
@@ -127,6 +136,7 @@ public Order quantity(Integer quantity) {
@Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("quantity")
+ @JacksonXmlProperty(localName = "quantity")
public Integer getQuantity() {
return quantity;
}
@@ -147,6 +157,7 @@ public Order shipDate(OffsetDateTime shipDate) {
@Valid
@Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("shipDate")
+ @JacksonXmlProperty(localName = "shipDate")
public OffsetDateTime getShipDate() {
return shipDate;
}
@@ -167,6 +178,7 @@ public Order status(StatusEnum status) {
@Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("status")
+ @JacksonXmlProperty(localName = "status")
public StatusEnum getStatus() {
return status;
}
@@ -187,6 +199,7 @@ public Order complete(Boolean complete) {
@Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("complete")
+ @JacksonXmlProperty(localName = "complete")
public Boolean getComplete() {
return complete;
}
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java
index 7c6d9a828f2c..dcaeffc6c0fd 100644
--- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java
@@ -14,8 +14,11 @@
import java.time.OffsetDateTime;
import jakarta.validation.Valid;
import jakarta.validation.constraints.*;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.xml.bind.annotation.*;
import java.util.*;
import jakarta.annotation.Generated;
@@ -25,6 +28,10 @@
*/
@Schema(name = "Pet", description = "A pet for sale in the pet store")
+@JacksonXmlRootElement(localName = "Pet")
+@XmlRootElement(name = "Pet")
+@XmlAccessorType(XmlAccessType.FIELD)
+
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
public class Pet {
@@ -104,6 +111,7 @@ public Pet id(Long id) {
@Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("id")
+ @JacksonXmlProperty(localName = "id")
public Long getId() {
return id;
}
@@ -124,6 +132,7 @@ public Pet category(Category category) {
@Valid
@Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("category")
+ @JacksonXmlProperty(localName = "Category")
public Category getCategory() {
return category;
}
@@ -144,6 +153,7 @@ public Pet name(String name) {
@NotNull
@Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
@JsonProperty("name")
+ @JacksonXmlProperty(localName = "name")
public String getName() {
return name;
}
@@ -172,6 +182,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
@NotNull
@Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
@JsonProperty("photoUrls")
+ @JacksonXmlProperty(localName = "photoUrl")
public List getPhotoUrls() {
return photoUrls;
}
@@ -200,6 +211,7 @@ public Pet addTagsItem(Tag tagsItem) {
@Valid
@Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("tags")
+ @JacksonXmlProperty(localName = "tag")
public List<@Valid Tag> getTags() {
return tags;
}
@@ -221,6 +233,7 @@ public Pet status(StatusEnum status) {
@Schema(name = "status", description = "pet status in the store", deprecated = true, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("status")
+ @JacksonXmlProperty(localName = "status")
@Deprecated
public StatusEnum getStatus() {
return status;
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java
index 2f0f6cb47607..beab7013baa3 100644
--- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java
@@ -8,8 +8,11 @@
import java.time.OffsetDateTime;
import jakarta.validation.Valid;
import jakarta.validation.constraints.*;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.xml.bind.annotation.*;
import java.util.*;
import jakarta.annotation.Generated;
@@ -19,6 +22,10 @@
*/
@Schema(name = "Tag", description = "A tag for a pet")
+@JacksonXmlRootElement(localName = "Tag")
+@XmlRootElement(name = "Tag")
+@XmlAccessorType(XmlAccessType.FIELD)
+
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
public class Tag {
@@ -38,6 +45,7 @@ public Tag id(Long id) {
@Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("id")
+ @JacksonXmlProperty(localName = "id")
public Long getId() {
return id;
}
@@ -58,6 +66,7 @@ public Tag name(String name) {
@Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("name")
+ @JacksonXmlProperty(localName = "name")
public String getName() {
return name;
}
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java
index 55f1824b9417..160ab08de281 100644
--- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java
@@ -8,8 +8,11 @@
import java.time.OffsetDateTime;
import jakarta.validation.Valid;
import jakarta.validation.constraints.*;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.xml.bind.annotation.*;
import java.util.*;
import jakarta.annotation.Generated;
@@ -19,6 +22,10 @@
*/
@Schema(name = "User", description = "A User who is purchasing from the pet store")
+@JacksonXmlRootElement(localName = "User")
+@XmlRootElement(name = "User")
+@XmlAccessorType(XmlAccessType.FIELD)
+
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
public class User {
@@ -50,6 +57,7 @@ public User id(Long id) {
@Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("id")
+ @JacksonXmlProperty(localName = "id")
public Long getId() {
return id;
}
@@ -70,6 +78,7 @@ public User username(String username) {
@Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("username")
+ @JacksonXmlProperty(localName = "username")
public String getUsername() {
return username;
}
@@ -90,6 +99,7 @@ public User firstName(String firstName) {
@Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("firstName")
+ @JacksonXmlProperty(localName = "firstName")
public String getFirstName() {
return firstName;
}
@@ -110,6 +120,7 @@ public User lastName(String lastName) {
@Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("lastName")
+ @JacksonXmlProperty(localName = "lastName")
public String getLastName() {
return lastName;
}
@@ -130,6 +141,7 @@ public User email(String email) {
@Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("email")
+ @JacksonXmlProperty(localName = "email")
public String getEmail() {
return email;
}
@@ -150,6 +162,7 @@ public User password(String password) {
@Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("password")
+ @JacksonXmlProperty(localName = "password")
public String getPassword() {
return password;
}
@@ -170,6 +183,7 @@ public User phone(String phone) {
@Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("phone")
+ @JacksonXmlProperty(localName = "phone")
public String getPhone() {
return phone;
}
@@ -190,6 +204,7 @@ public User userStatus(Integer userStatus) {
@Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("userStatus")
+ @JacksonXmlProperty(localName = "userStatus")
public Integer getUserStatus() {
return userStatus;
}
diff --git a/samples/openapi3/server/petstore/springboot-3/src/test/java/org/openapitools/JacksonTest.java b/samples/openapi3/server/petstore/springboot-3/src/test/java/org/openapitools/JacksonTest.java
new file mode 100644
index 000000000000..b6897b9fb4d7
--- /dev/null
+++ b/samples/openapi3/server/petstore/springboot-3/src/test/java/org/openapitools/JacksonTest.java
@@ -0,0 +1,34 @@
+package org.openapitools;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+import org.openapitools.model.Pet;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+
+@SpringBootTest
+class JacksonTest {
+
+ @Test
+ void shouldSerializeToXml() throws JsonProcessingException {
+ // Given
+ XmlMapper mapper = new XmlMapper();
+ Pet pet = new Pet()
+ .name("Red")
+ .status(Pet.StatusEnum.AVAILABLE);
+
+ // When
+ String xmlPet = mapper.writeValueAsString(pet);
+ Pet deserializedPet = mapper.readValue(xmlPet, Pet.class);
+
+ // Then
+ assertThat(deserializedPet)
+ .isNotNull()
+ .returns("Red", Pet::getName);
+ }
+}
\ No newline at end of file
diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java
index 5fe001a360f0..96728fdbbfab 100644
--- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java
@@ -30,10 +30,8 @@
@Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen")
public class Category {
- @JacksonXmlProperty(localName = "id")
private Long id;
- @JacksonXmlProperty(localName = "name")
private String name;
public Category id(Long id) {
@@ -48,6 +46,7 @@ public Category id(Long id) {
@Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("id")
+ @JacksonXmlProperty(localName = "id")
public Long getId() {
return id;
}
@@ -68,6 +67,7 @@ public Category name(String name) {
@Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$")
@Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("name")
+ @JacksonXmlProperty(localName = "name")
public String getName() {
return name;
}
diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java
index 37ee933d1276..fbd6b3716d91 100644
--- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -32,13 +32,10 @@
@Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen")
public class ModelApiResponse {
- @JacksonXmlProperty(localName = "code")
private Integer code;
- @JacksonXmlProperty(localName = "type")
private String type;
- @JacksonXmlProperty(localName = "message")
private String message;
public ModelApiResponse code(Integer code) {
@@ -53,6 +50,7 @@ public ModelApiResponse code(Integer code) {
@Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("code")
+ @JacksonXmlProperty(localName = "code")
public Integer getCode() {
return code;
}
@@ -73,6 +71,7 @@ public ModelApiResponse type(String type) {
@Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("type")
+ @JacksonXmlProperty(localName = "type")
public String getType() {
return type;
}
@@ -93,6 +92,7 @@ public ModelApiResponse message(String message) {
@Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("message")
+ @JacksonXmlProperty(localName = "message")
public String getMessage() {
return message;
}
diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java
index 19cc6ec9bf51..89df3e0d8cff 100644
--- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java
@@ -33,16 +33,12 @@
@Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen")
public class Order {
- @JacksonXmlProperty(localName = "id")
private Long id;
- @JacksonXmlProperty(localName = "petId")
private Long petId;
- @JacksonXmlProperty(localName = "quantity")
private Integer quantity;
- @JacksonXmlProperty(localName = "shipDate")
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
private Date shipDate;
@@ -83,10 +79,8 @@ public static StatusEnum fromValue(String value) {
}
}
- @JacksonXmlProperty(localName = "status")
private StatusEnum status;
- @JacksonXmlProperty(localName = "complete")
private Boolean complete = false;
public Order id(Long id) {
@@ -101,6 +95,7 @@ public Order id(Long id) {
@Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("id")
+ @JacksonXmlProperty(localName = "id")
public Long getId() {
return id;
}
@@ -121,6 +116,7 @@ public Order petId(Long petId) {
@Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("petId")
+ @JacksonXmlProperty(localName = "petId")
public Long getPetId() {
return petId;
}
@@ -141,6 +137,7 @@ public Order quantity(Integer quantity) {
@Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("quantity")
+ @JacksonXmlProperty(localName = "quantity")
public Integer getQuantity() {
return quantity;
}
@@ -161,6 +158,7 @@ public Order shipDate(Date shipDate) {
@Valid
@Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("shipDate")
+ @JacksonXmlProperty(localName = "shipDate")
public Date getShipDate() {
return shipDate;
}
@@ -181,6 +179,7 @@ public Order status(StatusEnum status) {
@Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("status")
+ @JacksonXmlProperty(localName = "status")
public StatusEnum getStatus() {
return status;
}
@@ -201,6 +200,7 @@ public Order complete(Boolean complete) {
@Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("complete")
+ @JacksonXmlProperty(localName = "complete")
public Boolean getComplete() {
return complete;
}
diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java
index 0f7d2a1f6f64..c7e6fb40e960 100644
--- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java
@@ -36,20 +36,15 @@
@Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen")
public class Pet {
- @JacksonXmlProperty(localName = "id")
private Long id;
- @JacksonXmlProperty(localName = "Category")
private Category category;
- @JacksonXmlProperty(localName = "name")
private String name;
- @JacksonXmlProperty(localName = "photoUrl")
@Valid
private List photoUrls = new ArrayList<>();
- @JacksonXmlProperty(localName = "tag")
@Valid
private List<@Valid Tag> tags;
@@ -90,7 +85,6 @@ public static StatusEnum fromValue(String value) {
}
}
- @JacksonXmlProperty(localName = "status")
@Deprecated
private StatusEnum status;
@@ -118,6 +112,7 @@ public Pet id(Long id) {
@Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("id")
+ @JacksonXmlProperty(localName = "id")
public Long getId() {
return id;
}
@@ -138,6 +133,7 @@ public Pet category(Category category) {
@Valid
@Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("category")
+ @JacksonXmlProperty(localName = "Category")
public Category getCategory() {
return category;
}
@@ -158,6 +154,7 @@ public Pet name(String name) {
@NotNull
@Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
@JsonProperty("name")
+ @JacksonXmlProperty(localName = "name")
public String getName() {
return name;
}
@@ -186,6 +183,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
@NotNull
@Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
@JsonProperty("photoUrls")
+ @JacksonXmlProperty(localName = "photoUrl")
public List getPhotoUrls() {
return photoUrls;
}
@@ -214,6 +212,7 @@ public Pet addTagsItem(Tag tagsItem) {
@Valid
@Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("tags")
+ @JacksonXmlProperty(localName = "tag")
public List<@Valid Tag> getTags() {
return tags;
}
@@ -235,6 +234,7 @@ public Pet status(StatusEnum status) {
@Schema(name = "status", description = "pet status in the store", deprecated = true, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("status")
+ @JacksonXmlProperty(localName = "status")
@Deprecated
public StatusEnum getStatus() {
return status;
diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java
index f2c6219aeb89..f5cbd87233e1 100644
--- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java
@@ -30,10 +30,8 @@
@Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen")
public class Tag {
- @JacksonXmlProperty(localName = "id")
private Long id;
- @JacksonXmlProperty(localName = "name")
private String name;
public Tag id(Long id) {
@@ -48,6 +46,7 @@ public Tag id(Long id) {
@Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("id")
+ @JacksonXmlProperty(localName = "id")
public Long getId() {
return id;
}
@@ -68,6 +67,7 @@ public Tag name(String name) {
@Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("name")
+ @JacksonXmlProperty(localName = "name")
public String getName() {
return name;
}
diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java
index 94ac85834347..23821e2e4fc7 100644
--- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java
@@ -30,28 +30,20 @@
@Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen")
public class User {
- @JacksonXmlProperty(localName = "id")
private Long id;
- @JacksonXmlProperty(localName = "username")
private String username;
- @JacksonXmlProperty(localName = "firstName")
private String firstName;
- @JacksonXmlProperty(localName = "lastName")
private String lastName;
- @JacksonXmlProperty(localName = "email")
private String email;
- @JacksonXmlProperty(localName = "password")
private String password;
- @JacksonXmlProperty(localName = "phone")
private String phone;
- @JacksonXmlProperty(localName = "userStatus")
private Integer userStatus;
public User id(Long id) {
@@ -66,6 +58,7 @@ public User id(Long id) {
@Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("id")
+ @JacksonXmlProperty(localName = "id")
public Long getId() {
return id;
}
@@ -86,6 +79,7 @@ public User username(String username) {
@Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("username")
+ @JacksonXmlProperty(localName = "username")
public String getUsername() {
return username;
}
@@ -106,6 +100,7 @@ public User firstName(String firstName) {
@Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("firstName")
+ @JacksonXmlProperty(localName = "firstName")
public String getFirstName() {
return firstName;
}
@@ -126,6 +121,7 @@ public User lastName(String lastName) {
@Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("lastName")
+ @JacksonXmlProperty(localName = "lastName")
public String getLastName() {
return lastName;
}
@@ -146,6 +142,7 @@ public User email(String email) {
@Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("email")
+ @JacksonXmlProperty(localName = "email")
public String getEmail() {
return email;
}
@@ -166,6 +163,7 @@ public User password(String password) {
@Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("password")
+ @JacksonXmlProperty(localName = "password")
public String getPassword() {
return password;
}
@@ -186,6 +184,7 @@ public User phone(String phone) {
@Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("phone")
+ @JacksonXmlProperty(localName = "phone")
public String getPhone() {
return phone;
}
@@ -206,6 +205,7 @@ public User userStatus(Integer userStatus) {
@Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("userStatus")
+ @JacksonXmlProperty(localName = "userStatus")
public Integer getUserStatus() {
return userStatus;
}