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 2af9105ce0..c240e79879 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 @@ -21,6 +21,7 @@ import java.util.List; import org.springframework.core.GenericTypeResolver; import org.springframework.core.annotation.AnnotationAwareOrderComparator; +import org.springframework.security.config.Customizer; import org.springframework.security.config.ObjectPostProcessor; import org.springframework.util.Assert; @@ -83,7 +84,7 @@ public abstract class SecurityConfigurerAdapter> /** * Sets the {@link SecurityBuilder} to be used. This is automatically set when using - * {@link AbstractConfiguredSecurityBuilder#apply(SecurityConfigurerAdapter)} + * {@link AbstractConfiguredSecurityBuilder#with(SecurityConfigurerAdapter, Customizer)} * @param builder the {@link SecurityBuilder} to set */ public void setBuilder(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 1259459bb8..a35c700f03 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 @@ -195,7 +195,9 @@ public class AuthenticationManagerBuilder * @throws Exception if an error occurs when adding the LDAP authentication */ public LdapAuthenticationProviderConfigurer ldapAuthentication() throws Exception { - return apply(new LdapAuthenticationProviderConfigurer<>()); + LdapAuthenticationProviderConfigurer ldap = new LdapAuthenticationProviderConfigurer<>(); + with(ldap); + return ldap; } /** @@ -277,7 +279,8 @@ public class AuthenticationManagerBuilder private > C apply( C configurer) throws Exception { this.defaultUserDetailsService = configurer.getUserDetailsService(); - return super.apply(configurer); + with(configurer); + return configurer; } } 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 56b3ffbc81..5fd58ac1fd 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 @@ -2106,7 +2106,8 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder getAuthenticationManagerPostProcessor() { 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 4593c84111..b4d428c0e1 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 @@ -123,7 +123,7 @@ class HttpSecurityConfiguration { .requestCache(withDefaults()) .anonymous(withDefaults()) .servletApi(withDefaults()) - .apply(new DefaultLoginPageConfigurer<>()); + .with(new DefaultLoginPageConfigurer<>()); http.logout(withDefaults()); // @formatter:on applyCorsIfAvailable(http); @@ -153,7 +153,7 @@ class HttpSecurityConfiguration { List defaultHttpConfigurers = SpringFactoriesLoader .loadFactories(AbstractHttpConfigurer.class, classLoader); for (AbstractHttpConfigurer configurer : defaultHttpConfigurers) { - http.apply(configurer); + http.with(configurer); } } 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 8c35f1aeb2..55e0a9049e 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 @@ -106,7 +106,8 @@ class HttpSecurityDsl(private val http: HttpSecurity, private val init: HttpSecu configurer: C, configuration: C.() -> Unit = { } ): C { - return this.http.apply(configurer).apply(configuration) + this.http.with(configurer, configuration) + return configurer } /**