From 58e68913f610b1627dded78766acc8b9c62c24cf Mon Sep 17 00:00:00 2001 From: Ruslan Stelmachenko Date: Thu, 21 Nov 2019 21:23:14 +0200 Subject: [PATCH 1/2] Fix InitializeAuthenticationProviderBeanManagerConfigurer Javadoc --- ...itializeAuthenticationProviderBeanManagerConfigurer.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 62fb6e9b480..b5f98f05b3b 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 @@ -19,13 +19,11 @@ import org.springframework.core.annotation.Order; import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.crypto.password.PasswordEncoder; /** - * Lazily initializes the global authentication with a {@link UserDetailsService} if it is - * not yet configured and there is only a single Bean of that type. Optionally, if a - * {@link PasswordEncoder} is defined will wire this up too. + * Lazily initializes the global authentication with an {@link AuthenticationProvider} if it is + * not yet configured and there is only a single Bean of that type. * * @author Rob Winch * @since 4.1 From 4048f380136f21460d811167f99a9dedc464d59e Mon Sep 17 00:00:00 2001 From: Ruslan Stelmachenko Date: Thu, 21 Nov 2019 22:52:55 +0200 Subject: [PATCH 2/2] Fix class and variable names --- ...thenticationProviderBeanManagerConfigurer.java | 15 +++++++-------- ...nitializeUserDetailsBeanManagerConfigurer.java | 6 +++--- 2 files changed, 10 insertions(+), 11 deletions(-) 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 b5f98f05b3b..6aa64b8dfa1 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 @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,6 @@ import org.springframework.core.annotation.Order; import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.crypto.password.PasswordEncoder; /** * Lazily initializes the global authentication with an {@link AuthenticationProvider} if it is @@ -47,10 +46,10 @@ class InitializeAuthenticationProviderBeanManagerConfigurer @Override public void init(AuthenticationManagerBuilder auth) throws Exception { - auth.apply(new InitializeUserDetailsManagerConfigurer()); + auth.apply(new InitializeAuthenticationProviderManagerConfigurer()); } - class InitializeUserDetailsManagerConfigurer + class InitializeAuthenticationProviderManagerConfigurer extends GlobalAuthenticationConfigurerAdapter { @Override public void configure(AuthenticationManagerBuilder auth) { @@ -68,17 +67,17 @@ public void configure(AuthenticationManagerBuilder auth) { } /** - * @return + * @return a bean of the requested class if there's just a single registered component, null otherwise. */ private T getBeanOrNull(Class type) { - String[] userDetailsBeanNames = InitializeAuthenticationProviderBeanManagerConfigurer.this.context + String[] beanNames = InitializeAuthenticationProviderBeanManagerConfigurer.this.context .getBeanNamesForType(type); - if (userDetailsBeanNames.length != 1) { + if (beanNames.length != 1) { return null; } return InitializeAuthenticationProviderBeanManagerConfigurer.this.context - .getBean(userDetailsBeanNames[0], type); + .getBean(beanNames[0], type); } } } 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 98af4d70db4..14013dbf0d5 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 @@ -85,14 +85,14 @@ public void configure(AuthenticationManagerBuilder auth) throws Exception { * @return a bean of the requested class if there's just a single registered component, null otherwise. */ private T getBeanOrNull(Class type) { - String[] userDetailsBeanNames = InitializeUserDetailsBeanManagerConfigurer.this.context + String[] beanNames = InitializeUserDetailsBeanManagerConfigurer.this.context .getBeanNamesForType(type); - if (userDetailsBeanNames.length != 1) { + if (beanNames.length != 1) { return null; } return InitializeUserDetailsBeanManagerConfigurer.this.context - .getBean(userDetailsBeanNames[0], type); + .getBean(beanNames[0], type); } } }