Merge branch 'develop'HEADv3.0master

8 files changed, 0 insertions, 689 deletions

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeService.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeService.java
deleted file mode 100644
index f7f8e71..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeService.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidEmployeeException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import java.util.Set;
-
-public interface EmployeeService {
-
-    /**
-     * Add given employee to the store.
-     *
-     * @param employee that should be added to the store
-     * @return the id that was assigned
-     * @throws InvalidEmployeeException if the employee is invalid
-     * @throws ServiceException if the employee could not be persisted
-     */
-    long add(Employee employee) throws InvalidEmployeeException, ServiceException;
-
-    /**
-     * Update the given employee.
-     *
-     * @param employee that should be updated
-     * @return the updated employee
-     * @throws InvalidEmployeeException if the employee is invalid
-     * @throws ServiceException if the updated employee could not be persisted
-     */
-    Employee update(Employee employee) throws InvalidEmployeeException, ServiceException;
-
-    /**
-     * Get all stored employees.
-     *
-     * @return list containing all stored employees
-     * @throws ServiceException if loading the stored employees failed
-     */
-    Set<Employee> list() throws ServiceException;
-
-    /**
-     * Remove employee with the given id from the store.
-     *
-     * @param id of the employee that should be removed
-     * @throws InvalidEmployeeException if given employee id is invalid or does not exist
-     * @throws ServiceException if the employee could not be removed from the store
-     */
-    void remove(long id) throws InvalidEmployeeException, ServiceException;
-}
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
deleted file mode 100644
index 31b5acd..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeServiceImpl.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.EmployeeDAO;
-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.ElementNotFoundException;
-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.Set;
-import org.springframework.stereotype.Service;
-
-@Service
-public class EmployeeServiceImpl implements EmployeeService {
-
-    private final EmployeeDAO employeePersistence;
-
-    public EmployeeServiceImpl(EmployeeDAO employeePersistence) {
-        this.employeePersistence = employeePersistence;
-    }
-
-    @Override
-    public long add(Employee employee) throws InvalidEmployeeException, ServiceException {
-
-        EmployeeValidator.validate(employee);
-        try {
-            return employeePersistence.add(employee);
-        } catch (PersistenceException e) {
-            throw new ServiceException(e);
-        }
-    }
-
-    @Override
-    public Employee update(Employee employee) throws InvalidEmployeeException, ServiceException {
-
-        EmployeeValidator.validate(employee);
-        try {
-            employeePersistence.update(employee);
-            return employee;
-        } catch (ElementNotFoundException | PersistenceException e) {
-            throw new ServiceException(e);
-        }
-    }
-
-    @Override
-    public Set<Employee> list() throws ServiceException {
-
-        try {
-            return employeePersistence.list();
-        } catch (PersistenceException e) {
-            throw new ServiceException(e);
-        }
-    }
-
-    @Override
-    public void remove(long id) throws InvalidEmployeeException, ServiceException {}
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationService.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationService.java
deleted file mode 100644
index 4b7e630..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationService.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Status;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import java.util.EnumSet;
-import java.util.Set;
-import java.util.SortedSet;
-
-public interface OperationService {
-
-    /**
-     * Add given operation to the store.
-     *
-     * @param operation that should be added to the store
-     * @return the id that was assigned
-     * @throws InvalidOperationException if the operation is invalid
-     * @throws ServiceException if the operation could not be persisted
-     */
-    long add(Operation operation) throws InvalidOperationException, ServiceException;
-
-    /**
-     * Request new vehicles to the given operation.
-     *
-     * @param operationId id of the operation that the vehicles should be send to
-     * @param vehicleIds the ids of the vehicles that should be send to the given operation
-     * @throws InvalidOperationException if the operationId is invalid or does not exist
-     * @throws InvalidVehicleException if one of the vehicle ids is invalid or does not exist
-     * @throws ServiceException if the vehicles could not be loaded or the operation could not be
-     *     persisted
-     */
-    void requestVehicles(long operationId, Set<Long> vehicleIds)
-            throws InvalidOperationException, InvalidVehicleException, ServiceException;
-
-    /**
-     * Completes the given operation with the specified status.
-     *
-     * @param operationId id of the operation that should be completed
-     * @param status of the completed operation, either {@link Status#COMPLETED} or {@link
-     *     Status#CANCELLED}
-     * @throws InvalidOperationException if the operationId is invalid or does not exist
-     * @throws ServiceException if the operation could not be persisted
-     */
-    void complete(long operationId, Status status)
-            throws InvalidOperationException, ServiceException;
-
-    /**
-     * Get all available vehicles, sorted by how well they fit to the given opCode, starting with
-     * the best fitting.
-     *
-     * @param opCode the operation code that is used to determine the ranking
-     * @return a sorted list containing all available vehicles
-     * @throws InvalidOperationException if the opCode is invalid
-     * @throws ServiceException if loading the stored vehicles failed
-     */
-    SortedSet<Vehicle> rankVehicles(String opCode)
-            throws InvalidOperationException, ServiceException;
-
-    /**
-     * Get all stored operations with matching status.
-     *
-     * @param statuses set containing all statuses that should be matched
-     * @return list containing all matched operations
-     * @throws ServiceException if loading the stored operations failed
-     */
-    Set<Operation> list(EnumSet<Status> statuses) throws ServiceException;
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceImpl.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceImpl.java
deleted file mode 100644
index d07f46f..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceImpl.java
+++ /dev/null
@@ -1,264 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.OperationDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.VehicleDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Severity;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Status;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-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.InvalidOperationException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
-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.Instant;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-@Service
-public class OperationServiceImpl implements OperationService {
-
-    private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
-    private final OperationDAO operationDAO;
-    private final VehicleDAO vehicleDAO;
-    private final VehicleService vehicleService;
-
-    public OperationServiceImpl(
-            OperationDAO operationDAO, VehicleDAO vehicleDAO, VehicleService vehicleService) {
-        this.operationDAO = operationDAO;
-        this.vehicleDAO = vehicleDAO;
-        this.vehicleService = vehicleService;
-    }
-
-    @Override
-    public long add(Operation o) throws InvalidOperationException, ServiceException {
-        if (o.created() != null) throw new InvalidOperationException("Created must not be set");
-
-        if (o.severity() != null) throw new InvalidOperationException("Severity must not be set");
-
-        if (o.id() != 0) throw new InvalidOperationException("Id must be 0");
-
-        if (o.status() != Status.ACTIVE)
-            LOG.warn("Status was set but will be overridden"); // TODO: nullable instead??
-
-        try {
-            for (long id : (Iterable<Long>) o.vehicles().stream().map(Vehicle::id)::iterator) {
-                Vehicle v = vehicleDAO.get(id);
-                VehicleServiceImpl.validateVehicle(v);
-            }
-
-            validateOperation(o);
-
-            return operationDAO.add(
-                    o.toBuilder()
-                            .created(Instant.now())
-                            .severity(extractSeverityFromOpCode(o.opCode()))
-                            .status(Status.ACTIVE)
-                            .build());
-        } catch (PersistenceException e) {
-            LOG.error("PersistenceException while adding operation: {}", e);
-            throw new ServiceException(e);
-        } catch (InvalidVehicleException e) {
-            throw new InvalidOperationException("Enthaltenes Fahrzeug ist invalid", e);
-        } catch (ElementNotFoundException e) {
-            throw new InvalidOperationException("Enthaltenes Fahrzeug existiert nicht", e);
-        }
-    }
-
-    @Override
-    public void requestVehicles(long operationId, Set<Long> vehicleIds)
-            throws InvalidOperationException, InvalidVehicleException, ServiceException {
-        Set<Vehicle> vs = new HashSet<>();
-
-        try {
-            if (operationId <= 0) throw new InvalidOperationException("OperationId ist invalid");
-            Operation o = operationDAO.get(operationId);
-            validateOperation(o);
-
-            if (o.opCode().trim().isEmpty()
-                    || extractSeverityFromOpCode(o.opCode()) != o.severity())
-                throw new InvalidOperationException("Einsatzcode ist invalid");
-
-            if (o.status() != Status.ACTIVE)
-                throw new InvalidOperationException("Einsatz ist inaktiv");
-
-            if (o.created() == null)
-                throw new InvalidOperationException("Created darf nicht leer sein");
-
-            for (Long id : vehicleIds) {
-                if (id <= 0) throw new InvalidVehicleException("VehicleId ist invalid");
-
-                try {
-                    Vehicle v = vehicleDAO.get(id);
-                    VehicleServiceImpl.validateVehicle(v);
-                    if (v.status() == Vehicle.Status.ABGEMELDET)
-                        throw new InvalidVehicleException(
-                                "Kann keine inaktiven Fahrzeuge anfordern");
-
-                    vs.add(v);
-                } catch (ElementNotFoundException e) {
-                    throw new InvalidVehicleException("VehicleId ist invalid");
-                }
-            }
-
-            vs.addAll(o.vehicles());
-            if (vs.equals(o.vehicles())) return;
-
-            operationDAO.update(o.toBuilder().vehicles(vs).build());
-        } catch (ElementNotFoundException e) {
-            throw new InvalidOperationException("Kein Einsatz mit dieser id existiert");
-        } catch (PersistenceException e) {
-            LOG.error("PersistenceException while requesting vehicles: {}", e);
-            throw new ServiceException(e);
-        }
-    }
-
-    @Override
-    public void complete(long operationId, Status status)
-            throws InvalidOperationException, ServiceException {
-        try {
-            Operation o = operationDAO.get(operationId);
-            operationDAO.update(o.toBuilder().status(status).build());
-        } catch (ElementNotFoundException e) {
-            throw new InvalidOperationException(e);
-        } catch (PersistenceException e) {
-            LOG.error("PersistenceException while completing operation: {}", e);
-            throw new ServiceException(e);
-        }
-    }
-
-    @Override
-    public SortedSet<Vehicle> rankVehicles(String opCode)
-            throws InvalidOperationException, ServiceException {
-        Set<Vehicle> vehicles =
-                vehicleService.list(EnumSet.complementOf(EnumSet.of(Vehicle.Status.ABGEMELDET)));
-
-        List<Predicate<Vehicle>> priorities = new ArrayList<>();
-        Predicate<Vehicle> ktw = v -> v.type() == VehicleType.KTW;
-        Predicate<Vehicle> rtwNoNEF = v -> v.type() == VehicleType.RTW && !v.hasNef();
-        Predicate<Vehicle> rtwNEF = v -> v.type() == VehicleType.RTW && v.hasNef();
-        Predicate<Vehicle> nef = v -> v.type() == VehicleType.NEF;
-        Predicate<Vehicle> nah = v -> v.type() == VehicleType.NAH;
-
-        switch (extractSeverityFromOpCode(opCode)) {
-            case A:
-                // fallthrough
-            case B:
-                // fallthrough
-            case O:
-                priorities.add(ktw);
-                priorities.add(rtwNoNEF);
-                priorities.add(rtwNEF);
-                break;
-            case C:
-                priorities.add(rtwNEF);
-                priorities.add(rtwNoNEF);
-                priorities.add(ktw);
-                break;
-            case D:
-                priorities.add(rtwNEF);
-                priorities.add(nef);
-                priorities.add(nah);
-                priorities.add(rtwNoNEF);
-                priorities.add(ktw);
-                break;
-            case E:
-                priorities.add(nah);
-                priorities.add(nef);
-                priorities.add(rtwNEF);
-                priorities.add(rtwNoNEF);
-                priorities.add(ktw);
-                break;
-        }
-
-        Comparator<Vehicle> vehicleComparator =
-                (v1, v2) -> {
-                    for (Predicate<Vehicle> priority : priorities) {
-                        if (priority.test(v1)) {
-                            return -1;
-                        }
-                        if (priority.test(v2)) {
-                            return +1;
-                        }
-                    }
-                    return 0;
-                };
-
-        Supplier<TreeSet<Vehicle>> supplier = () -> new TreeSet<>(vehicleComparator);
-
-        return vehicles.stream().collect(Collectors.toCollection(supplier));
-    }
-
-    @Override
-    public Set<Operation> list(EnumSet<Status> statuses) throws ServiceException {
-        try {
-            Set<Operation> operations = operationDAO.list(statuses);
-            for (Operation o : operations) validateOperation(o);
-
-            return operations;
-        } catch (PersistenceException e) {
-            LOG.error("PersistenceException while listing operations", e);
-            throw new ServiceException(e);
-        } catch (InvalidOperationException e) {
-            // database returned invalid values
-            LOG.error("DB returned invalid operation: {}", e);
-            throw new ServiceException("DB returned invalid operation", e);
-        }
-    }
-
-    private static void validateOperation(Operation o) throws InvalidOperationException {
-        if (o.vehicles().isEmpty())
-            throw new InvalidOperationException(
-                    "Es muss mindestens ein Fahrzeug ausgewählt werden!");
-
-        for (Vehicle v : o.vehicles()) {
-            try {
-                VehicleServiceImpl.validateVehicle(v);
-            } catch (InvalidVehicleException e) {
-                throw new InvalidOperationException("Fahrzeug " + v.name() + " ist invalid" + e);
-            }
-
-            if (v.status() != Vehicle.Status.FREI_FUNK && v.status() != Vehicle.Status.FREI_WACHE)
-                throw new InvalidOperationException(
-                        "Fahrzeug nicht verfügbar (" + v.status() + ")");
-
-            // TODO: validate if NEF/RTW/NAH conditions?
-        }
-
-        Instant created = o.created();
-        if (created != null && created.isAfter(Instant.now()))
-            throw new InvalidOperationException("Fahrzeug wurde in der Zukunft erstellt");
-
-        if (o.destination().trim().isEmpty())
-            throw new InvalidOperationException("Adresse darf nicht leer sein");
-    }
-
-    private static final Pattern opCodePattern =
-            Pattern.compile("(?:\\w{1,3}-\\d{0,2})([ABCDEO])(?:.*)");
-
-    private static Severity extractSeverityFromOpCode(String opCode)
-            throws InvalidOperationException {
-        Matcher m = opCodePattern.matcher(opCode);
-
-        if (!m.matches()) throw new InvalidOperationException("Einsatzcode ist invalid");
-
-        return Severity.valueOf(m.group(1));
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationService.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationService.java
deleted file mode 100644
index b7d8eef..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Registration;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidRegistrationException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import java.util.Set;
-
-public interface RegistrationService {
-
-    /**
-     * Register employee to a vehicle.
-     *
-     * @param vehicleId the id of the target vehicle
-     * @param registrations that should be added to the vehicle
-     * @return the list of ids that were assigned
-     * @throws InvalidVehicleException if the vehicleId is invalid or does not exist
-     * @throws InvalidRegistrationException if the registration is invalid
-     * @throws ServiceException if the registration could not be persisted
-     */
-    Set<Long> add(long vehicleId, Set<Registration> registrations)
-            throws InvalidVehicleException, InvalidRegistrationException, ServiceException;
-
-    /**
-     * Remove given registration from the store.
-     *
-     * @param registrationId the id of the registration that should be removed
-     * @throws InvalidRegistrationException if the registration is invalid or does not exist
-     * @throws ServiceException if the registration could not be removed from the store
-     */
-    void remove(long registrationId) throws InvalidRegistrationException, ServiceException;
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceImpl.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceImpl.java
deleted file mode 100644
index 54d46e7..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceImpl.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.RegistrationDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.VehicleDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Registration;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.RegistrationValidator;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidRegistrationException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import java.util.Set;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class RegistrationServiceImpl implements RegistrationService {
-
-    private static final Logger LOG = LoggerFactory.getLogger(RegistrationServiceImpl.class);
-
-    private final RegistrationDAO registrationDAO;
-    private final VehicleDAO vehicleDAO;
-
-    @Autowired
-    public RegistrationServiceImpl(RegistrationDAO registrationDAO, VehicleDAO vehicleDAO) {
-        this.registrationDAO = registrationDAO;
-        this.vehicleDAO = vehicleDAO;
-    }
-
-    @Override
-    public Set<Long> add(long vehicleId, Set<Registration> registrations)
-            throws InvalidVehicleException, InvalidRegistrationException, ServiceException {
-
-        if (vehicleId <= 0) throw new InvalidVehicleException("VehicleId invalid");
-
-        try {
-            Vehicle vehicle = vehicleDAO.get(vehicleId);
-
-            RegistrationValidator.validate(vehicle, registrations);
-
-            return registrationDAO.add(vehicle.id(), registrations);
-        } catch (PersistenceException e) {
-            LOG.warn("PersistenceException caught, throwing matching ServiceException");
-            throw new ServiceException(e);
-        } catch (ElementNotFoundException e) {
-            throw new InvalidVehicleException(e);
-        }
-    }
-
-    @Override
-    public void remove(long registrationId) throws InvalidRegistrationException, ServiceException {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleService.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleService.java
deleted file mode 100644
index fe09ca1..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleService.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.Status;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import java.util.EnumSet;
-import java.util.Set;
-
-public interface VehicleService {
-
-    /**
-     * Add given vehicle to the store.
-     *
-     * @param vehicle that should be added to the store
-     * @return the id that was assigned
-     * @throws InvalidVehicleException if the vehicle is invalid
-     * @throws ServiceException if the vehicle could not be persisted
-     */
-    long add(Vehicle vehicle) throws InvalidVehicleException, ServiceException;
-
-    /**
-     * Update the given vehicle.
-     *
-     * @param vehicle that should be updated
-     * @return the updated vehicle
-     * @throws InvalidVehicleException if the vehicle is invalid
-     * @throws ServiceException if the updated vehicle could not be persisted
-     */
-    Vehicle update(Vehicle vehicle) throws InvalidVehicleException, ServiceException;
-
-    /**
-     * Get all stored vehicles with matching status.
-     *
-     * @param statuses set containing all statuses that should be matched
-     * @return list containing all stored vehicles
-     * @throws ServiceException if loading the stored vehicles failed
-     */
-    Set<Vehicle> list(EnumSet<Status> statuses) throws ServiceException;
-
-    /**
-     * Remove vehicle with the given id from the store.
-     *
-     * @param id of the vehicle that should be removed
-     * @throws InvalidVehicleException if given vehicle id is invalid or does not exist
-     * @throws ServiceException if the vehicle could not be removed from the store
-     */
-    void remove(long id) throws InvalidVehicleException, ServiceException;
-}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleServiceImpl.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleServiceImpl.java
deleted file mode 100644
index 61a24e5..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleServiceImpl.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.VehicleDAO;
-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.exception.ElementNotFoundException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import java.util.EnumSet;
-import java.util.Set;
-import java.util.stream.Collectors;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-@Service
-public class VehicleServiceImpl implements VehicleService {
-
-    private VehicleDAO vehiclePersistence;
-
-    public VehicleServiceImpl(VehicleDAO vehiclePersistence) {
-        this.vehiclePersistence = vehiclePersistence;
-    }
-
-    public long add(Vehicle vehicle) throws InvalidVehicleException, ServiceException {
-        if (!CollectionUtils.isEmpty(vehicle.registrations()))
-            throw new InvalidVehicleException("Vehicle can't be created with registrations");
-
-        validateVehicle(vehicle);
-        try {
-            vehiclePersistence.add(vehicle);
-        } catch (PersistenceException e) {
-            throw new ServiceException(e);
-        }
-        return 0;
-    }
-
-    public Vehicle update(Vehicle vehicle) throws InvalidVehicleException, ServiceException {
-        validateVehicle(vehicle);
-        try {
-            vehiclePersistence.update(vehicle);
-        } catch (ElementNotFoundException e) {
-            throw new ServiceException("Element not found");
-        } catch (PersistenceException e) {
-            throw new ServiceException(e);
-        }
-        return vehicle;
-    }
-
-    protected static void validateVehicle(Vehicle vehicle) throws InvalidVehicleException {
-        switch (vehicle.type()) {
-            case RTW:
-                if (vehicle.constructionType() == ConstructionType.NORMAL) {
-                    throw new InvalidVehicleException("RTW darf kein Normales Dach haben");
-                } else if (vehicle.constructionType() == ConstructionType.MITTELHOCHDACH) {
-                    throw new InvalidVehicleException("RTW darf kein Mittelhochdach haben");
-                }
-                break;
-            case KTW:
-                if (vehicle.constructionType() == ConstructionType.NORMAL) {
-                    throw new InvalidVehicleException("KTW darf kein Normales Dach haben");
-                }
-                break;
-            case KTW_B:
-                if (vehicle.constructionType() == ConstructionType.NORMAL) {
-                    throw new InvalidVehicleException("KTW-B darf kein Normales Dach haben");
-                }
-                break;
-            case NEF:
-                if (vehicle.constructionType() == ConstructionType.MITTELHOCHDACH) {
-                    throw new InvalidVehicleException("NEF darf kein Mittelhochdach haben");
-                } else if (vehicle.constructionType() == ConstructionType.HOCHDACH) {
-                    throw new InvalidVehicleException("NEF darf kein Hochdach haben");
-                }
-                break;
-            case NAH:
-                if (vehicle.constructionType() == ConstructionType.MITTELHOCHDACH) {
-                    throw new InvalidVehicleException("NEF darf kein Mittelhochdach haben");
-                } else if (vehicle.constructionType() == ConstructionType.HOCHDACH) {
-                    throw new InvalidVehicleException("NEF darf kein Hochdach haben");
-                }
-                break;
-            case BKTW:
-                break;
-            default:
-                throw new IllegalStateException("BUG: invalid vehicle type" + vehicle.type());
-        }
-    }
-
-    @Override
-    public Set<Vehicle> list(EnumSet<Status> statuses) throws ServiceException {
-        if (statuses == null) {
-            throw new ServiceException("statuses may not be null");
-        }
-
-        Set<Vehicle> vehicles;
-
-        try {
-            vehicles = vehiclePersistence.list();
-        } catch (PersistenceException e) {
-            throw new ServiceException(e);
-        }
-
-        return vehicles.stream()
-                .filter(vehicle -> statuses.contains(vehicle.status()))
-                .collect(Collectors.toSet());
-    }
-
-    @Override
-    public void remove(long id) throws InvalidVehicleException, ServiceException {
-        throw new UnsupportedOperationException();
-    }
-}