Removed unused autodetect method and reformatted code.

core/src/main/java/org/springframework/security/providers/dao/DaoAuthenticationProvider.java

@@ -15,8 +15,6 @@
 
 package org.springframework.security.providers.dao;
 
-import java.util.Map;
-
 import org.springframework.security.AuthenticationException;
 import org.springframework.security.AuthenticationServiceException;
 import org.springframework.security.BadCredentialsException;
@@ -26,7 +24,6 @@ import org.springframework.security.providers.encoding.PasswordEncoder;
 import org.springframework.security.providers.encoding.PlaintextPasswordEncoder;
 import org.springframework.security.userdetails.UserDetails;
 import org.springframework.security.userdetails.UserDetailsService;
-import org.springframework.context.ApplicationContext;
 import org.springframework.dao.DataAccessException;
 import org.springframework.util.Assert;
 
@@ -40,8 +37,7 @@ import org.springframework.util.Assert;
  */
 public class DaoAuthenticationProvider extends AbstractUserDetailsAuthenticationProvider {
 
-	// ~ Instance fields
-	// ================================================================================================
+    //~ Instance fields ================================================================================================
 
     private PasswordEncoder passwordEncoder = new PlaintextPasswordEncoder();
 
@@ -51,8 +47,7 @@ public class DaoAuthenticationProvider extends AbstractUserDetailsAuthentication
 
     private boolean includeDetailsObject = true;
 
-	// ~ Methods
-	// ========================================================================================================
+    //~ Methods ========================================================================================================
 
     protected void additionalAuthenticationChecks(UserDetails userDetails,
             UsernamePasswordAuthenticationToken authentication) throws AuthenticationException {
@@ -82,31 +77,6 @@ public class DaoAuthenticationProvider extends AbstractUserDetailsAuthentication
         Assert.notNull(this.userDetailsService, "A UserDetailsService must be set");
     }
 
-	/**
-	 * Introspects the <code>Applicationcontext</code> for the single instance
-	 * of {@link AccessDeniedHandler}. If found invoke
-	 * setAccessDeniedHandler(AccessDeniedHandler accessDeniedHandler) method by
-	 * providing the found instance of accessDeniedHandler as a method
-	 * parameter. If more than one instance of <code>AccessDeniedHandler</code>
-	 * is found, the method throws <code>IllegalStateException</code>.
-	 *
-	 * @param applicationContext to locate the instance
-	 */
-	private void autoDetectAnyUserDetailsServiceAndUseIt(ApplicationContext applicationContext) {
-		if (applicationContext != null) {
-			Map map = applicationContext.getBeansOfType(UserDetailsService.class);
-
-			if (map.size() > 1) {
-				throw new IllegalArgumentException(
-						"More than one UserDetailsService beans detected please refer to the one using "
-								+ " [ principalRepositoryBeanRef  ] " + "attribute");
-			}
-			else if (map.size() == 1) {
-				setUserDetailsService((UserDetailsService) map.values().iterator().next());
-			}
-		}
-	}
-
     public PasswordEncoder getPasswordEncoder() {
         return passwordEncoder;
     }
@@ -138,9 +108,8 @@ public class DaoAuthenticationProvider extends AbstractUserDetailsAuthentication
     }
 
     /**
-	 * Sets the PasswordEncoder instance to be used to encode and validate
-	 * passwords. If not set, {@link PlaintextPasswordEncoder} will be used by
-	 * default.
+     * Sets the PasswordEncoder instance to be used to encode and validate passwords.
+     * If not set, {@link PlaintextPasswordEncoder} will be used by default.
      *
      * @param passwordEncoder The passwordEncoder to use
      */
@@ -151,11 +120,9 @@ public class DaoAuthenticationProvider extends AbstractUserDetailsAuthentication
     /**
      * The source of salts to use when decoding passwords. <code>null</code>
      * is a valid value, meaning the <code>DaoAuthenticationProvider</code>
-	 * will present <code>null</code> to the relevant
-	 * <code>PasswordEncoder</code>.
+     * will present <code>null</code> to the relevant <code>PasswordEncoder</code>.
      *
-	 * @param saltSource to use when attempting to decode passwords via the
-	 * <code>PasswordEncoder</code>
+     * @param saltSource to use when attempting to decode passwords via the <code>PasswordEncoder</code>
      */
     public void setSaltSource(SaltSource saltSource) {
         this.saltSource = saltSource;