Update DelegatingPasswordEncoder.java

Removes the use of `org.springframework.util.StringUtils` from `DelegatingPasswordEncoder` Closes gh-16442 Signed-off-by: Christian Hösel <[email protected]>
spring-projects · Jan 24, 2025 · 74d0f79 · 74d0f79
1 parent 5d9011b
commit 74d0f79
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/...src/main/java/org/springframework/security/crypto/password/DelegatingPasswordEncoder.java b/...src/main/java/org/springframework/security/crypto/password/DelegatingPasswordEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.springframework.util.StringUtils;
-
 /**
  * A password encoder that delegates to another PasswordEncoder based upon a prefixed
  * identifier.
@@ -297,10 +295,10 @@ public String encode(CharSequence rawPassword) {
 		@Override
 		public boolean matches(CharSequence rawPassword, String prefixEncodedPassword) {
 			String id = extractId(prefixEncodedPassword);
-			if (StringUtils.hasText(id)) {
+			if (id != null && !id.isBlank()) {
 				throw new IllegalArgumentException(String.format(NO_PASSWORD_ENCODER_MAPPED, id));
 			}
-			if (StringUtils.hasText(prefixEncodedPassword)) {
+			if (prefixEncodedPassword != null && !prefixEncodedPassword.isBlank()) {
 				int start = prefixEncodedPassword.indexOf(DelegatingPasswordEncoder.this.idPrefix);
 				int end = prefixEncodedPassword.indexOf(DelegatingPasswordEncoder.this.idSuffix, start);
 				if (start < 0 && end < 0) {