refactor(Unique{Category,Country}NameValidator): simplify.

php-coder · php-coder · commit 7236ecb167df · 2019-06-06T21:07:08.000+01:00
No functional changes.
diff --git a/src/main/java/ru/mystamps/web/feature/category/UniqueCategoryNameValidator.java b/src/main/java/ru/mystamps/web/feature/category/UniqueCategoryNameValidator.java
@@ -45,8 +45,9 @@ public boolean isValid(String value, ConstraintValidatorContext ctx) {
 		
 		if (lang == Lang.EN && categoryService.countByName(value) > 0) {
 			return false;
+		}
 		
-		} else if (lang == Lang.RU && categoryService.countByNameRu(value) > 0) {
+		if (lang == Lang.RU && categoryService.countByNameRu(value) > 0) {
 			return false;
 		}
 		
diff --git a/src/main/java/ru/mystamps/web/feature/country/UniqueCountryNameValidator.java b/src/main/java/ru/mystamps/web/feature/country/UniqueCountryNameValidator.java
@@ -44,8 +44,9 @@ public boolean isValid(String value, ConstraintValidatorContext ctx) {
 		
 		if (lang == Lang.EN && countryService.countByName(value) > 0) {
 			return false;
+		}
 		
-		} else if (lang == Lang.RU && countryService.countByNameRu(value) > 0) {
+		if (lang == Lang.RU && countryService.countByNameRu(value) > 0) {
 			return false;
 		}
 		

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,9 @@ public boolean isValid(String value, ConstraintValidatorContext ctx) {`
`45`	`45`
`46`	`46`	`if (lang == Lang.EN && categoryService.countByName(value) > 0) {`
`47`	`47`	`return false;`
	`48`	`+ }`
`48`	`49`
`49`		`- } else if (lang == Lang.RU && categoryService.countByNameRu(value) > 0) {`
	`50`	`+ if (lang == Lang.RU && categoryService.countByNameRu(value) > 0) {`
`50`	`51`	`return false;`
`51`	`52`	`}`
`52`	`53`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,9 @@ public boolean isValid(String value, ConstraintValidatorContext ctx) {`
`44`	`44`
`45`	`45`	`if (lang == Lang.EN && countryService.countByName(value) > 0) {`
`46`	`46`	`return false;`
	`47`	`+ }`
`47`	`48`
`48`		`- } else if (lang == Lang.RU && countryService.countByNameRu(value) > 0) {`
	`49`	`+ if (lang == Lang.RU && countryService.countByNameRu(value) > 0) {`
`49`	`50`	`return false;`
`50`	`51`	`}`
`51`	`52`