Change occurences of PersistenceException in Service and Controllers

to ServiceExceptions

6 files changed, 23 insertions, 25 deletions

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewEmployeeController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewEmployeeController.java
index 5906692..d81f6d7 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewEmployeeController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewEmployeeController.java
@@ -4,7 +4,7 @@ import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee.EducationLevel;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.EmployeeService;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidEmployeeException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
 import java.lang.invoke.MethodHandles;
 import java.time.LocalDate;
 import java.util.stream.Collectors;
@@ -85,7 +85,7 @@ public class CreateNewEmployeeController {
                     "Ungültige Eingabe",
                     "Mindestens eines der Eingabefelder haben einen ungültigen Wert!");
             return;
-        } catch (PersistenceException e) {
+        } catch (ServiceException e) {
             LOG.error("Employee could not be saved: {}", e);
 
             showModalDialogWithOkButton(
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeeDatabaseDao.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeeDatabaseDao.java
index f16f98e..fc9a549 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeeDatabaseDao.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeeDatabaseDao.java
@@ -1,9 +1,9 @@
 package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao;
 
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.util.JDBCConnectionManager;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.util.JDBCConnectionManager;
 import java.lang.invoke.MethodHandles;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeServiceImpl.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeServiceImpl.java
index df8df64..144ccc6 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeServiceImpl.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeServiceImpl.java
@@ -5,6 +5,7 @@ import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.EmployeeValidator;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidEmployeeException;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
 import java.util.List;
 import org.springframework.stereotype.Service;
 
@@ -18,23 +19,26 @@ public class EmployeeServiceImpl implements EmployeeService {
     }
 
     @Override
-    public long add(Employee employee) throws InvalidEmployeeException, PersistenceException {
+    public long add(Employee employee) throws InvalidEmployeeException, ServiceException {
 
         EmployeeValidator.validate(employee);
-        return employeePersistence.add(employee);
+        try {
+            return employeePersistence.add(employee);
+        } catch (PersistenceException e) {
+            throw new ServiceException(e);
+        }
     }
 
     @Override
-    public Employee update(Employee employee)
-            throws InvalidEmployeeException, PersistenceException {
+    public Employee update(Employee employee) throws InvalidEmployeeException, ServiceException {
         return null;
     }
 
     @Override
-    public List<Employee> list() throws PersistenceException {
+    public List<Employee> list() throws ServiceException {
         return null;
     }
 
     @Override
-    public void remove(long id) throws InvalidEmployeeException, PersistenceException {}
+    public void remove(long id) throws InvalidEmployeeException, ServiceException {}
 }
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/CreateNewEmployeeApplication.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/CreateNewEmployeeApplication.java
index 66c7e56..e9f4801 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/CreateNewEmployeeApplication.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/CreateNewEmployeeApplication.java
@@ -1,7 +1,6 @@
 package at.ac.tuwien.sepm.assignment.groupphase.employee;
 
-import at.ac.tuwien.sepm.assignment.groupphase.application.MainApplication;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.util.SpringFXMLLoader;
+import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
 import java.lang.invoke.MethodHandles;
 import javafx.application.Application;
 import javafx.scene.Parent;
@@ -46,11 +45,6 @@ public final class CreateNewEmployeeApplication extends Application {
         LOG.debug("Application startup complete");
     }
 
-    public static void main(String[] args) {
-        LOG.debug("Application starting with arguments={}", (Object) args);
-        Application.launch(MainApplication.class, args);
-    }
-
     @Override
     public void stop() {
         LOG.debug("Stopping application");
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/CreateNewEmployeeControllerTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/CreateNewEmployeeControllerTest.java
index 4a7477b..da8a6ac 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/CreateNewEmployeeControllerTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/CreateNewEmployeeControllerTest.java
@@ -5,7 +5,7 @@ import static org.mockito.Mockito.when;
 
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.EmployeeService;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidEmployeeException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
 import at.ac.tuwien.sepm.assignment.groupphase.util.HighDpiAwareApplicationTest;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -40,7 +40,7 @@ public class CreateNewEmployeeControllerTest extends HighDpiAwareApplicationTest
     }
 
     @Test
-    public void testClickAddValidEmployee() throws PersistenceException, InvalidEmployeeException {
+    public void testClickAddValidEmployee() throws InvalidEmployeeException, ServiceException {
 
         when(employeeService.add(any())).thenReturn(1L);
 
@@ -56,8 +56,7 @@ public class CreateNewEmployeeControllerTest extends HighDpiAwareApplicationTest
     }
 
     @Test
-    public void testClickAddInvalidEmployee()
-            throws PersistenceException, InvalidEmployeeException {
+    public void testClickAddInvalidEmployee() throws InvalidEmployeeException, ServiceException {
 
         when(employeeService.add(any())).thenThrow(InvalidEmployeeException.class);
 
@@ -72,10 +71,10 @@ public class CreateNewEmployeeControllerTest extends HighDpiAwareApplicationTest
     }
 
     @Test
-    public void testClickAddEmployeeWithPersistenceException()
-            throws PersistenceException, InvalidEmployeeException {
+    public void testClickAddEmployeeWithServiceException()
+            throws InvalidEmployeeException, ServiceException {
 
-        when(employeeService.add(any())).thenThrow(PersistenceException.class);
+        when(employeeService.add(any())).thenThrow(ServiceException.class);
 
         clickOn("#inputName", Motion.DIRECT, MouseButton.PRIMARY);
         write("Test");
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/EmployeeServiceTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/EmployeeServiceTest.java
index ac73c9a..47328b3 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/EmployeeServiceTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/EmployeeServiceTest.java
@@ -14,6 +14,7 @@ import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.Employe
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.EmployeeServiceImpl;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidEmployeeException;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
 import java.time.LocalDate;
 import org.junit.Assert;
 import org.junit.Test;
@@ -41,7 +42,7 @@ public class EmployeeServiceTest {
 
         try {
             Assert.assertThat(employeeService.add(employee), is(1L));
-        } catch (InvalidEmployeeException | PersistenceException e) {
+        } catch (InvalidEmployeeException | ServiceException e) {
             fail();
         }
     }
@@ -60,7 +61,7 @@ public class EmployeeServiceTest {
 
         try {
             employeeService.add(employee);
-        } catch (PersistenceException e) {
+        } catch (ServiceException e) {
             fail();
         }
     }