Index: .idea/artifacts/web_war_exploded.xml
===================================================================
diff -u -r9c682bfffc7a711c4653d1816a3e218913fd149f -r3cc6de1ed312d5484e49797cf8a54691bff2c876
--- .idea/artifacts/web_war_exploded.xml (.../web_war_exploded.xml) (revision 9c682bfffc7a711c4653d1816a3e218913fd149f)
+++ .idea/artifacts/web_war_exploded.xml (.../web_war_exploded.xml) (revision 3cc6de1ed312d5484e49797cf8a54691bff2c876)
@@ -122,6 +122,12 @@
+
+
+
+
+
+
Index: .idea/sonarIssues.xml
===================================================================
diff -u -ree762f88b4d2db13442f0a398ac67fc3085ad2ca -r3cc6de1ed312d5484e49797cf8a54691bff2c876
--- .idea/sonarIssues.xml (.../sonarIssues.xml) (revision ee762f88b4d2db13442f0a398ac67fc3085ad2ca)
+++ .idea/sonarIssues.xml (.../sonarIssues.xml) (revision 3cc6de1ed312d5484e49797cf8a54691bff2c876)
@@ -1798,11 +1798,21 @@
+
+
+
+
+
+
+
+
+
+
FishEye: Tag 3cc6de1ed312d5484e49797cf8a54691bff2c876 refers to a dead (removed) revision in file `standard/project/web/src/main/java/egovframework/com/ext/jstree/support/security/database/dao/RoleDAO.java'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag 3cc6de1ed312d5484e49797cf8a54691bff2c876 refers to a dead (removed) revision in file `standard/project/web/src/main/java/egovframework/com/ext/jstree/support/security/database/dao/UserDAO.java'.
FishEye: No comparison available. Pass `N' to diff?
Index: standard/project/web/src/main/java/egovframework/com/ext/jstree/support/security/service/LocalUserDetailService.java
===================================================================
diff -u -ree762f88b4d2db13442f0a398ac67fc3085ad2ca -r3cc6de1ed312d5484e49797cf8a54691bff2c876
--- standard/project/web/src/main/java/egovframework/com/ext/jstree/support/security/service/LocalUserDetailService.java (.../LocalUserDetailService.java) (revision ee762f88b4d2db13442f0a398ac67fc3085ad2ca)
+++ standard/project/web/src/main/java/egovframework/com/ext/jstree/support/security/service/LocalUserDetailService.java (.../LocalUserDetailService.java) (revision 3cc6de1ed312d5484e49797cf8a54691bff2c876)
@@ -1,6 +1,6 @@
package egovframework.com.ext.jstree.support.security.service;
-import egovframework.com.ext.jstree.support.security.database.dao.UserDAO;
+import egovframework.com.ext.jstree.support.security.database.dao.UserDao;
import egovframework.com.ext.jstree.support.security.database.model.Role;
import egovframework.com.ext.jstree.support.security.database.model.User;
import egovframework.com.ext.jstree.support.security.dto.LocalUser;
@@ -18,12 +18,12 @@
public class LocalUserDetailService implements UserDetailsService {
@Autowired
- private UserDAO userDAO;
+ private UserDao userDao;
@Override
@Transactional
public LocalUser loadUserByUsername(final String userId) throws UsernameNotFoundException {
- User user = userDAO.get(userId);
+ User user = userDao.get(userId);
if (user == null) {
return null;
}
Index: standard/project/web/src/main/java/egovframework/com/ext/jstree/support/security/service/RegistrationUserDetailService.java
===================================================================
diff -u -ree762f88b4d2db13442f0a398ac67fc3085ad2ca -r3cc6de1ed312d5484e49797cf8a54691bff2c876
--- standard/project/web/src/main/java/egovframework/com/ext/jstree/support/security/service/RegistrationUserDetailService.java (.../RegistrationUserDetailService.java) (revision ee762f88b4d2db13442f0a398ac67fc3085ad2ca)
+++ standard/project/web/src/main/java/egovframework/com/ext/jstree/support/security/service/RegistrationUserDetailService.java (.../RegistrationUserDetailService.java) (revision 3cc6de1ed312d5484e49797cf8a54691bff2c876)
@@ -1,6 +1,6 @@
package egovframework.com.ext.jstree.support.security.service;
-import egovframework.com.ext.jstree.support.security.database.dao.UserDAO;
+import egovframework.com.ext.jstree.support.security.database.dao.UserDao;
import egovframework.com.ext.jstree.support.security.database.model.Role;
import egovframework.com.ext.jstree.support.security.database.model.User;
import egovframework.com.ext.jstree.support.security.dto.LocalUser;
@@ -23,7 +23,7 @@
private UserDetailsService userDetailService;
@Autowired
- private UserDAO userDAO;
+ private UserDao userDao;
@Autowired
private BCryptPasswordEncoder passwordEncoder;
@@ -33,14 +33,14 @@
@Transactional(value = "transactionManager")
public LocalUser registerNewUser(final UserRegistrationForm userRegistrationForm) throws UserAlreadyExistAuthenticationException {
- User userExist = userDAO.get(userRegistrationForm.getUserId());
+ User userExist = userDao.get(userRegistrationForm.getUserId());
if (userExist != null) {
throw new UserAlreadyExistAuthenticationException("User with email id " + userRegistrationForm.getEmail() + " already exist");
}
User user = buildUser(userRegistrationForm);
- userDAO.save(user);
- userDAO.flush();
+ userDao.save(user);
+ userDao.flush();
return (LocalUser) userDetailService.loadUserByUsername(userRegistrationForm.getUserId());
}
Index: standard/project/web/web.iml
===================================================================
diff -u -r9c682bfffc7a711c4653d1816a3e218913fd149f -r3cc6de1ed312d5484e49797cf8a54691bff2c876
--- standard/project/web/web.iml (.../web.iml) (revision 9c682bfffc7a711c4653d1816a3e218913fd149f)
+++ standard/project/web/web.iml (.../web.iml) (revision 3cc6de1ed312d5484e49797cf8a54691bff2c876)
@@ -202,6 +202,12 @@
+
+
+
+
+
+