Skip to content

Commit 7f8b9c8

Browse files
committed
Use with Instead of Apply
Issue gh-13204
1 parent 728b522 commit 7f8b9c8

File tree

5 files changed

+13
-7
lines changed

5 files changed

+13
-7
lines changed

config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import org.springframework.core.GenericTypeResolver;
2323
import org.springframework.core.annotation.AnnotationAwareOrderComparator;
24+
import org.springframework.security.config.Customizer;
2425
import org.springframework.security.config.ObjectPostProcessor;
2526
import org.springframework.util.Assert;
2627

@@ -83,7 +84,7 @@ public void addObjectPostProcessor(ObjectPostProcessor<?> objectPostProcessor) {
8384

8485
/**
8586
* Sets the {@link SecurityBuilder} to be used. This is automatically set when using
86-
* {@link AbstractConfiguredSecurityBuilder#apply(SecurityConfigurerAdapter)}
87+
* {@link AbstractConfiguredSecurityBuilder#with(SecurityConfigurerAdapter, Customizer)}
8788
* @param builder the {@link SecurityBuilder} to set
8889
*/
8990
public void setBuilder(B builder) {

config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,9 @@ public <T extends UserDetailsService> DaoAuthenticationConfigurer<Authentication
195195
* @throws Exception if an error occurs when adding the LDAP authentication
196196
*/
197197
public LdapAuthenticationProviderConfigurer<AuthenticationManagerBuilder> ldapAuthentication() throws Exception {
198-
return apply(new LdapAuthenticationProviderConfigurer<>());
198+
LdapAuthenticationProviderConfigurer<AuthenticationManagerBuilder> ldap = new LdapAuthenticationProviderConfigurer<>();
199+
with(ldap);
200+
return ldap;
199201
}
200202

201203
/**
@@ -277,7 +279,8 @@ public UserDetailsService getDefaultUserDetailsService() {
277279
private <C extends UserDetailsAwareConfigurer<AuthenticationManagerBuilder, ? extends UserDetailsService>> C apply(
278280
C configurer) throws Exception {
279281
this.defaultUserDetailsService = configurer.getUserDetailsService();
280-
return super.apply(configurer);
282+
with(configurer);
283+
return configurer;
281284
}
282285

283286
}

config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2106,7 +2106,8 @@ private <C extends SecurityConfigurerAdapter<DefaultSecurityFilterChain, HttpSec
21062106
if (existingConfig != null) {
21072107
return existingConfig;
21082108
}
2109-
return apply(configurer);
2109+
with(configurer);
2110+
return configurer;
21102111
}
21112112

21122113
private ObjectPostProcessor<AuthenticationManager> getAuthenticationManagerPostProcessor() {

config/src/main/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ HttpSecurity httpSecurity() throws Exception {
123123
.requestCache(withDefaults())
124124
.anonymous(withDefaults())
125125
.servletApi(withDefaults())
126-
.apply(new DefaultLoginPageConfigurer<>());
126+
.with(new DefaultLoginPageConfigurer<>());
127127
http.logout(withDefaults());
128128
// @formatter:on
129129
applyCorsIfAvailable(http);
@@ -153,7 +153,7 @@ private void applyDefaultConfigurers(HttpSecurity http) throws Exception {
153153
List<AbstractHttpConfigurer> defaultHttpConfigurers = SpringFactoriesLoader
154154
.loadFactories(AbstractHttpConfigurer.class, classLoader);
155155
for (AbstractHttpConfigurer configurer : defaultHttpConfigurers) {
156-
http.apply(configurer);
156+
http.with(configurer);
157157
}
158158
}
159159

config/src/main/kotlin/org/springframework/security/config/annotation/web/HttpSecurityDsl.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ class HttpSecurityDsl(private val http: HttpSecurity, private val init: HttpSecu
106106
configurer: C,
107107
configuration: C.() -> Unit = { }
108108
): C {
109-
return this.http.apply(configurer).apply(configuration)
109+
this.http.with(configurer, configuration)
110+
return configurer
110111
}
111112

112113
/**

0 commit comments

Comments
 (0)