Index: .idea/sonarIssues.xml =================================================================== diff -u -rf65a84df30dda9e661e4b0af84b8f65311d94551 -re2c80690d724dd391cc01e3666cacd270bfd55e2 --- .idea/sonarIssues.xml (.../sonarIssues.xml) (revision f65a84df30dda9e661e4b0af84b8f65311d94551) +++ .idea/sonarIssues.xml (.../sonarIssues.xml) (revision e2c80690d724dd391cc01e3666cacd270bfd55e2) @@ -1788,6 +1788,11 @@ + + + + + @@ -1828,6 +1833,11 @@ + + + + + Index: standard/project/web/src/main/java/egovframework/com/ext/jstree/support/security/database/dao/UserDAO.java =================================================================== diff -u -r64d16c3d9ac985cb7a19b8e9f38236ae765711eb -re2c80690d724dd391cc01e3666cacd270bfd55e2 --- standard/project/web/src/main/java/egovframework/com/ext/jstree/support/security/database/dao/UserDAO.java (.../UserDAO.java) (revision 64d16c3d9ac985cb7a19b8e9f38236ae765711eb) +++ standard/project/web/src/main/java/egovframework/com/ext/jstree/support/security/database/dao/UserDAO.java (.../UserDAO.java) (revision e2c80690d724dd391cc01e3666cacd270bfd55e2) @@ -1,14 +1,12 @@ package egovframework.com.ext.jstree.support.security.database.dao; -import java.io.Serializable; -import java.util.List; - -import egovframework.com.ext.jstree.support.security.database.dao.GenericDao; +import egovframework.com.ext.jstree.support.security.database.model.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.orm.hibernate4.HibernateTemplate; import org.springframework.stereotype.Service; -import egovframework.com.ext.jstree.support.security.database.model.User; +import java.io.Serializable; +import java.util.List; /** Index: standard/project/web/src/main/java/egovframework/com/ext/jstree/support/security/registry/AppConnectionSignUp.java =================================================================== diff -u -r64d16c3d9ac985cb7a19b8e9f38236ae765711eb -re2c80690d724dd391cc01e3666cacd270bfd55e2 --- standard/project/web/src/main/java/egovframework/com/ext/jstree/support/security/registry/AppConnectionSignUp.java (.../AppConnectionSignUp.java) (revision 64d16c3d9ac985cb7a19b8e9f38236ae765711eb) +++ standard/project/web/src/main/java/egovframework/com/ext/jstree/support/security/registry/AppConnectionSignUp.java (.../AppConnectionSignUp.java) (revision e2c80690d724dd391cc01e3666cacd270bfd55e2) @@ -1,20 +1,17 @@ package egovframework.com.ext.jstree.support.security.registry; -import egovframework.com.ext.jstree.support.security.database.dao.UserDAO; +import egovframework.com.ext.jstree.support.security.dto.LocalUser; +import egovframework.com.ext.jstree.support.security.dto.SocialProvider; +import egovframework.com.ext.jstree.support.security.dto.UserRegistrationForm; +import egovframework.com.ext.jstree.support.security.service.UserService; +import egovframework.com.ext.jstree.support.security.util.SecurityUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.social.connect.Connection; import org.springframework.social.connect.ConnectionSignUp; import org.springframework.social.connect.UserProfile; -import egovframework.com.ext.jstree.support.security.util.SecurityUtil; -import egovframework.com.ext.jstree.support.security.dto.LocalUser; -import egovframework.com.ext.jstree.support.security.dto.SocialProvider; -import egovframework.com.ext.jstree.support.security.dto.UserRegistrationForm; -import egovframework.com.ext.jstree.support.security.service.UserService; -import org.springframework.util.ObjectUtils; - /** * If no local user associated with the given connection then * connection signup will create a new local user from the given connection. @@ -31,9 +28,6 @@ @Qualifier(value = "localUserDetailService") private UserDetailsService userDetailService; - @Autowired - private UserDAO userDAO; - @Override public String execute(final Connection connection) { UserRegistrationForm userDetails = toUserRegistrationObject(connection.getKey().getProviderUserId(), SecurityUtil.toSocialProvider(connection.getKey().getProviderId()), connection.fetchUserProfile());