Spring Security 3: Salting password issue

[Rohit Bhal]

Hi

I have got an simple application made in which I am able to register users and authenticate them.
I've got the passwords encoded using and successfully able to authenticate them. I am using Spring 3, Spring Security 3 and Hibernate 3 in my application.
Now I want to salt their passwords with the ID of the user but I am not able to achieve this functionality.
Could someone help me achieve it? I've been trying to do it for quite some time but ain't able to get it done.

Here is the code I've got for salting users with their ID and authenticating them.

xyz-security.xml

<http auto-config="true" use-expressions="true">
    	<intercept-url pattern="/welcome.do" access="hasRole('ROLE_USER')" /> 
    	<form-login login-page="/login.do" authentication-failure-url="/login.do?login_error=1"/>		
    	<logout invalidate-session="true" logout-url="/logout" logout-success-url="/"/>
    </http>
    
    <beans:bean id="daoAuthenticationProvider"  class="org.springframework.security.authentication.dao.DaoAuthenticationProvider">
    	<beans:property name="userDetailsService" ref="userDetailsService"/>
    </beans:bean>
    
    <beans:bean id="authenticationManager" class="org.springframework.security.authentication.ProviderManager">
    	<beans:property name="providers">
    		<beans:list>
    			<beans:ref local="daoAuthenticationProvider" />
    		</beans:list>
    	</beans:property>
    </beans:bean>
   
    <authentication-manager>
    	<authentication-provider user-service-ref="userDetailsService">
    		<password-encoder ref="passwordEncoder">				
       			<salt-source ref="saltSource"/>
     			</password-encoder>
    	</authentication-provider>
    </authentication-manager>
    
    <beans:bean id="passwordEncoder" class="org.springframework.security.authentication.encoding.ShaPasswordEncoder"/>
    <beans:bean id="saltSource" class="org.springframework.security.authentication.dao.ReflectionSaltSource"
    	p:userPropertyToUse="id"/>

UserDetailsAdapter.java

    @Service("userDetailsAdapter")
    public class UserDetailsAdapter {	
    	
    	private Long id;
    
    	org.springframework.security.core.userdetails.User buildUserFromUserEntity(User userEntity) {
    	    String username = userEntity.getUsername();
    	    String password = userEntity.getPassword();
    	    boolean enabled = userEntity.isEnabled();
    	    boolean accountNonExpired = true;
    	    boolean credentialsNonExpired = true;
    	    boolean accountNonLocked = true;
    	    
    	    Collection<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
    	    for (String authority: userEntity.getAuthorities()) {
    	    	
    	    	authorities.add(new GrantedAuthorityImpl(authority));
    	    }
    	    
    	    this.id = userEntity.getId();
    	    
    	    org.springframework.security.core.userdetails.User user = new org.springframework.security.core.userdetails.User(username, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities);
    	    return user;
    	}
    	
    	public Long getId() {
    		return id;
    	}
    	
    }

UserDetailsServiceImpl

   @Service("userDetailsService")
    public class UserDetailsServiceImpl implements UserDetailsService {
    	
    	@Autowired
    	private UserDao userDao;
    
    	@Autowired
    	private UserDetailsAdapter userDetailsAdapter;
    	
    	public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException, DataAccessException {
    		UserDetails userDetails = null;
    	    User userEntity = userDao.findByUsername(username);
    	    
    	    if (userEntity == null) {
    	      throw new UsernameNotFoundException("user not found");
    	    }
    	    userDetails = userDetailsAdapter.buildUserFromUserEntity(userEntity);
    		
    	    return userDetails;
    	}
    }

UserServiceImpl

    @Service
    public class UserServiceImpl implements UserService {
    	
    	@Autowired
    	private UserDao userDao;
    	
    	@Autowired
    	private PasswordEncoder passwordEncoder;
    	
    	@Autowired
    	private SaltSource saltSource;
    	
    	public User getByUsername(String username) {
    		return userDao.findByUsername(username);
    	}
    	
    	public User getByEmail(String email) {
    		return userDao.findByEmail(email);
    	}
    	
    	public void createUser(User user) {
    		userDao.create(user);
    		
    		UserDetailsAdapter userDetailsAdapter = new UserDetailsAdapter();
    		org.springframework.security.core.userdetails.User userDetails =  userDetailsAdapter.buildUserFromUserEntity(user);
    		String password = userDetails.getPassword();
    		Object salt = saltSource.getSalt(userDetails);
    		user.setPassword(passwordEncoder.encodePassword(password, salt));
    		userDao.update(user);
    		
    	}
    
    	public void updateUser(User user) {
    		userDao.update(user);
    	}
    }

Could someone help me understand what am I missing here?
Many thanks.

[Rohit Bhal]

I was supposed to extend org.springframework.security.core.userdetails.User that implements UserDetails for getting the password salted that way I wanted to. I've got it resolved with the help of skaffman. Thanks.