Task #2 (based on actually development branch)

src/main/java/io/khasang/pm/config/AppConfig.java

@@ -1,17 +1,20 @@
 package io.khasang.pm.config;
 
 import io.khasang.pm.dao.CatDao;
+import io.khasang.pm.dao.DocumentDao;
 import io.khasang.pm.dao.EmployeeDao;
 import io.khasang.pm.dao.ProjectDao;
-import io.khasang.pm.dao.DocumentDao;
+import io.khasang.pm.dao.RoleDao;
 import io.khasang.pm.dao.impl.CatDaoImpl;
+import io.khasang.pm.dao.impl.DocumentDaoImpl;
 import io.khasang.pm.dao.impl.EmployeeDaoImpl;
 import io.khasang.pm.dao.impl.ProjectDaoImpl;
-import io.khasang.pm.dao.impl.DocumentDaoImpl;
+import io.khasang.pm.dao.impl.RoleDaoImpl;
 import io.khasang.pm.entity.Cat;
 import io.khasang.pm.entity.Employee;
 import io.khasang.pm.entity.Project;
 import io.khasang.pm.entity.Document;
+import io.khasang.pm.entity.Role;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
@@ -34,9 +37,14 @@ public DocumentDao documentDao(){
         return new DocumentDaoImpl(Document.class);
     }
 
+    @Bean
+    public RoleDao roleDao() {
+        return new RoleDaoImpl(Role.class);
+    }
+
     @Bean
     public EmployeeDao employeeDao(){
         return new EmployeeDaoImpl(Employee.class);
     }
 
-}
+}

src/main/java/io/khasang/pm/config/jpa/HibernateConfig.java

@@ -62,4 +62,4 @@ public void setDataSource(DataSource dataSource) {
     public void setEnvironment(Environment environment) {
         this.environment = environment;
     }
-}
+}

src/main/java/io/khasang/pm/config/security/SecurityConfig.java

@@ -37,4 +37,4 @@ private PasswordEncoder passwordEncoder() {
     public void setUserDetailsService(UserDetailsService userDetailsService) {
         this.userDetailsService = userDetailsService;
     }
-}
+}

src/main/java/io/khasang/pm/config/security/SecurityInit.java

@@ -3,4 +3,5 @@
 import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer;
 
 public class SecurityInit extends AbstractSecurityWebApplicationInitializer {
-}
+
+}

src/main/java/io/khasang/pm/controller/AppController.java

@@ -30,11 +30,16 @@ public String getProjectPage() {
         return "project";
     }
 
-    @RequestMapping("/")
+    @RequestMapping("/getCat")
     public String getHelloPage() {
         return "cat";
     }
 
+    @RequestMapping("/")
+    public String getRolePage() {
+        return "role";
+    }
+
     @RequestMapping("/doc")
     public String workWithDoc() {
         return "doc";

src/main/java/io/khasang/pm/controller/CatController.java

@@ -36,4 +36,4 @@ public List<Cat> getAll(){
     public void setCatService(CatService catService) {
         this.catService = catService;
     }
-}
+}

src/main/java/io/khasang/pm/controller/Rabbit.java

@@ -43,4 +43,4 @@ public void cleanUp() {
     public void init() {
         System.err.println("Rabbit is coming...");
     }
-}
+}

src/main/java/io/khasang/pm/controller/RoleController.java

@@ -0,0 +1,39 @@
+package io.khasang.pm.controller;
+
+import io.khasang.pm.entity.Role;
+import io.khasang.pm.service.RoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Controller
+@RequestMapping("/role")
+// localhost:8080/role
+public class RoleController {
+    private RoleService roleService;
+
+    @RequestMapping(value = "/add", method = RequestMethod.POST, produces = "application/json;charset=utf-8")
+    @ResponseBody
+    public Role addRole(@RequestBody Role role){
+        return roleService.add(role);
+    }
+
+    @RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
+    @ResponseBody
+    public Role getById(@PathVariable("id") long id) {
+        return roleService.getById(id);
+    }
+
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public List<Role> getAll(){
+        return roleService.getAll();
+    }
+
+    @Autowired
+    public void setRoleService(RoleService roleService){
+        this.roleService = roleService;
+    }
+}

src/main/java/io/khasang/pm/dao/RoleDao.java

@@ -0,0 +1,6 @@
+package io.khasang.pm.dao;
+
+import io.khasang.pm.entity.Role;
+
+public interface RoleDao extends BasicDao<Role> {
+}

src/main/java/io/khasang/pm/dao/impl/RoleDaoImpl.java

@@ -0,0 +1,10 @@
+package io.khasang.pm.dao.impl;
+
+import io.khasang.pm.dao.RoleDao;
+import io.khasang.pm.entity.Role;
+
+public class RoleDaoImpl extends BasicDaoImpl<Role> implements RoleDao {
+    public RoleDaoImpl(Class<Role> entityClass) {
+        super(entityClass);
+    }
+}

src/main/java/io/khasang/pm/entity/Login.java

@@ -0,0 +1,37 @@
+package io.khasang.pm.entity;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "login")
+public class Login {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+    private String name;
+    private String description;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+}

src/main/java/io/khasang/pm/entity/Role.java

@@ -0,0 +1,51 @@
+package io.khasang.pm.entity;
+
+import javax.persistence.*;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Table(name = "roles")
+public class Role {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private long id;
+
+    private String name;
+    private String description;
+
+    public List<Login> getLogin() {
+        return login;
+    }
+
+    public void setLogin(List<Login> login) {
+        this.login = login;
+    }
+
+    @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
+    private List<Login> login = new ArrayList<>();
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+}

src/main/java/io/khasang/pm/service/RoleService.java

@@ -0,0 +1,13 @@
+package io.khasang.pm.service;
+
+import io.khasang.pm.entity.Role;
+
+import java.util.List;
+
+public interface RoleService {
+    Role add(Role role);
+
+    Role getById(long id);
+
+    List<Role> getAll();
+}

src/main/java/io/khasang/pm/service/impl/RoleServiceImpl.java

@@ -0,0 +1,34 @@
+package io.khasang.pm.service.impl;
+
+import io.khasang.pm.dao.RoleDao;
+import io.khasang.pm.entity.Role;
+import io.khasang.pm.service.RoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("roleService")
+public class RoleServiceImpl implements RoleService {
+    private RoleDao roleDao;
+
+    @Override
+    public Role add(Role role) {
+        return roleDao.add(role);
+    }
+
+    @Override
+    public Role getById(long id) {
+        return roleDao.getById(id);
+    }
+
+    @Override
+    public List<Role> getAll() {
+        return roleDao.getAll();
+    }
+
+    @Autowired
+    public void setRoleDao (RoleDao roleDao){
+        this.roleDao = roleDao;
+    }
+}

src/main/resources/hibernate.properties

@@ -1,4 +1,4 @@
 hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 hibernate.show_sql=true
 hibernate.format_sql=true
-hibernate.hbm2ddl.auto=update
+hibernate.hbm2ddl.auto=create