Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Deprecate StringUtils::trimWhitespace and variants

Browse Source 
This commits deprecates
- StringUtils::trimWhitespace in favor of String::strip
- StringUtils::trimLeadingWhitespace in favor of String::stripLeading
- StringUtils::trimTrailingWhitespace in favor of String::stripTrailing

Closes gh-27769
This commit is contained in:
Arjen Poutsma
2021-12-06 13:33:30 +01:00
parent 982ba0e86d
commit 81af7330f6
10 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -218,7 +218,9 @@ public abstract class StringUtils {
* @param str the {@code String} to check
* @return the trimmed {@code String}
* @see java.lang.Character#isWhitespace
* @deprecated in favor of {@link String#strip()}
*/
@Deprecated
public static String trimWhitespace(String str) {
if (!hasLength(str)) {
return str;
@@ -255,7 +257,9 @@ public abstract class StringUtils {
* @param str the {@code String} to check
* @return the trimmed {@code String}
* @see java.lang.Character#isWhitespace
* @deprecated in favor of {@link String#stripLeading()}
*/
@Deprecated
public static String trimLeadingWhitespace(String str) {
if (!hasLength(str)) {
return str;
@@ -269,7 +273,9 @@ public abstract class StringUtils {
* @param str the {@code String} to check
* @return the trimmed {@code String}
* @see java.lang.Character#isWhitespace
* @deprecated in favor of {@link String#stripTrailing()}
*/
@Deprecated
public static String trimTrailingWhitespace(String str) {
if (!hasLength(str)) {
return str;
@@ -843,7 +849,7 @@ public abstract class StringUtils {
// code sans the separator between the country code and the variant.
int endIndexOfCountryCode = localeString.indexOf(country, language.length()) + country.length();
// Strip off any leading '_' and whitespace, what's left is the variant.
variant = trimLeadingWhitespace(localeString.substring(endIndexOfCountryCode));
variant = localeString.substring(endIndexOfCountryCode).stripLeading();
if (variant.startsWith("_")) {
variant = trimLeadingCharacter(variant, '_');
}

3
spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
View File

@@ -67,6 +67,7 @@ class StringUtilsTests {
}
@Test
@Deprecated
void trimWhitespace() {
assertThat(StringUtils.trimWhitespace(null)).isEqualTo(null);
assertThat(StringUtils.trimWhitespace("")).isEqualTo("");
@@ -97,6 +98,7 @@ class StringUtilsTests {
}
@Test
@Deprecated
void trimLeadingWhitespace() {
assertThat(StringUtils.trimLeadingWhitespace(null)).isEqualTo(null);
assertThat(StringUtils.trimLeadingWhitespace("")).isEqualTo("");
@@ -112,6 +114,7 @@ class StringUtilsTests {
}
@Test
@Deprecated
void trimTrailingWhitespace() {
assertThat(StringUtils.trimTrailingWhitespace(null)).isEqualTo(null);
assertThat(StringUtils.trimTrailingWhitespace("")).isEqualTo("");