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

Polishing deprecated methods

Browse Source 
Added since and forRemoval to Deprecated methods.
This commit is contained in:
Arjen Poutsma
2022-11-16 09:57:14 +01:00
parent 37b439182e
commit 9be6cea012
7 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-core/src/main/java/org/springframework/util/MimeType.java
View File

@@ -708,7 +708,7 @@ public class MimeType implements Comparable<MimeType>, Serializable {
* @param <T> the type of mime types that may be compared by this comparator
* @deprecated As of 6.0, with no direct replacement
*/
@Deprecated(since = "6.0")
@Deprecated(since = "6.0", forRemoval = true)
public static class SpecificityComparator<T extends MimeType> implements Comparator<T> {
@Override

3
spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java
View File

@@ -55,7 +55,8 @@ public abstract class MimeTypeUtils {
* Comparator formally used by {@link #sortBySpecificity(List)}.
* @deprecated As of 6.0, with no direct replacement
*/
@Deprecated(since = "6.0")
@SuppressWarnings("removal")
@Deprecated(since = "6.0", forRemoval = true)
public static final Comparator<MimeType> SPECIFICITY_COMPARATOR = new MimeType.SpecificityComparator<>();
/**

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

@@ -221,9 +221,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 since 6.0, in favor of {@link String#strip()}
*/
@Deprecated
@Deprecated(since = "6.0")
public static String trimWhitespace(String str) {
if (!hasLength(str)) {
return str;
@@ -277,9 +277,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 since 6.0, in favor of {@link String#stripLeading()}
*/
@Deprecated
@Deprecated(since = "6.0")
public static String trimLeadingWhitespace(String str) {
if (!hasLength(str)) {
return str;
@@ -293,9 +293,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 since 6.0, in favor of {@link String#stripTrailing()}
*/
@Deprecated
@Deprecated(since = "6.0")
public static String trimTrailingWhitespace(String str) {
if (!hasLength(str)) {
return str;

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

@@ -98,7 +98,7 @@ class StringUtilsTests {
}
@Test
@Deprecated
@SuppressWarnings("deprecation")
void trimLeadingWhitespace() {
assertThat(StringUtils.trimLeadingWhitespace(null)).isNull();
assertThat(StringUtils.trimLeadingWhitespace("")).isEqualTo("");
@@ -114,7 +114,7 @@ class StringUtilsTests {
}
@Test
@Deprecated
@SuppressWarnings("deprecation")
void trimTrailingWhitespace() {
assertThat(StringUtils.trimTrailingWhitespace(null)).isNull();
assertThat(StringUtils.trimTrailingWhitespace("")).isEqualTo("");