From 5d8ac8cb8d8426dcafac7b68def750d353d3caa6 Mon Sep 17 00:00:00 2001
From: Tharre <tharre3@gmail.com>
Date: Thu, 24 May 2018 15:50:32 +0200
Subject: Fix id validation in OperationService #25963
---
.../groupphase/einsatzverwaltung/service/OperationServiceImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'src/main/java/at/ac')
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 3e811d4..d91c90a 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
@@ -51,6 +51,8 @@ public class OperationServiceImpl implements OperationService {
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??
@@ -218,8 +220,6 @@ public class OperationServiceImpl implements OperationService {
}
private static void validateOperation(Operation o) throws InvalidOperationException {
- if (o.id() <= 0) throw new InvalidOperationException("Id is invalid");
-
if (o.vehicles().isEmpty())
throw new InvalidOperationException(
"Es muss mindestens ein Fahrzeug ausgewählt werden!");
--
cgit v1.2.3-70-g09d2