Merge 'VehicleDBDAO' and 'DBVehicleDAO' to 'VehicleDatabaseDao'

3 files changed, 49 insertions, 86 deletions

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/DBVehicleDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/DBVehicleDAO.java
deleted file mode 100644
index d966dc5..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/DBVehicleDAO.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.ConstructionType;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.Status;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.VehicleType;
-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.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.LinkedList;
-import java.util.List;
-
-public class DBVehicleDAO implements VehicleDAO {
-
-    private JDBCConnectionManager jdbcConnectionManager;
-
-    public DBVehicleDAO(JDBCConnectionManager j) {
-        jdbcConnectionManager = j;
-    }
-
-    @Override
-    public long add(Vehicle vehicle) throws PersistenceException {
-        return 0;
-    }
-
-    @Override
-    public void update(Vehicle vehicle) throws ElementNotFoundException, PersistenceException {}
-
-    @Override
-    public List<Vehicle> list() throws PersistenceException {
-        PreparedStatement pstmt = null;
-        List<Vehicle> result = new LinkedList<>();
-        try {
-            pstmt =
-                    jdbcConnectionManager
-                            .getConnection()
-                            .prepareStatement(
-                                    "Select * from VehicleVersion, "
-                                            + "Vehicle where VehicleVersion.id=Vehicle.version");
-            pstmt.executeQuery();
-            ResultSet rs = pstmt.getResultSet();
-            while (rs.next()) {
-                Vehicle vehicle =
-                        Vehicle.builder()
-                                .name(rs.getString(2))
-                                .constructionType(ConstructionType.valueOf(rs.getString(3)))
-                                .status(Status.valueOf(rs.getString(8)))
-                                .id(rs.getInt(6))
-                                .hasNef(rs.getBoolean(5))
-                                .type(VehicleType.valueOf(rs.getString(4)))
-                                .build();
-                result.add(vehicle);
-            }
-        } catch (SQLException e) {
-            throw new PersistenceException("Die Werte konnten nicht geladen werden.", e);
-        } finally {
-            if (pstmt != null) {
-                try {
-                    pstmt.close();
-                } catch (SQLException e) {
-                    throw new PersistenceException(
-                            "Verbindung zur Datenbank konnte nicht geschlossen werden!", e);
-                }
-            }
-        }
-        return result;
-    }
-
-    @Override
-    public void remove(long id) throws ElementNotFoundException, PersistenceException {}
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDBDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDatabaseDao.java
index 8a596b3..5ddb035 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDBDAO.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDatabaseDao.java
@@ -1,6 +1,8 @@
 package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao;
 
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.ConstructionType;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.Status;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.VehicleType;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
@@ -8,16 +10,17 @@ import at.ac.tuwien.sepm.assignment.groupphase.util.JDBCConnectionManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.LinkedList;
 import java.util.List;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class VehicleDBDAO implements VehicleDAO {
+public class VehicleDatabaseDao implements VehicleDAO {
 
     private final JDBCConnectionManager jdbcConnectionManager;
 
-    public VehicleDBDAO(JDBCConnectionManager jdbcConnectionManager) {
-        this.jdbcConnectionManager = jdbcConnectionManager;
+    public VehicleDatabaseDao(JDBCConnectionManager j) {
+        jdbcConnectionManager = j;
     }
 
     public long add(Vehicle vehicle) throws PersistenceException {
@@ -93,15 +96,49 @@ public class VehicleDBDAO implements VehicleDAO {
         return id;
     }
 
-    public void update(Vehicle vehicle) throws ElementNotFoundException, PersistenceException {
-        throw new UnsupportedOperationException();
-    }
+    @Override
+    public void update(Vehicle vehicle) throws ElementNotFoundException, PersistenceException {}
 
+    @Override
     public List<Vehicle> list() throws PersistenceException {
-        throw new UnsupportedOperationException();
+        PreparedStatement pstmt = null;
+        List<Vehicle> result = new LinkedList<>();
+        try {
+            pstmt =
+                    jdbcConnectionManager
+                            .getConnection()
+                            .prepareStatement(
+                                    "Select * from VehicleVersion, "
+                                            + "Vehicle where VehicleVersion.id=Vehicle.version");
+            pstmt.executeQuery();
+            ResultSet rs = pstmt.getResultSet();
+            while (rs.next()) {
+                Vehicle vehicle =
+                        Vehicle.builder()
+                                .name(rs.getString(2))
+                                .constructionType(ConstructionType.valueOf(rs.getString(3)))
+                                .status(Status.valueOf(rs.getString(8)))
+                                .id(rs.getInt(6))
+                                .hasNef(rs.getBoolean(5))
+                                .type(VehicleType.valueOf(rs.getString(4)))
+                                .build();
+                result.add(vehicle);
+            }
+        } catch (SQLException e) {
+            throw new PersistenceException("Die Werte konnten nicht geladen werden.", e);
+        } finally {
+            if (pstmt != null) {
+                try {
+                    pstmt.close();
+                } catch (SQLException e) {
+                    throw new PersistenceException(
+                            "Verbindung zur Datenbank konnte nicht geschlossen werden!", e);
+                }
+            }
+        }
+        return result;
     }
 
-    public void remove(long id) throws ElementNotFoundException, PersistenceException {
-        throw new UnsupportedOperationException();
-    }
+    @Override
+    public void remove(long id) throws ElementNotFoundException, PersistenceException {}
 }
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/vehicle/CarAddTestService.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/vehicle/CarAddTestService.java
index 731da6f..de7a26a 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/vehicle/CarAddTestService.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/vehicle/CarAddTestService.java
@@ -6,7 +6,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.VehicleDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.VehicleDBDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.VehicleDatabaseDao;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleService;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleServiceImpl;
@@ -16,7 +16,7 @@ import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
 import org.junit.Test;
 
 public class CarAddTestService {
-    private final VehicleDAO vehicleP = mock(VehicleDBDAO.class);
+    private final VehicleDAO vehicleP = mock(VehicleDatabaseDao.class);
     private final VehicleService vehicleService = new VehicleServiceImpl(vehicleP);
 
     public CarAddTestService() throws PersistenceException {