Skip to content

Commit d5ab6b5

Browse files
committed
Fix Email annotation; copied from ootb spring boot templates
1 parent 2dc658a commit d5ab6b5

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

boat-scaffold/src/main/templates/boat-spring/beanValidationCore.mustache

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ minLength not set, maxLength set
1111
}}{{#minItems}}{{^maxItems}}@Size(min = {{minItems}}) {{/maxItems}}{{/minItems}}{{!
1212
@Size: minItems not set && maxItems set
1313
}}{{^minItems}}{{#maxItems}}@Size(max = {{.}}) {{/maxItems}}{{/minItems}}{{!
14-
@Email: useBeanValidation set && isEmail set
15-
}}{{#useBeanValidation}}{{#isEmail}}@Email{{/isEmail}}{{/useBeanValidation}}{{!
14+
@Email: useBeanValidation set && isEmail && java8 set
15+
}}{{#useBeanValidation}}{{#isEmail}}{{#java8}}@org.hibernate.validator.constraints.Email{{/java8}}{{/isEmail}}{{/useBeanValidation}}{{!
16+
@Email: performBeanValidation set && isEmail && not java8 set
17+
}}{{#performBeanValidation}}{{#isEmail}}{{^java8}}@jakarta.validation.constraints.Email{{/java8}}{{/isEmail}}{{/performBeanValidation}}{{!
1618
check for integer or long / all others=decimal type with @Decimal*
1719
isInteger set
1820
}}{{#isInteger}}{{#minimum}}@Min({{.}}) {{/minimum}}{{#maximum}}@Max({{.}}) {{/maximum}}{{/isInteger}}{{!

boat-scaffold/src/test/resources/boat-spring/openapi.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,12 @@ components:
357357
minLength: 7
358358
maxLength: 10
359359
description: "Transaction data string map"
360+
emailAddress:
361+
type: string
362+
description: Sender Email
363+
format: email
364+
maxLength: 250
365+
example: xyz@gmail.com
360366
PaymentRequestLine:
361367
required:
362368
- accountId

0 commit comments

Comments
 (0)