Polish JwtValidators

Closes gh-14831
spring-projects · Apr 2, 2024 · ee42ad2 · ee42ad2
1 parent ff19f04
commit ee42ad2
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtValidators.java b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtValidators.java
@@ -52,10 +52,7 @@ private JwtValidators() {
 	 * supplied
 	 */
 	public static OAuth2TokenValidator<Jwt> createDefaultWithIssuer(String issuer) {
-		List<OAuth2TokenValidator<Jwt>> validators = new ArrayList<>();
-		validators.add(new JwtTimestampValidator());
-		validators.add(new JwtIssuerValidator(issuer));
-		return new DelegatingOAuth2TokenValidator<>(validators);
+		return createDefaultWithValidators(new JwtIssuerValidator(issuer));
 	}
 
 	/**
@@ -90,7 +87,7 @@ public static OAuth2TokenValidator<Jwt> createDefaultWithValidators(List<OAuth2T
 		JwtTimestampValidator jwtTimestampValidator = CollectionUtils.findValueOfType(tokenValidators,
 				JwtTimestampValidator.class);
 		if (jwtTimestampValidator == null) {
-			tokenValidators.add(new JwtTimestampValidator());
+			tokenValidators.add(0, new JwtTimestampValidator());
 		}
 		return new DelegatingOAuth2TokenValidator<>(tokenValidators);
 	}