Skip to content

Commit 75dab6f

Browse files
committed
refactor(ReleaseDateIsNotInFuture): move validatior with its implementation to ru.mystamps.web.feature.series package.
Addressed to #927 No functional changes.
1 parent a71f0a7 commit 75dab6f

File tree

5 files changed

+6
-8
lines changed

5 files changed

+6
-8
lines changed

src/main/java/ru/mystamps/web/feature/series/AddSeriesForm.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
import ru.mystamps.web.support.beanvalidation.NotEmptyFilename;
4848
import ru.mystamps.web.support.beanvalidation.NotNullIfFirstField;
4949
import ru.mystamps.web.support.beanvalidation.Price;
50-
import ru.mystamps.web.support.beanvalidation.ReleaseDateIsNotInFuture;
5150
import ru.mystamps.web.support.beanvalidation.RequireImageOrImageUrl;
5251

5352
import static ru.mystamps.web.validation.ValidationRules.MAX_DAYS_IN_MONTH;

src/main/java/ru/mystamps/web/support/beanvalidation/ReleaseDateIsNotInFuture.java renamed to src/main/java/ru/mystamps/web/feature/series/ReleaseDateIsNotInFuture.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* along with this program; if not, write to the Free Software
1616
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1717
*/
18-
package ru.mystamps.web.support.beanvalidation;
18+
package ru.mystamps.web.feature.series;
1919

2020
import java.lang.annotation.Documented;
2121
import java.lang.annotation.Retention;
@@ -36,8 +36,7 @@
3636
@Constraint(validatedBy = ReleaseDateIsNotInFutureValidator.class)
3737
@Documented
3838
public @interface ReleaseDateIsNotInFuture {
39-
// CheckStyle: ignore LineLength for next 1 line
40-
String message() default "{ru.mystamps.web.support.beanvalidation.ReleaseDateIsNotInFuture.message}";
39+
String message() default "{ru.mystamps.web.feature.series.ReleaseDateIsNotInFuture.message}";
4140
Class<?>[] groups() default {};
4241
Class<? extends Payload>[] payload() default {};
4342
}

src/main/java/ru/mystamps/web/support/beanvalidation/ReleaseDateIsNotInFutureValidator.java renamed to src/main/java/ru/mystamps/web/feature/series/ReleaseDateIsNotInFutureValidator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* along with this program; if not, write to the Free Software
1616
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1717
*/
18-
package ru.mystamps.web.support.beanvalidation;
18+
package ru.mystamps.web.feature.series;
1919

2020
import java.time.LocalDate;
2121
import java.time.Year;
@@ -24,7 +24,7 @@
2424
import javax.validation.ConstraintValidator;
2525
import javax.validation.ConstraintValidatorContext;
2626

27-
import ru.mystamps.web.feature.series.AddSeriesDto;
27+
import ru.mystamps.web.support.beanvalidation.ConstraintViolationUtils;
2828

2929
/**
3030
* @author Sergey Chechenev

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ ru.mystamps.web.support.beanvalidation.Email.message = Invalid e-mail address
1414
ru.mystamps.web.support.beanvalidation.NotEmptyFilename.message = Value must not be empty
1515
ru.mystamps.web.support.beanvalidation.NotEmptyFile.message = File must not be empty
1616
ru.mystamps.web.support.beanvalidation.CatalogNumbers.message = Value must be comma delimited numbers
17-
ru.mystamps.web.support.beanvalidation.ReleaseDateIsNotInFuture.message = Release date must not be in future
1817
ru.mystamps.web.support.beanvalidation.NotNullIfFirstField.message = Field '{second}' must not be empty
1918
ru.mystamps.web.support.beanvalidation.Price.message = Invalid value
2019
ru.mystamps.web.support.beanvalidation.ImageFile.message = Cannot detect file type. Must be image in JPEG or PNG format
@@ -26,6 +25,7 @@ ru.mystamps.web.feature.category.UniqueCategorySlug.message = Category with simi
2625
ru.mystamps.web.feature.collection.MaxNumberOfStamps.message = Number of stamps must be less than or equal to a stamps quantity in the series
2726
ru.mystamps.web.feature.country.UniqueCountryName.message = Country already exists
2827
ru.mystamps.web.feature.country.UniqueCountrySlug.message = Country with similar name already exists
28+
ru.mystamps.web.feature.series.ReleaseDateIsNotInFuture.message = Release date must not be in future
2929

3030
ru.mystamps.web.service.dto.DownloadResult.INVALID_URL = Invalid URL
3131
ru.mystamps.web.service.dto.DownloadResult.INVALID_REDIRECT = URL must not redirect to another address

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ ru.mystamps.web.support.beanvalidation.FieldsMatch.message = Поле '{second}'
1111
ru.mystamps.web.support.beanvalidation.UniqueLogin.message = Логин уже существует
1212
ru.mystamps.web.support.beanvalidation.ExistingActivationKey.message = Неправильный код активации
1313
ru.mystamps.web.support.beanvalidation.Email.message = Неправильный адрес электронной почты
14-
ru.mystamps.web.support.beanvalidation.ReleaseDateIsNotInFuture.message = Дата выпуска не может быть в будущем
1514
ru.mystamps.web.support.beanvalidation.NotEmptyFilename.message = Поле обязательно для заполнения
1615
ru.mystamps.web.support.beanvalidation.NotEmptyFile.message = Файл не должен быть пустым
1716
ru.mystamps.web.support.beanvalidation.CatalogNumbers.message = Значение должно быть списком чисел через запятую
@@ -26,6 +25,7 @@ ru.mystamps.web.feature.category.UniqueCategorySlug.message = Категория
2625
ru.mystamps.web.feature.collection.MaxNumberOfStamps.message = Количество марок должно быть меньше либо равно количеству марок в серии
2726
ru.mystamps.web.feature.country.UniqueCountryName.message = Страна уже есть в базе
2827
ru.mystamps.web.feature.country.UniqueCountrySlug.message = Страна с похожим названием уже есть в базе
28+
ru.mystamps.web.feature.series.ReleaseDateIsNotInFuture.message = Дата выпуска не может быть в будущем
2929

3030
ru.mystamps.web.service.dto.DownloadResult.INVALID_URL = Неправильный URL
3131
ru.mystamps.web.service.dto.DownloadResult.INVALID_REDIRECT = URL не должен перенаправлять на другой адрес

0 commit comments

Comments
 (0)