diff --git a/spring-core/src/main/java/org/springframework/cglib/core/TypeUtils.java b/spring-core/src/main/java/org/springframework/cglib/core/TypeUtils.java
index de0f693146e3..71158205c55a 100644
--- a/spring-core/src/main/java/org/springframework/cglib/core/TypeUtils.java
+++ b/spring-core/src/main/java/org/springframework/cglib/core/TypeUtils.java
@@ -97,7 +97,7 @@ public static String getPackageName(String className) {
     }
 
     public static String upperFirst(String s) {
-        if (s == null || s.length() == 0) {
+        if (s == null || s.isEmpty()) {
             return s;
         }
         return Character.toUpperCase(s.charAt(0)) + s.substring(1);
diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/binding/BindMarkersFactoryResolver.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/binding/BindMarkersFactoryResolver.java
index 0175c0b1c3ca..a92c0a0d1241 100644
--- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/binding/BindMarkersFactoryResolver.java
+++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/binding/BindMarkersFactoryResolver.java
@@ -153,7 +153,7 @@ private static String filterBindMarker(CharSequence input) {
 					builder.append(ch);
 				}
 			}
-			if (builder.length() == 0) {
+			if (builder.isEmpty()) {
 				return "";
 			}
 			return "_" + builder.toString();
diff --git a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
index 32bc0eda0a2c..82b2004609b4 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
@@ -877,7 +877,7 @@ public void append(String path) {
 		@Override
 		@Nullable
 		public PathComponent build() {
-			if (this.path.length() == 0) {
+			if (this.path.isEmpty()) {
 				return null;
 			}
 			String sanitized = getSanitizedPath(this.path);
diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureVariablePathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureVariablePathElement.java
index b3002295a9f2..6bf30d17589a 100644
--- a/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureVariablePathElement.java
+++ b/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureVariablePathElement.java
@@ -73,7 +73,7 @@ public boolean matches(int pathIndex, PathPattern.MatchingContext matchingContex
 			return false;
 		}
 		String candidateCapture = matchingContext.pathElementValue(pathIndex);
-		if (candidateCapture.length() == 0) {
+		if (candidateCapture.isEmpty()) {
 			return false;
 		}
 
diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardPathElement.java
index 0fa2be98b9af..d874f888b6ac 100644
--- a/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardPathElement.java
+++ b/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardPathElement.java
@@ -66,7 +66,7 @@ public boolean matches(int pathIndex, MatchingContext matchingContext) {
 				}
 				else {
 					return (matchingContext.isMatchOptionalTrailingSeparator() &&  // if optional slash is on...
-							segmentData != null && segmentData.length() > 0 &&  // and there is at least one character to match the *...
+							segmentData != null && !segmentData.isEmpty() &&  // and there is at least one character to match the *...
 							(pathIndex + 1) == matchingContext.pathLength &&   // and the next path element is the end of the candidate...
 							matchingContext.isSeparator(pathIndex));  // and the final element is a separator
 				}
@@ -74,7 +74,7 @@ public boolean matches(int pathIndex, MatchingContext matchingContext) {
 		}
 		else {
 			// Within a path (e.g. /aa/*/bb) there must be at least one character to match the wildcard
-			if (segmentData == null || segmentData.length() == 0) {
+			if (segmentData == null || segmentData.isEmpty()) {
 				return false;
 			}
 			return (this.next != null && this.next.matches(pathIndex, matchingContext));
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
index d3062c94c715..b3ede2e57381 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
@@ -323,7 +323,7 @@ protected String createQueryString(List<Param> params, Set<String> usedParams, b
 		StringBuilder qs = new StringBuilder();
 		for (Param param : params) {
 			if (!usedParams.contains(param.getName()) && StringUtils.hasLength(param.getName())) {
-				if (includeQueryStringDelimiter && qs.length() == 0) {
+				if (includeQueryStringDelimiter && qs.isEmpty()) {
 					qs.append('?');
 				}
 				else {