From 259f93a8d57b1f8474c22afe18eb13398678bf57 Mon Sep 17 00:00:00 2001 From: ir73 Date: Fri, 30 Nov 2018 13:41:44 +0200 Subject: [PATCH] Moved CachingUserDetailsService to spring-core Made CachingUserDetailsService constructor public and moved to spring-core to make it easier to configure caching in UserDetailsService Fixes gh-4139 --- .../AbstractUserDetailsServiceBeanDefinitionParser.java | 1 + .../security/config/http/UserDetailsServiceFactoryBean.java | 2 +- .../JdbcUserServiceBeanDefinitionParserTests.java | 1 + .../security}/authentication/CachingUserDetailsService.java | 4 ++-- 4 files changed, 5 insertions(+), 3 deletions(-) rename {config/src/main/java/org/springframework/security/config => core/src/main/java/org/springframework/security}/authentication/CachingUserDetailsService.java (93%) diff --git a/config/src/main/java/org/springframework/security/config/authentication/AbstractUserDetailsServiceBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/authentication/AbstractUserDetailsServiceBeanDefinitionParser.java index 781dc15668e..9122d1a3929 100644 --- a/config/src/main/java/org/springframework/security/config/authentication/AbstractUserDetailsServiceBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/authentication/AbstractUserDetailsServiceBeanDefinitionParser.java @@ -24,6 +24,7 @@ import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.factory.xml.BeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; +import org.springframework.security.authentication.CachingUserDetailsService; import org.springframework.security.config.BeanIds; import org.springframework.util.StringUtils; import org.w3c.dom.Element; diff --git a/config/src/main/java/org/springframework/security/config/http/UserDetailsServiceFactoryBean.java b/config/src/main/java/org/springframework/security/config/http/UserDetailsServiceFactoryBean.java index 7545793aa3f..919c25cd894 100644 --- a/config/src/main/java/org/springframework/security/config/http/UserDetailsServiceFactoryBean.java +++ b/config/src/main/java/org/springframework/security/config/http/UserDetailsServiceFactoryBean.java @@ -25,7 +25,7 @@ import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationContextException; import org.springframework.security.config.authentication.AbstractUserDetailsServiceBeanDefinitionParser; -import org.springframework.security.config.authentication.CachingUserDetailsService; +import org.springframework.security.authentication.CachingUserDetailsService; import org.springframework.security.core.userdetails.AuthenticationUserDetailsService; import org.springframework.security.core.userdetails.UserDetailsByNameServiceWrapper; import org.springframework.security.core.userdetails.UserDetailsService; diff --git a/config/src/test/java/org/springframework/security/config/authentication/JdbcUserServiceBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/authentication/JdbcUserServiceBeanDefinitionParserTests.java index 2039afa655a..5f4080c021c 100644 --- a/config/src/test/java/org/springframework/security/config/authentication/JdbcUserServiceBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/authentication/JdbcUserServiceBeanDefinitionParserTests.java @@ -17,6 +17,7 @@ import org.junit.After; import org.junit.Test; +import org.springframework.security.authentication.CachingUserDetailsService; import org.w3c.dom.Element; import org.springframework.security.authentication.AuthenticationManager; diff --git a/config/src/main/java/org/springframework/security/config/authentication/CachingUserDetailsService.java b/core/src/main/java/org/springframework/security/authentication/CachingUserDetailsService.java similarity index 93% rename from config/src/main/java/org/springframework/security/config/authentication/CachingUserDetailsService.java rename to core/src/main/java/org/springframework/security/authentication/CachingUserDetailsService.java index 357ce7f472d..2c885a34762 100644 --- a/config/src/main/java/org/springframework/security/config/authentication/CachingUserDetailsService.java +++ b/core/src/main/java/org/springframework/security/authentication/CachingUserDetailsService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.config.authentication; +package org.springframework.security.authentication; import org.springframework.security.core.userdetails.UserCache; import org.springframework.security.core.userdetails.UserDetails; @@ -30,7 +30,7 @@ public class CachingUserDetailsService implements UserDetailsService { private UserCache userCache = new NullUserCache(); private final UserDetailsService delegate; - CachingUserDetailsService(UserDetailsService delegate) { + public CachingUserDetailsService(UserDetailsService delegate) { this.delegate = delegate; }