From 3de421be3a8690ccd48535b97d46806edb483441 Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Wed, 31 Aug 2022 15:14:45 -0300 Subject: [PATCH] Remove setAuthenticationManager from HttpSecurityConfiguration Closes gh-11776 --- .../web/configuration/HttpSecurityConfiguration.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) 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 2f5bb228fd..963a218123 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 @@ -56,8 +56,6 @@ class HttpSecurityConfiguration { private ObjectPostProcessor objectPostProcessor; - private AuthenticationManager authenticationManager; - private AuthenticationConfiguration authenticationConfiguration; private ApplicationContext context; @@ -70,10 +68,6 @@ class HttpSecurityConfiguration { this.objectPostProcessor = objectPostProcessor; } - void setAuthenticationManager(AuthenticationManager authenticationManager) { - this.authenticationManager = authenticationManager; - } - @Autowired void setAuthenticationConfiguration(AuthenticationConfiguration authenticationConfiguration) { this.authenticationConfiguration = authenticationConfiguration; @@ -120,8 +114,7 @@ class HttpSecurityConfiguration { } private AuthenticationManager authenticationManager() throws Exception { - return (this.authenticationManager != null) ? this.authenticationManager - : this.authenticationConfiguration.getAuthenticationManager(); + return this.authenticationConfiguration.getAuthenticationManager(); } private AuthenticationEventPublisher getAuthenticationEventPublisher() {