Merge branch '2.6.x' into 2.7.x

Closes gh-29902
spring-projects · Feb 18, 2022 · b6fea07 · b6fea07
2 parents fc8f55f + 0cebb33
commit b6fea07
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 19 deletions.
diff --git a/...ure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java b/...ure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java
@@ -41,15 +41,15 @@
 public class SecurityProperties {
 
 	/**
-	 * Order applied to the WebSecurityConfigurerAdapter that is used to configure basic
+	 * Order applied to the SecurityFilterChain that is used to configure basic
 	 * authentication for application endpoints. If you want to add your own
 	 * authentication for all or some of those endpoints the best thing to do is to add
 	 * your own WebSecurityConfigurerAdapter with lower order.
 	 */
 	public static final int BASIC_AUTH_ORDER = Ordered.LOWEST_PRECEDENCE - 5;
 
 	/**
-	 * Order applied to the WebSecurityConfigurer that ignores standard static resource
+	 * Order applied to the WebSecurityCustomizer that ignores standard static resource
 	 * paths.
 	 */
 	public static final int IGNORED_ORDER = Ordered.HIGHEST_PRECEDENCE;

diff --git a/...ork/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfiguration.java b/...ork/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -31,15 +31,13 @@
 import org.springframework.security.web.SecurityFilterChain;
 
 /**
- * {@link org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter}
- * to add OAuth client support.
+ * {@link SecurityFilterChain} to add OAuth client support.
  *
  * @author Madhura Bhave
  * @author Phillip Webb
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnBean(ClientRegistrationRepository.class)
-@SuppressWarnings("deprecation")
 class OAuth2WebSecurityConfiguration {
 
 	@Bean

diff --git a/.../autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java b/.../autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -43,16 +43,14 @@
 
 /**
  * Configures a {@link JwtDecoder} when a JWK Set URI, OpenID Connect Issuer URI or Public
- * Key configuration is available. Also configures a
- * {@link org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter}
- * if a {@link JwtDecoder} bean is found.
+ * Key configuration is available. Also configures a {@link SecurityFilterChain} if a
+ * {@link JwtDecoder} bean is found.
  *
  * @author Madhura Bhave
  * @author Artsiom Yudovin
  * @author HaiTao Zhang
  */
 @Configuration(proxyBeanMethods = false)
-@SuppressWarnings("deprecation")
 class OAuth2ResourceServerJwtConfiguration {
 
 	@Configuration(proxyBeanMethods = false)

diff --git a/...figure/security/oauth2/resource/servlet/OAuth2ResourceServerOpaqueTokenConfiguration.java b/...figure/security/oauth2/resource/servlet/OAuth2ResourceServerOpaqueTokenConfiguration.java
@@ -31,14 +31,12 @@
 
 /**
  * Configures a {@link OpaqueTokenIntrospector} when a token introspection endpoint is
- * available. Also configures a
- * {@link org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter}
- * if a {@link OpaqueTokenIntrospector} bean is found.
+ * available. Also configures a {@link SecurityFilterChain} if a
+ * {@link OpaqueTokenIntrospector} bean is found.
  *
  * @author Madhura Bhave
  */
 @Configuration(proxyBeanMethods = false)
-@SuppressWarnings("deprecation")
 class OAuth2ResourceServerOpaqueTokenConfiguration {
 
 	@Configuration(proxyBeanMethods = false)

diff --git a/...n/java/org/springframework/boot/autoconfigure/security/saml2/Saml2LoginConfiguration.java b/...n/java/org/springframework/boot/autoconfigure/security/saml2/Saml2LoginConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -25,15 +25,14 @@
 import org.springframework.security.web.SecurityFilterChain;
 
 /**
- * {@link org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter}
- * configuration for Spring Security's relying party SAML support.
+ * {@link SecurityFilterChain} configuration for Spring Security's relying party SAML
+ * support.
  *
  * @author Madhura Bhave
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnDefaultWebSecurity
 @ConditionalOnBean(RelyingPartyRegistrationRepository.class)
-@SuppressWarnings("deprecation")
 class Saml2LoginConfiguration {
 
 	@Bean