refactor: replace a custom validator implementation by @Email with "regexp" parameter.

Author: php-coder

src/main/java/ru/mystamps/web/feature/account/AccountValidation.java

@@ -39,6 +39,8 @@ public final class AccountValidation {
 	static final int PASSWORD_MAX_LENGTH = 72;
 
 	static final int EMAIL_MAX_LENGTH = UsersActivation.EMAIL_LENGTH;
+	// Require 2+ level domains in e-mails.
+	static final String EMAIL_2ND_LEVEL_DOMAIN_REGEXP = ".+@.+\\..+";
 
 	static final int ACT_KEY_LENGTH = UsersActivation.ACTIVATION_KEY_LENGTH;
 	static final String ACT_KEY_REGEXP = "[0-9a-z]+";

src/main/java/ru/mystamps/web/feature/account/RegisterAccountForm.java

@@ -19,13 +19,14 @@
 
 import lombok.Getter;
 import lombok.Setter;
-import ru.mystamps.web.support.beanvalidation.Email;
 import ru.mystamps.web.support.beanvalidation.Group;
 
 import javax.validation.GroupSequence;
+import javax.validation.constraints.Email;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.Size;
 
+import static ru.mystamps.web.feature.account.AccountValidation.EMAIL_2ND_LEVEL_DOMAIN_REGEXP;
 import static ru.mystamps.web.feature.account.AccountValidation.EMAIL_MAX_LENGTH;
 
 @Getter
@@ -40,7 +41,7 @@ public class RegisterAccountForm implements RegisterAccountDto {
 
 	@NotEmpty(groups = Group.Level1.class)
 	@Size(max = EMAIL_MAX_LENGTH, message = "{value.too-long}", groups = Group.Level2.class)
-	@Email(groups = Group.Level3.class)
+	@Email(regexp = EMAIL_2ND_LEVEL_DOMAIN_REGEXP, groups = Group.Level3.class)
 	private String email;
 
 }

src/main/java/ru/mystamps/web/support/beanvalidation/Email.java

@@ -1,3 +1,4 @@
+javax.validation.constraints.Email.message = Invalid e-mail address
 javax.validation.constraints.NotEmpty.message = Value must not be empty
 javax.validation.constraints.NotNull.message = Value must not be empty
 javax.validation.constraints.Min.message = Value must be greater than or equal to {value}
@@ -9,7 +10,6 @@ ru.mystamps.web.support.beanvalidation.BothOrNoneRequired.message = {first} and
 ru.mystamps.web.support.beanvalidation.DenyValues.message = Invalid value
 ru.mystamps.web.support.beanvalidation.FieldsMismatch.message = Field '{second}' must mismatch '{first}'
 ru.mystamps.web.support.beanvalidation.FieldsMatch.message = Field '{second}' must match '{first}'
-ru.mystamps.web.support.beanvalidation.Email.message = Invalid e-mail address
 ru.mystamps.web.support.beanvalidation.NotEmptyFilename.message = Value must not be empty
 ru.mystamps.web.support.beanvalidation.NotEmptyFile.message = File must not be empty
 ru.mystamps.web.feature.series.CatalogNumbers.message = Value must be a list of numbers separated by comma

src/main/resources/ru/mystamps/i18n/ValidationMessages.properties

@@ -1,3 +1,4 @@
+javax.validation.constraints.Email.message = Неправильный адрес электронной почты
 javax.validation.constraints.NotEmpty.message = Поле обязательно для заполнения
 javax.validation.constraints.NotNull.message = Поле обязательно для заполнения
 javax.validation.constraints.Min.message = Значение должно быть больше либо равно {value}
@@ -9,7 +10,6 @@ ru.mystamps.web.support.beanvalidation.BothOrNoneRequired.message = Оба по
 ru.mystamps.web.support.beanvalidation.DenyValues.message = Неправильное значение
 ru.mystamps.web.support.beanvalidation.FieldsMismatch.message = Поле '{second}' не должно совпадать с '{first}'
 ru.mystamps.web.support.beanvalidation.FieldsMatch.message = Поле '{second}' должно совпадать с '{first}'
-ru.mystamps.web.support.beanvalidation.Email.message = Неправильный адрес электронной почты
 ru.mystamps.web.support.beanvalidation.NotEmptyFilename.message = Поле обязательно для заполнения
 ru.mystamps.web.support.beanvalidation.NotEmptyFile.message = Файл не должен быть пустым
 ru.mystamps.web.feature.series.CatalogNumbers.message = Значение должно быть списком чисел через запятую