Entity manager

pom.xml

@@ -69,7 +69,7 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>4.3.0.Final</version>
+            <version>5.2.17.Final</version>
         </dependency>
 
         <dependency>
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
-            <version>4.3.0.Final</version>
+            <version>5.2.17.Final</version>
         </dependency>
 
         <dependency>

src/main/java/shell/DAO/RoleDao.java

@@ -0,0 +1,10 @@
+package shell.DAO;
+
+
+import shell.model.Role;
+
+public interface RoleDao {
+
+    Role getRoleById(Long roleId);
+    Role getRoleUser();
+}

src/main/java/shell/DAO/RoleDaoImpl.java

@@ -0,0 +1,38 @@
+package shell.DAO;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import shell.model.Role;
+import shell.util.DBHelper;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import java.util.List;
+
+@Component
+public class RoleDaoImpl implements RoleDao {
+
+//    private SessionFactory sessionFactory;
+//
+//    public RoleDaoImpl() {
+//        sessionFactory = DBHelper.getSessionFactory();
+//    }
+
+    @Autowired
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    @Override
+    public Role getRoleUser() {
+        return entityManager.find(Role.class, 2L);
+    }
+
+    @Override
+    public Role getRoleById(Long roleId) {
+        return entityManager.find(Role.class, roleId);
+    }
+}
+

src/main/java/shell/DAO/UserDao.java

@@ -0,0 +1,17 @@
+package shell.DAO;
+
+import shell.model.User;
+
+import java.util.List;
+
+
+public interface UserDao {
+
+    User getById(Long id);
+    User getByLogin(String username);
+    List<User> getAll();
+    void save(User user);
+    void update(User user, Long id);
+    void delete(Long id);
+
+}

src/main/java/shell/DAO/UserDaoImpl.java

@@ -0,0 +1,76 @@
+package shell.DAO;
+
+import org.hibernate.Query;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import shell.model.User;
+import shell.util.DBHelper;
+
+import javax.jws.soap.SOAPBinding;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import java.util.List;
+
+@Component
+public class UserDaoImpl implements UserDao {
+
+//    private SessionFactory sessionFactory;
+//
+//    public UserDaoImpl() {
+//        sessionFactory = DBHelper.getSessionFactory();
+//    }
+
+    @Autowired
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    @Override
+    public User getById(Long id) {
+        return entityManager.find(User.class, id);
+    }
+
+    @Override
+    public User getByLogin(String login) {
+        Query query = (Query) entityManager.createQuery("select e from User e where e.login = :log");
+        query.setParameter("log", login);
+        User user = (User) query.getSingleResult();
+        return user;
+    }
+
+    @Override
+    public List<User> getAll() {
+        List<User> users;
+        Query query = (Query) entityManager.createQuery("select e from User e");
+        users = query.getResultList();
+        return users;
+    }
+
+
+    @Override
+    @Transactional
+    public void save(User user) {
+        entityManager.persist(user);
+    }
+
+    @Override
+    @Transactional
+    public void update(User newUser, Long id) {
+        User user = getById(id);
+        user.setLogin(newUser.getLogin());
+        user.setName(newUser.getName());
+        user.setPassword(newUser.getPassword());
+        user.setRoles(newUser.getRoles());
+        entityManager.merge(user);
+    }
+
+    @Override
+    @Transactional
+    public void delete(Long id) {
+        User user = getById(id);
+        entityManager.remove(user);
+    }
+}

src/main/java/shell/config/JPAConfig.java

@@ -18,7 +18,7 @@
 
 @Configuration
 @ComponentScan(value = "shell")
-@EnableJpaRepositories(basePackages = "shell.repositories")
+@EnableJpaRepositories(basePackages = "shell")
 @EnableTransactionManagement
 public class JPAConfig {
 

src/main/java/shell/controlers/UsersController.java

@@ -7,15 +7,19 @@
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
+import shell.model.Role;
 import shell.model.User;
 
-import shell.repositories.UserRepository;
+
 import shell.service.RoleService;
+import shell.service.SignUpServiceImpl;
 import shell.service.UserService;
-import shell.service.UserServiceImpl;
+
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 @Controller
 public class UsersController {
@@ -31,7 +35,7 @@ public class UsersController {
     @Autowired
     private RoleService roleService;
     @Autowired
-    private UserRepository userRepository;
+    private SignUpServiceImpl service;
 
     public UsersController(UserService userService, RoleService roleService) {
         this.roleService = roleService;
@@ -40,7 +44,7 @@ public UsersController(UserService userService, RoleService roleService) {
 
     @RequestMapping(path = "/admin", method = RequestMethod.GET)
     public ModelAndView getAllUsers() {
-        List<User> users = userService.findAllUser();
+        List<User> users = userService.getAll();
         ModelAndView modelAndView = new ModelAndView();
         modelAndView.setViewName("mainPage");
         modelAndView.addObject("usersFromServer", users);
@@ -49,27 +53,26 @@ public ModelAndView getAllUsers() {
 
     @RequestMapping(value = "/admin/delete/{*}", method = RequestMethod.POST)
     public String deleteUser(@PathVariable("*") Long userId) {
-        userService.deleteById(userId);
+        userService.delete(userId);
         return "redirect:/admin";
     }
 
     @RequestMapping(value = "/admin/edit/{*}", method = RequestMethod.GET)
     public ModelAndView editPage(@PathVariable("*") long id) { //@PathVariable указывает на то, что данный параметр (int id) получается из адресной строки
-        User user = userService.findOneById(id);
+        User user = userService.getById(id);
         ModelAndView modelAndView = new ModelAndView();
         modelAndView.setViewName("editPage");
-        user.setId(id);
         modelAndView.addObject("user", user);
         return modelAndView;
     }
 
     @RequestMapping(value = "/admin/edit", method = RequestMethod.POST)
     public ModelAndView editUser(@ModelAttribute("user") User user) {
-        User userFromDB = userService.findOneById(user.getId());
-        userFromDB.setLogin(user.getLogin());
-        userFromDB.setName(user.getName());
-        userFromDB.setPassword(user.getPassword());
-        userRepository.save(userFromDB);
+        Role role = roleService.getRoleById((long) 2);
+        Set<Role> setRoles = new HashSet<>();
+        setRoles.add(role);
+        user.setRoles(setRoles);
+        userService.edit(user, user.getId());
         ModelAndView modelAndView = new ModelAndView();
         modelAndView.setViewName("redirect:/admin"); //означает, что после выполнения данного метода мы будем перенаправлены на адрес "/"
         return modelAndView;
@@ -104,8 +107,11 @@ public String getLoginPage(Authentication authentication) {
 
     @RequestMapping(path = "/admin/save", method = RequestMethod.POST)
     public String saveUsers(User user) {
-        user.setRoles(roleService.getRoleByName("USER"));
-        userService.addUser(user);
+        Role role = roleService.getRoleById((long) 2);
+        Set<Role> setRoles = new HashSet<>();
+        setRoles.add(role);
+        String roleStr = setRoles.toString();
+        userService.save(user, roleStr);
         return "redirect:/admin";
     }
 
@@ -116,12 +122,7 @@ public String getSignUpPage() {
 
     @PostMapping("/signUp")
     public String signUp (User user, String role) {
-        if (role.equals("USER")) {
-            user.setRoles(roleService.getRoleByName(role));
-        } else {
-            user.setRoles(roleService.getRoleByName("ADMIN"));
-        }
-        userRepository.save(user);
+        service.signUp(user, role);
         return "redirect:/login";
     }
 

src/main/java/shell/service/RoleService.java

@@ -1,12 +1,25 @@
 package shell.service;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import shell.DAO.RoleDao;
 import shell.model.Role;
 
-import java.util.Set;
+@Component
+public class RoleService {
 
-public interface RoleService {
+    private RoleDao roleDAO;
 
-    Set<Role> getRole ();
+    @Autowired
+    public RoleService(RoleDao roleDAO) {
+        this.roleDAO = roleDAO;
+    }
 
-    Set<Role> getRoleByName (String nameRole);
+    public Role getRoleById(Long roleId) {
+        return roleDAO.getRoleById(roleId);
+    }
+
+    public Role getRoleUser() {
+        return roleDAO.getRoleUser();
+    }
 }

src/main/java/shell/service/SignUpService.java

@@ -0,0 +1,8 @@
+package shell.service;
+
+
+import shell.model.User;
+
+public interface SignUpService {
+    void signUp(User user, String role);
+}