refactor(CategoryValidation): omit CATEGORY_ prefix from the constants.

Fix #1038

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/feature/category/AddCategoryForm.java

@@ -28,13 +28,12 @@
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 
-import static ru.mystamps.web.feature.category.CategoryValidation.CATEGORY_NAME_EN_REGEXP;
-import static ru.mystamps.web.feature.category.CategoryValidation.CATEGORY_NAME_MAX_LENGTH;
-import static ru.mystamps.web.feature.category.CategoryValidation.CATEGORY_NAME_MIN_LENGTH;
-import static ru.mystamps.web.feature.category.CategoryValidation.CATEGORY_NAME_NO_HYPHEN_REGEXP;
-// CheckStyle: ignore LineLength for next 1 line
-import static ru.mystamps.web.feature.category.CategoryValidation.CATEGORY_NAME_NO_REPEATING_HYPHENS_REGEXP;
-import static ru.mystamps.web.feature.category.CategoryValidation.CATEGORY_NAME_RU_REGEXP;
+import static ru.mystamps.web.feature.category.CategoryValidation.NAME_EN_REGEXP;
+import static ru.mystamps.web.feature.category.CategoryValidation.NAME_MAX_LENGTH;
+import static ru.mystamps.web.feature.category.CategoryValidation.NAME_MIN_LENGTH;
+import static ru.mystamps.web.feature.category.CategoryValidation.NAME_NO_HYPHEN_REGEXP;
+import static ru.mystamps.web.feature.category.CategoryValidation.NAME_NO_REPEATING_HYPHENS_REGEXP;
+import static ru.mystamps.web.feature.category.CategoryValidation.NAME_RU_REGEXP;
 
 @Getter
 @Setter
@@ -54,29 +53,29 @@ public class AddCategoryForm implements AddCategoryDto {
 	@NotEmpty(groups = Group.Level1.class)
 	@Size.List({
 		@Size(
-			min = CATEGORY_NAME_MIN_LENGTH,
+			min = NAME_MIN_LENGTH,
 			message = "{value.too-short}",
 			groups = Group.Level2.class
 		),
 		@Size(
-			max = CATEGORY_NAME_MAX_LENGTH,
+			max = NAME_MAX_LENGTH,
 			message = "{value.too-long}",
 			groups = Group.Level2.class
 		)
 	})
 	@Pattern.List({
 		@Pattern(
-			regexp = CATEGORY_NAME_EN_REGEXP,
+			regexp = NAME_EN_REGEXP,
 			message = "{value.invalid-en-chars}",
 			groups = Group.Level3.class
 		),
 		@Pattern(
-			regexp = CATEGORY_NAME_NO_REPEATING_HYPHENS_REGEXP,
+			regexp = NAME_NO_REPEATING_HYPHENS_REGEXP,
 			message = "{value.repeating-hyphen}",
 			groups = Group.Level4.class
 		),
 		@Pattern(
-			regexp = CATEGORY_NAME_NO_HYPHEN_REGEXP,
+			regexp = NAME_NO_HYPHEN_REGEXP,
 			message = "{value.hyphen}",
 			groups = Group.Level5.class
 		)
@@ -88,29 +87,29 @@ public class AddCategoryForm implements AddCategoryDto {
 
 	@Size.List({
 		@Size(
-			min = CATEGORY_NAME_MIN_LENGTH,
+			min = NAME_MIN_LENGTH,
 			message = "{value.too-short}",
 			groups = Group.Level2.class
 		),
 		@Size(
-			max = CATEGORY_NAME_MAX_LENGTH,
+			max = NAME_MAX_LENGTH,
 			message = "{value.too-long}",
 			groups = Group.Level2.class
 		)
 	})
 	@Pattern.List({
 		@Pattern(
-			regexp = CATEGORY_NAME_RU_REGEXP,
+			regexp = NAME_RU_REGEXP,
 			message = "{value.invalid-ru-chars}",
 			groups = Group.Level3.class
 		),
 		@Pattern(
-			regexp = CATEGORY_NAME_NO_REPEATING_HYPHENS_REGEXP,
+			regexp = NAME_NO_REPEATING_HYPHENS_REGEXP,
 			message = "{value.repeating-hyphen}",
 			groups = Group.Level4.class
 		),
 		@Pattern(
-			regexp = CATEGORY_NAME_NO_HYPHEN_REGEXP,
+			regexp = NAME_NO_HYPHEN_REGEXP,
 			message = "{value.hyphen}",
 			groups = Group.Level5.class
 		)

src/main/java/ru/mystamps/web/feature/category/CategoryValidation.java

@@ -19,17 +19,16 @@
 
 import ru.mystamps.web.feature.category.CategoryDb.Category;
 
-// @todo #927 CategoryValidation: remove CATEGORY_ prefix from the constants
 @SuppressWarnings("PMD.CommentDefaultAccessModifier")
 public final class CategoryValidation {
 
-	public static final int CATEGORY_NAME_MIN_LENGTH = 3;
-	public static final int CATEGORY_NAME_MAX_LENGTH = Category.NAME_LENGTH;
-	public static final String CATEGORY_NAME_EN_REGEXP = "[- a-zA-Z]+";
-	public static final String CATEGORY_NAME_RU_REGEXP = "[- а-яёА-ЯЁ]+";
-	static final String CATEGORY_NAME_NO_HYPHEN_REGEXP = "[ \\p{L}]([- \\p{L}]+[ \\p{L}])*";
+	public static final int NAME_MIN_LENGTH = 3;
+	public static final int NAME_MAX_LENGTH = Category.NAME_LENGTH;
+	public static final String NAME_EN_REGEXP = "[- a-zA-Z]+";
+	public static final String NAME_RU_REGEXP = "[- а-яёА-ЯЁ]+";
+	static final String NAME_NO_HYPHEN_REGEXP = "[ \\p{L}]([- \\p{L}]+[ \\p{L}])*";
 	@SuppressWarnings("PMD.LongVariable")
-	static final String CATEGORY_NAME_NO_REPEATING_HYPHENS_REGEXP = "(?!.+[-]{2,}).+";
+	static final String NAME_NO_REPEATING_HYPHENS_REGEXP = "(?!.+[-]{2,}).+";
 
 	private CategoryValidation() {
 	}

src/main/java/ru/mystamps/web/feature/series/importing/SeriesInfoExtractorServiceImpl.java

@@ -65,8 +65,8 @@ public class SeriesInfoExtractorServiceImpl implements SeriesInfoExtractorServic
 		Pattern.compile("#[ ]?(?<begin>[1-9][0-9]{0,3})-(?<end>[1-9][0-9]{0,3})");
 
 	// CheckStyle: ignore LineLength for next 4 lines
-	private static final Pattern VALID_CATEGORY_NAME_EN = Pattern.compile(CategoryValidation.CATEGORY_NAME_EN_REGEXP);
-	private static final Pattern VALID_CATEGORY_NAME_RU = Pattern.compile(CategoryValidation.CATEGORY_NAME_RU_REGEXP);
+	private static final Pattern VALID_CATEGORY_NAME_EN = Pattern.compile(CategoryValidation.NAME_EN_REGEXP);
+	private static final Pattern VALID_CATEGORY_NAME_RU = Pattern.compile(CategoryValidation.NAME_RU_REGEXP);
 	private static final Pattern VALID_COUNTRY_NAME_EN  = Pattern.compile(CountryValidation.NAME_EN_REGEXP);
 	private static final Pattern VALID_COUNTRY_NAME_RU  = Pattern.compile(CountryValidation.NAME_RU_REGEXP);
 
@@ -427,10 +427,10 @@ private Integer extractSellerBySiteName(String name) {
 	}
 
 	private static boolean validCategoryName(String name) {
-		if (name.length() < CategoryValidation.CATEGORY_NAME_MIN_LENGTH) {
+		if (name.length() < CategoryValidation.NAME_MIN_LENGTH) {
 			return false;
 		}
-		if (name.length() > CategoryValidation.CATEGORY_NAME_MAX_LENGTH) {
+		if (name.length() > CategoryValidation.NAME_MAX_LENGTH) {
 			return false;
 		}
 		return VALID_CATEGORY_NAME_EN.matcher(name).matches()

src/test/groovy/ru/mystamps/web/feature/series/importing/SeriesInfoExtractorServiceImplTest.groovy

@@ -85,7 +85,7 @@ class SeriesInfoExtractorServiceImplTest extends Specification {
 	def 'extractCategory() should filter out invalid candidates'() {
 		given:
 			String shortName = 'ok'
-			String longName = 'x' * (CategoryValidation.CATEGORY_NAME_MAX_LENGTH + 1)
+			String longName = 'x' * (CategoryValidation.NAME_MAX_LENGTH + 1)
 			String invalidEnName = 't3st_'
 			String invalidRuName = 'т_е_с_т'
 			String validEnName = 'valid'

src/test/java/ru/mystamps/web/tests/Random.java

@@ -136,8 +136,8 @@ public static String name() {
 
 	public static String categoryName() {
 		String name = between(
-				CategoryValidation.CATEGORY_NAME_MIN_LENGTH,
-				CategoryValidation.CATEGORY_NAME_MAX_LENGTH
+				CategoryValidation.NAME_MIN_LENGTH,
+				CategoryValidation.NAME_MAX_LENGTH
 			)
 			.with(oneOf(" -"))
 			.english();