summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorTharre <tharre3@gmail.com>2018-05-24 15:50:32 +0200
committerTharre <tharre3@gmail.com>2018-05-24 16:02:25 +0200
commit5d8ac8cb8d8426dcafac7b68def750d353d3caa6 (patch)
tree4b352da545ab1d6bcf900f5b2727031afef61417 /src/main
parenta2b0959767bcb9c4412f7886d4b07b3fc5078bab (diff)
downloadsepm-groupproject-5d8ac8cb8d8426dcafac7b68def750d353d3caa6.tar.gz
sepm-groupproject-5d8ac8cb8d8426dcafac7b68def750d353d3caa6.tar.xz
sepm-groupproject-5d8ac8cb8d8426dcafac7b68def750d353d3caa6.zip
Fix id validation in OperationService #25963
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceImpl.java4
1 files changed, 2 insertions, 2 deletions
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!");