From 32df079b05d2b1b755c6c84ef4d2bf5238186b71 Mon Sep 17 00:00:00 2001 From: Park Sung Jun Date: Sat, 5 Oct 2024 12:00:00 +0900 Subject: [PATCH] Polish use of constants in StringUtils The hardcoded '.' and '\\' literals have been replaced by the use of EXTENSION_SEPARATOR and WINDOWS_FOLDER_SEPARATOR_CHAR. Closes gh-33654 --- .../src/main/java/org/springframework/util/StringUtils.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/util/StringUtils.java b/spring-core/src/main/java/org/springframework/util/StringUtils.java index c7aa9ffc26..f26355f721 100644 --- a/spring-core/src/main/java/org/springframework/util/StringUtils.java +++ b/spring-core/src/main/java/org/springframework/util/StringUtils.java @@ -72,6 +72,8 @@ public abstract class StringUtils { private static final String WINDOWS_FOLDER_SEPARATOR = "\\"; + private static final char WINDOWS_FOLDER_SEPARATOR_CHAR = '\\'; + private static final String DOUBLE_BACKSLASHES = "\\\\"; private static final String TOP_PATH = ".."; @@ -712,7 +714,7 @@ public abstract class StringUtils { String normalizedPath; // Optimize when there is no backslash - if (path.indexOf('\\') != -1) { + if (path.indexOf(WINDOWS_FOLDER_SEPARATOR_CHAR) != -1) { normalizedPath = replace(path, DOUBLE_BACKSLASHES, FOLDER_SEPARATOR); normalizedPath = replace(normalizedPath, WINDOWS_FOLDER_SEPARATOR, FOLDER_SEPARATOR); } @@ -722,7 +724,7 @@ public abstract class StringUtils { String pathToUse = normalizedPath; // Shortcut if there is no work to do - if (pathToUse.indexOf('.') == -1) { + if (pathToUse.indexOf(EXTENSION_SEPARATOR) == -1) { return pathToUse; }