diff --git a/configuration-metadata/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/PropertyDescriptorTests.java b/configuration-metadata/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/PropertyDescriptorTests.java index 8a41b1820e5..ecd921dfbe4 100644 --- a/configuration-metadata/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/PropertyDescriptorTests.java +++ b/configuration-metadata/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/PropertyDescriptorTests.java @@ -18,7 +18,6 @@ package org.springframework.boot.configurationprocessor; import java.util.function.BiConsumer; -import javax.lang.model.element.Element; import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.TypeElement; import javax.lang.model.element.VariableElement; @@ -47,7 +46,7 @@ public abstract class PropertyDescriptorTests { protected ExecutableElement getMethod(TypeElement element, String name) { return ElementFilter.methodsIn(element.getEnclosedElements()) .stream() - .filter((method) -> ((Element) method).getSimpleName().toString().equals(name)) + .filter((method) -> method.getSimpleName().toString().equals(name)) .findFirst() .orElse(null); } @@ -55,7 +54,7 @@ public abstract class PropertyDescriptorTests { protected VariableElement getField(TypeElement element, String name) { return ElementFilter.fieldsIn(element.getEnclosedElements()) .stream() - .filter((method) -> ((Element) method).getSimpleName().toString().equals(name)) + .filter((method) -> method.getSimpleName().toString().equals(name)) .findFirst() .orElse(null); } diff --git a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/endpoints/security/exposeall/MySecurityConfiguration.java b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/endpoints/security/exposeall/MySecurityConfiguration.java index e8840663d99..06c77a80949 100644 --- a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/endpoints/security/exposeall/MySecurityConfiguration.java +++ b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/endpoints/security/exposeall/MySecurityConfiguration.java @@ -26,7 +26,7 @@ import org.springframework.security.web.SecurityFilterChain; public class MySecurityConfiguration { @Bean - public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + public SecurityFilterChain securityFilterChain(HttpSecurity http) { http.securityMatcher(EndpointRequest.toAnyEndpoint()); http.authorizeHttpRequests((requests) -> requests.anyRequest().permitAll()); return http.build(); diff --git a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/endpoints/security/typical/MySecurityConfiguration.java b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/endpoints/security/typical/MySecurityConfiguration.java index 20ed72a11b1..6cd96dbab23 100644 --- a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/endpoints/security/typical/MySecurityConfiguration.java +++ b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/endpoints/security/typical/MySecurityConfiguration.java @@ -28,7 +28,7 @@ import static org.springframework.security.config.Customizer.withDefaults; public class MySecurityConfiguration { @Bean - public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + public SecurityFilterChain securityFilterChain(HttpSecurity http) { http.securityMatcher(EndpointRequest.toAnyEndpoint()); http.authorizeHttpRequests((requests) -> requests.anyRequest().hasRole("ENDPOINT_ADMIN")); http.httpBasic(withDefaults()); diff --git a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/data/sql/h2webconsole/springsecurity/DevProfileSecurityConfiguration.java b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/data/sql/h2webconsole/springsecurity/DevProfileSecurityConfiguration.java index 265af6d339f..a81bf6b0b3c 100644 --- a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/data/sql/h2webconsole/springsecurity/DevProfileSecurityConfiguration.java +++ b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/data/sql/h2webconsole/springsecurity/DevProfileSecurityConfiguration.java @@ -34,7 +34,7 @@ public class DevProfileSecurityConfiguration { @Bean @Order(Ordered.HIGHEST_PRECEDENCE) - SecurityFilterChain h2ConsoleSecurityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain h2ConsoleSecurityFilterChain(HttpSecurity http) { http.securityMatcher(PathRequest.toH2Console()); http.authorizeHttpRequests(yourCustomAuthorization()); http.csrf(CsrfConfigurer::disable); diff --git a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/security/enablehttps/MySecurityConfig.java b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/security/enablehttps/MySecurityConfig.java index 85c1b3bc3d0..b7d937d9aee 100644 --- a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/security/enablehttps/MySecurityConfig.java +++ b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/security/enablehttps/MySecurityConfig.java @@ -26,7 +26,7 @@ import org.springframework.security.web.SecurityFilterChain; public class MySecurityConfig { @Bean - public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + public SecurityFilterChain securityFilterChain(HttpSecurity http) { // Customize the application security ... http.redirectToHttps(Customizer.withDefaults()); return http.build(); diff --git a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/slicetests/MyConfiguration.java b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/slicetests/MyConfiguration.java index 88295be2c16..56340dca0fe 100644 --- a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/slicetests/MyConfiguration.java +++ b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/slicetests/MyConfiguration.java @@ -29,7 +29,7 @@ import org.springframework.security.web.SecurityFilterChain; public class MyConfiguration { @Bean - public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + public SecurityFilterChain securityFilterChain(HttpSecurity http) { http.authorizeHttpRequests((requests) -> requests.anyRequest().authenticated()); return http.build(); } diff --git a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/slicetests/MySecurityConfiguration.java b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/slicetests/MySecurityConfiguration.java index bb0d255f147..ee743ac3dd5 100644 --- a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/slicetests/MySecurityConfiguration.java +++ b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/slicetests/MySecurityConfiguration.java @@ -25,7 +25,7 @@ import org.springframework.security.web.SecurityFilterChain; public class MySecurityConfiguration { @Bean - public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + public SecurityFilterChain securityFilterChain(HttpSecurity http) { http.authorizeHttpRequests((requests) -> requests.anyRequest().authenticated()); return http.build(); } diff --git a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/security/oauth2/client/MyOAuthClientConfiguration.java b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/security/oauth2/client/MyOAuthClientConfiguration.java index 7aae956a03a..f3e35ff60c5 100644 --- a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/security/oauth2/client/MyOAuthClientConfiguration.java +++ b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/security/oauth2/client/MyOAuthClientConfiguration.java @@ -27,7 +27,7 @@ import org.springframework.security.web.SecurityFilterChain; public class MyOAuthClientConfiguration { @Bean - public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + public SecurityFilterChain securityFilterChain(HttpSecurity http) { // @formatter:off http .authorizeHttpRequests((requests) -> requests diff --git a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/security/saml2/relyingparty/MySamlRelyingPartyConfiguration.java b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/security/saml2/relyingparty/MySamlRelyingPartyConfiguration.java index 770e435ed8e..cf85e4a3575 100644 --- a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/security/saml2/relyingparty/MySamlRelyingPartyConfiguration.java +++ b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/security/saml2/relyingparty/MySamlRelyingPartyConfiguration.java @@ -27,7 +27,7 @@ import static org.springframework.security.config.Customizer.withDefaults; public class MySamlRelyingPartyConfiguration { @Bean - public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + public SecurityFilterChain securityFilterChain(HttpSecurity http) { http.authorizeHttpRequests((requests) -> requests.anyRequest().authenticated()); http.saml2Login(withDefaults()); http.saml2Logout((saml2) -> saml2.logoutRequest((request) -> request.logoutUrl("/SLOService.saml2")) diff --git a/module/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ChildManagementContextInitializer.java b/module/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ChildManagementContextInitializer.java index 248405adce3..c8b4ecc0fe8 100644 --- a/module/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ChildManagementContextInitializer.java +++ b/module/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ChildManagementContextInitializer.java @@ -124,7 +124,7 @@ class ChildManagementContextInitializer implements BeanRegistrationAotProcessor, @Override public @Nullable BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) { Assert.isInstanceOf(ConfigurableApplicationContext.class, this.parentContext); - BeanFactory parentBeanFactory = ((ConfigurableApplicationContext) this.parentContext).getBeanFactory(); + BeanFactory parentBeanFactory = this.parentContext.getBeanFactory(); if (registeredBean.getBeanClass().equals(getClass()) && registeredBean.getBeanFactory().equals(parentBeanFactory)) { ConfigurableApplicationContext managementContext = createManagementContext(); diff --git a/module/spring-boot-cloudfoundry/src/main/java/org/springframework/boot/cloudfoundry/autoconfigure/actuate/endpoint/servlet/CloudFoundryActuatorAutoConfiguration.java b/module/spring-boot-cloudfoundry/src/main/java/org/springframework/boot/cloudfoundry/autoconfigure/actuate/endpoint/servlet/CloudFoundryActuatorAutoConfiguration.java index 91661a5872b..aebc8276b5a 100644 --- a/module/spring-boot-cloudfoundry/src/main/java/org/springframework/boot/cloudfoundry/autoconfigure/actuate/endpoint/servlet/CloudFoundryActuatorAutoConfiguration.java +++ b/module/spring-boot-cloudfoundry/src/main/java/org/springframework/boot/cloudfoundry/autoconfigure/actuate/endpoint/servlet/CloudFoundryActuatorAutoConfiguration.java @@ -174,7 +174,7 @@ public final class CloudFoundryActuatorAutoConfiguration { @Bean @Order(FILTER_CHAIN_ORDER) SecurityFilterChain cloudFoundrySecurityFilterChain(HttpSecurity http, - CloudFoundryWebEndpointServletHandlerMapping handlerMapping) throws Exception { + CloudFoundryWebEndpointServletHandlerMapping handlerMapping) { RequestMatcher cloudFoundryRequest = getRequestMatcher(handlerMapping); http.csrf((csrf) -> csrf.ignoringRequestMatchers(cloudFoundryRequest)); http.securityMatchers((matches) -> matches.requestMatchers(cloudFoundryRequest)) diff --git a/module/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevtoolsSecurityConfiguration.java b/module/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevtoolsSecurityConfiguration.java index 8d685c6df3e..9f72ec1a2dc 100644 --- a/module/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevtoolsSecurityConfiguration.java +++ b/module/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevtoolsSecurityConfiguration.java @@ -47,7 +47,7 @@ class RemoteDevtoolsSecurityConfiguration { @Bean @Order(SecurityProperties.BASIC_AUTH_ORDER - 1) - SecurityFilterChain devtoolsSecurityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain devtoolsSecurityFilterChain(HttpSecurity http) { http.securityMatcher(PathPatternRequestMatcher.withDefaults().matcher(this.url)); http.authorizeHttpRequests((requests) -> requests.anyRequest().anonymous()); http.csrf(CsrfConfigurer::disable); diff --git a/module/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchClientConfigurations.java b/module/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchClientConfigurations.java index b8867e431f6..18a6a7ea132 100644 --- a/module/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchClientConfigurations.java +++ b/module/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchClientConfigurations.java @@ -85,6 +85,7 @@ class ElasticsearchClientConfigurations { } + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(ElasticsearchTransport.class) static class ElasticsearchTransportConfiguration { diff --git a/module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/autoconfigure/MetricsAspectsAutoConfiguration.java b/module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/autoconfigure/MetricsAspectsAutoConfiguration.java index 43f3537b8eb..ee665fdedcd 100644 --- a/module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/autoconfigure/MetricsAspectsAutoConfiguration.java +++ b/module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/autoconfigure/MetricsAspectsAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.micrometer.observation.autoconfigure.ObservationAutoConfiguration; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; /** * {@link EnableAutoConfiguration Auto-configuration} for Micrometer-based metrics @@ -68,6 +69,7 @@ public final class MetricsAspectsAutoConfiguration { return timedAspect; } + @Configuration(proxyBeanMethods = false) @ConditionalOnBean(ValueExpressionResolver.class) static class TagAnnotationHandlersConfiguration { diff --git a/module/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/autoconfigure/metrics/MongoMetricsAutoConfiguration.java b/module/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/autoconfigure/metrics/MongoMetricsAutoConfiguration.java index 8ccc745f40a..31469f4f309 100644 --- a/module/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/autoconfigure/metrics/MongoMetricsAutoConfiguration.java +++ b/module/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/autoconfigure/metrics/MongoMetricsAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.boot.mongodb.autoconfigure.MongoAutoConfiguration; import org.springframework.boot.mongodb.autoconfigure.MongoClientSettingsBuilderCustomizer; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; /** * {@link EnableAutoConfiguration Auto-configuration} for Mongo metrics. @@ -48,6 +49,7 @@ import org.springframework.context.annotation.Bean; @ConditionalOnBean(MeterRegistry.class) public final class MongoMetricsAutoConfiguration { + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(MongoMetricsCommandListener.class) @ConditionalOnBooleanProperty(name = "management.metrics.mongodb.command.enabled", matchIfMissing = true) static class MongoCommandMetricsConfiguration { @@ -73,6 +75,7 @@ public final class MongoMetricsAutoConfiguration { } + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(MongoMetricsConnectionPoolListener.class) @ConditionalOnBooleanProperty(name = "management.metrics.mongodb.connectionpool.enabled", matchIfMissing = true) static class MongoConnectionPoolMetricsConfiguration { diff --git a/module/spring-boot-security-oauth2-authorization-server/src/main/java/org/springframework/boot/security/oauth2/server/authorization/autoconfigure/servlet/OAuth2AuthorizationServerWebSecurityConfiguration.java b/module/spring-boot-security-oauth2-authorization-server/src/main/java/org/springframework/boot/security/oauth2/server/authorization/autoconfigure/servlet/OAuth2AuthorizationServerWebSecurityConfiguration.java index fb1fadabe65..a53fd05d797 100644 --- a/module/spring-boot-security-oauth2-authorization-server/src/main/java/org/springframework/boot/security/oauth2/server/authorization/autoconfigure/servlet/OAuth2AuthorizationServerWebSecurityConfiguration.java +++ b/module/spring-boot-security-oauth2-authorization-server/src/main/java/org/springframework/boot/security/oauth2/server/authorization/autoconfigure/servlet/OAuth2AuthorizationServerWebSecurityConfiguration.java @@ -49,7 +49,7 @@ class OAuth2AuthorizationServerWebSecurityConfiguration { @Bean @Order(Ordered.HIGHEST_PRECEDENCE) - SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) { OAuth2AuthorizationServerConfigurer authorizationServer = new OAuth2AuthorizationServerConfigurer(); http.securityMatcher(authorizationServer.getEndpointsMatcher()); http.with(authorizationServer, withDefaults()); @@ -63,7 +63,7 @@ class OAuth2AuthorizationServerWebSecurityConfiguration { @Bean @Order(SecurityProperties.BASIC_AUTH_ORDER) - SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) { http.authorizeHttpRequests((authorize) -> authorize.anyRequest().authenticated()).formLogin(withDefaults()); return http.build(); } diff --git a/module/spring-boot-security-oauth2-authorization-server/src/test/java/org/springframework/boot/security/oauth2/server/authorization/autoconfigure/servlet/OAuth2AuthorizationServerWebSecurityConfigurationTests.java b/module/spring-boot-security-oauth2-authorization-server/src/test/java/org/springframework/boot/security/oauth2/server/authorization/autoconfigure/servlet/OAuth2AuthorizationServerWebSecurityConfigurationTests.java index 4b8a5cf9726..09f34444dd3 100644 --- a/module/spring-boot-security-oauth2-authorization-server/src/test/java/org/springframework/boot/security/oauth2/server/authorization/autoconfigure/servlet/OAuth2AuthorizationServerWebSecurityConfigurationTests.java +++ b/module/spring-boot-security-oauth2-authorization-server/src/test/java/org/springframework/boot/security/oauth2/server/authorization/autoconfigure/servlet/OAuth2AuthorizationServerWebSecurityConfigurationTests.java @@ -164,7 +164,7 @@ class OAuth2AuthorizationServerWebSecurityConfigurationTests { @Bean @Order(1) - SecurityFilterChain authServerSecurityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain authServerSecurityFilterChain(HttpSecurity http) { OAuth2AuthorizationServerConfigurer authorizationServer = new OAuth2AuthorizationServerConfigurer(); http.securityMatcher(authorizationServer.getEndpointsMatcher()) .with(authorizationServer, Customizer.withDefaults()); @@ -174,7 +174,7 @@ class OAuth2AuthorizationServerWebSecurityConfigurationTests { @Bean @Order(2) - SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain securityFilterChain(HttpSecurity http) { return http.httpBasic(withDefaults()).build(); } diff --git a/module/spring-boot-security-oauth2-client/src/main/java/org/springframework/boot/security/oauth2/client/autoconfigure/servlet/OAuth2ClientWebSecurityAutoConfiguration.java b/module/spring-boot-security-oauth2-client/src/main/java/org/springframework/boot/security/oauth2/client/autoconfigure/servlet/OAuth2ClientWebSecurityAutoConfiguration.java index f79f5998422..9f0868dbc5a 100644 --- a/module/spring-boot-security-oauth2-client/src/main/java/org/springframework/boot/security/oauth2/client/autoconfigure/servlet/OAuth2ClientWebSecurityAutoConfiguration.java +++ b/module/spring-boot-security-oauth2-client/src/main/java/org/springframework/boot/security/oauth2/client/autoconfigure/servlet/OAuth2ClientWebSecurityAutoConfiguration.java @@ -63,7 +63,7 @@ public final class OAuth2ClientWebSecurityAutoConfiguration { static class OAuth2SecurityFilterChainConfiguration { @Bean - SecurityFilterChain oauth2SecurityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain oauth2SecurityFilterChain(HttpSecurity http) { http.authorizeHttpRequests((requests) -> requests.anyRequest().authenticated()); http.oauth2Login(withDefaults()); http.oauth2Client(withDefaults()); diff --git a/module/spring-boot-security-oauth2-client/src/test/java/org/springframework/boot/security/oauth2/client/autoconfigure/servlet/OAuth2ClientWebSecurityAutoConfigurationTests.java b/module/spring-boot-security-oauth2-client/src/test/java/org/springframework/boot/security/oauth2/client/autoconfigure/servlet/OAuth2ClientWebSecurityAutoConfigurationTests.java index 05238e28893..b5400bb556a 100644 --- a/module/spring-boot-security-oauth2-client/src/test/java/org/springframework/boot/security/oauth2/client/autoconfigure/servlet/OAuth2ClientWebSecurityAutoConfigurationTests.java +++ b/module/spring-boot-security-oauth2-client/src/test/java/org/springframework/boot/security/oauth2/client/autoconfigure/servlet/OAuth2ClientWebSecurityAutoConfigurationTests.java @@ -254,7 +254,7 @@ class OAuth2ClientWebSecurityAutoConfigurationTests { static class TestSecurityFilterChainConfiguration { @Bean - SecurityFilterChain testSecurityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain testSecurityFilterChain(HttpSecurity http) { return http.securityMatcher("/**") .authorizeHttpRequests((authorize) -> authorize.anyRequest().authenticated()) .build(); diff --git a/module/spring-boot-security-oauth2-resource-server/src/main/java/org/springframework/boot/security/oauth2/server/resource/autoconfigure/servlet/OAuth2ResourceServerJwtConfiguration.java b/module/spring-boot-security-oauth2-resource-server/src/main/java/org/springframework/boot/security/oauth2/server/resource/autoconfigure/servlet/OAuth2ResourceServerJwtConfiguration.java index 5866279cc79..c4491ac6edb 100644 --- a/module/spring-boot-security-oauth2-resource-server/src/main/java/org/springframework/boot/security/oauth2/server/resource/autoconfigure/servlet/OAuth2ResourceServerJwtConfiguration.java +++ b/module/spring-boot-security-oauth2-resource-server/src/main/java/org/springframework/boot/security/oauth2/server/resource/autoconfigure/servlet/OAuth2ResourceServerJwtConfiguration.java @@ -181,7 +181,7 @@ class OAuth2ResourceServerJwtConfiguration { @Bean @ConditionalOnBean(JwtDecoder.class) - SecurityFilterChain jwtSecurityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain jwtSecurityFilterChain(HttpSecurity http) { http.authorizeHttpRequests((requests) -> requests.anyRequest().authenticated()); http.oauth2ResourceServer((resourceServer) -> resourceServer.jwt(withDefaults())); return http.build(); diff --git a/module/spring-boot-security-oauth2-resource-server/src/main/java/org/springframework/boot/security/oauth2/server/resource/autoconfigure/servlet/OAuth2ResourceServerOpaqueTokenConfiguration.java b/module/spring-boot-security-oauth2-resource-server/src/main/java/org/springframework/boot/security/oauth2/server/resource/autoconfigure/servlet/OAuth2ResourceServerOpaqueTokenConfiguration.java index 93d8e028dd3..401ad31fdac 100644 --- a/module/spring-boot-security-oauth2-resource-server/src/main/java/org/springframework/boot/security/oauth2/server/resource/autoconfigure/servlet/OAuth2ResourceServerOpaqueTokenConfiguration.java +++ b/module/spring-boot-security-oauth2-resource-server/src/main/java/org/springframework/boot/security/oauth2/server/resource/autoconfigure/servlet/OAuth2ResourceServerOpaqueTokenConfiguration.java @@ -69,7 +69,7 @@ class OAuth2ResourceServerOpaqueTokenConfiguration { @Bean @ConditionalOnBean(OpaqueTokenIntrospector.class) - SecurityFilterChain opaqueTokenSecurityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain opaqueTokenSecurityFilterChain(HttpSecurity http) { http.authorizeHttpRequests((requests) -> requests.anyRequest().authenticated()); http.oauth2ResourceServer((resourceServer) -> resourceServer.opaqueToken(withDefaults())); return http.build(); diff --git a/module/spring-boot-security-oauth2-resource-server/src/test/java/org/springframework/boot/security/oauth2/server/resource/autoconfigure/servlet/OAuth2ResourceServerAutoConfigurationTests.java b/module/spring-boot-security-oauth2-resource-server/src/test/java/org/springframework/boot/security/oauth2/server/resource/autoconfigure/servlet/OAuth2ResourceServerAutoConfigurationTests.java index fdaf10c79d1..4ea1e978614 100644 --- a/module/spring-boot-security-oauth2-resource-server/src/test/java/org/springframework/boot/security/oauth2/server/resource/autoconfigure/servlet/OAuth2ResourceServerAutoConfigurationTests.java +++ b/module/spring-boot-security-oauth2-resource-server/src/test/java/org/springframework/boot/security/oauth2/server/resource/autoconfigure/servlet/OAuth2ResourceServerAutoConfigurationTests.java @@ -885,7 +885,7 @@ class OAuth2ResourceServerAutoConfigurationTests { static class TestSecurityFilterChainConfig { @Bean - SecurityFilterChain testSecurityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain testSecurityFilterChain(HttpSecurity http) { http.securityMatcher("/**"); http.authorizeHttpRequests((requests) -> requests.anyRequest().authenticated()); return http.build(); diff --git a/module/spring-boot-security-saml2/src/main/java/org/springframework/boot/security/saml2/autoconfigure/Saml2LoginConfiguration.java b/module/spring-boot-security-saml2/src/main/java/org/springframework/boot/security/saml2/autoconfigure/Saml2LoginConfiguration.java index 2147b9c15be..4b7e36f035c 100644 --- a/module/spring-boot-security-saml2/src/main/java/org/springframework/boot/security/saml2/autoconfigure/Saml2LoginConfiguration.java +++ b/module/spring-boot-security-saml2/src/main/java/org/springframework/boot/security/saml2/autoconfigure/Saml2LoginConfiguration.java @@ -38,7 +38,7 @@ import static org.springframework.security.config.Customizer.withDefaults; class Saml2LoginConfiguration { @Bean - SecurityFilterChain samlSecurityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain samlSecurityFilterChain(HttpSecurity http) { http.authorizeHttpRequests((requests) -> requests.anyRequest().authenticated()); http.saml2Login(withDefaults()); http.saml2Logout(withDefaults()); diff --git a/module/spring-boot-security-saml2/src/test/java/org/springframework/boot/security/saml2/autoconfigure/Saml2RelyingPartyAutoConfigurationTests.java b/module/spring-boot-security-saml2/src/test/java/org/springframework/boot/security/saml2/autoconfigure/Saml2RelyingPartyAutoConfigurationTests.java index bbf26ef4e1d..ed24408901f 100644 --- a/module/spring-boot-security-saml2/src/test/java/org/springframework/boot/security/saml2/autoconfigure/Saml2RelyingPartyAutoConfigurationTests.java +++ b/module/spring-boot-security-saml2/src/test/java/org/springframework/boot/security/saml2/autoconfigure/Saml2RelyingPartyAutoConfigurationTests.java @@ -450,7 +450,7 @@ class Saml2RelyingPartyAutoConfigurationTests { static class TestSecurityFilterChainConfig { @Bean - SecurityFilterChain testSecurityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain testSecurityFilterChain(HttpSecurity http) { return http.securityMatcher("/**") .authorizeHttpRequests((authorize) -> authorize.anyRequest().authenticated()) .build(); diff --git a/module/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/servlet/SpringBootWebSecurityConfiguration.java b/module/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/servlet/SpringBootWebSecurityConfiguration.java index e93dae19038..f828db4d606 100644 --- a/module/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/servlet/SpringBootWebSecurityConfiguration.java +++ b/module/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/servlet/SpringBootWebSecurityConfiguration.java @@ -73,7 +73,7 @@ class SpringBootWebSecurityConfiguration { @Bean @Order(SecurityProperties.BASIC_AUTH_ORDER) - SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) { http.authorizeHttpRequests((requests) -> requests.anyRequest().authenticated()); http.formLogin(withDefaults()); http.httpBasic(withDefaults()); diff --git a/module/spring-boot-security/src/test/java/org/springframework/boot/security/autoconfigure/actuate/servlet/AbstractEndpointRequestIntegrationTests.java b/module/spring-boot-security/src/test/java/org/springframework/boot/security/autoconfigure/actuate/servlet/AbstractEndpointRequestIntegrationTests.java index 0840b8df61c..682fd15804b 100644 --- a/module/spring-boot-security/src/test/java/org/springframework/boot/security/autoconfigure/actuate/servlet/AbstractEndpointRequestIntegrationTests.java +++ b/module/spring-boot-security/src/test/java/org/springframework/boot/security/autoconfigure/actuate/servlet/AbstractEndpointRequestIntegrationTests.java @@ -224,7 +224,7 @@ abstract class AbstractEndpointRequestIntegrationTests { } @Bean - SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain securityFilterChain(HttpSecurity http) { http.authorizeHttpRequests((requests) -> { requests.requestMatchers(EndpointRequest.toLinks()).permitAll(); requests.requestMatchers(EndpointRequest.to(TestEndpoint1.class).withHttpMethod(HttpMethod.POST)) diff --git a/module/spring-boot-security/src/test/java/org/springframework/boot/security/autoconfigure/actuate/servlet/ManagementWebSecurityAutoConfigurationTests.java b/module/spring-boot-security/src/test/java/org/springframework/boot/security/autoconfigure/actuate/servlet/ManagementWebSecurityAutoConfigurationTests.java index d8b5a3ace54..cfda7c10ef4 100644 --- a/module/spring-boot-security/src/test/java/org/springframework/boot/security/autoconfigure/actuate/servlet/ManagementWebSecurityAutoConfigurationTests.java +++ b/module/spring-boot-security/src/test/java/org/springframework/boot/security/autoconfigure/actuate/servlet/ManagementWebSecurityAutoConfigurationTests.java @@ -194,7 +194,7 @@ class ManagementWebSecurityAutoConfigurationTests { static class CustomSecurityConfiguration { @Bean - SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain securityFilterChain(HttpSecurity http) { http.authorizeHttpRequests((requests) -> { requests.requestMatchers(PathPatternRequestMatcher.withDefaults().matcher("/foo")).permitAll(); requests.anyRequest().authenticated(); @@ -210,7 +210,7 @@ class ManagementWebSecurityAutoConfigurationTests { static class TestSecurityFilterChainConfig { @Bean - SecurityFilterChain testSecurityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain testSecurityFilterChain(HttpSecurity http) { return http.securityMatcher("/**") .authorizeHttpRequests((authorize) -> authorize.anyRequest().authenticated()) .build(); @@ -223,7 +223,7 @@ class ManagementWebSecurityAutoConfigurationTests { @Bean @Order(SecurityProperties.BASIC_AUTH_ORDER - 1) - SecurityFilterChain testRemoteDevToolsSecurityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain testRemoteDevToolsSecurityFilterChain(HttpSecurity http) { http.securityMatcher(PathPatternRequestMatcher.withDefaults().matcher("/**")); http.authorizeHttpRequests((requests) -> requests.anyRequest().anonymous()); http.csrf((csrf) -> csrf.disable()); diff --git a/module/spring-boot-security/src/test/java/org/springframework/boot/security/autoconfigure/servlet/SecurityAutoConfigurationTests.java b/module/spring-boot-security/src/test/java/org/springframework/boot/security/autoconfigure/servlet/SecurityAutoConfigurationTests.java index b16593b48ea..d206624114a 100644 --- a/module/spring-boot-security/src/test/java/org/springframework/boot/security/autoconfigure/servlet/SecurityAutoConfigurationTests.java +++ b/module/spring-boot-security/src/test/java/org/springframework/boot/security/autoconfigure/servlet/SecurityAutoConfigurationTests.java @@ -272,7 +272,7 @@ class SecurityAutoConfigurationTests { static class TestSecurityFilterChainConfig { @Bean - SecurityFilterChain testSecurityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain testSecurityFilterChain(HttpSecurity http) { return http.securityMatcher("/**") .authorizeHttpRequests((authorize) -> authorize.anyRequest().authenticated()) .build(); diff --git a/smoke-test/spring-boot-smoke-test-actuator-custom-security/src/main/java/smoketest/actuator/customsecurity/SecurityConfiguration.java b/smoke-test/spring-boot-smoke-test-actuator-custom-security/src/main/java/smoketest/actuator/customsecurity/SecurityConfiguration.java index 8c6b48e726c..9c80bcdfb34 100644 --- a/smoke-test/spring-boot-smoke-test-actuator-custom-security/src/main/java/smoketest/actuator/customsecurity/SecurityConfiguration.java +++ b/smoke-test/spring-boot-smoke-test-actuator-custom-security/src/main/java/smoketest/actuator/customsecurity/SecurityConfiguration.java @@ -56,7 +56,7 @@ public class SecurityConfiguration { } @Bean - SecurityFilterChain configure(HttpSecurity http) throws Exception { + SecurityFilterChain configure(HttpSecurity http) { http.authorizeHttpRequests((requests) -> { requests.requestMatchers(PathPatternRequestMatcher.withDefaults().matcher("/actuator/beans")) .hasRole("BEANS"); diff --git a/smoke-test/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ShutdownSampleActuatorApplicationTests.java b/smoke-test/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ShutdownSampleActuatorApplicationTests.java index 7faa291238c..f3bbadde50b 100644 --- a/smoke-test/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ShutdownSampleActuatorApplicationTests.java +++ b/smoke-test/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ShutdownSampleActuatorApplicationTests.java @@ -76,7 +76,7 @@ class ShutdownSampleActuatorApplicationTests { static class SecurityConfiguration { @Bean - SecurityFilterChain configure(HttpSecurity http) throws Exception { + SecurityFilterChain configure(HttpSecurity http) { http.csrf(CsrfConfigurer::disable); return http.build(); } diff --git a/smoke-test/spring-boot-smoke-test-graphql/src/main/java/smoketest/graphql/SecurityConfig.java b/smoke-test/spring-boot-smoke-test-graphql/src/main/java/smoketest/graphql/SecurityConfig.java index 5383b4b8417..d55f655bc08 100644 --- a/smoke-test/spring-boot-smoke-test-graphql/src/main/java/smoketest/graphql/SecurityConfig.java +++ b/smoke-test/spring-boot-smoke-test-graphql/src/main/java/smoketest/graphql/SecurityConfig.java @@ -35,7 +35,7 @@ import static org.springframework.security.config.Customizer.withDefaults; public class SecurityConfig { @Bean - public DefaultSecurityFilterChain springWebFilterChain(HttpSecurity http) throws Exception { + public DefaultSecurityFilterChain springWebFilterChain(HttpSecurity http) { return http.csrf(CsrfConfigurer::disable) // Demonstrate that method security works // Best practice to use both for defense in depth diff --git a/smoke-test/spring-boot-smoke-test-session-data-mongodb/src/main/java/smoketest/session/mongodb/SecurityConfiguration.java b/smoke-test/spring-boot-smoke-test-session-data-mongodb/src/main/java/smoketest/session/mongodb/SecurityConfiguration.java index 7442cbfe442..cc8ee8abb2e 100644 --- a/smoke-test/spring-boot-smoke-test-session-data-mongodb/src/main/java/smoketest/session/mongodb/SecurityConfiguration.java +++ b/smoke-test/spring-boot-smoke-test-session-data-mongodb/src/main/java/smoketest/session/mongodb/SecurityConfiguration.java @@ -35,7 +35,7 @@ import static org.springframework.security.config.Customizer.withDefaults; class SecurityConfiguration { @Bean - SecurityFilterChain managementSecurityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain managementSecurityFilterChain(HttpSecurity http) { http.authorizeHttpRequests((requests) -> { requests.requestMatchers(EndpointRequest.to(HealthEndpoint.class)).permitAll(); requests.anyRequest().authenticated(); diff --git a/smoke-test/spring-boot-smoke-test-session-data-redis/src/main/java/smoketest/session/redis/SecurityConfiguration.java b/smoke-test/spring-boot-smoke-test-session-data-redis/src/main/java/smoketest/session/redis/SecurityConfiguration.java index 43f52ea6096..19f3c8dde24 100644 --- a/smoke-test/spring-boot-smoke-test-session-data-redis/src/main/java/smoketest/session/redis/SecurityConfiguration.java +++ b/smoke-test/spring-boot-smoke-test-session-data-redis/src/main/java/smoketest/session/redis/SecurityConfiguration.java @@ -35,7 +35,7 @@ import static org.springframework.security.config.Customizer.withDefaults; class SecurityConfiguration { @Bean - SecurityFilterChain managementSecurityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain managementSecurityFilterChain(HttpSecurity http) { http.authorizeHttpRequests((requests) -> { requests.requestMatchers(EndpointRequest.to(HealthEndpoint.class)).permitAll(); requests.anyRequest().authenticated(); diff --git a/smoke-test/spring-boot-smoke-test-session-hazelcast/src/main/java/smoketest/session/hazelcast/SecurityConfiguration.java b/smoke-test/spring-boot-smoke-test-session-hazelcast/src/main/java/smoketest/session/hazelcast/SecurityConfiguration.java index 35f630ab33d..ff1141117f5 100644 --- a/smoke-test/spring-boot-smoke-test-session-hazelcast/src/main/java/smoketest/session/hazelcast/SecurityConfiguration.java +++ b/smoke-test/spring-boot-smoke-test-session-hazelcast/src/main/java/smoketest/session/hazelcast/SecurityConfiguration.java @@ -35,7 +35,7 @@ import static org.springframework.security.config.Customizer.withDefaults; class SecurityConfiguration { @Bean - SecurityFilterChain managementSecurityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain managementSecurityFilterChain(HttpSecurity http) { http.authorizeHttpRequests((requests) -> { requests.requestMatchers(EndpointRequest.to(HealthEndpoint.class)).permitAll(); requests.anyRequest().authenticated(); diff --git a/smoke-test/spring-boot-smoke-test-session-jdbc/src/main/java/smoketest/session/SecurityConfiguration.java b/smoke-test/spring-boot-smoke-test-session-jdbc/src/main/java/smoketest/session/SecurityConfiguration.java index 94bec4a60dd..659bcf94382 100644 --- a/smoke-test/spring-boot-smoke-test-session-jdbc/src/main/java/smoketest/session/SecurityConfiguration.java +++ b/smoke-test/spring-boot-smoke-test-session-jdbc/src/main/java/smoketest/session/SecurityConfiguration.java @@ -35,7 +35,7 @@ import static org.springframework.security.config.Customizer.withDefaults; class SecurityConfiguration { @Bean - SecurityFilterChain managementSecurityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain managementSecurityFilterChain(HttpSecurity http) { http.authorizeHttpRequests((requests) -> { requests.requestMatchers(EndpointRequest.to(HealthEndpoint.class)).permitAll(); requests.anyRequest().authenticated(); diff --git a/smoke-test/spring-boot-smoke-test-web-method-security/src/main/java/smoketest/security/method/SampleMethodSecurityApplication.java b/smoke-test/spring-boot-smoke-test-web-method-security/src/main/java/smoketest/security/method/SampleMethodSecurityApplication.java index b85cd3e4919..170f565d0cd 100644 --- a/smoke-test/spring-boot-smoke-test-web-method-security/src/main/java/smoketest/security/method/SampleMethodSecurityApplication.java +++ b/smoke-test/spring-boot-smoke-test-web-method-security/src/main/java/smoketest/security/method/SampleMethodSecurityApplication.java @@ -75,7 +75,7 @@ public class SampleMethodSecurityApplication implements WebMvcConfigurer { protected static class ApplicationSecurity { @Bean - SecurityFilterChain configure(HttpSecurity http) throws Exception { + SecurityFilterChain configure(HttpSecurity http) { http.csrf(CsrfConfigurer::disable); http.authorizeHttpRequests((requests) -> { requests.dispatcherTypeMatchers(DispatcherType.FORWARD).permitAll(); @@ -94,7 +94,7 @@ public class SampleMethodSecurityApplication implements WebMvcConfigurer { protected static class ActuatorSecurity { @Bean - SecurityFilterChain actuatorSecurity(HttpSecurity http) throws Exception { + SecurityFilterChain actuatorSecurity(HttpSecurity http) { http.csrf(CsrfConfigurer::disable); http.securityMatcher(EndpointRequest.toAnyEndpoint()); http.authorizeHttpRequests((requests) -> requests.anyRequest().authenticated()); diff --git a/smoke-test/spring-boot-smoke-test-web-secure-custom/src/main/java/smoketest/web/secure/custom/SampleWebSecureCustomApplication.java b/smoke-test/spring-boot-smoke-test-web-secure-custom/src/main/java/smoketest/web/secure/custom/SampleWebSecureCustomApplication.java index e51e37d0640..0d6a05ed535 100644 --- a/smoke-test/spring-boot-smoke-test-web-secure-custom/src/main/java/smoketest/web/secure/custom/SampleWebSecureCustomApplication.java +++ b/smoke-test/spring-boot-smoke-test-web-secure-custom/src/main/java/smoketest/web/secure/custom/SampleWebSecureCustomApplication.java @@ -45,7 +45,7 @@ public class SampleWebSecureCustomApplication implements WebMvcConfigurer { protected static class ApplicationSecurity { @Bean - SecurityFilterChain configure(HttpSecurity http) throws Exception { + SecurityFilterChain configure(HttpSecurity http) { http.csrf(CsrfConfigurer::disable); http.authorizeHttpRequests((requests) -> { requests.dispatcherTypeMatchers(DispatcherType.FORWARD).permitAll(); diff --git a/smoke-test/spring-boot-smoke-test-web-secure-jdbc/src/main/java/smoketest/web/secure/jdbc/SampleWebSecureJdbcApplication.java b/smoke-test/spring-boot-smoke-test-web-secure-jdbc/src/main/java/smoketest/web/secure/jdbc/SampleWebSecureJdbcApplication.java index edd214e7aae..b3e3dea809b 100644 --- a/smoke-test/spring-boot-smoke-test-web-secure-jdbc/src/main/java/smoketest/web/secure/jdbc/SampleWebSecureJdbcApplication.java +++ b/smoke-test/spring-boot-smoke-test-web-secure-jdbc/src/main/java/smoketest/web/secure/jdbc/SampleWebSecureJdbcApplication.java @@ -48,7 +48,7 @@ public class SampleWebSecureJdbcApplication implements WebMvcConfigurer { protected static class ApplicationSecurity { @Bean - SecurityFilterChain configure(HttpSecurity http) throws Exception { + SecurityFilterChain configure(HttpSecurity http) { http.csrf(CsrfConfigurer::disable); http.authorizeHttpRequests((requests) -> { requests.dispatcherTypeMatchers(DispatcherType.FORWARD).permitAll(); diff --git a/smoke-test/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/CustomServletPathErrorPageTests.java b/smoke-test/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/CustomServletPathErrorPageTests.java index 3fb0b4b29f8..2cf22d987ef 100644 --- a/smoke-test/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/CustomServletPathErrorPageTests.java +++ b/smoke-test/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/CustomServletPathErrorPageTests.java @@ -45,7 +45,7 @@ class CustomServletPathErrorPageTests extends AbstractErrorPageTests { static class SecurityConfiguration { @Bean - SecurityFilterChain configure(HttpSecurity http) throws Exception { + SecurityFilterChain configure(HttpSecurity http) { http.authorizeHttpRequests((requests) -> { requests.requestMatchers("/public/**").permitAll(); requests.anyRequest().fullyAuthenticated(); diff --git a/smoke-test/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/CustomServletPathUnauthenticatedErrorPageTests.java b/smoke-test/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/CustomServletPathUnauthenticatedErrorPageTests.java index f332b347213..01e9a2955e6 100644 --- a/smoke-test/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/CustomServletPathUnauthenticatedErrorPageTests.java +++ b/smoke-test/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/CustomServletPathUnauthenticatedErrorPageTests.java @@ -44,7 +44,7 @@ class CustomServletPathUnauthenticatedErrorPageTests extends AbstractUnauthentic static class SecurityConfiguration { @Bean - SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) { http.authorizeHttpRequests((requests) -> { requests.requestMatchers("/error").permitAll(); requests.requestMatchers("/public/**").permitAll(); diff --git a/smoke-test/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/ErrorPageTests.java b/smoke-test/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/ErrorPageTests.java index 60be6ad8967..fc0b9a52242 100644 --- a/smoke-test/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/ErrorPageTests.java +++ b/smoke-test/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/ErrorPageTests.java @@ -44,7 +44,7 @@ class ErrorPageTests extends AbstractErrorPageTests { static class SecurityConfiguration { @Bean - SecurityFilterChain configure(HttpSecurity http) throws Exception { + SecurityFilterChain configure(HttpSecurity http) { http.authorizeHttpRequests((requests) -> { requests.requestMatchers("/public/**").permitAll(); requests.anyRequest().fullyAuthenticated(); diff --git a/smoke-test/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/NoSessionErrorPageTests.java b/smoke-test/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/NoSessionErrorPageTests.java index 60c1baeacfc..63541354745 100644 --- a/smoke-test/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/NoSessionErrorPageTests.java +++ b/smoke-test/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/NoSessionErrorPageTests.java @@ -45,7 +45,7 @@ class NoSessionErrorPageTests extends AbstractErrorPageTests { static class SecurityConfiguration { @Bean - SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) { http.sessionManagement((session) -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) .authorizeHttpRequests((requests) -> { requests.requestMatchers("/public/**").permitAll(); diff --git a/smoke-test/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/SampleWebSecureApplicationTests.java b/smoke-test/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/SampleWebSecureApplicationTests.java index 6567c30c809..e22c717539e 100644 --- a/smoke-test/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/SampleWebSecureApplicationTests.java +++ b/smoke-test/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/SampleWebSecureApplicationTests.java @@ -99,7 +99,7 @@ class SampleWebSecureApplicationTests { static class SecurityConfiguration { @Bean - SecurityFilterChain configure(HttpSecurity http) throws Exception { + SecurityFilterChain configure(HttpSecurity http) { http.csrf(CsrfConfigurer::disable); http.authorizeHttpRequests((requests) -> { requests.requestMatchers("/public/**").permitAll(); diff --git a/smoke-test/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/UnauthenticatedErrorPageTests.java b/smoke-test/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/UnauthenticatedErrorPageTests.java index 0dbb6f53e4a..394b7ec08c3 100644 --- a/smoke-test/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/UnauthenticatedErrorPageTests.java +++ b/smoke-test/spring-boot-smoke-test-web-secure/src/test/java/smoketest/web/secure/UnauthenticatedErrorPageTests.java @@ -44,7 +44,7 @@ class UnauthenticatedErrorPageTests extends AbstractUnauthenticatedErrorPageTest static class SecurityConfiguration { @Bean - SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) { http.authorizeHttpRequests((requests) -> { requests.requestMatchers("/error").permitAll(); requests.requestMatchers("/public/**").permitAll();