root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

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
This commit is contained in:
Park Sung Jun 2024-10-05 12:00:00 +09:00 committed by Sam Brannen
parent d89983d633
commit 32df079b05
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-core/src/main/java/org/springframework/util/StringUtils.java
View File

@ -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;
}