Skip to content

Sync bean validation template (jaxrs) #18697

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
merged 1 commit into from
May 17, 2024
Merged

Sync bean validation template (jaxrs) #18697

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/JavaJaxRS/beanValidation.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{{#required}}@NotNull {{/required}}{{#isContainer}}{{^items.isPrimitiveType}}{{^items.isDate}}{{^items.isDateTime}}{{^items.isString}}{{^items.isFile}}{{^items.isEnumOrRef}}@Valid {{/items.isEnumOrRef}}{{/items.isFile}}{{/items.isString}}{{/items.isDateTime}}{{/items.isDate}}{{/items.isPrimitiveType}}{{/isContainer}}{{^isContainer}}{{^isPrimitiveType}}{{^isDate}}{{^isDateTime}}{{^isString}}{{^isFile}}{{^isEnumOrRef}}@Valid {{/isEnumOrRef}}{{/isFile}}{{/isString}}{{/isDateTime}}{{/isDate}}{{/isPrimitiveType}}{{/isContainer}}{{>beanValidationCore}}
{{#required}}{{^isReadOnly}}@NotNull {{/isReadOnly}}{{/required}}{{#isContainer}}{{^items.isPrimitiveType}}{{^items.isDate}}{{^items.isDateTime}}{{^items.isString}}{{^items.isFile}}{{^items.isEnumOrRef}}@Valid {{/items.isEnumOrRef}}{{/items.isFile}}{{/items.isString}}{{/items.isDateTime}}{{/items.isDate}}{{/items.isPrimitiveType}}{{/isContainer}}{{^isContainer}}{{^isPrimitiveType}}{{^isDate}}{{^isDateTime}}{{^isString}}{{^isFile}}{{^isEnumOrRef}}@Valid {{/isEnumOrRef}}{{/isFile}}{{/isString}}{{/isDateTime}}{{/isDate}}{{/isPrimitiveType}}{{/isContainer}}{{>beanValidationCore}}
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/JavaJaxRS/spec/beanValidation.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{{#required}}{{^isReadOnly}}@NotNull {{/isReadOnly}}{{/required}}{{#isContainer}}{{^isPrimitiveType}}{{^isEnum}}@Valid {{/isEnum}}{{/isPrimitiveType}}{{/isContainer}}{{^isContainer}}{{^isPrimitiveType}}@Valid {{/isPrimitiveType}}{{/isContainer}}{{>beanValidationCore}}
{{#required}}@NotNull {{/required}}{{#isContainer}}{{^items.isPrimitiveType}}{{^items.isDate}}{{^items.isDateTime}}{{^items.isString}}{{^items.isFile}}{{^items.isEnumOrRef}}@Valid {{/items.isEnumOrRef}}{{/items.isFile}}{{/items.isString}}{{/items.isDateTime}}{{/items.isDate}}{{/items.isPrimitiveType}}{{/isContainer}}{{^isContainer}}{{^isPrimitiveType}}{{^isDate}}{{^isDateTime}}{{^isString}}{{^isFile}}{{^isEnumOrRef}}@Valid {{/isEnumOrRef}}{{/isFile}}{{/isString}}{{/isDateTime}}{{/isDate}}{{/isPrimitiveType}}{{/isContainer}}{{>beanValidationCore}}
8 changes: 4 additions & 4 deletions ...pec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public AdditionalPropertiesClass mapArrayInteger(Map<String, List<Integer>> mapA

@ApiModelProperty(value = "")
@JsonProperty("map_array_integer")
@Valid public Map<String, List<Integer>> getMapArrayInteger() {
public Map<String, List<Integer>> getMapArrayInteger() {
return mapArrayInteger;
}

Expand Down Expand Up @@ -219,7 +219,7 @@ public AdditionalPropertiesClass mapArrayAnytype(Map<String, List<Object>> mapAr

@ApiModelProperty(value = "")
@JsonProperty("map_array_anytype")
@Valid public Map<String, List<Object>> getMapArrayAnytype() {
public Map<String, List<Object>> getMapArrayAnytype() {
return mapArrayAnytype;
}

Expand Down Expand Up @@ -254,7 +254,7 @@ public AdditionalPropertiesClass mapMapString(Map<String, Map<String, String>> m

@ApiModelProperty(value = "")
@JsonProperty("map_map_string")
@Valid public Map<String, Map<String, String>> getMapMapString() {
public Map<String, Map<String, String>> getMapMapString() {
return mapMapString;
}

Expand Down Expand Up @@ -289,7 +289,7 @@ public AdditionalPropertiesClass mapMapAnytype(Map<String, Map<String, Object>>

@ApiModelProperty(value = "")
@JsonProperty("map_map_anytype")
@Valid public Map<String, Map<String, Object>> getMapMapAnytype() {
public Map<String, Map<String, Object>> getMapMapAnytype() {
return mapMapAnytype;
}

Expand Down
2 changes: 1 addition & 1 deletion ...petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {

@ApiModelProperty(value = "")
@JsonProperty("array_array_of_integer")
@Valid public List<List<Long>> getArrayArrayOfInteger() {
public List<List<Long>> getArrayArrayOfInteger() {
return arrayArrayOfInteger;
}

Expand Down
2 changes: 1 addition & 1 deletion .../petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {

@ApiModelProperty(value = "")
@JsonProperty("outerEnum")
@Valid public OuterEnum getOuterEnum() {
public OuterEnum getOuterEnum() {
return outerEnum;
}

Expand Down
8 changes: 4 additions & 4 deletions ...etstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ public FormatTest binary(File binary) {

@ApiModelProperty(value = "")
@JsonProperty("binary")
@Valid public File getBinary() {
public File getBinary() {
return binary;
}

Expand All @@ -231,7 +231,7 @@ public FormatTest date(LocalDate date) {

@ApiModelProperty(required = true, value = "")
@JsonProperty("date")
@NotNull @Valid public LocalDate getDate() {
@NotNull public LocalDate getDate() {
return date;
}

Expand All @@ -250,7 +250,7 @@ public FormatTest dateTime(Date dateTime) {

@ApiModelProperty(value = "")
@JsonProperty("dateTime")
@Valid public Date getDateTime() {
public Date getDateTime() {
return dateTime;
}

Expand All @@ -269,7 +269,7 @@ public FormatTest uuid(UUID uuid) {

@ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
@JsonProperty("uuid")
@Valid public UUID getUuid() {
public UUID getUuid() {
return uuid;
}

Expand Down
2 changes: 1 addition & 1 deletion ...r/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {

@ApiModelProperty(value = "")
@JsonProperty("map_map_of_string")
@Valid public Map<String, Map<String, String>> getMapMapOfString() {
public Map<String, Map<String, String>> getMapMapOfString() {
return mapMapOfString;
}

Expand Down
4 changes: 2 additions & 2 deletions ...onse/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {

@ApiModelProperty(value = "")
@JsonProperty("uuid")
@Valid public UUID getUuid() {
public UUID getUuid() {
return uuid;
}

Expand All @@ -56,7 +56,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) {

@ApiModelProperty(value = "")
@JsonProperty("dateTime")
@Valid public Date getDateTime() {
public Date getDateTime() {
return dateTime;
}

Expand Down
2 changes: 1 addition & 1 deletion ...ver/petstore/jaxrs-spec-interface-response/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 @@ -140,7 +140,7 @@ public Order shipDate(Date shipDate) {

@ApiModelProperty(value = "")
@JsonProperty("shipDate")
@Valid public Date getShipDate() {
public Date getShipDate() {
return shipDate;
}

Expand Down
8 changes: 4 additions & 4 deletions ...e/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public AdditionalPropertiesClass mapArrayInteger(Map<String, List<Integer>> mapA

@ApiModelProperty(value = "")
@JsonProperty("map_array_integer")
@Valid public Map<String, List<Integer>> getMapArrayInteger() {
public Map<String, List<Integer>> getMapArrayInteger() {
return mapArrayInteger;
}

Expand Down Expand Up @@ -219,7 +219,7 @@ public AdditionalPropertiesClass mapArrayAnytype(Map<String, List<Object>> mapAr

@ApiModelProperty(value = "")
@JsonProperty("map_array_anytype")
@Valid public Map<String, List<Object>> getMapArrayAnytype() {
public Map<String, List<Object>> getMapArrayAnytype() {
return mapArrayAnytype;
}

Expand Down Expand Up @@ -254,7 +254,7 @@ public AdditionalPropertiesClass mapMapString(Map<String, Map<String, String>> m

@ApiModelProperty(value = "")
@JsonProperty("map_map_string")
@Valid public Map<String, Map<String, String>> getMapMapString() {
public Map<String, Map<String, String>> getMapMapString() {
return mapMapString;
}

Expand Down Expand Up @@ -289,7 +289,7 @@ public AdditionalPropertiesClass mapMapAnytype(Map<String, Map<String, Object>>

@ApiModelProperty(value = "")
@JsonProperty("map_map_anytype")
@Valid public Map<String, Map<String, Object>> getMapMapAnytype() {
public Map<String, Map<String, Object>> getMapMapAnytype() {
return mapMapAnytype;
}

Expand Down
2 changes: 1 addition & 1 deletion ...s/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {

@ApiModelProperty(value = "")
@JsonProperty("array_array_of_integer")
@Valid public List<List<Long>> getArrayArrayOfInteger() {
public List<List<Long>> getArrayArrayOfInteger() {
return arrayArrayOfInteger;
}

Expand Down
2 changes: 1 addition & 1 deletion ...es/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {

@ApiModelProperty(value = "")
@JsonProperty("outerEnum")
@Valid public OuterEnum getOuterEnum() {
public OuterEnum getOuterEnum() {
return outerEnum;
}

Expand Down
8 changes: 4 additions & 4 deletions .../server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ public FormatTest binary(File binary) {

@ApiModelProperty(value = "")
@JsonProperty("binary")
@Valid public File getBinary() {
public File getBinary() {
return binary;
}

Expand All @@ -231,7 +231,7 @@ public FormatTest date(LocalDate date) {

@ApiModelProperty(required = true, value = "")
@JsonProperty("date")
@NotNull @Valid public LocalDate getDate() {
@NotNull public LocalDate getDate() {
return date;
}

Expand All @@ -250,7 +250,7 @@ public FormatTest dateTime(Date dateTime) {

@ApiModelProperty(value = "")
@JsonProperty("dateTime")
@Valid public Date getDateTime() {
public Date getDateTime() {
return dateTime;
}

Expand All @@ -269,7 +269,7 @@ public FormatTest uuid(UUID uuid) {

@ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
@JsonProperty("uuid")
@Valid public UUID getUuid() {
public UUID getUuid() {
return uuid;
}

Expand Down
2 changes: 1 addition & 1 deletion ...les/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {

@ApiModelProperty(value = "")
@JsonProperty("map_map_of_string")
@Valid public Map<String, Map<String, String>> getMapMapOfString() {
public Map<String, Map<String, String>> getMapMapOfString() {
return mapMapOfString;
}

Expand Down
4 changes: 2 additions & 2 deletions ...face/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {

@ApiModelProperty(value = "")
@JsonProperty("uuid")
@Valid public UUID getUuid() {
public UUID getUuid() {
return uuid;
}

Expand All @@ -56,7 +56,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) {

@ApiModelProperty(value = "")
@JsonProperty("dateTime")
@Valid public Date getDateTime() {
public Date getDateTime() {
return dateTime;
}

Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/jaxrs-spec-interface/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 @@ -140,7 +140,7 @@ public Order shipDate(Date shipDate) {

@ApiModelProperty(value = "")
@JsonProperty("shipDate")
@Valid public Date getShipDate() {
public Date getShipDate() {
return shipDate;
}

Expand Down
8 changes: 4 additions & 4 deletions ...ore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ public AdditionalPropertiesClass mapArrayInteger(Map<String, List<Integer>> mapA

@ApiModelProperty(value = "")
@JsonProperty("map_array_integer")
@Valid public Map<String, List<Integer>> getMapArrayInteger() {
public Map<String, List<Integer>> getMapArrayInteger() {
return mapArrayInteger;
}

Expand Down Expand Up @@ -236,7 +236,7 @@ public AdditionalPropertiesClass mapArrayAnytype(Map<String, List<Object>> mapAr

@ApiModelProperty(value = "")
@JsonProperty("map_array_anytype")
@Valid public Map<String, List<Object>> getMapArrayAnytype() {
public Map<String, List<Object>> getMapArrayAnytype() {
return mapArrayAnytype;
}

Expand Down Expand Up @@ -271,7 +271,7 @@ public AdditionalPropertiesClass mapMapString(Map<String, Map<String, String>> m

@ApiModelProperty(value = "")
@JsonProperty("map_map_string")
@Valid public Map<String, Map<String, String>> getMapMapString() {
public Map<String, Map<String, String>> getMapMapString() {
return mapMapString;
}

Expand Down Expand Up @@ -306,7 +306,7 @@ public AdditionalPropertiesClass mapMapAnytype(Map<String, Map<String, Object>>

@ApiModelProperty(value = "")
@JsonProperty("map_map_anytype")
@Valid public Map<String, Map<String, Object>> getMapMapAnytype() {
public Map<String, Map<String, Object>> getMapMapAnytype() {
return mapMapAnytype;
}

Expand Down
2 changes: 1 addition & 1 deletion ...les/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {

@ApiModelProperty(value = "")
@JsonProperty("array_array_of_integer")
@Valid public List<List<Long>> getArrayArrayOfInteger() {
public List<List<Long>> getArrayArrayOfInteger() {
return arrayArrayOfInteger;
}

Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/EnumTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {

@ApiModelProperty(value = "")
@JsonProperty("outerEnum")
@Valid public OuterEnum getOuterEnum() {
public OuterEnum getOuterEnum() {
return outerEnum;
}

Expand Down
8 changes: 4 additions & 4 deletions ...es/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FormatTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ public FormatTest binary(File binary) {

@ApiModelProperty(value = "")
@JsonProperty("binary")
@Valid public File getBinary() {
public File getBinary() {
return binary;
}

Expand All @@ -251,7 +251,7 @@ public FormatTest date(LocalDate date) {

@ApiModelProperty(required = true, value = "")
@JsonProperty("date")
@NotNull @Valid public LocalDate getDate() {
@NotNull public LocalDate getDate() {
return date;
}

Expand All @@ -270,7 +270,7 @@ public FormatTest dateTime(Date dateTime) {

@ApiModelProperty(value = "")
@JsonProperty("dateTime")
@Valid public Date getDateTime() {
public Date getDateTime() {
return dateTime;
}

Expand All @@ -289,7 +289,7 @@ public FormatTest uuid(UUID uuid) {

@ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
@JsonProperty("uuid")
@Valid public UUID getUuid() {
public UUID getUuid() {
return uuid;
}

Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {

@ApiModelProperty(value = "")
@JsonProperty("map_map_of_string")
@Valid public Map<String, Map<String, String>> getMapMapOfString() {
public Map<String, Map<String, String>> getMapMapOfString() {
return mapMapOfString;
}

Expand Down
4 changes: 2 additions & 2 deletions ...arta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {

@ApiModelProperty(value = "")
@JsonProperty("uuid")
@Valid public UUID getUuid() {
public UUID getUuid() {
return uuid;
}

Expand All @@ -65,7 +65,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) {

@ApiModelProperty(value = "")
@JsonProperty("dateTime")
@Valid public Date getDateTime() {
public Date getDateTime() {
return dateTime;
}

Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/jaxrs-spec-jakarta/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 @@ -152,7 +152,7 @@ public Order shipDate(Date shipDate) {

@ApiModelProperty(value = "")
@JsonProperty("shipDate")
@Valid public Date getShipDate() {
public Date getShipDate() {
return shipDate;
}

Expand Down
Loading