From dc77b5cf7912f58e64c1d8b163004a370e9b250b Mon Sep 17 00:00:00 2001 From: TNM Technologies Date: Fri, 1 Feb 2019 12:08:47 +0100 Subject: [PATCH 1/2] [JavaJaxrsResteasy] add @Valid to getter methods --- .../main/resources/JavaJaxRS/resteasy/pojo.mustache | 5 ++++- .../gen/java/org/openapitools/model/Category.java | 4 ++++ .../org/openapitools/model/ModelApiResponse.java | 5 +++++ .../src/gen/java/org/openapitools/model/Order.java | 8 ++++++++ .../src/gen/java/org/openapitools/model/Pet.java | 12 ++++++++++-- .../src/gen/java/org/openapitools/model/Tag.java | 4 ++++ .../src/gen/java/org/openapitools/model/User.java | 10 ++++++++++ .../gen/java/org/openapitools/model/Category.java | 4 ++++ .../org/openapitools/model/ModelApiResponse.java | 5 +++++ .../src/gen/java/org/openapitools/model/Order.java | 8 ++++++++ .../src/gen/java/org/openapitools/model/Pet.java | 12 ++++++++++-- .../src/gen/java/org/openapitools/model/Tag.java | 4 ++++ .../src/gen/java/org/openapitools/model/User.java | 10 ++++++++++ 13 files changed, 86 insertions(+), 5 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pojo.mustache index f382819c6616..9a4d334cecaf 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pojo.mustache @@ -1,4 +1,6 @@ import io.swagger.annotations.*; +{{#useBeanValidation}}import javax.validation.Valid;{{/useBeanValidation}} + {{#description}}@ApiModel(description="{{{.}}}"){{/description}}{{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}} {{#vendorExtensions.x-class-extra-annotation}} @@ -33,7 +35,8 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens {{#vendorExtensions.x-extra-annotation}}{{{vendorExtensions.x-extra-annotation}}}{{/vendorExtensions.x-extra-annotation}} @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}") @JsonProperty("{{baseName}}") -{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{getter}}() { + {{#useBeanValidation}}{{>beanValidation}}{{^isPrimitiveType}}{{^isDate}}{{^isDateTime}}{{^isString}}{{^isFile}}@Valid{{/isFile}}{{/isString}}{{/isDateTime}}{{/isDate}}{{/isPrimitiveType}}{{/useBeanValidation}} + public {{{datatypeWithEnum}}} {{getter}}() { return {{name}}; } {{#vendorExtensions.x-setter-extra-annotation}}{{{vendorExtensions.x-setter-extra-annotation}}} diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Category.java index 4884ee2c4c27..e09e182bac36 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Category.java @@ -8,6 +8,8 @@ import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.*; import io.swagger.annotations.*; +import javax.validation.Valid; + @ApiModel(description="A category for a pet")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class Category { @@ -20,6 +22,7 @@ public class Category { @ApiModelProperty(value = "") @JsonProperty("id") + public Long getId() { return id; } @@ -32,6 +35,7 @@ public void setId(Long id) { @ApiModelProperty(value = "") @JsonProperty("name") + public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/ModelApiResponse.java index de3e6418a2a6..f055c74c3717 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/ModelApiResponse.java @@ -9,6 +9,8 @@ import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.*; import io.swagger.annotations.*; +import javax.validation.Valid; + @ApiModel(description="Describes the result of uploading an image resource")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class ModelApiResponse { @@ -22,6 +24,7 @@ public class ModelApiResponse { @ApiModelProperty(value = "") @JsonProperty("code") + public Integer getCode() { return code; } @@ -34,6 +37,7 @@ public void setCode(Integer code) { @ApiModelProperty(value = "") @JsonProperty("type") + public String getType() { return type; } @@ -46,6 +50,7 @@ public void setType(String type) { @ApiModelProperty(value = "") @JsonProperty("message") + public String getMessage() { return message; } diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Order.java index ab5a4d232213..5accca50b03e 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Order.java @@ -10,6 +10,8 @@ import java.util.Date; import javax.validation.constraints.*; import io.swagger.annotations.*; +import javax.validation.Valid; + @ApiModel(description="An order for a pets from the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class Order { @@ -49,6 +51,7 @@ public String toString() { @ApiModelProperty(value = "") @JsonProperty("id") + public Long getId() { return id; } @@ -61,6 +64,7 @@ public void setId(Long id) { @ApiModelProperty(value = "") @JsonProperty("petId") + public Long getPetId() { return petId; } @@ -73,6 +77,7 @@ public void setPetId(Long petId) { @ApiModelProperty(value = "") @JsonProperty("quantity") + public Integer getQuantity() { return quantity; } @@ -85,6 +90,7 @@ public void setQuantity(Integer quantity) { @ApiModelProperty(value = "") @JsonProperty("shipDate") + public Date getShipDate() { return shipDate; } @@ -98,6 +104,7 @@ public void setShipDate(Date shipDate) { @ApiModelProperty(value = "Order Status") @JsonProperty("status") + public StatusEnum getStatus() { return status; } @@ -110,6 +117,7 @@ public void setStatus(StatusEnum status) { @ApiModelProperty(value = "") @JsonProperty("complete") + public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Pet.java index 8d78c7a0702c..32f2ca871e5d 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Pet.java @@ -13,6 +13,8 @@ import org.openapitools.model.Tag; import javax.validation.constraints.*; import io.swagger.annotations.*; +import javax.validation.Valid; + @ApiModel(description="A pet for sale in the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class Pet { @@ -52,6 +54,7 @@ public String toString() { @ApiModelProperty(value = "") @JsonProperty("id") + public Long getId() { return id; } @@ -64,6 +67,7 @@ public void setId(Long id) { @ApiModelProperty(value = "") @JsonProperty("category") + @Valid public Category getCategory() { return category; } @@ -76,7 +80,8 @@ public void setCategory(Category category) { @ApiModelProperty(example = "doggie", required = true, value = "") @JsonProperty("name") - @NotNull + @NotNull + public String getName() { return name; } @@ -89,7 +94,8 @@ public void setName(String name) { @ApiModelProperty(required = true, value = "") @JsonProperty("photoUrls") - @NotNull + @NotNull + public List getPhotoUrls() { return photoUrls; } @@ -102,6 +108,7 @@ public void setPhotoUrls(List photoUrls) { @ApiModelProperty(value = "") @JsonProperty("tags") + @Valid public List getTags() { return tags; } @@ -115,6 +122,7 @@ public void setTags(List tags) { @ApiModelProperty(value = "pet status in the store") @JsonProperty("status") + public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Tag.java index afd723dee10c..f30b8c4a836c 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Tag.java @@ -8,6 +8,8 @@ import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.*; import io.swagger.annotations.*; +import javax.validation.Valid; + @ApiModel(description="A tag for a pet")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class Tag { @@ -20,6 +22,7 @@ public class Tag { @ApiModelProperty(value = "") @JsonProperty("id") + public Long getId() { return id; } @@ -32,6 +35,7 @@ public void setId(Long id) { @ApiModelProperty(value = "") @JsonProperty("name") + public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/User.java index 2e649203067e..f87d9db2c6f6 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/User.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/User.java @@ -8,6 +8,8 @@ import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.*; import io.swagger.annotations.*; +import javax.validation.Valid; + @ApiModel(description="A User who is purchasing from the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class User { @@ -26,6 +28,7 @@ public class User { @ApiModelProperty(value = "") @JsonProperty("id") + public Long getId() { return id; } @@ -38,6 +41,7 @@ public void setId(Long id) { @ApiModelProperty(value = "") @JsonProperty("username") + public String getUsername() { return username; } @@ -50,6 +54,7 @@ public void setUsername(String username) { @ApiModelProperty(value = "") @JsonProperty("firstName") + public String getFirstName() { return firstName; } @@ -62,6 +67,7 @@ public void setFirstName(String firstName) { @ApiModelProperty(value = "") @JsonProperty("lastName") + public String getLastName() { return lastName; } @@ -74,6 +80,7 @@ public void setLastName(String lastName) { @ApiModelProperty(value = "") @JsonProperty("email") + public String getEmail() { return email; } @@ -86,6 +93,7 @@ public void setEmail(String email) { @ApiModelProperty(value = "") @JsonProperty("password") + public String getPassword() { return password; } @@ -98,6 +106,7 @@ public void setPassword(String password) { @ApiModelProperty(value = "") @JsonProperty("phone") + public String getPhone() { return phone; } @@ -111,6 +120,7 @@ public void setPhone(String phone) { @ApiModelProperty(value = "User Status") @JsonProperty("userStatus") + public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Category.java index 4884ee2c4c27..e09e182bac36 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Category.java @@ -8,6 +8,8 @@ import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.*; import io.swagger.annotations.*; +import javax.validation.Valid; + @ApiModel(description="A category for a pet")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class Category { @@ -20,6 +22,7 @@ public class Category { @ApiModelProperty(value = "") @JsonProperty("id") + public Long getId() { return id; } @@ -32,6 +35,7 @@ public void setId(Long id) { @ApiModelProperty(value = "") @JsonProperty("name") + public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/ModelApiResponse.java index de3e6418a2a6..f055c74c3717 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/ModelApiResponse.java @@ -9,6 +9,8 @@ import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.*; import io.swagger.annotations.*; +import javax.validation.Valid; + @ApiModel(description="Describes the result of uploading an image resource")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class ModelApiResponse { @@ -22,6 +24,7 @@ public class ModelApiResponse { @ApiModelProperty(value = "") @JsonProperty("code") + public Integer getCode() { return code; } @@ -34,6 +37,7 @@ public void setCode(Integer code) { @ApiModelProperty(value = "") @JsonProperty("type") + public String getType() { return type; } @@ -46,6 +50,7 @@ public void setType(String type) { @ApiModelProperty(value = "") @JsonProperty("message") + public String getMessage() { return message; } diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Order.java index a19101f584ea..621f693654cf 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Order.java @@ -10,6 +10,8 @@ import org.joda.time.DateTime; import javax.validation.constraints.*; import io.swagger.annotations.*; +import javax.validation.Valid; + @ApiModel(description="An order for a pets from the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class Order { @@ -49,6 +51,7 @@ public String toString() { @ApiModelProperty(value = "") @JsonProperty("id") + public Long getId() { return id; } @@ -61,6 +64,7 @@ public void setId(Long id) { @ApiModelProperty(value = "") @JsonProperty("petId") + public Long getPetId() { return petId; } @@ -73,6 +77,7 @@ public void setPetId(Long petId) { @ApiModelProperty(value = "") @JsonProperty("quantity") + public Integer getQuantity() { return quantity; } @@ -85,6 +90,7 @@ public void setQuantity(Integer quantity) { @ApiModelProperty(value = "") @JsonProperty("shipDate") + public DateTime getShipDate() { return shipDate; } @@ -98,6 +104,7 @@ public void setShipDate(DateTime shipDate) { @ApiModelProperty(value = "Order Status") @JsonProperty("status") + public StatusEnum getStatus() { return status; } @@ -110,6 +117,7 @@ public void setStatus(StatusEnum status) { @ApiModelProperty(value = "") @JsonProperty("complete") + public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Pet.java index 8d78c7a0702c..32f2ca871e5d 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Pet.java @@ -13,6 +13,8 @@ import org.openapitools.model.Tag; import javax.validation.constraints.*; import io.swagger.annotations.*; +import javax.validation.Valid; + @ApiModel(description="A pet for sale in the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class Pet { @@ -52,6 +54,7 @@ public String toString() { @ApiModelProperty(value = "") @JsonProperty("id") + public Long getId() { return id; } @@ -64,6 +67,7 @@ public void setId(Long id) { @ApiModelProperty(value = "") @JsonProperty("category") + @Valid public Category getCategory() { return category; } @@ -76,7 +80,8 @@ public void setCategory(Category category) { @ApiModelProperty(example = "doggie", required = true, value = "") @JsonProperty("name") - @NotNull + @NotNull + public String getName() { return name; } @@ -89,7 +94,8 @@ public void setName(String name) { @ApiModelProperty(required = true, value = "") @JsonProperty("photoUrls") - @NotNull + @NotNull + public List getPhotoUrls() { return photoUrls; } @@ -102,6 +108,7 @@ public void setPhotoUrls(List photoUrls) { @ApiModelProperty(value = "") @JsonProperty("tags") + @Valid public List getTags() { return tags; } @@ -115,6 +122,7 @@ public void setTags(List tags) { @ApiModelProperty(value = "pet status in the store") @JsonProperty("status") + public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Tag.java index afd723dee10c..f30b8c4a836c 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Tag.java @@ -8,6 +8,8 @@ import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.*; import io.swagger.annotations.*; +import javax.validation.Valid; + @ApiModel(description="A tag for a pet")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class Tag { @@ -20,6 +22,7 @@ public class Tag { @ApiModelProperty(value = "") @JsonProperty("id") + public Long getId() { return id; } @@ -32,6 +35,7 @@ public void setId(Long id) { @ApiModelProperty(value = "") @JsonProperty("name") + public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/User.java index 2e649203067e..f87d9db2c6f6 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/User.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/User.java @@ -8,6 +8,8 @@ import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.*; import io.swagger.annotations.*; +import javax.validation.Valid; + @ApiModel(description="A User who is purchasing from the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class User { @@ -26,6 +28,7 @@ public class User { @ApiModelProperty(value = "") @JsonProperty("id") + public Long getId() { return id; } @@ -38,6 +41,7 @@ public void setId(Long id) { @ApiModelProperty(value = "") @JsonProperty("username") + public String getUsername() { return username; } @@ -50,6 +54,7 @@ public void setUsername(String username) { @ApiModelProperty(value = "") @JsonProperty("firstName") + public String getFirstName() { return firstName; } @@ -62,6 +67,7 @@ public void setFirstName(String firstName) { @ApiModelProperty(value = "") @JsonProperty("lastName") + public String getLastName() { return lastName; } @@ -74,6 +80,7 @@ public void setLastName(String lastName) { @ApiModelProperty(value = "") @JsonProperty("email") + public String getEmail() { return email; } @@ -86,6 +93,7 @@ public void setEmail(String email) { @ApiModelProperty(value = "") @JsonProperty("password") + public String getPassword() { return password; } @@ -98,6 +106,7 @@ public void setPassword(String password) { @ApiModelProperty(value = "") @JsonProperty("phone") + public String getPhone() { return phone; } @@ -111,6 +120,7 @@ public void setPhone(String phone) { @ApiModelProperty(value = "User Status") @JsonProperty("userStatus") + public Integer getUserStatus() { return userStatus; } From 2bad5efe1388e8f7fd59d4e42a068d62cdefd1ac Mon Sep 17 00:00:00 2001 From: Martin <2026226+martin-mfg@users.noreply.github.com> Date: Tue, 28 Mar 2023 08:50:15 +0200 Subject: [PATCH 2/2] improve whitespacing --- .../src/main/resources/JavaJaxRS/resteasy/pojo.mustache | 5 ++--- .../src/gen/java/org/openapitools/model/Category.java | 3 --- .../java/org/openapitools/model/ModelApiResponse.java | 4 ---- .../src/gen/java/org/openapitools/model/Order.java | 7 ------- .../default/src/gen/java/org/openapitools/model/Pet.java | 9 ++------- .../default/src/gen/java/org/openapitools/model/Tag.java | 3 --- .../src/gen/java/org/openapitools/model/User.java | 9 --------- .../src/gen/java/org/openapitools/model/Category.java | 1 + .../java/org/openapitools/model/ModelApiResponse.java | 1 + .../java8/src/gen/java/org/openapitools/model/Order.java | 1 + .../java8/src/gen/java/org/openapitools/model/Pet.java | 3 +++ .../java8/src/gen/java/org/openapitools/model/Tag.java | 1 + .../java8/src/gen/java/org/openapitools/model/User.java | 1 + .../src/gen/java/org/openapitools/model/Category.java | 3 --- .../java/org/openapitools/model/ModelApiResponse.java | 4 ---- .../joda/src/gen/java/org/openapitools/model/Order.java | 7 ------- .../joda/src/gen/java/org/openapitools/model/Pet.java | 9 ++------- .../joda/src/gen/java/org/openapitools/model/Tag.java | 3 --- .../joda/src/gen/java/org/openapitools/model/User.java | 9 --------- 19 files changed, 14 insertions(+), 69 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pojo.mustache index 9a4d334cecaf..e4c106c46bd2 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pojo.mustache @@ -1,7 +1,6 @@ import io.swagger.annotations.*; {{#useBeanValidation}}import javax.validation.Valid;{{/useBeanValidation}} - {{#description}}@ApiModel(description="{{{.}}}"){{/description}}{{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}} {{#vendorExtensions.x-class-extra-annotation}} {{{vendorExtensions.x-class-extra-annotation}}} @@ -35,8 +34,8 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens {{#vendorExtensions.x-extra-annotation}}{{{vendorExtensions.x-extra-annotation}}}{{/vendorExtensions.x-extra-annotation}} @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}") @JsonProperty("{{baseName}}") - {{#useBeanValidation}}{{>beanValidation}}{{^isPrimitiveType}}{{^isDate}}{{^isDateTime}}{{^isString}}{{^isFile}}@Valid{{/isFile}}{{/isString}}{{/isDateTime}}{{/isDate}}{{/isPrimitiveType}}{{/useBeanValidation}} - public {{{datatypeWithEnum}}} {{getter}}() { +{{#useBeanValidation}}{{>beanValidation}}{{^isPrimitiveType}}{{^isDate}}{{^isDateTime}}{{^isString}}{{^isFile}} @Valid +{{/isFile}}{{/isString}}{{/isDateTime}}{{/isDate}}{{/isPrimitiveType}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{getter}}() { return {{name}}; } {{#vendorExtensions.x-setter-extra-annotation}}{{{vendorExtensions.x-setter-extra-annotation}}} diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Category.java index e09e182bac36..d2566a81692d 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Category.java @@ -10,7 +10,6 @@ import io.swagger.annotations.*; import javax.validation.Valid; - @ApiModel(description="A category for a pet")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class Category { @@ -22,7 +21,6 @@ public class Category { @ApiModelProperty(value = "") @JsonProperty("id") - public Long getId() { return id; } @@ -35,7 +33,6 @@ public void setId(Long id) { @ApiModelProperty(value = "") @JsonProperty("name") - public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/ModelApiResponse.java index f055c74c3717..c1a1f5741043 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/ModelApiResponse.java @@ -11,7 +11,6 @@ import io.swagger.annotations.*; import javax.validation.Valid; - @ApiModel(description="Describes the result of uploading an image resource")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class ModelApiResponse { @@ -24,7 +23,6 @@ public class ModelApiResponse { @ApiModelProperty(value = "") @JsonProperty("code") - public Integer getCode() { return code; } @@ -37,7 +35,6 @@ public void setCode(Integer code) { @ApiModelProperty(value = "") @JsonProperty("type") - public String getType() { return type; } @@ -50,7 +47,6 @@ public void setType(String type) { @ApiModelProperty(value = "") @JsonProperty("message") - public String getMessage() { return message; } diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Order.java index 5accca50b03e..96e47d3b3ba7 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Order.java @@ -12,7 +12,6 @@ import io.swagger.annotations.*; import javax.validation.Valid; - @ApiModel(description="An order for a pets from the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class Order { @@ -51,7 +50,6 @@ public String toString() { @ApiModelProperty(value = "") @JsonProperty("id") - public Long getId() { return id; } @@ -64,7 +62,6 @@ public void setId(Long id) { @ApiModelProperty(value = "") @JsonProperty("petId") - public Long getPetId() { return petId; } @@ -77,7 +74,6 @@ public void setPetId(Long petId) { @ApiModelProperty(value = "") @JsonProperty("quantity") - public Integer getQuantity() { return quantity; } @@ -90,7 +86,6 @@ public void setQuantity(Integer quantity) { @ApiModelProperty(value = "") @JsonProperty("shipDate") - public Date getShipDate() { return shipDate; } @@ -104,7 +99,6 @@ public void setShipDate(Date shipDate) { @ApiModelProperty(value = "Order Status") @JsonProperty("status") - public StatusEnum getStatus() { return status; } @@ -117,7 +111,6 @@ public void setStatus(StatusEnum status) { @ApiModelProperty(value = "") @JsonProperty("complete") - public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Pet.java index 32f2ca871e5d..8e8ee91cf942 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Pet.java @@ -15,7 +15,6 @@ import io.swagger.annotations.*; import javax.validation.Valid; - @ApiModel(description="A pet for sale in the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class Pet { @@ -54,7 +53,6 @@ public String toString() { @ApiModelProperty(value = "") @JsonProperty("id") - public Long getId() { return id; } @@ -80,8 +78,7 @@ public void setCategory(Category category) { @ApiModelProperty(example = "doggie", required = true, value = "") @JsonProperty("name") - @NotNull - + @NotNull public String getName() { return name; } @@ -94,8 +91,7 @@ public void setName(String name) { @ApiModelProperty(required = true, value = "") @JsonProperty("photoUrls") - @NotNull - + @NotNull public List getPhotoUrls() { return photoUrls; } @@ -122,7 +118,6 @@ public void setTags(List tags) { @ApiModelProperty(value = "pet status in the store") @JsonProperty("status") - public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Tag.java index f30b8c4a836c..1375bf209496 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Tag.java @@ -10,7 +10,6 @@ import io.swagger.annotations.*; import javax.validation.Valid; - @ApiModel(description="A tag for a pet")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class Tag { @@ -22,7 +21,6 @@ public class Tag { @ApiModelProperty(value = "") @JsonProperty("id") - public Long getId() { return id; } @@ -35,7 +33,6 @@ public void setId(Long id) { @ApiModelProperty(value = "") @JsonProperty("name") - public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/User.java index f87d9db2c6f6..330a25d8a4a4 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/User.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/User.java @@ -10,7 +10,6 @@ import io.swagger.annotations.*; import javax.validation.Valid; - @ApiModel(description="A User who is purchasing from the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class User { @@ -28,7 +27,6 @@ public class User { @ApiModelProperty(value = "") @JsonProperty("id") - public Long getId() { return id; } @@ -41,7 +39,6 @@ public void setId(Long id) { @ApiModelProperty(value = "") @JsonProperty("username") - public String getUsername() { return username; } @@ -54,7 +51,6 @@ public void setUsername(String username) { @ApiModelProperty(value = "") @JsonProperty("firstName") - public String getFirstName() { return firstName; } @@ -67,7 +63,6 @@ public void setFirstName(String firstName) { @ApiModelProperty(value = "") @JsonProperty("lastName") - public String getLastName() { return lastName; } @@ -80,7 +75,6 @@ public void setLastName(String lastName) { @ApiModelProperty(value = "") @JsonProperty("email") - public String getEmail() { return email; } @@ -93,7 +87,6 @@ public void setEmail(String email) { @ApiModelProperty(value = "") @JsonProperty("password") - public String getPassword() { return password; } @@ -106,7 +99,6 @@ public void setPassword(String password) { @ApiModelProperty(value = "") @JsonProperty("phone") - public String getPhone() { return phone; } @@ -120,7 +112,6 @@ public void setPhone(String phone) { @ApiModelProperty(value = "User Status") @JsonProperty("userStatus") - public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Category.java index 4884ee2c4c27..d2566a81692d 100644 --- a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Category.java @@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.*; import io.swagger.annotations.*; +import javax.validation.Valid; @ApiModel(description="A category for a pet")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class Category { diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/ModelApiResponse.java index de3e6418a2a6..c1a1f5741043 100644 --- a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/ModelApiResponse.java @@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.*; import io.swagger.annotations.*; +import javax.validation.Valid; @ApiModel(description="Describes the result of uploading an image resource")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class ModelApiResponse { diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Order.java index 2987afa9926f..76fb75a08f96 100644 --- a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Order.java @@ -10,6 +10,7 @@ import java.time.OffsetDateTime; import javax.validation.constraints.*; import io.swagger.annotations.*; +import javax.validation.Valid; @ApiModel(description="An order for a pets from the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class Order { diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Pet.java index 8d78c7a0702c..8e8ee91cf942 100644 --- a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Pet.java @@ -13,6 +13,7 @@ import org.openapitools.model.Tag; import javax.validation.constraints.*; import io.swagger.annotations.*; +import javax.validation.Valid; @ApiModel(description="A pet for sale in the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class Pet { @@ -64,6 +65,7 @@ public void setId(Long id) { @ApiModelProperty(value = "") @JsonProperty("category") + @Valid public Category getCategory() { return category; } @@ -102,6 +104,7 @@ public void setPhotoUrls(List photoUrls) { @ApiModelProperty(value = "") @JsonProperty("tags") + @Valid public List getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Tag.java index afd723dee10c..1375bf209496 100644 --- a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Tag.java @@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.*; import io.swagger.annotations.*; +import javax.validation.Valid; @ApiModel(description="A tag for a pet")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class Tag { diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/User.java index 2e649203067e..330a25d8a4a4 100644 --- a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/User.java +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/User.java @@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.*; import io.swagger.annotations.*; +import javax.validation.Valid; @ApiModel(description="A User who is purchasing from the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class User { diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Category.java index e09e182bac36..d2566a81692d 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Category.java @@ -10,7 +10,6 @@ import io.swagger.annotations.*; import javax.validation.Valid; - @ApiModel(description="A category for a pet")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class Category { @@ -22,7 +21,6 @@ public class Category { @ApiModelProperty(value = "") @JsonProperty("id") - public Long getId() { return id; } @@ -35,7 +33,6 @@ public void setId(Long id) { @ApiModelProperty(value = "") @JsonProperty("name") - public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/ModelApiResponse.java index f055c74c3717..c1a1f5741043 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/ModelApiResponse.java @@ -11,7 +11,6 @@ import io.swagger.annotations.*; import javax.validation.Valid; - @ApiModel(description="Describes the result of uploading an image resource")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class ModelApiResponse { @@ -24,7 +23,6 @@ public class ModelApiResponse { @ApiModelProperty(value = "") @JsonProperty("code") - public Integer getCode() { return code; } @@ -37,7 +35,6 @@ public void setCode(Integer code) { @ApiModelProperty(value = "") @JsonProperty("type") - public String getType() { return type; } @@ -50,7 +47,6 @@ public void setType(String type) { @ApiModelProperty(value = "") @JsonProperty("message") - public String getMessage() { return message; } diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Order.java index 621f693654cf..ec015fcacaaf 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Order.java @@ -12,7 +12,6 @@ import io.swagger.annotations.*; import javax.validation.Valid; - @ApiModel(description="An order for a pets from the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class Order { @@ -51,7 +50,6 @@ public String toString() { @ApiModelProperty(value = "") @JsonProperty("id") - public Long getId() { return id; } @@ -64,7 +62,6 @@ public void setId(Long id) { @ApiModelProperty(value = "") @JsonProperty("petId") - public Long getPetId() { return petId; } @@ -77,7 +74,6 @@ public void setPetId(Long petId) { @ApiModelProperty(value = "") @JsonProperty("quantity") - public Integer getQuantity() { return quantity; } @@ -90,7 +86,6 @@ public void setQuantity(Integer quantity) { @ApiModelProperty(value = "") @JsonProperty("shipDate") - public DateTime getShipDate() { return shipDate; } @@ -104,7 +99,6 @@ public void setShipDate(DateTime shipDate) { @ApiModelProperty(value = "Order Status") @JsonProperty("status") - public StatusEnum getStatus() { return status; } @@ -117,7 +111,6 @@ public void setStatus(StatusEnum status) { @ApiModelProperty(value = "") @JsonProperty("complete") - public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Pet.java index 32f2ca871e5d..8e8ee91cf942 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Pet.java @@ -15,7 +15,6 @@ import io.swagger.annotations.*; import javax.validation.Valid; - @ApiModel(description="A pet for sale in the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class Pet { @@ -54,7 +53,6 @@ public String toString() { @ApiModelProperty(value = "") @JsonProperty("id") - public Long getId() { return id; } @@ -80,8 +78,7 @@ public void setCategory(Category category) { @ApiModelProperty(example = "doggie", required = true, value = "") @JsonProperty("name") - @NotNull - + @NotNull public String getName() { return name; } @@ -94,8 +91,7 @@ public void setName(String name) { @ApiModelProperty(required = true, value = "") @JsonProperty("photoUrls") - @NotNull - + @NotNull public List getPhotoUrls() { return photoUrls; } @@ -122,7 +118,6 @@ public void setTags(List tags) { @ApiModelProperty(value = "pet status in the store") @JsonProperty("status") - public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Tag.java index f30b8c4a836c..1375bf209496 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Tag.java @@ -10,7 +10,6 @@ import io.swagger.annotations.*; import javax.validation.Valid; - @ApiModel(description="A tag for a pet")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class Tag { @@ -22,7 +21,6 @@ public class Tag { @ApiModelProperty(value = "") @JsonProperty("id") - public Long getId() { return id; } @@ -35,7 +33,6 @@ public void setId(Long id) { @ApiModelProperty(value = "") @JsonProperty("name") - public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/User.java index f87d9db2c6f6..330a25d8a4a4 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/User.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/User.java @@ -10,7 +10,6 @@ import io.swagger.annotations.*; import javax.validation.Valid; - @ApiModel(description="A User who is purchasing from the pet store")@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen") public class User { @@ -28,7 +27,6 @@ public class User { @ApiModelProperty(value = "") @JsonProperty("id") - public Long getId() { return id; } @@ -41,7 +39,6 @@ public void setId(Long id) { @ApiModelProperty(value = "") @JsonProperty("username") - public String getUsername() { return username; } @@ -54,7 +51,6 @@ public void setUsername(String username) { @ApiModelProperty(value = "") @JsonProperty("firstName") - public String getFirstName() { return firstName; } @@ -67,7 +63,6 @@ public void setFirstName(String firstName) { @ApiModelProperty(value = "") @JsonProperty("lastName") - public String getLastName() { return lastName; } @@ -80,7 +75,6 @@ public void setLastName(String lastName) { @ApiModelProperty(value = "") @JsonProperty("email") - public String getEmail() { return email; } @@ -93,7 +87,6 @@ public void setEmail(String email) { @ApiModelProperty(value = "") @JsonProperty("password") - public String getPassword() { return password; } @@ -106,7 +99,6 @@ public void setPassword(String password) { @ApiModelProperty(value = "") @JsonProperty("phone") - public String getPhone() { return phone; } @@ -120,7 +112,6 @@ public void setPhone(String phone) { @ApiModelProperty(value = "User Status") @JsonProperty("userStatus") - public Integer getUserStatus() { return userStatus; }