From 42328771adf7ed212959a48b983b700bc560776d Mon Sep 17 00:00:00 2001 From: Scott Frederick Date: Thu, 17 Feb 2022 11:43:23 -0600 Subject: [PATCH] Suppress deprecation warnings for WebSecurityConfigurerAdapter Fixes gh-29897 --- .../AbstractEndpointRequestIntegrationTests.java | 6 +++--- .../ManagementWebSecurityAutoConfigurationTests.java | 5 +++-- .../security/DefaultWebSecurityCondition.java | 6 ++++-- .../client/servlet/OAuth2WebSecurityConfiguration.java | 5 +++-- .../servlet/OAuth2ResourceServerJwtConfiguration.java | 5 +++-- .../OAuth2ResourceServerOpaqueTokenConfiguration.java | 7 ++++--- .../security/saml2/Saml2LoginConfiguration.java | 6 +++--- .../servlet/SpringBootWebSecurityConfiguration.java | 7 ++++--- .../servlet/OAuth2WebSecurityConfigurationTests.java | 5 +++-- .../saml2/Saml2RelyingPartyAutoConfigurationTests.java | 6 +++--- .../servlet/SecurityAutoConfigurationTests.java | 10 +++++++--- .../UserDetailsServiceAutoConfigurationTests.java | 6 +++--- .../RemoteDevtoolsSecurityConfiguration.java | 4 ++-- .../RemoteDevToolsAutoConfigurationTests.java | 5 +++-- .../web/servlet/WebMvcTypeExcludeFilterTests.java | 5 +++-- 15 files changed, 51 insertions(+), 37 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/AbstractEndpointRequestIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/AbstractEndpointRequestIntegrationTests.java index 67dcf86f57a..a7539d91352 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/AbstractEndpointRequestIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/AbstractEndpointRequestIntegrationTests.java @@ -40,7 +40,6 @@ import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebSe import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.test.web.reactive.server.WebTestClient; /** @@ -168,8 +167,9 @@ abstract class AbstractEndpointRequestIntegrationTests { static class SecurityConfiguration { @Bean - WebSecurityConfigurerAdapter webSecurityConfigurerAdapter() { - return new WebSecurityConfigurerAdapter() { + @SuppressWarnings("deprecation") + org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter webSecurityConfigurerAdapter() { + return new org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter() { @Override protected void configure(HttpSecurity http) throws Exception { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.java index 1b99ffeacfd..f980d13ae6b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.java @@ -47,7 +47,6 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockServletContext; import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.web.FilterChainProxy; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; @@ -174,7 +173,9 @@ class ManagementWebSecurityAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - static class CustomSecurityConfiguration extends WebSecurityConfigurerAdapter { + @SuppressWarnings("deprecation") + static class CustomSecurityConfiguration + extends org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter { @Override protected void configure(HttpSecurity http) throws Exception { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/DefaultWebSecurityCondition.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/DefaultWebSecurityCondition.java index 1b8f12d6852..cdd146da771 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/DefaultWebSecurityCondition.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/DefaultWebSecurityCondition.java @@ -21,7 +21,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Condition; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.web.SecurityFilterChain; /** @@ -41,7 +40,10 @@ class DefaultWebSecurityCondition extends AllNestedConditions { } - @ConditionalOnMissingBean({ WebSecurityConfigurerAdapter.class, SecurityFilterChain.class }) + @ConditionalOnMissingBean({ + org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter.class, + SecurityFilterChain.class }) + @SuppressWarnings("deprecation") static class Beans { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfiguration.java index 153af686cd6..009e3b3a399 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfiguration.java @@ -23,7 +23,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.oauth2.client.InMemoryOAuth2AuthorizedClientService; import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService; import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; @@ -32,13 +31,15 @@ import org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepo import org.springframework.security.web.SecurityFilterChain; /** - * {@link WebSecurityConfigurerAdapter} to add OAuth client support. + * {@link org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter} + * 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/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java index 77f8faf812f..5f24446c79e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java @@ -32,7 +32,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer; import org.springframework.security.oauth2.jose.jws.SignatureAlgorithm; import org.springframework.security.oauth2.jwt.JwtDecoder; @@ -44,7 +43,8 @@ import org.springframework.security.web.SecurityFilterChain; /** * Configures a {@link JwtDecoder} when a JWK Set URI, OpenID Connect Issuer URI or Public - * Key configuration is available. Also configures a {@link WebSecurityConfigurerAdapter} + * Key configuration is available. Also configures a + * {@link org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter} * if a {@link JwtDecoder} bean is found. * * @author Madhura Bhave @@ -52,6 +52,7 @@ import org.springframework.security.web.SecurityFilterChain; * @author HaiTao Zhang */ @Configuration(proxyBeanMethods = false) +@SuppressWarnings("deprecation") class OAuth2ResourceServerJwtConfiguration { @Configuration(proxyBeanMethods = false) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerOpaqueTokenConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerOpaqueTokenConfiguration.java index 9586cfa3313..964d322b43f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerOpaqueTokenConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerOpaqueTokenConfiguration.java @@ -24,7 +24,6 @@ import org.springframework.boot.autoconfigure.security.oauth2.resource.OAuth2Res import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer; import org.springframework.security.oauth2.server.resource.introspection.OpaqueTokenIntrospector; import org.springframework.security.oauth2.server.resource.introspection.SpringOpaqueTokenIntrospector; @@ -32,12 +31,14 @@ import org.springframework.security.web.SecurityFilterChain; /** * Configures a {@link OpaqueTokenIntrospector} when a token introspection endpoint is - * available. Also configures a {@link WebSecurityConfigurerAdapter} if a - * {@link OpaqueTokenIntrospector} bean is found. + * available. Also configures a + * {@link org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter} + * if a {@link OpaqueTokenIntrospector} bean is found. * * @author Madhura Bhave */ @Configuration(proxyBeanMethods = false) +@SuppressWarnings("deprecation") class OAuth2ResourceServerOpaqueTokenConfiguration { @Configuration(proxyBeanMethods = false) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/saml2/Saml2LoginConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/saml2/Saml2LoginConfiguration.java index 8376adcafdc..c6edbd6396f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/saml2/Saml2LoginConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/saml2/Saml2LoginConfiguration.java @@ -21,19 +21,19 @@ import org.springframework.boot.autoconfigure.security.ConditionalOnDefaultWebSe import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository; import org.springframework.security.web.SecurityFilterChain; /** - * {@link WebSecurityConfigurerAdapter} configuration for Spring Security's relying party - * SAML support. + * {@link org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter} + * configuration for Spring Security's relying party SAML support. * * @author Madhura Bhave */ @Configuration(proxyBeanMethods = false) @ConditionalOnDefaultWebSecurity @ConditionalOnBean(RelyingPartyRegistrationRepository.class) +@SuppressWarnings("deprecation") class Saml2LoginConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SpringBootWebSecurityConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SpringBootWebSecurityConfiguration.java index a127a94113d..cbbe3d5a0d8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SpringBootWebSecurityConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SpringBootWebSecurityConfiguration.java @@ -24,14 +24,14 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.annotation.Order; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.web.SecurityFilterChain; /** * The default configuration for web security. It relies on Spring Security's * content-negotiation strategy to determine what sort of authentication to use. If the - * user specifies their own {@link WebSecurityConfigurerAdapter} or - * {@link SecurityFilterChain} bean, this will back-off completely and the users should + * user specifies their own + * {@link org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter} + * or {@link SecurityFilterChain} bean, this will back-off completely and the users should * specify all the bits that they want to configure as part of the custom security * configuration. * @@ -40,6 +40,7 @@ import org.springframework.security.web.SecurityFilterChain; @Configuration(proxyBeanMethods = false) @ConditionalOnDefaultWebSecurity @ConditionalOnWebApplication(type = Type.SERVLET) +@SuppressWarnings("deprecation") class SpringBootWebSecurityConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfigurationTests.java index 338c828707e..53f1371691d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfigurationTests.java @@ -34,7 +34,6 @@ import org.springframework.context.annotation.Import; import org.springframework.security.config.BeanIds; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.oauth2.client.InMemoryOAuth2AuthorizedClientService; import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService; import org.springframework.security.oauth2.client.registration.ClientRegistration; @@ -231,7 +230,9 @@ class OAuth2WebSecurityConfigurationTests { @Configuration(proxyBeanMethods = false) @Import(ClientRegistrationRepositoryConfiguration.class) - static class TestWebSecurityConfigurerConfig extends WebSecurityConfigurerAdapter { + @SuppressWarnings("deprecation") + static class TestWebSecurityConfigurerConfig + extends org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyAutoConfigurationTests.java index da95d630825..f5e36cd4d77 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyAutoConfigurationTests.java @@ -39,7 +39,6 @@ import org.springframework.core.io.Resource; import org.springframework.security.config.BeanIds; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration; import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository; import org.springframework.security.saml2.provider.service.registration.Saml2MessageBinding; @@ -282,8 +281,9 @@ class Saml2RelyingPartyAutoConfigurationTests { static class WebSecurityConfigurerAdapterConfiguration { @Bean - WebSecurityConfigurerAdapter webSecurityConfigurerAdapter() { - return new WebSecurityConfigurerAdapter() { + @SuppressWarnings("deprecation") + org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter webSecurityConfigurerAdapter() { + return new org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter() { }; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityAutoConfigurationTests.java index fefae03f932..5501ab9999d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityAutoConfigurationTests.java @@ -51,7 +51,6 @@ import org.springframework.security.authentication.DefaultAuthenticationEventPub import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; import org.springframework.security.data.repository.query.SecurityEvaluationContextExtension; @@ -103,9 +102,12 @@ class SecurityAutoConfigurationTests { } @Test + @SuppressWarnings("deprecation") void securityConfigurerBacksOffWhenOtherWebSecurityAdapterBeanPresent() { this.contextRunner.withUserConfiguration(WebSecurity.class).run((context) -> { - assertThat(context.getBeansOfType(WebSecurityConfigurerAdapter.class).size()).isEqualTo(1); + assertThat(context.getBeansOfType( + org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter.class) + .size()).isEqualTo(1); assertThat(context.containsBean("securityAutoConfigurationTests.WebSecurity")).isTrue(); }); } @@ -286,7 +288,9 @@ class SecurityAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @EnableWebSecurity - static class WebSecurity extends WebSecurityConfigurerAdapter { + @SuppressWarnings("deprecation") + static class WebSecurity + extends org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfigurationTests.java index 2ae8c294b32..9fa64ddd8ad 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfigurationTests.java @@ -38,7 +38,6 @@ import org.springframework.security.authentication.TestingAuthenticationProvider import org.springframework.security.authentication.TestingAuthenticationToken; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.crypto.password.PasswordEncoder; @@ -270,8 +269,9 @@ class UserDetailsServiceAutoConfigurationTests { static class TestConfigWithAuthenticationManagerBuilder { @Bean - WebSecurityConfigurerAdapter webSecurityConfigurerAdapter() { - return new WebSecurityConfigurerAdapter() { + @SuppressWarnings("deprecation") + org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter webSecurityConfigurerAdapter() { + return new org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter() { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { auth.inMemoryAuthentication().withUser("hero").password("{noop}hero").roles("HERO", "USER").and() diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevtoolsSecurityConfiguration.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevtoolsSecurityConfiguration.java index d2610401276..5d0461e05d1 100644 --- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevtoolsSecurityConfiguration.java +++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevtoolsSecurityConfiguration.java @@ -24,7 +24,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.annotation.Order; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; @@ -48,7 +47,8 @@ class RemoteDevtoolsSecurityConfiguration { @Bean @Order(SecurityProperties.BASIC_AUTH_ORDER - 1) - @ConditionalOnMissingBean(WebSecurityConfigurerAdapter.class) + @ConditionalOnMissingBean(org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter.class) + @SuppressWarnings("deprecation") SecurityFilterChain devtoolsSecurityFilterChain(HttpSecurity http) throws Exception { http.requestMatcher(new AntPathRequestMatcher(this.url)).authorizeRequests().anyRequest().anonymous().and() .csrf().disable(); diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java index 81047e28eab..059060996f2 100644 --- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java @@ -46,7 +46,6 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockServletContext; import org.springframework.security.config.BeanIds; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.test.web.servlet.setup.MockMvcBuilders; @@ -273,7 +272,9 @@ class RemoteDevToolsAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - static class TestWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdapter { + @SuppressWarnings("deprecation") + static class TestWebSecurityConfigurerAdapter + extends org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter { @Override protected void configure(HttpSecurity http) throws Exception { diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilterTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilterTests.java index 198ecf7295a..25315dbff6c 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilterTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilterTests.java @@ -29,7 +29,6 @@ import org.springframework.core.type.classreading.MetadataReader; import org.springframework.core.type.classreading.MetadataReaderFactory; import org.springframework.core.type.classreading.SimpleMetadataReaderFactory; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.web.SecurityFilterChain; import org.springframework.stereotype.Controller; import org.springframework.stereotype.Repository; @@ -205,7 +204,9 @@ class WebMvcTypeExcludeFilterTests { } - static class ExampleWebSecurityConfigurer extends WebSecurityConfigurerAdapter { + @SuppressWarnings("deprecation") + static class ExampleWebSecurityConfigurer + extends org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter { }