From 8bcf2b15f3d06d4a82920ab67e2986aa42f18a69 Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Thu, 17 May 2018 21:28:04 +0200
Subject: Resolved some warnings, deleted comments [#24990]

---
 .../groupphase/einsatzverwaltung/dao/DBOperationDAO.java      | 11 ++---------
 .../einsatzverwaltung/service/OperationServiceImpl.java       |  2 +-
 .../userInterface/ArchiveOperationController.java             |  6 +++---
 .../userInterface/CreateOperationController.java              |  3 ++-
 4 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'src/main')

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/DBOperationDAO.java
index 16233e1..395f7b4 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/DBOperationDAO.java
@@ -22,6 +22,7 @@ import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -108,7 +109,7 @@ public class DBOperationDAO implements OperationDAO {
             }*/
             pstmt.setString(2, operation.severity().name());
             if (operation.created() != null) {
-                pstmt.setTimestamp(3, Timestamp.from(operation.created()));
+                pstmt.setTimestamp(3, Timestamp.from(Objects.requireNonNull(operation.created())));
             } else {
                 throw new PersistenceException("Zeitpunkt der Erstellung darf nicht null sein!");
             }
@@ -408,13 +409,6 @@ public class DBOperationDAO implements OperationDAO {
             pstmt.setLong(1, vehicleID);
             pstmt.setLong(2, operationID);
             pstmt.executeUpdate();
-
-            /*
-            ResultSet rs = pstmt.getGeneratedKeys();
-            if (rs.next()) return rs.getInt(1);
-            else
-                throw new PersistenceException(
-                        "Fahrzeug für die Operation konnte nicht abgespeichert werden!");*/
         } catch (SQLException e) {
             throw new PersistenceException("Die Werte konnten nicht gespeichert werden!");
         } finally {
@@ -427,7 +421,6 @@ public class DBOperationDAO implements OperationDAO {
                 }
             }
         }
-
         return 1;
     }
 }
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 8a9d61c..4991858 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
@@ -98,7 +98,7 @@ public class OperationServiceImpl implements OperationService {
         }
         operation = operation.toBuilder().status(Status.ACTIVE).build();
 
-        long operationId = -1;
+        long operationId;
         try {
             operationId = operationDAO.add(operation);
         } catch (PersistenceException e) {
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/userInterface/ArchiveOperationController.java
index ba76d7d..2a37e0d 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/userInterface/ArchiveOperationController.java
@@ -37,8 +37,7 @@ public class ArchiveOperationController {
 
     public ArchiveOperationController() {}
 
-    void setServices(
-            OperationService operationService) {
+    void setServices(OperationService operationService) {
         this.operationService = operationService;
     }
 
@@ -83,7 +82,8 @@ public class ArchiveOperationController {
         String date = "am ";
         if (detailOperation.created() != null) {
             LocalDateTime myDateTime =
-                    LocalDateTime.ofInstant(Objects.requireNonNull(detailOperation.created()), ZoneOffset.UTC);
+                    LocalDateTime.ofInstant(
+                            Objects.requireNonNull(detailOperation.created()), ZoneOffset.UTC);
             date +=
                     myDateTime.getDayOfMonth()
                             + "."
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/userInterface/CreateOperationController.java
index 99b5dc5..e9410c4 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/userInterface/CreateOperationController.java
@@ -251,7 +251,8 @@ public class CreateOperationController {
     private void openNewArchivWindow() {
         Stage stage = new Stage();
         try {
-            FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/fxml/ArchiveOperation.fxml"));
+            FXMLLoader fxmlLoader =
+                    new FXMLLoader(getClass().getResource("/fxml/ArchiveOperation.fxml"));
             Parent node = fxmlLoader.load();
             ArchiveOperationController archiveOperationController = fxmlLoader.getController();
             archiveOperationController.setServices(operationService);
-- 
cgit v1.2.3-70-g09d2