Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Remove bean validation for uuid #18900

Merged
merged 2 commits into from
Jun 12, 2024
Merged

Remove bean validation for uuid #18900

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
d1e34d9
Remove bean validation for uuid
MelleD Jun 11, 2024
3532211
Add maxLenght to test the uuid validation
MelleD Jun 11, 2024
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: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/JavaSpring/beanValidationCore.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{#pattern}}{{^isByteArray}}@Pattern(regexp = "{{{pattern}}}"{{#vendorExtensions.x-pattern-message}}, message="{{vendorExtensions.x-pattern-message}}"{{/vendorExtensions.x-pattern-message}}) {{/isByteArray}}{{/pattern}}{{!
{{^isUuid}}{{#pattern}}{{^isByteArray}}@Pattern(regexp = "{{{pattern}}}"{{#vendorExtensions.x-pattern-message}}, message="{{vendorExtensions.x-pattern-message}}"{{/vendorExtensions.x-pattern-message}}) {{/isByteArray}}{{/pattern}}{{!
minLength && maxLength set
}}{{#minLength}}{{#maxLength}}@Size(min = {{minLength}}, max = {{maxLength}}) {{/maxLength}}{{/minLength}}{{!
minLength set, maxLength not
Expand All @@ -21,4 +21,4 @@ isInteger set
isLong set
}}{{#isLong}}{{#minimum}}@Min({{.}}L) {{/minimum}}{{#maximum}}@Max({{.}}L) {{/maximum}}{{/isLong}}{{!
Not Integer, not Long => we have a decimal value!
}}{{^isInteger}}{{^isLong}}{{#minimum}}@DecimalMin({{#exclusiveMinimum}}value = {{/exclusiveMinimum}}"{{minimum}}"{{#exclusiveMinimum}}, inclusive = false{{/exclusiveMinimum}}) {{/minimum}}{{#maximum}}@DecimalMax({{#exclusiveMaximum}}value = {{/exclusiveMaximum}}"{{maximum}}"{{#exclusiveMaximum}}, inclusive = false{{/exclusiveMaximum}}) {{/maximum}}{{/isLong}}{{/isInteger}}
}}{{^isInteger}}{{^isLong}}{{#minimum}}@DecimalMin({{#exclusiveMinimum}}value = {{/exclusiveMinimum}}"{{minimum}}"{{#exclusiveMinimum}}, inclusive = false{{/exclusiveMinimum}}) {{/minimum}}{{#maximum}}@DecimalMax({{#exclusiveMaximum}}value = {{/exclusiveMaximum}}"{{maximum}}"{{#exclusiveMaximum}}, inclusive = false{{/exclusiveMaximum}}) {{/maximum}}{{/isLong}}{{/isInteger}}{{/isUuid}}
1 change: 1 addition & 0 deletions ...erator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1454,6 +1454,7 @@ components:
uuid:
type: string
format: uuid
maxLength: 36
example: 72f98069-206d-4f12-9f12-3d1e525a8e84
password:
type: string
Expand Down
1 change: 1 addition & 0 deletions samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1609,6 +1609,7 @@ components:
uuid:
example: 72f98069-206d-4f12-9f12-3d1e525a8e84
format: uuid
maxLength: 36
type: string
password:
format: password
Expand Down
1 change: 1 addition & 0 deletions samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1609,6 +1609,7 @@ components:
uuid:
example: 72f98069-206d-4f12-9f12-3d1e525a8e84
format: uuid
maxLength: 36
type: string
password:
format: password
Expand Down
1 change: 1 addition & 0 deletions ...les/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1609,6 +1609,7 @@ components:
uuid:
example: 72f98069-206d-4f12-9f12-3d1e525a8e84
format: uuid
maxLength: 36
type: string
password:
format: password
Expand Down
1 change: 1 addition & 0 deletions samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1609,6 +1609,7 @@ components:
uuid:
example: 72f98069-206d-4f12-9f12-3d1e525a8e84
format: uuid
maxLength: 36
type: string
password:
format: password
Expand Down
1 change: 1 addition & 0 deletions samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1609,6 +1609,7 @@ components:
uuid:
example: 72f98069-206d-4f12-9f12-3d1e525a8e84
format: uuid
maxLength: 36
type: string
password:
format: password
Expand Down
1 change: 1 addition & 0 deletions samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1609,6 +1609,7 @@ components:
uuid:
example: 72f98069-206d-4f12-9f12-3d1e525a8e84
format: uuid
maxLength: 36
type: string
password:
format: password
Expand Down
1 change: 1 addition & 0 deletions samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1609,6 +1609,7 @@ components:
uuid:
example: 72f98069-206d-4f12-9f12-3d1e525a8e84
format: uuid
maxLength: 36
type: string
password:
format: password
Expand Down
1 change: 1 addition & 0 deletions samples/server/petstore/springboot-reactive-noResponseEntity/src/main/resources/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1609,6 +1609,7 @@ components:
uuid:
example: 72f98069-206d-4f12-9f12-3d1e525a8e84
format: uuid
maxLength: 36
type: string
password:
format: password
Expand Down
1 change: 1 addition & 0 deletions samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1609,6 +1609,7 @@ components:
uuid:
example: 72f98069-206d-4f12-9f12-3d1e525a8e84
format: uuid
maxLength: 36
type: string
password:
format: password
Expand Down
1 change: 1 addition & 0 deletions samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1609,6 +1609,7 @@ components:
uuid:
example: 72f98069-206d-4f12-9f12-3d1e525a8e84
format: uuid
maxLength: 36
type: string
password:
format: password
Expand Down
1 change: 1 addition & 0 deletions samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1609,6 +1609,7 @@ components:
uuid:
example: 72f98069-206d-4f12-9f12-3d1e525a8e84
format: uuid
maxLength: 36
type: string
password:
format: password
Expand Down
1 change: 1 addition & 0 deletions samples/server/petstore/springboot/src/main/resources/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1609,6 +1609,7 @@ components:
uuid:
example: 72f98069-206d-4f12-9f12-3d1e525a8e84
format: uuid
maxLength: 36
type: string
password:
format: password
Expand Down
Loading