From c56c0ff433baa45c82641b27a7d019ef10538aaa Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 4 Dec 2018 10:53:01 +0100 Subject: [PATCH] Rename OAuth2ResourceServerJwkConfiguration Closes gh-15375 --- .../servlet/OAuth2ResourceServerAutoConfiguration.java | 2 +- ...uration.java => OAuth2ResourceServerJwtConfiguration.java} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/{OAuth2ResourceServerJwkConfiguration.java => OAuth2ResourceServerJwtConfiguration.java} (95%) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfiguration.java index c42ead6d8a0..d3e9f813e72 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfiguration.java @@ -37,7 +37,7 @@ import org.springframework.security.oauth2.server.resource.authentication.JwtAut @EnableConfigurationProperties(OAuth2ResourceServerProperties.class) @ConditionalOnClass(JwtAuthenticationToken.class) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) -@Import({ OAuth2ResourceServerJwkConfiguration.class, +@Import({ OAuth2ResourceServerJwtConfiguration.class, OAuth2ResourceServerWebSecurityConfiguration.class }) public class OAuth2ResourceServerAutoConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwkConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java similarity index 95% rename from spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwkConfiguration.java rename to spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java index d760162198f..4f614d5c94e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwkConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java @@ -34,11 +34,11 @@ import org.springframework.security.oauth2.jwt.NimbusJwtDecoderJwkSupport; * @author Artsiom Yudovin */ @Configuration -class OAuth2ResourceServerJwkConfiguration { +class OAuth2ResourceServerJwtConfiguration { private final OAuth2ResourceServerProperties properties; - OAuth2ResourceServerJwkConfiguration(OAuth2ResourceServerProperties properties) { + OAuth2ResourceServerJwtConfiguration(OAuth2ResourceServerProperties properties) { this.properties = properties; }