From 550956d425c9828c065aa8af78215595eb5ec050 Mon Sep 17 00:00:00 2001
From: jasper linschoten <jasper@backbase.com>
Date: Tue, 13 Feb 2024 11:19:18 +0100
Subject: [PATCH] Fix Email annotation; copied from ootb spring boot templates

---
 .../main/templates/boat-spring/beanValidationCore.mustache  | 6 ++++--
 boat-scaffold/src/test/resources/boat-spring/openapi.yaml   | 6 ++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/boat-scaffold/src/main/templates/boat-spring/beanValidationCore.mustache b/boat-scaffold/src/main/templates/boat-spring/beanValidationCore.mustache
index f8aa5ab2a..7faf96bc9 100644
--- a/boat-scaffold/src/main/templates/boat-spring/beanValidationCore.mustache
+++ b/boat-scaffold/src/main/templates/boat-spring/beanValidationCore.mustache
@@ -11,8 +11,10 @@ minLength not set, maxLength set
 }}{{#minItems}}{{^maxItems}}@Size(min = {{minItems}}) {{/maxItems}}{{/minItems}}{{!
 @Size: minItems not set && maxItems set
 }}{{^minItems}}{{#maxItems}}@Size(max = {{.}}) {{/maxItems}}{{/minItems}}{{!
-@Email: useBeanValidation set && isEmail set
-}}{{#useBeanValidation}}{{#isEmail}}@Email{{/isEmail}}{{/useBeanValidation}}{{!
+@Email: useBeanValidation set && isEmail && java8 set
+}}{{#useBeanValidation}}{{#isEmail}}{{#java8}}@org.hibernate.validator.constraints.Email{{/java8}}{{/isEmail}}{{/useBeanValidation}}{{!
+@Email: performBeanValidation set && isEmail && not java8 set
+}}{{#performBeanValidation}}{{#isEmail}}{{^java8}}@jakarta.validation.constraints.Email{{/java8}}{{/isEmail}}{{/performBeanValidation}}{{!
 check for integer or long / all others=decimal type with @Decimal*
 isInteger set
 }}{{#isInteger}}{{#minimum}}@Min({{.}}) {{/minimum}}{{#maximum}}@Max({{.}}) {{/maximum}}{{/isInteger}}{{!
diff --git a/boat-scaffold/src/test/resources/boat-spring/openapi.yaml b/boat-scaffold/src/test/resources/boat-spring/openapi.yaml
index 1374ee7bd..8b4b1972a 100644
--- a/boat-scaffold/src/test/resources/boat-spring/openapi.yaml
+++ b/boat-scaffold/src/test/resources/boat-spring/openapi.yaml
@@ -357,6 +357,12 @@ components:
             minLength: 7
             maxLength: 10
           description: "Transaction data string map"
+        emailAddress:
+          type: string
+          description: Sender Email
+          format: email
+          maxLength: 250
+          example: xyz@gmail.com
     PaymentRequestLine:
       required:
         - accountId