From 37186284e411489c96455cf627c53c69aa44b7b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Mon, 27 Apr 2026 11:01:09 +0200 Subject: [PATCH] Fix name of ReactiveOAuth2ResourceServerJwkConfiguration Closes gh-50226 --- .../reactive/ReactiveOAuth2ResourceServerConfiguration.java | 6 +++--- ...va => ReactiveOAuth2ResourceServerJwtConfiguration.java} | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/{ReactiveOAuth2ResourceServerJwkConfiguration.java => ReactiveOAuth2ResourceServerJwtConfiguration.java} (99%) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerConfiguration.java index 6337b2c7ef4..38b3d9437bd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerConfiguration.java @@ -33,9 +33,9 @@ class ReactiveOAuth2ResourceServerConfiguration { @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ BearerTokenAuthenticationToken.class, ReactiveJwtDecoder.class }) - @Import({ ReactiveOAuth2ResourceServerJwkConfiguration.JwtConfiguration.class, - ReactiveOAuth2ResourceServerJwkConfiguration.JwtConverterConfiguration.class, - ReactiveOAuth2ResourceServerJwkConfiguration.WebSecurityConfiguration.class }) + @Import({ ReactiveOAuth2ResourceServerJwtConfiguration.JwtConfiguration.class, + ReactiveOAuth2ResourceServerJwtConfiguration.JwtConverterConfiguration.class, + ReactiveOAuth2ResourceServerJwtConfiguration.WebSecurityConfiguration.class }) static class JwtConfiguration { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerJwkConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerJwtConfiguration.java similarity index 99% rename from spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerJwkConfiguration.java rename to spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerJwtConfiguration.java index 00a7ade0553..a63d8ef3365 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerJwkConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerJwtConfiguration.java @@ -73,7 +73,7 @@ import org.springframework.util.StringUtils; * @author Yan Kardziyaka */ @Configuration(proxyBeanMethods = false) -class ReactiveOAuth2ResourceServerJwkConfiguration { +class ReactiveOAuth2ResourceServerJwtConfiguration { @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(ReactiveJwtDecoder.class)