UniqueCountryName: move validation with its implementation to ru.mystamps.web.feature.country package.

Addressed to #927

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/feature/country/AddCountryForm.java

@@ -26,10 +26,9 @@
 import lombok.Getter;
 import lombok.Setter;
 
+import ru.mystamps.web.feature.country.UniqueCountryName.Lang;
 import ru.mystamps.web.support.beanvalidation.DenyValues;
 import ru.mystamps.web.support.beanvalidation.Group;
-import ru.mystamps.web.support.beanvalidation.UniqueCountryName;
-import ru.mystamps.web.support.beanvalidation.UniqueCountryName.Lang;
 import ru.mystamps.web.support.beanvalidation.UniqueCountrySlug;
 
 import static ru.mystamps.web.validation.ValidationRules.COUNTRY_NAME_EN_REGEXP;

src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCountryName.java renamed to src/main/java/ru/mystamps/web/feature/country/UniqueCountryName.java

@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.support.beanvalidation;
+package ru.mystamps.web.feature.country;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -34,7 +34,7 @@
 @Constraint(validatedBy = UniqueCountryNameValidator.class)
 @Documented
 public @interface UniqueCountryName {
-	String message() default "{ru.mystamps.web.support.beanvalidation.UniqueCountryName.message}";
+	String message() default "{ru.mystamps.web.feature.country.UniqueCountryName.message}";
 	Class<?>[] groups() default {};
 	Class<? extends Payload>[] payload() default {};
 

src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCountryNameValidator.java renamed to src/main/java/ru/mystamps/web/feature/country/UniqueCountryNameValidator.java

@@ -15,15 +15,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.support.beanvalidation;
+package ru.mystamps.web.feature.country;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
 import lombok.RequiredArgsConstructor;
 
-import ru.mystamps.web.feature.country.CountryService;
-import ru.mystamps.web.support.beanvalidation.UniqueCountryName.Lang;
+import ru.mystamps.web.feature.country.UniqueCountryName.Lang;
 
 @RequiredArgsConstructor
 public class UniqueCountryNameValidator implements ConstraintValidator<UniqueCountryName, String> {

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

@@ -9,7 +9,6 @@ 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.UniqueLogin.message = Login already exists
-ru.mystamps.web.support.beanvalidation.UniqueCountryName.message = Country already exists
 ru.mystamps.web.support.beanvalidation.UniqueCountrySlug.message = Country with similar name already exists
 ru.mystamps.web.support.beanvalidation.ExistingActivationKey.message = Invalid activation key
 ru.mystamps.web.support.beanvalidation.Email.message = Invalid e-mail address
@@ -26,6 +25,7 @@ ru.mystamps.web.support.beanvalidation.MaxNumberOfStamps.message = Number of sta
 
 ru.mystamps.web.feature.category.UniqueCategoryName.message = Category already exists
 ru.mystamps.web.feature.category.UniqueCategorySlug.message = Category with similar name already exists
+ru.mystamps.web.feature.country.UniqueCountryName.message = Country already exists
 
 ru.mystamps.web.service.dto.DownloadResult.INVALID_URL = Invalid URL
 ru.mystamps.web.service.dto.DownloadResult.INVALID_REDIRECT = URL must not redirect to another address

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

@@ -9,7 +9,6 @@ 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.UniqueLogin.message = Логин уже существует
-ru.mystamps.web.support.beanvalidation.UniqueCountryName.message = Страна уже есть в базе
 ru.mystamps.web.support.beanvalidation.UniqueCountrySlug.message = Страна с похожим названием уже есть в базе
 ru.mystamps.web.support.beanvalidation.ExistingActivationKey.message = Неправильный код активации
 ru.mystamps.web.support.beanvalidation.Email.message = Неправильный адрес электронной почты
@@ -26,6 +25,7 @@ ru.mystamps.web.support.beanvalidation.MaxNumberOfStamps.message = Количе
 
 ru.mystamps.web.feature.category.UniqueCategoryName.message = Категория уже есть в базе
 ru.mystamps.web.feature.category.UniqueCategorySlug.message = Категория с похожим названием уже есть в базе
+ru.mystamps.web.feature.country.UniqueCountryName.message = Страна уже есть в базе
 
 ru.mystamps.web.service.dto.DownloadResult.INVALID_URL = Неправильный URL
 ru.mystamps.web.service.dto.DownloadResult.INVALID_REDIRECT = URL не должен перенаправлять на другой адрес