Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-07-12 05:13:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use with Instead of Apply

Browse Source 
Issue gh-13204
This commit is contained in:
Josh Cummings 2025-07-09 17:50:14 -06:00
parent 728b5224cb
commit 7f8b9c895f
No known key found for this signature in database
GPG Key ID: 869B37A20E876129
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java
View File

@ -21,6 +21,7 @@ import java.util.List;
import org.springframework.core.GenericTypeResolver; import org.springframework.core.GenericTypeResolver;
import org.springframework.core.annotation.AnnotationAwareOrderComparator; import org.springframework.core.annotation.AnnotationAwareOrderComparator;
import org.springframework.security.config.Customizer;
import org.springframework.security.config.ObjectPostProcessor; import org.springframework.security.config.ObjectPostProcessor;
import org.springframework.util.Assert; import org.springframework.util.Assert;
@ -83,7 +84,7 @@ public abstract class SecurityConfigurerAdapter<O, B extends SecurityBuilder<O>>
/** /**
* Sets the {@link SecurityBuilder} to be used. This is automatically set when using * 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 * @param builder the {@link SecurityBuilder} to set
*/ */
public void setBuilder(B builder) { public void setBuilder(B builder) {

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

@ -195,7 +195,9 @@ public class AuthenticationManagerBuilder
* @throws Exception if an error occurs when adding the LDAP authentication * @throws Exception if an error occurs when adding the LDAP authentication
*/ */
public LdapAuthenticationProviderConfigurer<AuthenticationManagerBuilder> ldapAuthentication() throws Exception { public LdapAuthenticationProviderConfigurer<AuthenticationManagerBuilder> ldapAuthentication() throws Exception {
return apply(new LdapAuthenticationProviderConfigurer<>()); LdapAuthenticationProviderConfigurer<AuthenticationManagerBuilder> ldap = new LdapAuthenticationProviderConfigurer<>();
with(ldap);
return ldap;
} }
/** /**
@ -277,7 +279,8 @@ public class AuthenticationManagerBuilder
private <C extends UserDetailsAwareConfigurer<AuthenticationManagerBuilder, ? extends UserDetailsService>> C apply( private <C extends UserDetailsAwareConfigurer<AuthenticationManagerBuilder, ? extends UserDetailsService>> C apply(
C configurer) throws Exception { C configurer) throws Exception {
this.defaultUserDetailsService = configurer.getUserDetailsService(); this.defaultUserDetailsService = configurer.getUserDetailsService();
return super.apply(configurer); with(configurer);
return configurer;
} }
} }

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

@ -2106,7 +2106,8 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
if (existingConfig != null) { if (existingConfig != null) {
return existingConfig; return existingConfig;
} }
return apply(configurer); with(configurer);
return configurer;
} }
private ObjectPostProcessor<AuthenticationManager> getAuthenticationManagerPostProcessor() { private ObjectPostProcessor<AuthenticationManager> getAuthenticationManagerPostProcessor() {

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

@ -123,7 +123,7 @@ class HttpSecurityConfiguration {
.requestCache(withDefaults()) .requestCache(withDefaults())
.anonymous(withDefaults()) .anonymous(withDefaults())
.servletApi(withDefaults()) .servletApi(withDefaults())
.apply(new DefaultLoginPageConfigurer<>()); .with(new DefaultLoginPageConfigurer<>());
http.logout(withDefaults()); http.logout(withDefaults());
// @formatter:on // @formatter:on
applyCorsIfAvailable(http); applyCorsIfAvailable(http);
@ -153,7 +153,7 @@ class HttpSecurityConfiguration {
List<AbstractHttpConfigurer> defaultHttpConfigurers = SpringFactoriesLoader List<AbstractHttpConfigurer> defaultHttpConfigurers = SpringFactoriesLoader
.loadFactories(AbstractHttpConfigurer.class, classLoader); .loadFactories(AbstractHttpConfigurer.class, classLoader);
for (AbstractHttpConfigurer configurer : defaultHttpConfigurers) { for (AbstractHttpConfigurer configurer : defaultHttpConfigurers) {
http.apply(configurer); http.with(configurer);
} }
} }

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

@ -106,7 +106,8 @@ class HttpSecurityDsl(private val http: HttpSecurity, private val init: HttpSecu
configurer: C, configurer: C,
configuration: C.() -> Unit = { } configuration: C.() -> Unit = { }
): C { ): C {
return this.http.apply(configurer).apply(configuration) this.http.with(configurer, configuration)
return configurer
} }
/** /**