refactor: propagate constants from StringUtils class.

Author: php-coder

src/main/java/ru/mystamps/web/common/SlugUtils.java

@@ -21,6 +21,8 @@
 
 import java.util.Locale;
 
+import static org.apache.commons.lang3.StringUtils.EMPTY;
+
 public final class SlugUtils {
 
 	private SlugUtils() {
@@ -35,9 +37,9 @@ public static String slugify(String text) {
 			// replace multiple hyphens by one
 			.replaceAll("-{2,}", "-")
 			// remove leading hyphen
-			.replaceAll("^-", "")
+			.replaceAll("^-", EMPTY)
 			// remove ending hyphen
-			.replaceAll("-$", "");
+			.replaceAll("-$", EMPTY);
 	}
 
 }

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

@@ -28,6 +28,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import static org.apache.commons.lang3.StringUtils.EMPTY;
+
 @RequiredArgsConstructor
 public class JdbcStampsCatalogDao implements StampsCatalogDao {
 
@@ -39,7 +41,7 @@ public class JdbcStampsCatalogDao implements StampsCatalogDao {
 
 	@Override
 	public List<String> add(Set<String> catalogNumbers) {
-		Validate.validState(!"".equals(addCatalogNumberSql), "Query must be non empty");
+		Validate.validState(!EMPTY.equals(addCatalogNumberSql), "Query must be non empty");
 
 		List<String> inserted = new ArrayList<>();
 		for (String number : catalogNumbers) {
@@ -59,7 +61,7 @@ public List<String> add(Set<String> catalogNumbers) {
 	public void addToSeries(Integer seriesId, Set<String> catalogNumbers) {
 		Validate.validState(seriesId != null, "Series id must be non null");
 		Validate.validState(!catalogNumbers.isEmpty(), "Catalog numbers must be non empty");
-		Validate.validState(!"".equals(addCatalogNumbersToSeriesSql), "Query must be non empty");
+		Validate.validState(!EMPTY.equals(addCatalogNumbersToSeriesSql), "Query must be non empty");
 
 		Map<String, Object> params = new HashMap<>();
 		params.put("series_id", seriesId);

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

@@ -77,6 +77,8 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import static org.apache.commons.lang3.StringUtils.EMPTY;
+import static org.apache.commons.lang3.StringUtils.SPACE;
 import static ru.mystamps.web.common.ControllerUtils.redirectTo;
 
 @Controller
@@ -107,7 +109,7 @@ public class SeriesController {
 
 	@InitBinder("addSeriesForm")
 	protected void initSeriesFormBinder(WebDataBinder binder) {
-		StringTrimmerEditor editor = new StringTrimmerEditor(" ", true);
+		StringTrimmerEditor editor = new StringTrimmerEditor(SPACE, true);
 		binder.registerCustomEditor(String.class, "michelNumbers", editor);
 		binder.registerCustomEditor(String.class, "scottNumbers", editor);
 		binder.registerCustomEditor(String.class, "yvertNumbers", editor);
@@ -555,8 +557,8 @@ public String processAskForm(
 
 	@GetMapping(SeriesUrl.SEARCH_SERIES_BY_CATALOG)
 	public String searchSeriesByCatalog(
-		@RequestParam(name = "catalogNumber", defaultValue = "") String catalogNumber,
-		@RequestParam(name = "catalogName", defaultValue = "") String catalogName,
+		@RequestParam(name = "catalogNumber", defaultValue = EMPTY) String catalogNumber,
+		@RequestParam(name = "catalogName", defaultValue = EMPTY) String catalogName,
 		@RequestParam(name = "inCollection", defaultValue = "false") Boolean inCollection,
 		@CurrentUser Integer currentUserId,
 		Model model,

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

@@ -24,6 +24,9 @@
 import java.beans.PropertyEditorSupport;
 import java.util.Set;
 
+import static org.apache.commons.lang3.StringUtils.EMPTY;
+import static org.apache.commons.lang3.StringUtils.SPACE;
+
 /**
  * Expands range of catalog numbers (1-3) into a comma-separated list (1,2,3).
  *
@@ -33,10 +36,6 @@
 @RequiredArgsConstructor
 public class ExpandCatalogNumbersEditor extends PropertyEditorSupport {
 
-	// We can't use StringUtils.EMPTY constant from commons-lang because
-	// we are using StringUtils from Spring.
-	private static final String EMPTY = "";
-	
 	@Override
 	public void setAsText(String text) {
 		String result = null;
@@ -50,7 +49,7 @@ public void setAsText(String text) {
 			//
 			// @todo #694 ExpandCatalogNumbersEditor: find a better way of editors composition
 			String value = text.trim();
-			value = StringUtils.deleteAny(value, " ");
+			value = StringUtils.deleteAny(value, SPACE);
 
 			if (!value.equals(EMPTY)) {
 				try {

src/main/java/ru/mystamps/web/support/spring/mvc/ReplaceRepeatingSpacesEditor.java

@@ -22,6 +22,9 @@
 import java.beans.PropertyEditorSupport;
 import java.util.regex.Pattern;
 
+import static org.apache.commons.lang3.StringUtils.EMPTY;
+import static org.apache.commons.lang3.StringUtils.SPACE;
+
 /**
  * @author Maxim Shestakov
  * @author Slava Semushin
@@ -36,10 +39,10 @@ public void setAsText(String name) throws IllegalArgumentException {
 		String text = name.trim();
 
 		if (text.contains("  ")) {
-			text = REPEATING_SPACES.matcher(text).replaceAll(" ");
+			text = REPEATING_SPACES.matcher(text).replaceAll(SPACE);
 		}
 
-		if (emptyAsNull && "".equals(text)) { // NOPMD: AvoidLiteralsInIfCondition (it's ok for me)
+		if (emptyAsNull && EMPTY.equals(text)) {
 			text = null; // NOPMD: NullAssignment (we need it)
 		}
 

src/main/java/ru/mystamps/web/support/spring/security/ContentSecurityPolicyHeaderWriter.java

@@ -29,6 +29,8 @@
 
 import java.util.regex.Pattern;
 
+import static org.apache.commons.lang3.StringUtils.EMPTY;
+
 /**
  * Implementation of {@link HeaderWriter} that is adding CSP header depending on the current URL.
  */
@@ -39,7 +41,7 @@ class ContentSecurityPolicyHeaderWriter implements HeaderWriter {
 	private static final String CSP_REPORT_ONLY_HEADER = "Content-Security-Policy-Report-Only";
 
 	private static final String COLLECTION_INFO_PAGE_PATTERN =
-		CollectionUrl.INFO_COLLECTION_PAGE.replace("{slug}", "");
+		CollectionUrl.INFO_COLLECTION_PAGE.replace("{slug}", EMPTY);
 
 	private static final Pattern SERIES_INFO_PAGE_PATTERN =
 		Pattern.compile(SeriesUrl.SERIES_INFO_PAGE_REGEXP);

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

@@ -55,6 +55,7 @@
 import static io.qala.datagen.RandomValue.between;
 import static io.qala.datagen.StringModifier.Impls.multipleOf;
 import static io.qala.datagen.StringModifier.Impls.oneOf;
+import static org.apache.commons.lang3.StringUtils.SPACE;
 
 public final class Random {
 
@@ -104,7 +105,7 @@ public static String login() {
 			.with(multipleOf(" -_"))
 			.alphanumeric();
 
-		if (StringUtils.containsAny(login, "  ", "--", "__")) {
+		if (StringUtils.containsAny(login, SPACE, "--", "__")) {
 			return login();
 		}
 
@@ -147,8 +148,8 @@ public static String categoryName() {
 			.with(oneOf(" -"))
 			.english();
 
-		if (StringUtils.startsWithAny(name, " ", "-")
-			|| StringUtils.endsWithAny(name, " ", "-")) {
+		if (StringUtils.startsWithAny(name, SPACE, "-")
+			|| StringUtils.endsWithAny(name, SPACE, "-")) {
 			return countryName();
 		}
 
@@ -167,8 +168,8 @@ public static String countryName() {
 			.with(oneOf(" -"))
 			.english();
 
-		if (StringUtils.startsWithAny(name, " ", "-")
-			|| StringUtils.endsWithAny(name, " ", "-")) {
+		if (StringUtils.startsWithAny(name, SPACE, "-")
+			|| StringUtils.endsWithAny(name, SPACE, "-")) {
 			return countryName();
 		}