Skip to content

[Java][Jaxrs][Resteasy] add @Valid to getter methods, updated #15064

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
wing328 merged 2 commits into from
Jun 8, 2023
Merged

[Java][Jaxrs][Resteasy] add @Valid to getter methods, updated #15064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc77b5c
[JavaJaxrsResteasy] add @Valid to getter methods
tnmtechnologies Feb 1, 2019
2bad5ef
improve whitespacing
martin-mfg Mar 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pojo.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import io.swagger.annotations.*;
{{#useBeanValidation}}import javax.validation.Valid;{{/useBeanValidation}}

@wing328 wing328 Jun 8, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI. You can do the following to avoid a blank line if useBeanValidation is not true

{{#useBeanValidation}}
import javax.validation.Valid;
{{/useBeanValidation}}


{{#description}}@ApiModel(description="{{{.}}}"){{/description}}{{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}
{{#vendorExtensions.x-class-extra-annotation}}
Expand Down Expand Up @@ -33,7 +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}}{{/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}}}
Expand Down
1 change: 1 addition & 0 deletions .../server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Category.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions ...petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/ModelApiResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions ...les/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Order.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
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 {
Expand Down
3 changes: 3 additions & 0 deletions samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Pet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -64,6 +65,7 @@ public void setId(Long id) {

@ApiModelProperty(value = "")
@JsonProperty("category")
@Valid
public Category getCategory() {
return category;
}
Expand Down Expand Up @@ -102,6 +104,7 @@ public void setPhotoUrls(List<String> photoUrls) {

@ApiModelProperty(value = "")
@JsonProperty("tags")
@Valid
public List<Tag> getTags() {
return tags;
}
Expand Down
1 change: 1 addition & 0 deletions samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Tag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions ...es/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Category.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions ...r/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/ModelApiResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Order.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 3 additions & 0 deletions samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Pet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -64,6 +65,7 @@ public void setId(Long id) {

@ApiModelProperty(value = "")
@JsonProperty("category")
@Valid
public Category getCategory() {
return category;
}
Expand Down Expand Up @@ -102,6 +104,7 @@ public void setPhotoUrls(List<String> photoUrls) {

@ApiModelProperty(value = "")
@JsonProperty("tags")
@Valid
public List<Tag> getTags() {
return tags;
}
Expand Down
1 change: 1 addition & 0 deletions samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Tag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions ...les/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Category.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions ...er/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/ModelApiResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Order.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
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 {
Expand Down
3 changes: 3 additions & 0 deletions samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Pet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -64,6 +65,7 @@ public void setId(Long id) {

@ApiModelProperty(value = "")
@JsonProperty("category")
@Valid
public Category getCategory() {
return category;
}
Expand Down Expand Up @@ -102,6 +104,7 @@ public void setPhotoUrls(List<String> photoUrls) {

@ApiModelProperty(value = "")
@JsonProperty("tags")
@Valid
public List<Tag> getTags() {
return tags;
}
Expand Down
1 change: 1 addition & 0 deletions samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Tag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down