diff --git a/pom.xml b/pom.xml index 52ade09..b3cc358 100644 --- a/pom.xml +++ b/pom.xml @@ -18,6 +18,10 @@ 15 + + org.springframework.boot + spring-boot-starter-data-jpa + org.springframework.boot spring-boot-starter-validation @@ -30,7 +34,6 @@ org.springframework.boot spring-boot-starter-web - org.springframework.boot spring-boot-devtools diff --git a/src/main/java/com/itacademy/CrudEmpleats/CrudEmpleatsApplication.java b/src/main/java/com/itacademy/CrudEmpleats/CrudEmpleatsApplication.java index 3803e5e..2f7243f 100644 --- a/src/main/java/com/itacademy/CrudEmpleats/CrudEmpleatsApplication.java +++ b/src/main/java/com/itacademy/CrudEmpleats/CrudEmpleatsApplication.java @@ -2,8 +2,9 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -@SpringBootApplication +@SpringBootApplication(exclude={DataSourceAutoConfiguration.class}) public class CrudEmpleatsApplication { public static void main(String[] args) { diff --git a/src/main/java/com/itacademy/CrudEmpleats/controller/ControllerEmployees.java b/src/main/java/com/itacademy/CrudEmpleats/controller/ControllerEmployees.java index 4349cec..67a4b95 100644 --- a/src/main/java/com/itacademy/CrudEmpleats/controller/ControllerEmployees.java +++ b/src/main/java/com/itacademy/CrudEmpleats/controller/ControllerEmployees.java @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.*; import com.itacademy.CrudEmpleats.domain.Employee; -import com.itacademy.CrudEmpleats.persistence.EmployeeRepository; +import com.itacademy.CrudEmpleats.service.EmployeeServices; @RestController public class ControllerEmployees { @@ -18,8 +18,8 @@ public class ControllerEmployees { */ @Autowired - private EmployeeRepository repositori; - + private EmployeeServices repositori; + // Crear nou empleat @PostMapping( "/EmployeeList") @ResponseStatus(HttpStatus.CREATED) // 201 diff --git a/src/main/java/com/itacademy/CrudEmpleats/domain/Employee.java b/src/main/java/com/itacademy/CrudEmpleats/domain/Employee.java index 04e8718..91e2a70 100644 --- a/src/main/java/com/itacademy/CrudEmpleats/domain/Employee.java +++ b/src/main/java/com/itacademy/CrudEmpleats/domain/Employee.java @@ -1,10 +1,14 @@ package com.itacademy.CrudEmpleats.domain; +import javax.persistence.Entity; +import javax.persistence.Id; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +@Entity public class Employee { + @Id @NotNull private int id; @NotBlank diff --git a/src/main/java/com/itacademy/CrudEmpleats/persistence/EmployeeRepository.java b/src/main/java/com/itacademy/CrudEmpleats/persistence/EmployeeRepository.java index 4ea11d2..4cad6f2 100644 --- a/src/main/java/com/itacademy/CrudEmpleats/persistence/EmployeeRepository.java +++ b/src/main/java/com/itacademy/CrudEmpleats/persistence/EmployeeRepository.java @@ -1,20 +1,21 @@ package com.itacademy.CrudEmpleats.persistence; + import java.util.*; -import org.springframework.stereotype.Service; +import org.springframework.stereotype.Repository; import com.itacademy.CrudEmpleats.domain.Employee; import com.itacademy.CrudEmpleats.exceptions.IdNotFound; -@Service +@Repository public class EmployeeRepository implements IEmployeeRepository{ // Els objectes persistents únicament en memòria private static int idcount=0; - private List repository = new ArrayList<>( + private static List repository = new ArrayList<>( Arrays.asList( new Employee(idcount++,"Joan Gordi", "Director_Projectes"), new Employee(idcount++,"Gerard Puig", "Programador_Mid"), diff --git a/src/main/java/com/itacademy/CrudEmpleats/persistence/IEmployeeRepository.java b/src/main/java/com/itacademy/CrudEmpleats/persistence/IEmployeeRepository.java index 838f7ae..85e28d9 100644 --- a/src/main/java/com/itacademy/CrudEmpleats/persistence/IEmployeeRepository.java +++ b/src/main/java/com/itacademy/CrudEmpleats/persistence/IEmployeeRepository.java @@ -4,6 +4,7 @@ import com.itacademy.CrudEmpleats.domain.Employee; + public interface IEmployeeRepository { public List getAllEmployees(); diff --git a/src/main/java/com/itacademy/CrudEmpleats/service/EmployeeServices.java b/src/main/java/com/itacademy/CrudEmpleats/service/EmployeeServices.java new file mode 100644 index 0000000..1f6633f --- /dev/null +++ b/src/main/java/com/itacademy/CrudEmpleats/service/EmployeeServices.java @@ -0,0 +1,37 @@ +package com.itacademy.CrudEmpleats.service; + +import java.util.*; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.itacademy.CrudEmpleats.domain.Employee; +import com.itacademy.CrudEmpleats.persistence.EmployeeRepository; + +@Service +public class EmployeeServices { + + @Autowired + private EmployeeRepository repositori; + + public List getAllEmployees() { + return repositori.getAllEmployees(); + } + + public Employee getEmployeeById(int id){ + return repositori.getEmployeeById(id); + } + + public void addEmployee(Employee employee) { + repositori.addEmployee(employee); + } + + public void updateEmployee(Employee employee, int id) { + repositori.updateEmployee(employee, id); + } + + public void deleteEmployee(int id) { + repositori.deleteEmployee(id); + } + +}