Skip to content

Commit bf0e860

Browse files
php-coderphp-coder
committed
refactor(CatalogNumbers): move validator with its implementation to ru.mystamps.web.feature.series package.
Addressed to #927 No functional changes.
1 parent 3eb6630 commit bf0e860

File tree

7 files changed

+12
-13
lines changed

7 files changed

+12
-13
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
@@ -26,7 +26,6 @@
2626
import ru.mystamps.web.common.LinkEntityDto;
2727
import ru.mystamps.web.feature.category.Category;
2828
import ru.mystamps.web.feature.country.Country;
29-
import ru.mystamps.web.support.beanvalidation.CatalogNumbers;
3029
import ru.mystamps.web.support.beanvalidation.ImageFile;
3130
import ru.mystamps.web.support.beanvalidation.MaxFileSize;
3231
import ru.mystamps.web.support.beanvalidation.MaxFileSize.Unit;

‎src/main/java/ru/mystamps/web/support/beanvalidation/CatalogNumbers.java renamed to ‎src/main/java/ru/mystamps/web/feature/series/CatalogNumbers.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 javax.validation.Constraint;
2121
import javax.validation.Payload;
@@ -33,7 +33,7 @@
3333
@Constraint(validatedBy = CatalogNumbersValidator.class)
3434
@Documented
3535
public @interface CatalogNumbers {
36-
String message() default "{ru.mystamps.web.support.beanvalidation.CatalogNumbers.message}";
36+
String message() default "{ru.mystamps.web.feature.series.CatalogNumbers.message}";
3737
Class<?>[] groups() default {};
3838
Class<? extends Payload>[] payload() default {};
3939

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
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

20-
import ru.mystamps.web.feature.series.SeriesValidation;
20+
import ru.mystamps.web.support.beanvalidation.ConstraintViolationUtils;
2121

2222
import javax.validation.ConstraintValidator;
2323
import javax.validation.ConstraintValidatorContext;
@@ -55,7 +55,7 @@ public boolean isValid(String catalogNumbers, ConstraintValidatorContext ctx) {
5555

5656
ConstraintViolationUtils.recreate(
5757
ctx,
58-
"{ru.mystamps.web.support.beanvalidation.CatalogNumbers.Alnum.message}"
58+
"{ru.mystamps.web.feature.series.CatalogNumbers.Alnum.message}"
5959
);
6060

6161
return false;

‎src/main/java/ru/mystamps/web/feature/series/SeriesValidation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ public final class SeriesValidation {
2525
public static final int MIN_STAMPS_IN_SERIES = 1;
2626
public static final int MAX_STAMPS_IN_SERIES = 50;
2727
public static final int MIN_RELEASE_YEAR = 1840;
28-
public static final String CATALOG_NUMBERS_REGEXP = "[1-9][0-9]{0,3}(,[1-9][0-9]{0,3})*";
28+
static final String CATALOG_NUMBERS_REGEXP = "[1-9][0-9]{0,3}(,[1-9][0-9]{0,3})*";
2929
@SuppressWarnings({ "PMD.LongVariable", "checkstyle:linelength" })
30-
public static final String CATALOG_NUMBERS_AND_LETTERS_REGEXP = "[1-9][0-9]{0,3}[a-z]?(,[1-9][0-9]{0,3}[a-z]?)*";
30+
static final String CATALOG_NUMBERS_AND_LETTERS_REGEXP = "[1-9][0-9]{0,3}[a-z]?(,[1-9][0-9]{0,3}[a-z]?)*";
3131
static final int MAX_SERIES_COMMENT_LENGTH = Series.COMMENT_LENGTH;
3232

3333
static final int MAX_DAYS_IN_MONTH = 31;

‎src/main/java/ru/mystamps/web/feature/series/importing/ImportSeriesForm.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import ru.mystamps.web.feature.category.Category;
2626
import ru.mystamps.web.feature.country.Country;
2727
import ru.mystamps.web.feature.series.AddSeriesDto;
28+
import ru.mystamps.web.feature.series.CatalogNumbers;
2829
import ru.mystamps.web.feature.series.NullableImageUrl;
29-
import ru.mystamps.web.support.beanvalidation.CatalogNumbers;
3030

3131
import javax.validation.Valid;
3232
import javax.validation.constraints.Max;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ ru.mystamps.web.support.beanvalidation.FieldsMatch.message = Field '{second}' mu
1212
ru.mystamps.web.support.beanvalidation.Email.message = Invalid e-mail address
1313
ru.mystamps.web.support.beanvalidation.NotEmptyFilename.message = Value must not be empty
1414
ru.mystamps.web.support.beanvalidation.NotEmptyFile.message = File must not be empty
15-
ru.mystamps.web.support.beanvalidation.CatalogNumbers.message = Value must be a list of numbers separated by comma
16-
ru.mystamps.web.support.beanvalidation.CatalogNumbers.Alnum.message = Value must be a list of numbers separated by comma. Any number may end with a latin letter in lower case
15+
ru.mystamps.web.feature.series.CatalogNumbers.message = Value must be a list of numbers separated by comma
16+
ru.mystamps.web.feature.series.CatalogNumbers.Alnum.message = Value must be a list of numbers separated by comma. Any number may end with a latin letter in lower case
1717
ru.mystamps.web.support.beanvalidation.NotNullIfFirstField.message = Field '{second}' must not be empty
1818
ru.mystamps.web.support.beanvalidation.Price.message = Invalid value
1919
ru.mystamps.web.support.beanvalidation.ImageFile.message = Cannot detect file type. Must be image in JPEG or PNG format

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ ru.mystamps.web.support.beanvalidation.FieldsMatch.message = Поле '{second}'
1212
ru.mystamps.web.support.beanvalidation.Email.message = Неправильный адрес электронной почты
1313
ru.mystamps.web.support.beanvalidation.NotEmptyFilename.message = Поле обязательно для заполнения
1414
ru.mystamps.web.support.beanvalidation.NotEmptyFile.message = Файл не должен быть пустым
15-
ru.mystamps.web.support.beanvalidation.CatalogNumbers.message = Значение должно быть списком чисел через запятую
16-
ru.mystamps.web.support.beanvalidation.CatalogNumbers.Alnum.message = Значение должно быть списком чисел через запятую. Каждое число может оканчиваться латинской буквой в нижнем регистре
15+
ru.mystamps.web.feature.series.CatalogNumbers.message = Значение должно быть списком чисел через запятую
16+
ru.mystamps.web.feature.series.CatalogNumbers.Alnum.message = Значение должно быть списком чисел через запятую. Каждое число может оканчиваться латинской буквой в нижнем регистре
1717
ru.mystamps.web.support.beanvalidation.NotNullIfFirstField.message = Поле '{second}' обязательно для заполнения
1818
ru.mystamps.web.support.beanvalidation.Price.message = Некорректное значение
1919
ru.mystamps.web.support.beanvalidation.ImageFile.message = Не удалось определить тип файла. Должен быть изображением в формате JPEG или PNG

0 commit comments

Comments
 (0)