Introduce and use @CatalogNumbers validation constraint.

Inspired by PMD warnings about too many string usage.

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/model/AddSeriesForm.java

@@ -21,17 +21,16 @@
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 
 import org.springframework.web.multipart.MultipartFile;
 
+import ru.mystamps.web.validation.jsr303.CatalogNumbers;
 import ru.mystamps.web.validation.jsr303.NotEmptyFilename;
 
 import static ru.mystamps.web.validation.ValidationRules.MAX_SERIES_COMMENT_LENGTH;
 import static ru.mystamps.web.validation.ValidationRules.MAX_STAMPS_IN_SERIES;
 import static ru.mystamps.web.validation.ValidationRules.MIN_STAMPS_IN_SERIES;
-import static ru.mystamps.web.validation.ValidationRules.CATALOG_NUMBERS_REGEXP;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -50,16 +49,16 @@ public class AddSeriesForm {
 	@NotNull
 	private Boolean perforated;
 
-	@Pattern(regexp = CATALOG_NUMBERS_REGEXP, message = "{catalog-numbers.invalid}")
+	@CatalogNumbers
 	private String michelNumbers;
 
-	@Pattern(regexp = CATALOG_NUMBERS_REGEXP, message = "{catalog-numbers.invalid}")
+	@CatalogNumbers
 	private String scottNumbers;
 
-	@Pattern(regexp = CATALOG_NUMBERS_REGEXP, message = "{catalog-numbers.invalid}")
+	@CatalogNumbers
 	private String yvertNumbers;
 
-	@Pattern(regexp = CATALOG_NUMBERS_REGEXP, message = "{catalog-numbers.invalid}")
+	@CatalogNumbers
 	private String gibbonsNumbers;
 
 	@Size(max = MAX_SERIES_COMMENT_LENGTH, message = "{value.too-long}")

src/main/java/ru/mystamps/web/validation/jsr303/CatalogNumbers.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2009-2012 Slava Semushin <slava.semushin@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.validation.jsr303;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import javax.validation.ReportAsSingleViolation;
+import javax.validation.constraints.Pattern;
+
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import ru.mystamps.web.validation.ValidationRules;
+
+@Pattern(regexp = ValidationRules.CATALOG_NUMBERS_REGEXP)
+@ReportAsSingleViolation
+@Target({ METHOD, FIELD, ANNOTATION_TYPE })
+@Retention(RUNTIME)
+@Constraint(validatedBy = {})
+@Documented
+public @interface CatalogNumbers {
+	String message() default "{ru.mystamps.web.validation.jsr303.CatalogNumbers.message}";
+	Class<?>[] groups() default {};
+	Class<? extends Payload>[] payload() default {};
+}

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

@@ -11,13 +11,12 @@ ru.mystamps.web.validation.jsr303.UniqueCountryName.message = Country already ex
 ru.mystamps.web.validation.jsr303.ExistingActivationKey.message = Wrong activation key
 ru.mystamps.web.validation.jsr303.Email.message = Wrong e-mail address
 ru.mystamps.web.validation.jsr303.NotEmptyFilename.message = Value must not be empty
+ru.mystamps.web.validation.jsr303.CatalogNumbers.message = Value must be comma delimited numbers
 
 value.too-short = Value is less than allowable minimum of {min} characters
 value.too-long = Value is greater than allowable maximum of {max} characters
 value.invalid-length = Value length must be equals to {max} characters
 
-catalog-numbers.invalid = Value must be comma delimited numbers
-
 country-name.invalid = Country name must consist only latin letters, hyphen or spaces
 country-name.hyphen = Country name must not start or end with hyphen
 

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

@@ -11,13 +11,12 @@ ru.mystamps.web.validation.jsr303.UniqueCountryName.message = Страна уж
 ru.mystamps.web.validation.jsr303.ExistingActivationKey.message = Неправильный код активации
 ru.mystamps.web.validation.jsr303.Email.message = Неправильный адрес электронной почты
 ru.mystamps.web.validation.jsr303.NotEmptyFilename.message = Поле обязательно для заполнения
+ru.mystamps.web.validation.jsr303.CatalogNumbers.message = Значение должно быть списком чисел через запятую
 
 value.too-short = Значение должно быть не менее {min} символов
 value.too-long = Значение должно быть не более {max} символов
 value.invalid-length = Значение должно быть длинной {max} символов
 
-catalog-numbers.invalid = Значение должно быть списком чисел через запятую
-
 country-name.invalid = Название страны может содержать только латинские буквы, дефис или пробел
 country-name.hyphen = Название страны не должно начинаться или заканчиваться знаком дефиса
 

src/test/java/ru/mystamps/web/tests/cases/WhenUserAddSeries.java

@@ -389,7 +389,8 @@ public Object[][] getValidCatalogNumbers() {
 
 	@DataProvider(name = "invalidCatalogNumbers")
 	public Object[][] getInvalidCatalogNumbers() {
-		final String expectedErrorMessage = tr("catalog-numbers.invalid");
+		final String expectedErrorMessage =
+			tr("ru.mystamps.web.validation.jsr303.CatalogNumbers.message");
 
 		return new Object[][] {
 			{"t", expectedErrorMessage},