From 04b167d77ac32e6d496d9c9f75aeefebf0c249f5 Mon Sep 17 00:00:00 2001 From: Vitor Hideyoshi Date: Wed, 2 Aug 2023 00:10:15 -0300 Subject: [PATCH] Hotfix - Changes Email REGEX --- .../util/validator/email/valid/EmailValidator.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/hideyoshi/backendportfolio/util/validator/email/valid/EmailValidator.java b/src/main/java/com/hideyoshi/backendportfolio/util/validator/email/valid/EmailValidator.java index 5881814..65beae4 100644 --- a/src/main/java/com/hideyoshi/backendportfolio/util/validator/email/valid/EmailValidator.java +++ b/src/main/java/com/hideyoshi/backendportfolio/util/validator/email/valid/EmailValidator.java @@ -4,15 +4,14 @@ import lombok.RequiredArgsConstructor; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; +import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; @RequiredArgsConstructor public class EmailValidator implements ConstraintValidator { - private Pattern pattern; - private Matcher matcher; - private static final String EMAIL_PATTERN = "^[_A-Za-z\\d-+]+(.[_A-Za-z\\d-]+)*@+[A-Za-z\\d-]+(.[A-Za-z\\d]+)*(.[A-Za-z]{2,})$"; + private static final String EMAIL_PATTERN = "^[\\w-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$"; @Override public void initialize(ValidEmail constraintAnnotation) { @@ -24,8 +23,12 @@ public class EmailValidator implements ConstraintValidator { } private boolean validateEmail(String email) { - pattern = Pattern.compile(EMAIL_PATTERN); - matcher = pattern.matcher(email); + if (Objects.isNull(email)) { + return false; + } + + Pattern pattern = Pattern.compile(EMAIL_PATTERN); + Matcher matcher = pattern.matcher(email); return matcher.matches(); }