From ee42ad2c8c1f70025cbd383dbb7d673a3009a062 Mon Sep 17 00:00:00 2001
From: Josh Cummings <josh.cummings@gmail.com>
Date: Tue, 2 Apr 2024 16:04:43 -0600
Subject: [PATCH] Polish JwtValidators

Closes gh-14831
---
 .../springframework/security/oauth2/jwt/JwtValidators.java | 7 ++-----
 1 file changed, 2 insertions(+), 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
index e564811a80..7618d2911d 100644
--- 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 @@ public final class 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 final class JwtValidators {
 		JwtTimestampValidator jwtTimestampValidator = CollectionUtils.findValueOfType(tokenValidators,
 				JwtTimestampValidator.class);
 		if (jwtTimestampValidator == null) {
-			tokenValidators.add(new JwtTimestampValidator());
+			tokenValidators.add(0, new JwtTimestampValidator());
 		}
 		return new DelegatingOAuth2TokenValidator<>(tokenValidators);
 	}