Skip to content

Commit 474da80

Browse files
snicollsnicoll
committed
Revert "Restructure of security packages"
See gh-14412
1 parent ea42fb4 commit 474da80

File tree

81 files changed

+380
-383
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+380
-383
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.autoconfigure.security.web.reactive;
17+
package org.springframework.boot.actuate.autoconfigure.security.reactive;
1818

1919
import java.util.ArrayList;
2020
import java.util.Arrays;
@@ -49,7 +49,7 @@
4949
* endpoint locations.
5050
*
5151
* @author Madhura Bhave
52-
* @since 2.1.0
52+
* @since 2.0.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‎ renamed to ‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfiguration.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.autoconfigure.security.web.reactive;
17+
package org.springframework.boot.actuate.autoconfigure.security.reactive;
1818

1919
import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration;
2020
import org.springframework.boot.actuate.autoconfigure.health.HealthEndpointAutoConfiguration;
@@ -27,8 +27,8 @@
2727
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2828
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2929
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
30-
import org.springframework.boot.autoconfigure.security.oauth2.client.ReactiveOAuth2ClientAutoConfiguration;
31-
import org.springframework.boot.autoconfigure.security.web.reactive.ReactiveWebSecurityAutoConfiguration;
30+
import org.springframework.boot.autoconfigure.security.oauth2.client.reactive.ReactiveOAuth2ClientAutoConfiguration;
31+
import org.springframework.boot.autoconfigure.security.reactive.ReactiveSecurityAutoConfiguration;
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(ReactiveWebSecurityAutoConfiguration.class)
51+
@AutoConfigureBefore(ReactiveSecurityAutoConfiguration.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/reactive/package-info.java‎ renamed to ‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/reactive/package-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
/**
1818
* Auto-configuration for actuator security using WebFlux.
1919
*/
20-
package org.springframework.boot.actuate.autoconfigure.security.web.reactive;
20+
package org.springframework.boot.actuate.autoconfigure.security.reactive;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.autoconfigure.security.web.servlet;
17+
package org.springframework.boot.actuate.autoconfigure.security.servlet;
1818

1919
import java.util.ArrayList;
2020
import java.util.Arrays;
@@ -34,7 +34,7 @@
3434
import org.springframework.boot.actuate.endpoint.EndpointId;
3535
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
3636
import org.springframework.boot.actuate.endpoint.web.PathMappedEndpoints;
37-
import org.springframework.boot.autoconfigure.security.web.servlet.RequestMatcherProvider;
37+
import org.springframework.boot.autoconfigure.security.servlet.RequestMatcherProvider;
3838
import org.springframework.boot.security.servlet.ApplicationContextRequestMatcher;
3939
import org.springframework.core.annotation.AnnotatedElementUtils;
4040
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
@@ -50,7 +50,7 @@
5050
*
5151
* @author Madhura Bhave
5252
* @author Phillip Webb
53-
* @since 2.1.0
53+
* @since 2.0.0
5454
*/
5555
public final class EndpointRequest {
5656

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.autoconfigure.security.web.servlet;
17+
package org.springframework.boot.actuate.autoconfigure.security.servlet;
1818

1919
import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration;
2020
import org.springframework.boot.actuate.autoconfigure.health.HealthEndpointAutoConfiguration;
@@ -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.oauth2.client.web.OAuth2ClientAutoConfiguration;
29-
import org.springframework.boot.autoconfigure.security.web.servlet.EnableWebSecurityConfiguration;
30-
import org.springframework.boot.autoconfigure.security.web.servlet.ServletWebSecurityAutoConfiguration;
28+
import org.springframework.boot.autoconfigure.security.oauth2.client.servlet.OAuth2ClientAutoConfiguration;
29+
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
30+
import org.springframework.boot.autoconfigure.security.servlet.WebSecurityEnablerConfiguration;
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(ServletWebSecurityAutoConfiguration.class)
47+
@AutoConfigureBefore(SecurityAutoConfiguration.class)
4848
@AutoConfigureAfter({ HealthEndpointAutoConfiguration.class,
4949
InfoEndpointAutoConfiguration.class, WebEndpointAutoConfiguration.class,
5050
OAuth2ClientAutoConfiguration.class })
5151
@Import({ ManagementWebSecurityConfigurerAdapter.class,
52-
EnableWebSecurityConfiguration.class })
52+
WebSecurityEnablerConfiguration.class })
5353
public class ManagementWebSecurityAutoConfiguration {
5454

5555
}

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,23 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.autoconfigure.security.web.servlet;
17+
package org.springframework.boot.actuate.autoconfigure.security.servlet;
1818

1919
import org.springframework.boot.actuate.health.HealthEndpoint;
2020
import org.springframework.boot.actuate.info.InfoEndpoint;
21-
import org.springframework.boot.autoconfigure.security.web.servlet.SpringBootWebSecurityConfiguration;
2221
import org.springframework.context.annotation.Configuration;
2322
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
2423
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
2524

2625
/**
2726
* The default configuration for web security when the actuator dependency is on the
28-
* classpath. It is different from {@link SpringBootWebSecurityConfiguration} in that it
29-
* allows unauthenticated access to the {@link HealthEndpoint} and {@link InfoEndpoint}.
30-
* If the user specifies their own {@link WebSecurityConfigurerAdapter}, this will
31-
* back-off completely and the user should specify all the bits that they want to
32-
* configure as part of the custom security configuration.
27+
* classpath. It is different from
28+
* {@link org.springframework.boot.autoconfigure.security.servlet.SpringBootWebSecurityConfiguration}
29+
* in that it allows unauthenticated access to the {@link HealthEndpoint} and
30+
* {@link InfoEndpoint}. If the user specifies their own
31+
* {@link WebSecurityConfigurerAdapter}, this will back-off completely and the user should
32+
* specify all the bits that they want to configure as part of the custom security
33+
* configuration.
3334
*
3435
* @author Madhura Bhave
3536
*/

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/web/servlet/package-info.java‎ renamed to ‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/package-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
/**
1818
* Auto-configuration for actuator security using Spring MVC.
1919
*/
20-
package org.springframework.boot.actuate.autoconfigure.security.web.servlet;
20+
package org.springframework.boot.actuate.autoconfigure.security.servlet;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ org.springframework.boot.actuate.autoconfigure.neo4j.Neo4jHealthIndicatorAutoCon
7777
org.springframework.boot.actuate.autoconfigure.redis.RedisHealthIndicatorAutoConfiguration,\
7878
org.springframework.boot.actuate.autoconfigure.redis.RedisReactiveHealthIndicatorAutoConfiguration,\
7979
org.springframework.boot.actuate.autoconfigure.scheduling.ScheduledTasksEndpointAutoConfiguration,\
80-
org.springframework.boot.actuate.autoconfigure.security.web.reactive.ReactiveManagementWebSecurityAutoConfiguration,\
81-
org.springframework.boot.actuate.autoconfigure.security.web.servlet.ManagementWebSecurityAutoConfiguration,\
80+
org.springframework.boot.actuate.autoconfigure.security.reactive.ReactiveManagementWebSecurityAutoConfiguration,\
81+
org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration,\
8282
org.springframework.boot.actuate.autoconfigure.session.SessionsEndpointAutoConfiguration,\
8383
org.springframework.boot.actuate.autoconfigure.solr.SolrHealthIndicatorAutoConfiguration,\
8484
org.springframework.boot.actuate.autoconfigure.system.DiskSpaceHealthIndicatorAutoConfiguration,\

‎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.ReactiveUserDetailsServiceAutoConfiguration;
31-
import org.springframework.boot.autoconfigure.security.web.reactive.ReactiveWebSecurityAutoConfiguration;
30+
import org.springframework.boot.autoconfigure.security.reactive.ReactiveSecurityAutoConfiguration;
31+
import org.springframework.boot.autoconfigure.security.reactive.ReactiveUserDetailsServiceAutoConfiguration;
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-
ReactiveWebSecurityAutoConfiguration.class,
48+
ReactiveSecurityAutoConfiguration.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.ReactiveUserDetailsServiceAutoConfiguration;
48-
import org.springframework.boot.autoconfigure.security.web.reactive.ReactiveWebSecurityAutoConfiguration;
47+
import org.springframework.boot.autoconfigure.security.reactive.ReactiveSecurityAutoConfiguration;
48+
import org.springframework.boot.autoconfigure.security.reactive.ReactiveUserDetailsServiceAutoConfiguration;
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-
ReactiveWebSecurityAutoConfiguration.class,
79+
ReactiveSecurityAutoConfiguration.class,
8080
ReactiveUserDetailsServiceAutoConfiguration.class,
8181
WebFluxAutoConfiguration.class, JacksonAutoConfiguration.class,
8282
HttpMessageConvertersAutoConfiguration.class,

0 commit comments

Comments
 (0)