Merge remote-tracking branch 'origin/develop' into develop

13 files changed, 62 insertions, 56 deletions

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/MainApplication.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/MainApplication.java
index 01c04d3..d8365a7 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/MainApplication.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/MainApplication.java
@@ -1,6 +1,6 @@
 package at.ac.tuwien.sepm.assignment.groupphase.application;
 
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.userInterface.CreateOperationController;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.CreateOperationController;
 import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
 import javafx.application.Application;
 import javafx.application.Platform;
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchiveOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
index 53e7067..80d9fc4 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchiveOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/ArchiveOperationController.java
@@ -1,4 +1,4 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.userInterface;
+package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
 
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Status;
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java
index 67c8807..57759e3 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java
@@ -1,4 +1,4 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.userInterface;
+package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
 
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Status;
@@ -6,7 +6,6 @@ import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Registratio
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.OperationService;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleService;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.ui.vehiclepane.VehiclePaneController;
 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;
@@ -341,7 +340,7 @@ public class CreateOperationController {
             LOG.error("Could not open new window: {}", e);
         }
 
-        stage.setTitle("Einsatz erstellen");
+        stage.setTitle("Ressourcenverwaltung");
         stage.centerOnScreen();
         stage.showAndWait(); // important to call wait so that updateList is executed afterwards
 
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/OperationDetailsController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationDetailsController.java
index 9c9eb28..dc7e969 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/OperationDetailsController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationDetailsController.java
@@ -1,4 +1,4 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.userInterface;
+package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
 
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Status;
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/ui/vehiclepane/VehiclePaneController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/VehiclePaneController.java
index e7a1cc0..6c0932b 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/ui/vehiclepane/VehiclePaneController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/VehiclePaneController.java
@@ -1,4 +1,4 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.ui.vehiclepane;
+package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
 
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee.EducationLevel;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Registration;
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 40a9134..43a5c9d 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
@@ -20,7 +20,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class EmployeeDatabaseDao implements EmployeeDAO {
+public class EmployeeDatabaseDAO implements EmployeeDAO {
 
     private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
     private static final String INSERT_EMPLOYEE_VERSION =
@@ -40,7 +40,7 @@ public class EmployeeDatabaseDao implements EmployeeDAO {
 
     private final Connection connection;
 
-    public EmployeeDatabaseDao(JDBCConnectionManager connectionManager)
+    public EmployeeDatabaseDAO(JDBCConnectionManager connectionManager)
             throws PersistenceException {
 
         try {
@@ -76,17 +76,19 @@ public class EmployeeDatabaseDao implements EmployeeDAO {
             insertEmployeeVersion.setBoolean(4, employee.isDriver());
             insertEmployeeVersion.setBoolean(5, employee.isPilot());
             insertEmployeeVersion.executeUpdate();
-            ResultSet resultSetEmployeeVersion = insertEmployeeVersion.getGeneratedKeys();
-            if (resultSetEmployeeVersion.next()) {
-                long versionId = resultSetEmployeeVersion.getLong(1);
-
-                insertEmployee.setLong(1, versionId);
-                insertEmployee.executeUpdate();
-
-                ResultSet resultSetEmployee = insertEmployee.getGeneratedKeys();
-                if (resultSetEmployee.next()) {
-                    connection.commit();
-                    return resultSetEmployee.getLong(1);
+            try (ResultSet resultSetEmployeeVersion = insertEmployeeVersion.getGeneratedKeys()) {
+                if (resultSetEmployeeVersion.next()) {
+                    long versionId = resultSetEmployeeVersion.getLong(1);
+
+                    insertEmployee.setLong(1, versionId);
+                    insertEmployee.executeUpdate();
+
+                    try (ResultSet resultSetEmployee = insertEmployee.getGeneratedKeys()) {
+                        if (resultSetEmployee.next()) {
+                            connection.commit();
+                            return resultSetEmployee.getLong(1);
+                        }
+                    }
                 }
             }
 
@@ -125,20 +127,21 @@ public class EmployeeDatabaseDao implements EmployeeDAO {
             insertEmployeeVersion.setBoolean(4, employee.isDriver());
             insertEmployeeVersion.setBoolean(5, employee.isPilot());
             insertEmployeeVersion.executeUpdate();
-            ResultSet resultSetEmployeeVersion = insertEmployeeVersion.getGeneratedKeys();
+            try (ResultSet resultSetEmployeeVersion = insertEmployeeVersion.getGeneratedKeys()) {
 
-            if (resultSetEmployeeVersion.next()) {
-                long versionId = resultSetEmployeeVersion.getLong(1);
+                if (resultSetEmployeeVersion.next()) {
+                    long versionId = resultSetEmployeeVersion.getLong(1);
 
-                updateEmployee.setLong(1, versionId);
-                updateEmployee.setLong(2, employee.id());
-                int affectedRows = updateEmployee.executeUpdate();
+                    updateEmployee.setLong(1, versionId);
+                    updateEmployee.setLong(2, employee.id());
+                    int affectedRows = updateEmployee.executeUpdate();
 
-                if (affectedRows == 1) {
-                    connection.commit();
-                } else {
-                    throw new ElementNotFoundException(
-                            "element not found with id: " + employee.id());
+                    if (affectedRows == 1) {
+                        connection.commit();
+                    } else {
+                        throw new ElementNotFoundException(
+                                "element not found with id: " + employee.id());
+                    }
                 }
             }
 
@@ -164,22 +167,24 @@ public class EmployeeDatabaseDao implements EmployeeDAO {
     public Set<Employee> list() throws PersistenceException {
 
         try {
-            ResultSet rs = listEmployee.executeQuery();
-
-            Set<Employee> employees = new HashSet<>();
-            while (rs.next()) {
-
-                Employee employee =
-                        Employee.builder()
-                                .id(rs.getLong(1))
-                                .name(rs.getString(2))
-                                .birthday(rs.getTimestamp(3).toLocalDateTime().toLocalDate())
-                                .educationLevel(EducationLevel.valueOf(rs.getString(4)))
-                                .isDriver(rs.getBoolean(5))
-                                .isPilot(rs.getBoolean(6))
-                                .build();
-
-                employees.add(employee);
+            Set<Employee> employees;
+            try (ResultSet rs = listEmployee.executeQuery()) {
+
+                employees = new HashSet<>();
+                while (rs.next()) {
+
+                    Employee employee =
+                            Employee.builder()
+                                    .id(rs.getLong(1))
+                                    .name(rs.getString(2))
+                                    .birthday(rs.getTimestamp(3).toLocalDateTime().toLocalDate())
+                                    .educationLevel(EducationLevel.valueOf(rs.getString(4)))
+                                    .isDriver(rs.getBoolean(5))
+                                    .isPilot(rs.getBoolean(6))
+                                    .build();
+
+                    employees.add(employee);
+                }
             }
 
             return employees;
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/DBOperationDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDatabaseDAO.java
index 0bb25b8..0a465f2 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/DBOperationDAO.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDatabaseDAO.java
@@ -21,12 +21,13 @@ import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class DBOperationDAO implements OperationDAO {
+public class OperationDatabaseDAO implements OperationDAO {
 
     private JDBCConnectionManager jdbcConnectionManager;
     private VehicleDAO vehicleDAO;
 
-    public DBOperationDAO(JDBCConnectionManager jdbcConnectionManager, VehicleDAO vehicleDAO) {
+    public OperationDatabaseDAO(
+            JDBCConnectionManager jdbcConnectionManager, VehicleDAO vehicleDAO) {
         this.jdbcConnectionManager = jdbcConnectionManager;
         this.vehicleDAO = vehicleDAO;
     }
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDatabaseDao.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDatabaseDAO.java
index 89a3aca..6d50588 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDatabaseDao.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDatabaseDAO.java
@@ -17,12 +17,12 @@ import java.util.Set;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class VehicleDatabaseDao implements VehicleDAO {
+public class VehicleDatabaseDAO implements VehicleDAO {
 
     private final JDBCConnectionManager jdbcConnectionManager;
     private RegistrationDatabaseDAO registrationDatabaseDao;
 
-    public VehicleDatabaseDao(
+    public VehicleDatabaseDAO(
             JDBCConnectionManager j, RegistrationDatabaseDAO registrationDatabaseDao) {
         jdbcConnectionManager = j;
         this.registrationDatabaseDao = registrationDatabaseDao;
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
index 396d62c..d07f46f 100644
--- 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
@@ -250,7 +250,8 @@ public class OperationServiceImpl implements OperationService {
             throw new InvalidOperationException("Adresse darf nicht leer sein");
     }
 
-    private static final Pattern opCodePattern = Pattern.compile("(?:\\w{1,3}-\\d{0,2})(.)(?:.*)");
+    private static final Pattern opCodePattern =
+            Pattern.compile("(?:\\w{1,3}-\\d{0,2})([ABCDEO])(?:.*)");
 
     private static Severity extractSeverityFromOpCode(String opCode)
             throws InvalidOperationException {
diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml
index 45d128c..88b5b39 100644
--- a/src/main/resources/fxml/ArchiveOperation.fxml
+++ b/src/main/resources/fxml/ArchiveOperation.fxml
@@ -7,7 +7,7 @@
 <?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="1200.0" style="-fx-background-color: BLACK;" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.userInterface.ArchiveOperationController">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="1200.0" style="-fx-background-color: BLACK;" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.ArchiveOperationController">
   <children>
     <AnchorPane prefHeight="650.0" prefWidth="800.0" style="-fx-background-color: rgba(239,235,232,1);" AnchorPane.leftAnchor="200.0" />
       <ScrollPane prefHeight="650.0" prefWidth="800.0" AnchorPane.leftAnchor="200.0">
diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml
index 9b063e3..8a8f5d7 100644
--- a/src/main/resources/fxml/CreateOperationController.fxml
+++ b/src/main/resources/fxml/CreateOperationController.fxml
@@ -11,7 +11,7 @@
 <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"
   prefHeight="650.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/9.0.1"
   xmlns:fx="http://javafx.com/fxml/1"
-  fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.userInterface.CreateOperationController"
+  fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.CreateOperationController"
   stylesheets="@/styles/main.css">
   <AnchorPane prefHeight="182.0" style="-fx-background-color: #2D75B6;" AnchorPane.leftAnchor="0.0"
     AnchorPane.topAnchor="0.0" AnchorPane.rightAnchor="0.0"/>
diff --git a/src/main/resources/fxml/OperationDetails.fxml b/src/main/resources/fxml/OperationDetails.fxml
index f4d2a17..3ac7d93 100644
--- a/src/main/resources/fxml/OperationDetails.fxml
+++ b/src/main/resources/fxml/OperationDetails.fxml
@@ -7,7 +7,7 @@
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane fx:id="operationDetailsAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="542.0" prefWidth="1100.0" visible="false" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.userInterface.OperationDetailsController">
+<AnchorPane fx:id="operationDetailsAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="542.0" prefWidth="1100.0" visible="false" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.OperationDetailsController">
   <children>
     <AnchorPane prefHeight="542.0" prefWidth="1100.0" style="-fx-background-color: white;" />
     <AnchorPane layoutX="10.0" layoutY="10.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="542.0" prefWidth="1000.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
diff --git a/src/main/resources/fxml/vehiclePane.fxml b/src/main/resources/fxml/vehiclePane.fxml
index 4ed3c19..784febc 100644
--- a/src/main/resources/fxml/vehiclePane.fxml
+++ b/src/main/resources/fxml/vehiclePane.fxml
@@ -10,7 +10,7 @@
 <?import javafx.scene.text.Text?>
 <?import javafx.scene.text.TextFlow?>
 
-<GridPane hgap="6.0" stylesheets="@/styles/main.css" styleClass="bg-white, shadowed" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.ui.vehiclepane.VehiclePaneController">
+<GridPane hgap="6.0" stylesheets="@/styles/main.css" styleClass="bg-white, shadowed" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.VehiclePaneController">
   <columnConstraints>
     <ColumnConstraints />
     <ColumnConstraints />