Skip to content

Commit 29707bf

Browse files
philwebbphilwebb
committed
Complete restructure of security packages
Complete the restructuring of the security auto-configuration packages by removing the direct import of web configuration from the main security auto-configuration. Closes gh-14412
1 parent f835f82 commit 29707bf

File tree

40 files changed

+270
-193
lines changed

40 files changed

+270
-193
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/web/reactive/EndpointRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
* endpoint locations.
5050
*
5151
* @author Madhura Bhave
52-
* @since 2.0.0
52+
* @since 2.1.0
5353
*/
5454
public final class EndpointRequest {
5555

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/web/reactive/ReactiveManagementWebSecurityAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2929
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
3030
import org.springframework.boot.autoconfigure.security.oauth2.client.ReactiveOAuth2ClientAutoConfiguration;
31-
import org.springframework.boot.autoconfigure.security.web.reactive.ReactiveSecurityAutoConfiguration;
31+
import org.springframework.boot.autoconfigure.security.web.reactive.ReactiveWebSecurityAutoConfiguration;
3232
import org.springframework.context.annotation.Bean;
3333
import org.springframework.context.annotation.Configuration;
3434
import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
@@ -48,7 +48,7 @@
4848
@ConditionalOnClass({ EnableWebFluxSecurity.class, WebFilterChainProxy.class })
4949
@ConditionalOnMissingBean({ SecurityWebFilterChain.class, WebFilterChainProxy.class })
5050
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
51-
@AutoConfigureBefore(ReactiveSecurityAutoConfiguration.class)
51+
@AutoConfigureBefore(ReactiveWebSecurityAutoConfiguration.class)
5252
@AutoConfigureAfter({ HealthEndpointAutoConfiguration.class,
5353
InfoEndpointAutoConfiguration.class, WebEndpointAutoConfiguration.class,
5454
ReactiveOAuth2ClientAutoConfiguration.class })

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/web/servlet/EndpointRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
*
5252
* @author Madhura Bhave
5353
* @author Phillip Webb
54-
* @since 2.0.0
54+
* @since 2.1.0
5555
*/
5656
public final class EndpointRequest {
5757

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/web/servlet/ManagementWebSecurityAutoConfiguration.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2727
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
28-
import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration;
2928
import org.springframework.boot.autoconfigure.security.oauth2.client.web.OAuth2ClientAutoConfiguration;
30-
import org.springframework.boot.autoconfigure.security.web.servlet.WebSecurityEnablerConfiguration;
29+
import org.springframework.boot.autoconfigure.security.web.servlet.EnableWebSecurityConfiguration;
30+
import org.springframework.boot.autoconfigure.security.web.servlet.ServletWebSecurityAutoConfiguration;
3131
import org.springframework.context.annotation.Configuration;
3232
import org.springframework.context.annotation.Import;
3333
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
@@ -44,12 +44,12 @@
4444
@ConditionalOnClass(WebSecurityConfigurerAdapter.class)
4545
@ConditionalOnMissingBean(WebSecurityConfigurerAdapter.class)
4646
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
47-
@AutoConfigureBefore(SecurityAutoConfiguration.class)
47+
@AutoConfigureBefore(ServletWebSecurityAutoConfiguration.class)
4848
@AutoConfigureAfter({ HealthEndpointAutoConfiguration.class,
4949
InfoEndpointAutoConfiguration.class, WebEndpointAutoConfiguration.class,
5050
OAuth2ClientAutoConfiguration.class })
5151
@Import({ ManagementWebSecurityConfigurerAdapter.class,
52-
WebSecurityEnablerConfiguration.class })
52+
EnableWebSecurityConfiguration.class })
5353
public class ManagementWebSecurityAutoConfiguration {
5454

5555
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundryReactiveHealthEndpointWebExtensionTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
2828
import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
2929
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
30-
import org.springframework.boot.autoconfigure.security.web.reactive.ReactiveSecurityAutoConfiguration;
31-
import org.springframework.boot.autoconfigure.security.web.reactive.ReactiveUserDetailsServiceAutoConfiguration;
30+
import org.springframework.boot.autoconfigure.security.ReactiveUserDetailsServiceAutoConfiguration;
31+
import org.springframework.boot.autoconfigure.security.web.reactive.ReactiveWebSecurityAutoConfiguration;
3232
import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
3333
import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration;
3434
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
@@ -45,7 +45,7 @@ public class CloudFoundryReactiveHealthEndpointWebExtensionTests {
4545
private ReactiveWebApplicationContextRunner contextRunner = new ReactiveWebApplicationContextRunner()
4646
.withPropertyValues("VCAP_APPLICATION={}")
4747
.withConfiguration(AutoConfigurations.of(
48-
ReactiveSecurityAutoConfiguration.class,
48+
ReactiveWebSecurityAutoConfiguration.class,
4949
ReactiveUserDetailsServiceAutoConfiguration.class,
5050
WebFluxAutoConfiguration.class, JacksonAutoConfiguration.class,
5151
HttpMessageConvertersAutoConfiguration.class,

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfigurationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
4545
import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
4646
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
47-
import org.springframework.boot.autoconfigure.security.web.reactive.ReactiveSecurityAutoConfiguration;
48-
import org.springframework.boot.autoconfigure.security.web.reactive.ReactiveUserDetailsServiceAutoConfiguration;
47+
import org.springframework.boot.autoconfigure.security.ReactiveUserDetailsServiceAutoConfiguration;
48+
import org.springframework.boot.autoconfigure.security.web.reactive.ReactiveWebSecurityAutoConfiguration;
4949
import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
5050
import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration;
5151
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
@@ -76,7 +76,7 @@ public class ReactiveCloudFoundryActuatorAutoConfigurationTests {
7676

7777
private final ReactiveWebApplicationContextRunner contextRunner = new ReactiveWebApplicationContextRunner()
7878
.withConfiguration(AutoConfigurations.of(
79-
ReactiveSecurityAutoConfiguration.class,
79+
ReactiveWebSecurityAutoConfiguration.class,
8080
ReactiveUserDetailsServiceAutoConfiguration.class,
8181
WebFluxAutoConfiguration.class, JacksonAutoConfiguration.class,
8282
HttpMessageConvertersAutoConfiguration.class,

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfigurationTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
4040
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
4141
import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration;
42+
import org.springframework.boot.autoconfigure.security.web.servlet.ServletWebSecurityAutoConfiguration;
4243
import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration;
4344
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
4445
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
@@ -70,6 +71,7 @@ public class CloudFoundryActuatorAutoConfigurationTests {
7071

7172
private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
7273
.withConfiguration(AutoConfigurations.of(SecurityAutoConfiguration.class,
74+
ServletWebSecurityAutoConfiguration.class,
7375
WebMvcAutoConfiguration.class, JacksonAutoConfiguration.class,
7476
DispatcherServletAutoConfiguration.class,
7577
HttpMessageConvertersAutoConfiguration.class,

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/ControllerEndpointWebMvcIntegrationTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
3333
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
3434
import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration;
35+
import org.springframework.boot.autoconfigure.security.web.servlet.ServletWebSecurityAutoConfiguration;
3536
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
3637
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
3738
import org.springframework.boot.test.util.TestPropertyValues;
@@ -118,7 +119,8 @@ static class DefaultConfiguration {
118119
}
119120

120121
@Import(DefaultConfiguration.class)
121-
@ImportAutoConfiguration({ SecurityAutoConfiguration.class })
122+
@ImportAutoConfiguration({ SecurityAutoConfiguration.class,
123+
ServletWebSecurityAutoConfiguration.class })
122124
static class SecureConfiguration {
123125

124126
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebMvcEndpointIntegrationTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
4141
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
4242
import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration;
43+
import org.springframework.boot.autoconfigure.security.web.servlet.ServletWebSecurityAutoConfiguration;
4344
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
4445
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
4546
import org.springframework.boot.test.util.TestPropertyValues;
@@ -164,7 +165,8 @@ static class SpringDataRestConfiguration {
164165
}
165166

166167
@Import(DefaultConfiguration.class)
167-
@ImportAutoConfiguration({ SecurityAutoConfiguration.class })
168+
@ImportAutoConfiguration({ SecurityAutoConfiguration.class,
169+
ServletWebSecurityAutoConfiguration.class })
168170
static class SecureConfiguration {
169171

170172
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfigurationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
import org.springframework.boot.actuate.autoconfigure.info.InfoEndpointAutoConfiguration;
3333
import org.springframework.boot.actuate.autoconfigure.security.web.reactive.ReactiveManagementWebSecurityAutoConfiguration;
3434
import org.springframework.boot.autoconfigure.AutoConfigurations;
35-
import org.springframework.boot.autoconfigure.security.web.reactive.ReactiveSecurityAutoConfiguration;
36-
import org.springframework.boot.autoconfigure.security.web.reactive.ReactiveUserDetailsServiceAutoConfiguration;
35+
import org.springframework.boot.autoconfigure.security.ReactiveUserDetailsServiceAutoConfiguration;
36+
import org.springframework.boot.autoconfigure.security.web.reactive.ReactiveWebSecurityAutoConfiguration;
3737
import org.springframework.boot.test.context.assertj.AssertableReactiveWebApplicationContext;
3838
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
3939
import org.springframework.context.ApplicationContext;
@@ -70,7 +70,7 @@ public class ReactiveManagementWebSecurityAutoConfigurationTests {
7070
InfoEndpointAutoConfiguration.class,
7171
EnvironmentEndpointAutoConfiguration.class,
7272
EndpointAutoConfiguration.class, WebEndpointAutoConfiguration.class,
73-
ReactiveSecurityAutoConfiguration.class,
73+
ReactiveWebSecurityAutoConfiguration.class,
7474
ReactiveUserDetailsServiceAutoConfiguration.class,
7575
ReactiveManagementWebSecurityAutoConfiguration.class));
7676

0 commit comments

Comments
 (0)