Rename Registration Dao & service to conventional style

4 files changed, 13 insertions, 14 deletions

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/H2RegistrationDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDatabaseDAO.java
index f76c706..e4bc0ab 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/H2RegistrationDAO.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDatabaseDAO.java
@@ -18,9 +18,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class H2RegistrationDAO implements RegistrationDAO {
+public class RegistrationDatabaseDAO implements RegistrationDAO {
 
-    private static final Logger LOG = LoggerFactory.getLogger(H2RegistrationDAO.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RegistrationDatabaseDAO.class);
 
     private static final String ADD_REGISTRATION =
             "INSERT INTO Registration (vehicleId, employeeId, start, end, active) VALUES (?,?,?,?,?);";
@@ -33,7 +33,8 @@ public class H2RegistrationDAO implements RegistrationDAO {
     private Connection connection;
 
     @Autowired
-    public H2RegistrationDAO(JDBCConnectionManager connectionManager) throws PersistenceException {
+    public RegistrationDatabaseDAO(JDBCConnectionManager connectionManager)
+            throws PersistenceException {
         try {
             connection = connectionManager.getConnection();
             addRegistration =
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/SimpleRegistrationService.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceImpl.java
index 5b26e39..b0605f0 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/SimpleRegistrationService.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceImpl.java
@@ -15,14 +15,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
-public class SimpleRegistrationService implements RegistrationService {
+public class RegistrationServiceImpl implements RegistrationService {
 
-    private static final Logger LOG = LoggerFactory.getLogger(SimpleRegistrationService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RegistrationServiceImpl.class);
 
     private final RegistrationDAO registrationDAO;
 
     @Autowired
-    public SimpleRegistrationService(RegistrationDAO registrationDAO) {
+    public RegistrationServiceImpl(RegistrationDAO registrationDAO) {
         this.registrationDAO = registrationDAO;
     }
 
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/H2RegistrationDAOTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDatabaseDAOTest.java
index 1180bfa..980c429 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/H2RegistrationDAOTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDatabaseDAOTest.java
@@ -21,7 +21,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-public class H2RegistrationDAOTest {
+public class RegistrationDatabaseDAOTest {
 
     // Base taken from EmployeePersistenceTest
 
@@ -32,8 +32,8 @@ public class H2RegistrationDAOTest {
 
     private RegistrationDAO registrationDAO;
 
-    public H2RegistrationDAOTest() throws PersistenceException {
-        this.registrationDAO = new H2RegistrationDAO(new JDBCConnectionManager(JDBC_URL));
+    public RegistrationDatabaseDAOTest() throws PersistenceException {
+        this.registrationDAO = new RegistrationDatabaseDAO(new JDBCConnectionManager(JDBC_URL));
     }
 
     @BeforeClass
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/SimpleRegistrationServiceTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceImplTest.java
index b1ef38f..7171f83 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/SimpleRegistrationServiceTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceImplTest.java
@@ -1,7 +1,5 @@
 package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
 
-import static org.junit.Assert.*;
-
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.RegistrationDAO;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee.EducationLevel;
@@ -25,7 +23,7 @@ import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 
-public class SimpleRegistrationServiceTest {
+public class RegistrationServiceImplTest {
 
     @Mock RegistrationDAO daoMock;
 
@@ -36,7 +34,7 @@ public class SimpleRegistrationServiceTest {
     @Test
     public void addValidRegistrationsShouldSucceed()
             throws InvalidRegistrationException, ServiceException, InvalidVehicleException {
-        RegistrationService registrationService = new SimpleRegistrationService(daoMock);
+        RegistrationService registrationService = new RegistrationServiceImpl(daoMock);
         List<Registration> registrations = new LinkedList<>();
         Vehicle vehicle =
                 Vehicle.builder()
@@ -92,7 +90,7 @@ public class SimpleRegistrationServiceTest {
     public void addOnlyOnePersonToRTWShouldFail()
             throws InvalidRegistrationException, ServiceException, InvalidVehicleException {
         thrown.expect(InvalidRegistrationException.class);
-        RegistrationService registrationService = new SimpleRegistrationService(daoMock);
+        RegistrationService registrationService = new RegistrationServiceImpl(daoMock);
         List<Registration> registrations = new LinkedList<>();
         Vehicle vehicle =
                 Vehicle.builder()