From aff568efb9db4eb1ac95b9dafbed9f661ff795dd Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Mon, 21 Jan 2008 17:23:48 +0000 Subject: [PATCH] Tidied up getters/setters (undoing jalopy ordering). Made getters protected. --- .../dao/DaoAuthenticationProvider.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/core/src/main/java/org/springframework/security/providers/dao/DaoAuthenticationProvider.java b/core/src/main/java/org/springframework/security/providers/dao/DaoAuthenticationProvider.java index 1db075da2a..28cb6744fa 100644 --- a/core/src/main/java/org/springframework/security/providers/dao/DaoAuthenticationProvider.java +++ b/core/src/main/java/org/springframework/security/providers/dao/DaoAuthenticationProvider.java @@ -75,18 +75,6 @@ public class DaoAuthenticationProvider extends AbstractUserDetailsAuthentication Assert.notNull(this.userDetailsService, "A UserDetailsService must be set"); } - public PasswordEncoder getPasswordEncoder() { - return passwordEncoder; - } - - public SaltSource getSaltSource() { - return saltSource; - } - - public UserDetailsService getUserDetailsService() { - return userDetailsService; - } - protected final UserDetails retrieveUser(String username, UsernamePasswordAuthenticationToken authentication) throws AuthenticationException { UserDetails loadedUser; @@ -115,6 +103,10 @@ public class DaoAuthenticationProvider extends AbstractUserDetailsAuthentication this.passwordEncoder = passwordEncoder; } + protected PasswordEncoder getPasswordEncoder() { + return passwordEncoder; + } + /** * The source of salts to use when decoding passwords. null * is a valid value, meaning the DaoAuthenticationProvider @@ -126,10 +118,18 @@ public class DaoAuthenticationProvider extends AbstractUserDetailsAuthentication this.saltSource = saltSource; } + protected SaltSource getSaltSource() { + return saltSource; + } + public void setUserDetailsService(UserDetailsService userDetailsService) { this.userDetailsService = userDetailsService; } + protected UserDetailsService getUserDetailsService() { + return userDetailsService; + } + public boolean isIncludeDetailsObject() { return includeDetailsObject; }