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

Consistent hasText checks for CharSequence vs String 

Directly inlined hasLength implementations for proper nullability detection in IntelliJ, assuming a hasText checked value is never null afterwards. Since the JVM is going to do this at runtime anyway, this is effectively equivalent but more indicative for source code introspection algorithms.

Issue: SPR-15540
This commit is contained in:
Juergen Hoeller 2017-10-24 13:16:47 +02:00
parent 9efdadcdca
commit 2d0ab4740c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,7 +139,7 @@ public abstract class StringUtils {
* @see Character#isWhitespace
*/
public static boolean hasText(@Nullable CharSequence str) {
return (hasLength(str) && containsText(str));
return (str != null && str.length() > 0 && containsText(str));
}
/**
@ -153,7 +153,7 @@ public abstract class StringUtils {
* @see #hasText(CharSequence)
*/
public static boolean hasText(@Nullable String str) {
return (hasLength(str) && containsText(str));
return (str != null && !str.isEmpty() && containsText(str));
}
private static boolean containsText(CharSequence str) {