diff --git a/config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java b/config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java index a8b4b5d923..04046fea10 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java +++ b/config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java @@ -96,10 +96,10 @@ public abstract class AbstractConfiguredSecurityBuilder> C apply(C configurer) throws Exception { + public > C apply(C configurer) { add(configurer); return configurer; } @@ -145,7 +145,7 @@ public abstract class AbstractConfiguredSecurityBuilder> B with(C configurer) throws Exception { + public > B with(C configurer) { return with(configurer, Customizer.withDefaults()); } @@ -158,7 +158,7 @@ public abstract class AbstractConfiguredSecurityBuilder> B with(C configurer, Customizer customizer) throws Exception { + public > B with(C configurer, Customizer customizer) { configurer.addObjectPostProcessor(this.objectPostProcessor); configurer.setBuilder((B) this); add(configurer); @@ -326,7 +326,7 @@ public abstract class AbstractConfiguredSecurityBuilder */ @Override - protected final O doBuild() throws Exception { + protected final O doBuild() { synchronized (this.configurers) { this.buildState = BuildState.INITIALIZING; beforeInit(); @@ -346,7 +346,7 @@ public abstract class AbstractConfiguredSecurityBuilder> configurers = getConfigurers(); for (SecurityConfigurer configurer : configurers) { configurer.init((B) this); @@ -380,7 +380,7 @@ public abstract class AbstractConfiguredSecurityBuilder> configurers = getConfigurers(); for (SecurityConfigurer configurer : configurers) { configurer.configure((B) this); diff --git a/config/src/main/java/org/springframework/security/config/annotation/AbstractSecurityBuilder.java b/config/src/main/java/org/springframework/security/config/annotation/AbstractSecurityBuilder.java index 87822a26ba..0180f48ec6 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/AbstractSecurityBuilder.java +++ b/config/src/main/java/org/springframework/security/config/annotation/AbstractSecurityBuilder.java @@ -33,7 +33,7 @@ public abstract class AbstractSecurityBuilder implements SecurityBuilder { private O object; @Override - public final O build() throws Exception { + public final O build() { if (this.building.compareAndSet(false, true)) { this.object = doBuild(); return this.object; @@ -55,9 +55,9 @@ public abstract class AbstractSecurityBuilder implements SecurityBuilder { /** * Subclasses should implement this to perform the build. - * @return the object that should be returned by {@link #build()}. + * @return the object that should be returned by {@link SecurityBuilder#build()}. * @throws Exception if an error occurs */ - protected abstract O doBuild() throws Exception; + protected abstract O doBuild(); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/AlreadyBuiltException.java b/config/src/main/java/org/springframework/security/config/annotation/AlreadyBuiltException.java index f454e98cec..57c41c2347 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/AlreadyBuiltException.java +++ b/config/src/main/java/org/springframework/security/config/annotation/AlreadyBuiltException.java @@ -17,7 +17,7 @@ package org.springframework.security.config.annotation; /** - * Thrown when {@link AbstractSecurityBuilder#build()} is two or more times. + * Thrown when {@link SecurityBuilder#build()} is two or more times. * * @author Rob Winch * @since 3.2 diff --git a/config/src/main/java/org/springframework/security/config/annotation/SecurityBuilder.java b/config/src/main/java/org/springframework/security/config/annotation/SecurityBuilder.java index 67b551a3a3..27c20a3983 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/SecurityBuilder.java +++ b/config/src/main/java/org/springframework/security/config/annotation/SecurityBuilder.java @@ -30,6 +30,6 @@ public interface SecurityBuilder { * @return the Object to be built or null if the implementation allows it. * @throws Exception if an error occurred when building the Object */ - O build() throws Exception; + O build(); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurer.java index d127ccb8d9..8bb5358570 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurer.java @@ -38,7 +38,7 @@ public interface SecurityConfigurer> { * @param builder * @throws Exception */ - void init(B builder) throws Exception; + void init(B builder); /** * Configure the {@link SecurityBuilder} by setting the necessary properties on the @@ -46,6 +46,6 @@ public interface SecurityConfigurer> { * @param builder * @throws Exception */ - void configure(B builder) throws Exception; + void configure(B builder); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java b/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java index 4b6c39416f..965ee12301 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java +++ b/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java @@ -44,11 +44,11 @@ public abstract class SecurityConfigurerAdapter> private CompositeObjectPostProcessor objectPostProcessor = new CompositeObjectPostProcessor(); @Override - public void init(B builder) throws Exception { + public void init(B builder) { } @Override - public void configure(B builder) throws Exception { + public void configure(B builder) { } /** diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java index 64f5fd489b..3bf0769668 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java @@ -127,8 +127,7 @@ public class AuthenticationManagerBuilder * the in memory authentication * @throws Exception if an error occurs when adding the in memory authentication */ - public InMemoryUserDetailsManagerConfigurer inMemoryAuthentication() - throws Exception { + public InMemoryUserDetailsManagerConfigurer inMemoryAuthentication() { return apply(new InMemoryUserDetailsManagerConfigurer<>()); } @@ -156,7 +155,7 @@ public class AuthenticationManagerBuilder * JDBC authentication * @throws Exception if an error occurs when adding the JDBC authentication */ - public JdbcUserDetailsManagerConfigurer jdbcAuthentication() throws Exception { + public JdbcUserDetailsManagerConfigurer jdbcAuthentication() { return apply(new JdbcUserDetailsManagerConfigurer<>()); } @@ -177,7 +176,7 @@ public class AuthenticationManagerBuilder * based authentication */ public DaoAuthenticationConfigurer userDetailsService( - T userDetailsService) throws Exception { + T userDetailsService) { this.defaultUserDetailsService = userDetailsService; return apply(new DaoAuthenticationConfigurer<>(userDetailsService)); } @@ -222,7 +221,7 @@ public class AuthenticationManagerBuilder } @Override - protected ProviderManager performBuild() throws Exception { + protected ProviderManager performBuild() { if (!isConfigured()) { this.logger.debug("No authenticationProviders and no parentAuthenticationManager defined. Returning null."); return null; @@ -277,7 +276,7 @@ public class AuthenticationManagerBuilder * @throws Exception if an error occurs */ private > C apply( - C configurer) throws Exception { + C configurer) { this.defaultUserDetailsService = configurer.getUserDetailsService(); with(configurer); return configurer; diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfiguration.java index 77b5f38986..da00527302 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfiguration.java @@ -107,7 +107,7 @@ public class AuthenticationConfiguration { return new InitializeAuthenticationProviderBeanManagerConfigurer(context); } - public AuthenticationManager getAuthenticationManager() throws Exception { + public AuthenticationManager getAuthenticationManager() { if (this.authenticationManagerInitialized) { return this.authenticationManager; } @@ -274,19 +274,18 @@ public class AuthenticationConfiguration { } @Override - public InMemoryUserDetailsManagerConfigurer inMemoryAuthentication() - throws Exception { + public InMemoryUserDetailsManagerConfigurer inMemoryAuthentication() { return super.inMemoryAuthentication().passwordEncoder(this.defaultPasswordEncoder); } @Override - public JdbcUserDetailsManagerConfigurer jdbcAuthentication() throws Exception { + public JdbcUserDetailsManagerConfigurer jdbcAuthentication() { return super.jdbcAuthentication().passwordEncoder(this.defaultPasswordEncoder); } @Override public DaoAuthenticationConfigurer userDetailsService( - T userDetailsService) throws Exception { + T userDetailsService) { return super.userDetailsService(userDetailsService).passwordEncoder(this.defaultPasswordEncoder); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/GlobalAuthenticationConfigurerAdapter.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/GlobalAuthenticationConfigurerAdapter.java index fc3fd722b2..1b58ab8e5a 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/GlobalAuthenticationConfigurerAdapter.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/GlobalAuthenticationConfigurerAdapter.java @@ -35,11 +35,11 @@ public abstract class GlobalAuthenticationConfigurerAdapter implements SecurityConfigurer { @Override - public void init(AuthenticationManagerBuilder auth) throws Exception { + public void init(AuthenticationManagerBuilder auth) { } @Override - public void configure(AuthenticationManagerBuilder auth) throws Exception { + public void configure(AuthenticationManagerBuilder auth) { } } diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeAuthenticationProviderBeanManagerConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeAuthenticationProviderBeanManagerConfigurer.java index 5183fffe35..62abca45a3 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeAuthenticationProviderBeanManagerConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeAuthenticationProviderBeanManagerConfigurer.java @@ -49,7 +49,7 @@ class InitializeAuthenticationProviderBeanManagerConfigurer extends GlobalAuthen } @Override - public void init(AuthenticationManagerBuilder auth) throws Exception { + public void init(AuthenticationManagerBuilder auth) { auth.apply(new InitializeAuthenticationProviderManagerConfigurer()); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeUserDetailsBeanManagerConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeUserDetailsBeanManagerConfigurer.java index 185987772b..6f3d714144 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeUserDetailsBeanManagerConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeUserDetailsBeanManagerConfigurer.java @@ -56,7 +56,7 @@ class InitializeUserDetailsBeanManagerConfigurer extends GlobalAuthenticationCon } @Override - public void init(AuthenticationManagerBuilder auth) throws Exception { + public void init(AuthenticationManagerBuilder auth) { auth.apply(new InitializeUserDetailsManagerConfigurer()); } @@ -65,7 +65,7 @@ class InitializeUserDetailsBeanManagerConfigurer extends GlobalAuthenticationCon private final Log logger = LogFactory.getLog(getClass()); @Override - public void configure(AuthenticationManagerBuilder auth) throws Exception { + public void configure(AuthenticationManagerBuilder auth) { String[] beanNames = InitializeUserDetailsBeanManagerConfigurer.this.context .getBeanNamesForType(UserDetailsService.class); if (auth.isConfigured()) { diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurer.java index 21e73969f4..d8fd2cd211 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurer.java @@ -98,7 +98,7 @@ public class LdapAuthenticationProviderConfigurer, C * @throws Exception */ @Override - protected void initUserDetailsService() throws Exception { + protected void initUserDetailsService() { for (UserDetailsBuilder userBuilder : this.userBuilders) { getUserDetailsService().createUser(userBuilder.build()); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/AbstractDaoAuthenticationConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/AbstractDaoAuthenticationConfigurer.java index 3d49780e9e..723f89165a 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/AbstractDaoAuthenticationConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/AbstractDaoAuthenticationConfigurer.java @@ -81,7 +81,7 @@ public abstract class AbstractDaoAuthenticationConfigurer, C } @Override - public void configure(B builder) throws Exception { + public void configure(B builder) { initUserDetailsService(); super.configure(builder); } @@ -52,7 +52,7 @@ public class UserDetailsServiceConfigurer, C * Allows subclasses to initialize the {@link UserDetailsService}. For example, it * might add users, initialize schema, etc. */ - protected void initUserDetailsService() throws Exception { + protected void initUserDetailsService() { } } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java index 407c9b271b..cabfba23ec 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java @@ -118,7 +118,7 @@ import org.springframework.web.filter.CorsFilter; * public class FormLoginSecurityConfig { * * @Bean - * public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + * public SecurityFilterChain securityFilterChain(HttpSecurity http) { * http * .authorizeHttpRequests((authorize) -> authorize * .requestMatchers("/**").hasRole("USER") @@ -199,7 +199,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder * @param headersCustomizer the {@link Customizer} to provide more options for the * {@link HeadersConfigurer} - * @return the {@link HttpSecurity} for further customizations - * @throws Exception + * @return the {@link HttpSecurity} for further customizations @ */ - public HttpSecurity headers(Customizer> headersCustomizer) throws Exception { + public HttpSecurity headers(Customizer> headersCustomizer) { headersCustomizer.customize(getOrApply(new HeadersConfigurer<>())); return HttpSecurity.this; } @@ -296,7 +295,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder * @param corsCustomizer the {@link Customizer} to provide more options for the * {@link CorsConfigurer} - * @return the {@link HttpSecurity} for further customizations - * @throws Exception + * @return the {@link HttpSecurity} for further customizations @ */ - public HttpSecurity cors(Customizer> corsCustomizer) throws Exception { + public HttpSecurity cors(Customizer> corsCustomizer) { corsCustomizer.customize(getOrApply(new CorsConfigurer<>())); return HttpSecurity.this; } @@ -329,7 +327,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder> sessionManagementCustomizer) throws Exception { + Customizer> sessionManagementCustomizer) { sessionManagementCustomizer.customize(getOrApply(new SessionManagementConfigurer<>())); return HttpSecurity.this; } @@ -410,7 +407,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder> portMapperCustomizer) - throws Exception { + public HttpSecurity portMapper(Customizer> portMapperCustomizer) { portMapperCustomizer.customize(getOrApply(new PortMapperConfigurer<>())); return HttpSecurity.this; } @@ -463,7 +458,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder> jeeCustomizer) throws Exception { + public HttpSecurity jee(Customizer> jeeCustomizer) { jeeCustomizer.customize(getOrApply(new JeeConfigurer<>())); return HttpSecurity.this; } @@ -543,7 +537,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder * @param x509Customizer the {@link Customizer} to provide more options for the * {@link X509Configurer} - * @return the {@link HttpSecurity} for further customizations - * @throws Exception + * @return the {@link HttpSecurity} for further customizations @ */ - public HttpSecurity x509(Customizer> x509Customizer) throws Exception { + public HttpSecurity x509(Customizer> x509Customizer) { x509Customizer.customize(getOrApply(new X509Configurer<>())); return HttpSecurity.this; } @@ -580,7 +573,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder * @param rememberMeCustomizer the {@link Customizer} to provide more options for the * {@link RememberMeConfigurer} - * @return the {@link HttpSecurity} for further customizations - * @throws Exception + * @return the {@link HttpSecurity} for further customizations @ */ - public HttpSecurity rememberMe(Customizer> rememberMeCustomizer) - throws Exception { + public HttpSecurity rememberMe(Customizer> rememberMeCustomizer) { rememberMeCustomizer.customize(getOrApply(new RememberMeConfigurer<>())); return HttpSecurity.this; } @@ -629,7 +620,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder.AuthorizationManagerRequestMatcherRegistry> authorizeHttpRequestsCustomizer) - throws Exception { + Customizer.AuthorizationManagerRequestMatcherRegistry> authorizeHttpRequestsCustomizer) { ApplicationContext context = getContext(); authorizeHttpRequestsCustomizer .customize(getOrApply(new AuthorizeHttpRequestsConfigurer<>(context)).getRegistry()); @@ -744,7 +733,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder * @param requestCacheCustomizer the {@link Customizer} to provide more options for * the {@link RequestCacheConfigurer} - * @return the {@link HttpSecurity} for further customizations - * @throws Exception + * @return the {@link HttpSecurity} for further customizations @ */ - public HttpSecurity requestCache(Customizer> requestCacheCustomizer) - throws Exception { + public HttpSecurity requestCache(Customizer> requestCacheCustomizer) { requestCacheCustomizer.customize(getOrApply(new RequestCacheConfigurer<>())); return HttpSecurity.this; } @@ -783,7 +770,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder * @param exceptionHandlingCustomizer the {@link Customizer} to provide more options * for the {@link ExceptionHandlingConfigurer} - * @return the {@link HttpSecurity} for further customizations - * @throws Exception + * @return the {@link HttpSecurity} for further customizations @ */ public HttpSecurity exceptionHandling( - Customizer> exceptionHandlingCustomizer) throws Exception { + Customizer> exceptionHandlingCustomizer) { exceptionHandlingCustomizer.customize(getOrApply(new ExceptionHandlingConfigurer<>())); return HttpSecurity.this; } @@ -822,7 +808,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder * @param securityContextCustomizer the {@link Customizer} to provide more options for * the {@link SecurityContextConfigurer} - * @return the {@link HttpSecurity} for further customizations - * @throws Exception + * @return the {@link HttpSecurity} for further customizations @ */ - public HttpSecurity securityContext(Customizer> securityContextCustomizer) - throws Exception { + public HttpSecurity securityContext(Customizer> securityContextCustomizer) { securityContextCustomizer.customize(getOrApply(new SecurityContextConfigurer<>())); return HttpSecurity.this; } @@ -854,7 +838,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder * @param servletApiCustomizer the {@link Customizer} to provide more options for the * {@link ServletApiConfigurer} - * @return the {@link HttpSecurity} for further customizations - * @throws Exception + * @return the {@link HttpSecurity} for further customizations @ */ - public HttpSecurity servletApi(Customizer> servletApiCustomizer) - throws Exception { + public HttpSecurity servletApi(Customizer> servletApiCustomizer) { servletApiCustomizer.customize(getOrApply(new ServletApiConfigurer<>())); return HttpSecurity.this; } @@ -884,7 +866,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder * @param csrfCustomizer the {@link Customizer} to provide more options for the * {@link CsrfConfigurer} - * @return the {@link HttpSecurity} for further customizations - * @throws Exception + * @return the {@link HttpSecurity} for further customizations @ */ - public HttpSecurity csrf(Customizer> csrfCustomizer) throws Exception { + public HttpSecurity csrf(Customizer> csrfCustomizer) { ApplicationContext context = getContext(); csrfCustomizer.customize(getOrApply(new CsrfConfigurer<>(context))); return HttpSecurity.this; @@ -921,7 +902,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder * @param logoutCustomizer the {@link Customizer} to provide more options for the * {@link LogoutConfigurer} - * @return the {@link HttpSecurity} for further customizations - * @throws Exception + * @return the {@link HttpSecurity} for further customizations @ */ - public HttpSecurity logout(Customizer> logoutCustomizer) throws Exception { + public HttpSecurity logout(Customizer> logoutCustomizer) { logoutCustomizer.customize(getOrApply(new LogoutConfigurer<>())); return HttpSecurity.this; } @@ -977,7 +957,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder * @param anonymousCustomizer the {@link Customizer} to provide more options for the * {@link AnonymousConfigurer} - * @return the {@link HttpSecurity} for further customizations - * @throws Exception + * @return the {@link HttpSecurity} for further customizations @ */ - public HttpSecurity anonymous(Customizer> anonymousCustomizer) throws Exception { + public HttpSecurity anonymous(Customizer> anonymousCustomizer) { anonymousCustomizer.customize(getOrApply(new AnonymousConfigurer<>())); return HttpSecurity.this; } @@ -1067,7 +1046,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder> formLoginCustomizer) throws Exception { + public HttpSecurity formLogin(Customizer> formLoginCustomizer) { formLoginCustomizer.customize(getOrApply(new FormLoginConfigurer<>())); return HttpSecurity.this; } @@ -1177,7 +1155,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder> saml2LoginCustomizer) - throws Exception { + public HttpSecurity saml2Login(Customizer> saml2LoginCustomizer) { saml2LoginCustomizer.customize(getOrApply(new Saml2LoginConfigurer<>())); return HttpSecurity.this; } @@ -1266,7 +1242,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder * @return the {@link HttpSecurity} for further customizations - * @throws Exception - * @since 5.6 + * @ @since 5.6 */ - public HttpSecurity saml2Logout(Customizer> saml2LogoutCustomizer) - throws Exception { + public HttpSecurity saml2Logout(Customizer> saml2LogoutCustomizer) { saml2LogoutCustomizer.customize(getOrApply(new Saml2LogoutConfigurer<>(getContext()))); return HttpSecurity.this; } @@ -1319,7 +1293,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder authorize.anyRequest().authenticated()) * .saml2Metadata(Customizer.withDefaults()); @@ -1339,11 +1313,9 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder> saml2MetadataConfigurer) - throws Exception { + public HttpSecurity saml2Metadata(Customizer> saml2MetadataConfigurer) { saml2MetadataConfigurer.customize(getOrApply(new Saml2MetadataConfigurer<>(getContext()))); return HttpSecurity.this; } @@ -1395,7 +1367,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilderSection 4.1 Authorization Code - * Grant + * @ @see + * Section + * 4.1 Authorization Code Grant * @see Section 3.1 * Authorization Code Flow * @see org.springframework.security.oauth2.client.registration.ClientRegistration * @see org.springframework.security.oauth2.client.registration.ClientRegistrationRepository */ - public HttpSecurity oauth2Login(Customizer> oauth2LoginCustomizer) - throws Exception { + public HttpSecurity oauth2Login(Customizer> oauth2LoginCustomizer) { oauth2LoginCustomizer.customize(getOrApply(new OAuth2LoginConfigurer<>())); return HttpSecurity.this; } - public OidcLogoutConfigurer oidcLogout() throws Exception { + public OidcLogoutConfigurer oidcLogout() { return getOrApply(new OidcLogoutConfigurer<>()); } - public HttpSecurity oidcLogout(Customizer> oidcLogoutCustomizer) - throws Exception { + public HttpSecurity oidcLogout(Customizer> oidcLogoutCustomizer) { oidcLogoutCustomizer.customize(getOrApply(new OidcLogoutConfigurer<>())); return HttpSecurity.this; } @@ -1475,7 +1444,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilderOAuth 2.0 Authorization - * Framework + * @ @see + * OAuth + * 2.0 Authorization Framework */ - public HttpSecurity oauth2Client(Customizer> oauth2ClientCustomizer) - throws Exception { + public HttpSecurity oauth2Client(Customizer> oauth2ClientCustomizer) { oauth2ClientCustomizer.customize(getOrApply(new OAuth2ClientConfigurer<>())); return HttpSecurity.this; } @@ -1514,7 +1481,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilderOAuth 2.0 Authorization - * Framework + * @ @see + * OAuth + * 2.0 Authorization Framework */ public HttpSecurity oauth2ResourceServer( - Customizer> oauth2ResourceServerCustomizer) throws Exception { + Customizer> oauth2ResourceServerCustomizer) { OAuth2ResourceServerConfigurer configurer = getOrApply( new OAuth2ResourceServerConfigurer<>(getContext())); this.postProcess(configurer); @@ -1558,14 +1524,13 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilderOAuth 2.1 * Authorization Framework */ public HttpSecurity oauth2AuthorizationServer( - Customizer oauth2AuthorizationServerCustomizer) throws Exception { + Customizer oauth2AuthorizationServerCustomizer) { oauth2AuthorizationServerCustomizer.customize(getOrApply(new OAuth2AuthorizationServerConfigurer())); return HttpSecurity.this; } @@ -1581,7 +1546,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder * @param oneTimeTokenLoginConfigurerCustomizer the {@link Customizer} to provide more * options for the {@link OneTimeTokenLoginConfigurer} - * @return the {@link HttpSecurity} for further customizations - * @throws Exception + * @return the {@link HttpSecurity} for further customizations @ */ public HttpSecurity oneTimeTokenLogin( - Customizer> oneTimeTokenLoginConfigurerCustomizer) - throws Exception { + Customizer> oneTimeTokenLoginConfigurerCustomizer) { oneTimeTokenLoginConfigurerCustomizer.customize(getOrApply(new OneTimeTokenLoginConfigurer<>(getContext()))); return HttpSecurity.this; } @@ -1627,7 +1590,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder.ChannelRequestMatcherRegistry> requiresChannelCustomizer) - throws Exception { + Customizer.ChannelRequestMatcherRegistry> requiresChannelCustomizer) { ApplicationContext context = getContext(); requiresChannelCustomizer.customize(getOrApply(new ChannelSecurityConfigurer<>(context)).getRegistry()); return HttpSecurity.this; @@ -1683,7 +1644,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder> httpsRedirectConfigurerCustomizer) throws Exception { + Customizer> httpsRedirectConfigurerCustomizer) { httpsRedirectConfigurerCustomizer.customize(getOrApply(new HttpsRedirectConfigurer<>())); return HttpSecurity.this; } @@ -1729,7 +1690,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder * @param httpBasicCustomizer the {@link Customizer} to provide more options for the * {@link HttpBasicConfigurer} - * @return the {@link HttpSecurity} for further customizations - * @throws Exception + * @return the {@link HttpSecurity} for further customizations @ */ - public HttpSecurity httpBasic(Customizer> httpBasicCustomizer) throws Exception { + public HttpSecurity httpBasic(Customizer> httpBasicCustomizer) { httpBasicCustomizer.customize(getOrApply(new HttpBasicConfigurer<>())); return HttpSecurity.this; } @@ -1774,7 +1734,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder> passwordManagementCustomizer) throws Exception { + Customizer> passwordManagementCustomizer) { passwordManagementCustomizer.customize(getOrApply(new PasswordManagementConfigurer<>())); return HttpSecurity.this; } @@ -1818,7 +1777,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder * @Bean - * SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + * SecurityFilterChain securityFilterChain(HttpSecurity http) { * http * // ... * .webAuthn((webAuthn) -> webAuthn @@ -2101,10 +2060,9 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder * @param webAuthn the customizer to apply - * @return the {@link HttpSecurity} for further customizations - * @throws Exception + * @return the {@link HttpSecurity} for further customizations @ */ - public HttpSecurity webAuthn(Customizer> webAuthn) throws Exception { + public HttpSecurity webAuthn(Customizer> webAuthn) { webAuthn.customize(getOrApply(new WebAuthnConfigurer<>())); return HttpSecurity.this; } @@ -2114,12 +2072,10 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder> C getOrApply(C configurer) - throws Exception { + private > C getOrApply(C configurer) { C existingConfig = (C) getConfigurer(configurer.getClass()); if (existingConfig != null) { return existingConfig; diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java index bce1b3bdf2..05e586c061 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java @@ -302,7 +302,7 @@ public final class WebSecurity extends AbstractConfiguredSecurityBuilder "At least one SecurityBuilder needs to be specified. " + "Typically this is done by exposing a SecurityFilterChain bean. " diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfiguration.java index ad641ea656..efde27ad3f 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfiguration.java @@ -112,7 +112,7 @@ class HttpSecurityConfiguration { @Bean(HTTPSECURITY_BEAN_NAME) @Scope("prototype") - HttpSecurity httpSecurity() throws Exception { + HttpSecurity httpSecurity() { LazyPasswordEncoder passwordEncoder = new LazyPasswordEncoder(this.context); AuthenticationManagerBuilder authenticationBuilder = new DefaultPasswordEncoderAuthenticationManagerBuilder( this.objectPostProcessor, passwordEncoder); @@ -142,13 +142,13 @@ class HttpSecurityConfiguration { return http; } - private void applyCorsIfAvailable(HttpSecurity http) throws Exception { + private void applyCorsIfAvailable(HttpSecurity http) { if (this.context.getBeanNamesForType(UrlBasedCorsConfigurationSource.class).length > 0) { http.cors(withDefaults()); } } - private AuthenticationManager authenticationManager() throws Exception { + private AuthenticationManager authenticationManager() { return this.authenticationConfiguration.getAuthenticationManager(); } @@ -159,7 +159,7 @@ class HttpSecurityConfiguration { return this.objectPostProcessor.postProcess(new DefaultAuthenticationEventPublisher()); } - private void applyDefaultConfigurers(HttpSecurity http) throws Exception { + private void applyDefaultConfigurers(HttpSecurity http) { ClassLoader classLoader = this.context.getClassLoader(); List defaultHttpConfigurers = SpringFactoriesLoader .loadFactories(AbstractHttpConfigurer.class, classLoader); @@ -197,8 +197,7 @@ class HttpSecurityConfiguration { * with the {@link Customizer} Bean as the argument * * @param context the {@link ApplicationContext} - * @param http the {@link HttpSecurity} - * @throws Exception + * @param http the {@link HttpSecurity} @ */ private void applyTopLevelCustomizers(ApplicationContext context, HttpSecurity http) { ReflectionUtils.MethodFilter isCustomizerMethod = (method) -> { @@ -266,19 +265,18 @@ class HttpSecurityConfiguration { } @Override - public InMemoryUserDetailsManagerConfigurer inMemoryAuthentication() - throws Exception { + public InMemoryUserDetailsManagerConfigurer inMemoryAuthentication() { return super.inMemoryAuthentication().passwordEncoder(this.defaultPasswordEncoder); } @Override - public JdbcUserDetailsManagerConfigurer jdbcAuthentication() throws Exception { + public JdbcUserDetailsManagerConfigurer jdbcAuthentication() { return super.jdbcAuthentication().passwordEncoder(this.defaultPasswordEncoder); } @Override public DaoAuthenticationConfigurer userDetailsService( - T userDetailsService) throws Exception { + T userDetailsService) { return super.userDetailsService(userDetailsService).passwordEncoder(this.defaultPasswordEncoder); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractAuthenticationFilterConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractAuthenticationFilterConfigurer.java index 398d9ff28b..3cf0cd6dda 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractAuthenticationFilterConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractAuthenticationFilterConfigurer.java @@ -232,7 +232,7 @@ public abstract class AbstractAuthenticationFilterConfigurer> extends } @Override - public void init(H http) throws Exception { + public void init(H http) { super.init(http); initDefaultLoginFilter(http); ExceptionHandlingConfigurer exceptions = http.getConfigurer(ExceptionHandlingConfigurer.class); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HttpsRedirectConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HttpsRedirectConfigurer.java index 52c3d2457a..3175d57c5e 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HttpsRedirectConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HttpsRedirectConfigurer.java @@ -61,7 +61,7 @@ public final class HttpsRedirectConfigurer> } @Override - public void configure(H http) throws Exception { + public void configure(H http) { HttpsRedirectFilter filter = new HttpsRedirectFilter(); if (this.requestMatcher != null) { filter.setRequestMatcher(this.requestMatcher); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java index 6771df02f9..8ac1a4b087 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java @@ -23,6 +23,7 @@ import jakarta.servlet.http.HttpServletRequest; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.config.Customizer; +import org.springframework.security.config.annotation.SecurityConfigurer; import org.springframework.security.config.annotation.web.HttpSecurityBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.core.authority.mapping.SimpleMappableAttributesRetriever; @@ -186,7 +187,7 @@ public final class JeeConfigurer> extends Abstr * and a {@link Http403ForbiddenEntryPoint} into * {@link HttpSecurityBuilder#setSharedObject(Class, Object)} * - * @see org.springframework.security.config.annotation.SecurityConfigurerAdapter#init(org.springframework.security.config.annotation.SecurityBuilder) + * @see SecurityConfigurer#init(org.springframework.security.config.annotation.SecurityBuilder) */ @Override public void init(H http) { diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java index 937ce8761f..b70b0e19c5 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java @@ -45,7 +45,8 @@ import org.springframework.util.Assert; /** * Adds logout support. Other {@link SecurityConfigurer} instances may invoke - * {@link #addLogoutHandler(LogoutHandler)} in the {@link #init(HttpSecurityBuilder)} + * {@link #addLogoutHandler(LogoutHandler)} in the + * {@link SecurityConfigurer#init(org.springframework.security.config.annotation.SecurityBuilder)} * phase. * *

Security Filters

@@ -288,7 +289,7 @@ public final class LogoutConfigurer> } @Override - public void configure(H http) throws Exception { + public void configure(H http) { LogoutFilter logoutFilter = createLogoutFilter(http); http.addFilter(logoutFilter); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PasswordManagementConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PasswordManagementConfigurer.java index 0de4c03b51..6f990ddcec 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PasswordManagementConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PasswordManagementConfigurer.java @@ -52,7 +52,7 @@ public final class PasswordManagementConfigurer * {@inheritDoc} */ @Override - public void configure(B http) throws Exception { + public void configure(B http) { RequestMatcherRedirectFilter changePasswordFilter = new RequestMatcherRedirectFilter( getRequestMatcherBuilder().matcher(WELL_KNOWN_CHANGE_PASSWORD_PATTERN), this.changePasswordPage); http.addFilterBefore(postProcess(changePasswordFilter), UsernamePasswordAuthenticationFilter.class); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurer.java index 308556f55e..60b5050e80 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurer.java @@ -268,7 +268,7 @@ public final class RememberMeConfigurer> @SuppressWarnings("unchecked") @Override - public void init(H http) throws Exception { + public void init(H http) { validateInput(); String key = getKey(); RememberMeServices rememberMeServices = getRememberMeServices(http, key); @@ -346,7 +346,7 @@ public final class RememberMeConfigurer> * @return the {@link RememberMeServices} to use * @throws Exception */ - private RememberMeServices getRememberMeServices(H http, String key) throws Exception { + private RememberMeServices getRememberMeServices(H http, String key) { if (this.rememberMeServices != null) { if (this.rememberMeServices instanceof LogoutHandler && this.logoutHandler == null) { this.logoutHandler = (LogoutHandler) this.rememberMeServices; diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/WebAuthnConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/WebAuthnConfigurer.java index c5491f4006..bd17087378 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/WebAuthnConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/WebAuthnConfigurer.java @@ -154,7 +154,7 @@ public class WebAuthnConfigurer> } @Override - public void init(H http) throws Exception { + public void init(H http) { ExceptionHandlingConfigurer exceptions = http.getConfigurer(ExceptionHandlingConfigurer.class); if (exceptions != null) { AuthenticationEntryPoint entryPoint = new LoginUrlAuthenticationEntryPoint("/login"); @@ -164,7 +164,7 @@ public class WebAuthnConfigurer> } @Override - public void configure(H http) throws Exception { + public void configure(H http) { UserDetailsService userDetailsService = getSharedOrBean(http, UserDetailsService.class) .orElseThrow(() -> new IllegalStateException("Missing UserDetailsService Bean")); PublicKeyCredentialUserEntityRepository userEntities = getSharedOrBean(http, diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurer.java index c06a0332e5..37ec87dcc2 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurer.java @@ -306,7 +306,7 @@ public final class OAuth2LoginConfigurer> } @Override - public void init(B http) throws Exception { + public void init(B http) { OAuth2LoginAuthenticationFilter authenticationFilter = new OAuth2LoginAuthenticationFilter( this.getClientRegistrationRepository(), this.getAuthorizedClientRepository(), this.loginProcessingUrl); RequestMatcher processUri = getRequestMatcherBuilder().matcher(this.loginProcessingUrl); @@ -377,7 +377,7 @@ public final class OAuth2LoginConfigurer> } @Override - public void configure(B http) throws Exception { + public void configure(B http) { OAuth2AuthorizationRequestRedirectFilter authorizationRequestFilter = new OAuth2AuthorizationRequestRedirectFilter( getAuthorizationRequestResolver()); if (this.authorizationEndpointConfig.authorizationRequestRepository != null) { diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OidcLogoutConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OidcLogoutConfigurer.java index 2e615d1baf..4947669a2e 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OidcLogoutConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OidcLogoutConfigurer.java @@ -112,7 +112,7 @@ public final class OidcLogoutConfigurer> } @Override - public void configure(B builder) throws Exception { + public void configure(B builder) { if (this.backChannel != null) { this.backChannel.configure(builder); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationServerConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationServerConfigurer.java index 333a413d05..bd2fcf3c40 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationServerConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationServerConfigurer.java @@ -295,7 +295,7 @@ public final class OAuth2AuthorizationServerConfigurer } @Override - public void init(HttpSecurity httpSecurity) throws Exception { + public void init(HttpSecurity httpSecurity) { AuthorizationServerSettings authorizationServerSettings = OAuth2ConfigurerUtils .getAuthorizationServerSettings(httpSecurity); validateAuthorizationServerSettings(authorizationServerSettings); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ott/OneTimeTokenLoginConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ott/OneTimeTokenLoginConfigurer.java index 73468ef97f..4e0da7bec7 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ott/OneTimeTokenLoginConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ott/OneTimeTokenLoginConfigurer.java @@ -129,7 +129,7 @@ public final class OneTimeTokenLoginConfigurer> } @Override - public void init(H http) throws Exception { + public void init(H http) { if (getLoginProcessingUrl() == null) { loginProcessingUrl(OneTimeTokenAuthenticationFilter.DEFAULT_LOGIN_PROCESSING_URL); } @@ -165,7 +165,7 @@ public final class OneTimeTokenLoginConfigurer> } @Override - public void configure(H http) throws Exception { + public void configure(H http) { super.configure(http); configureSubmitPage(http); configureOttGenerateFilter(http); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java index 1f605af131..f6db8a8a2f 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java @@ -273,7 +273,7 @@ public final class Saml2LoginConfigurer> * */ @Override - public void init(B http) throws Exception { + public void init(B http) { registerDefaultCsrfOverride(http); relyingPartyRegistrationRepository(http); this.saml2WebSsoAuthenticationFilter = new Saml2WebSsoAuthenticationFilter(getAuthenticationConverter(http)); @@ -316,7 +316,7 @@ public final class Saml2LoginConfigurer> * AuthNRequest redirects */ @Override - public void configure(B http) throws Exception { + public void configure(B http) { Saml2WebSsoAuthenticationRequestFilter filter = getAuthenticationRequestFilter(http); filter.setAuthenticationRequestRepository(getAuthenticationRequestRepository(http)); http.addFilter(postProcess(filter)); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LogoutConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LogoutConfigurer.java index 5704deb4b0..1c519e786c 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LogoutConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LogoutConfigurer.java @@ -199,7 +199,7 @@ public final class Saml2LogoutConfigurer> * {@inheritDoc} */ @Override - public void configure(H http) throws Exception { + public void configure(H http) { LogoutConfigurer logout = http.getConfigurer(LogoutConfigurer.class); if (logout != null) { this.logoutHandlers = logout.getLogoutHandlers(); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2MetadataConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2MetadataConfigurer.java index ab32891c68..b53717d200 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2MetadataConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2MetadataConfigurer.java @@ -135,7 +135,7 @@ public class Saml2MetadataConfigurer> } @Override - public void configure(H http) throws Exception { + public void configure(H http) { Saml2MetadataResponseResolver metadataResponseResolver = createMetadataResponseResolver(http); http.addFilterBefore(new Saml2MetadataFilter(metadataResponseResolver), BasicAuthenticationFilter.class); } diff --git a/config/src/main/kotlin/org/springframework/security/config/annotation/web/HttpSecurityDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/HttpSecurityDsl.kt index 2fecffb7b8..06863f06e5 100644 --- a/config/src/main/kotlin/org/springframework/security/config/annotation/web/HttpSecurityDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/HttpSecurityDsl.kt @@ -24,7 +24,6 @@ import org.springframework.core.MethodParameter import org.springframework.core.ResolvableType import org.springframework.core.annotation.AnnotationUtils import org.springframework.security.authentication.AuthenticationManager -import org.springframework.security.config.Customizer import org.springframework.security.config.annotation.SecurityConfigurerAdapter import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository diff --git a/config/src/test/java/org/springframework/security/config/annotation/SecurityConfigurerAdapterClosureTests.java b/config/src/test/java/org/springframework/security/config/annotation/SecurityConfigurerAdapterClosureTests.java index c5fa5c552a..0059adacb3 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/SecurityConfigurerAdapterClosureTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/SecurityConfigurerAdapterClosureTests.java @@ -55,7 +55,7 @@ public class SecurityConfigurerAdapterClosureTests { private List list = new ArrayList<>(); @Override - public void configure(SecurityBuilder builder) throws Exception { + public void configure(SecurityBuilder builder) { this.list = postProcess(this.list); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfigurationTests.java b/config/src/test/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfigurationTests.java index 1ee660564e..e43378a064 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfigurationTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfigurationTests.java @@ -355,7 +355,7 @@ public class AuthenticationConfigurationTests { static class UserGlobalAuthenticationConfigurerAdapter extends GlobalAuthenticationConfigurerAdapter { @Override - public void init(AuthenticationManagerBuilder auth) throws Exception { + public void init(AuthenticationManagerBuilder auth) { auth.inMemoryAuthentication().withUser(PasswordEncodedUser.user()); } @@ -428,7 +428,7 @@ public class AuthenticationConfigurationTests { static List> configs = new ArrayList<>(); @Override - public void init(AuthenticationManagerBuilder auth) throws Exception { + public void init(AuthenticationManagerBuilder auth) { inits.add(getClass()); } @@ -454,7 +454,7 @@ public class AuthenticationConfigurationTests { static class ConfiguresInMemoryConfigurerAdapter extends GlobalAuthenticationConfigurerAdapter { @Override - public void init(AuthenticationManagerBuilder auth) throws Exception { + public void init(AuthenticationManagerBuilder auth) { // @formatter:off auth .inMemoryAuthentication() @@ -468,7 +468,7 @@ public class AuthenticationConfigurationTests { static class BootGlobalAuthenticationConfigurerAdapter extends DefaultOrderGlobalAuthenticationConfigurerAdapter { @Override - public void init(AuthenticationManagerBuilder auth) throws Exception { + public void init(AuthenticationManagerBuilder auth) { auth.apply(new DefaultBootGlobalAuthenticationConfigurerAdapter()); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfigurationTests.java b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfigurationTests.java index 3b1c388f53..d6e1b1792b 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfigurationTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfigurationTests.java @@ -453,7 +453,7 @@ public class GlobalMethodSecurityConfigurationTests { DataSource dataSource; @Override - public void init(AuthenticationManagerBuilder auth) throws Exception { + public void init(AuthenticationManagerBuilder auth) { auth.inMemoryAuthentication(); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/AbstractConfiguredSecurityBuilderTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/AbstractConfiguredSecurityBuilderTests.java index e707a96925..1fdb1fcc8f 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/AbstractConfiguredSecurityBuilderTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/AbstractConfiguredSecurityBuilderTests.java @@ -173,7 +173,7 @@ public class AbstractConfiguredSecurityBuilderTests { extends SecurityConfigurerAdapter { @Override - public void init(TestConfiguredSecurityBuilder builder) throws Exception { + public void init(TestConfiguredSecurityBuilder builder) { builder.with(new NestedConfigurer(), Customizer.withDefaults()); } @@ -182,7 +182,7 @@ public class AbstractConfiguredSecurityBuilderTests { private static class NestedConfigurer extends SecurityConfigurerAdapter { @Override - public void init(TestConfiguredSecurityBuilder http) throws Exception { + public void init(TestConfiguredSecurityBuilder http) { http.with(new DoubleNestedConfigurer(), Customizer.withDefaults()); } @@ -199,7 +199,7 @@ public class AbstractConfiguredSecurityBuilderTests { private static SecurityConfigurer CONFIGURER; @Override - public void init(TestConfiguredSecurityBuilder builder) throws Exception { + public void init(TestConfiguredSecurityBuilder builder) { builder.apply(CONFIGURER); builder.removeConfigurer(CONFIGURER.getClass()); } @@ -212,7 +212,7 @@ public class AbstractConfiguredSecurityBuilderTests { private static SecurityConfigurer CONFIGURER; @Override - public void init(TestConfiguredSecurityBuilder builder) throws Exception { + public void init(TestConfiguredSecurityBuilder builder) { builder.apply(CONFIGURER); builder.removeConfigurers(CONFIGURER.getClass()); } @@ -225,7 +225,7 @@ public class AbstractConfiguredSecurityBuilderTests { private static SecurityConfigurer CONFIGURER; @Override - public void init(TestConfiguredSecurityBuilder builder) throws Exception { + public void init(TestConfiguredSecurityBuilder builder) { builder.apply(CONFIGURER); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfigurationTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfigurationTests.java index 6aac552970..87f9874da9 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfigurationTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfigurationTests.java @@ -720,7 +720,7 @@ public class HttpSecurityConfigurationTests { static class CustomDsl extends AbstractHttpConfigurer { @Override - public void init(HttpSecurity http) throws Exception { + public void init(HttpSecurity http) { http.formLogin(FormLoginConfigurer::disable); } @@ -824,7 +824,7 @@ public class HttpSecurityConfigurationTests { static class WithCustomDsl extends AbstractHttpConfigurer { @Override - public void init(HttpSecurity builder) throws Exception { + public void init(HttpSecurity builder) { builder.formLogin(Customizer.withDefaults()); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AnonymousConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AnonymousConfigurerTests.java index 4a7b20713c..f53683c163 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AnonymousConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AnonymousConfigurerTests.java @@ -200,7 +200,7 @@ public class AnonymousConfigurerTests { static class CustomDsl extends AbstractHttpConfigurer { @Override - public void init(HttpSecurity http) throws Exception { + public void init(HttpSecurity http) { http.anonymous((anonymous) -> anonymous.principal("myAnonymousUser")); } diff --git a/config/src/test/java/org/springframework/security/config/authentication/AuthenticationConfigurationGh3935Tests.java b/config/src/test/java/org/springframework/security/config/authentication/AuthenticationConfigurationGh3935Tests.java index 6c537971fe..b69c0bd761 100644 --- a/config/src/test/java/org/springframework/security/config/authentication/AuthenticationConfigurationGh3935Tests.java +++ b/config/src/test/java/org/springframework/security/config/authentication/AuthenticationConfigurationGh3935Tests.java @@ -94,7 +94,7 @@ public class AuthenticationConfigurationGh3935Tests { } @Override - public void init(AuthenticationManagerBuilder auth) throws Exception { + public void init(AuthenticationManagerBuilder auth) { AuthenticationConfiguration configuration = this.context.getBean(AuthenticationConfiguration.class); this.authenticationManager = configuration.getAuthenticationManager(); } diff --git a/config/src/test/java/org/springframework/security/config/http/customconfigurer/CustomConfigurer.java b/config/src/test/java/org/springframework/security/config/http/customconfigurer/CustomConfigurer.java index d97d64c794..de1c15f01c 100644 --- a/config/src/test/java/org/springframework/security/config/http/customconfigurer/CustomConfigurer.java +++ b/config/src/test/java/org/springframework/security/config/http/customconfigurer/CustomConfigurer.java @@ -38,7 +38,7 @@ public class CustomConfigurer extends SecurityConfigurerAdapter