Roman_Schenk/PM3-HS22-IT21b_WIN-Team1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: Made Task::id nullable/Optional for semantic reasons

Browse Source 
better use of builder semantics in task and crop creation
This commit is contained in:
David Guler
2022-11-21 09:45:58 +01:00
parent 2312149256
commit 95b0f7e13d
5 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ch/zhaw/gartenverwaltung/io/JsonTaskList.java
+7 -7
View File
@@ -103,10 +103,9 @@ public class JsonTaskList implements TaskList {
if(taskMap.isEmpty()) {
loadTaskListFromFile();
}
if(task.getId() == 0) {
task.withId(idProvider.incrementAndGet());
}
taskMap.put(task.getId(), task);
long id = task.getId().orElse(idProvider.incrementAndGet());
taskMap.put(id, task.withId(id));
writeTaskListToFile();
}
@@ -122,8 +121,9 @@ public class JsonTaskList implements TaskList {
if(taskMap.isEmpty()) {
loadTaskListFromFile();
}
if(taskMap.containsKey(task.getId())){
taskMap.remove(task.getId());
Long taskId = task.getId().orElseThrow(IOException::new);
if(taskMap.containsKey(taskId)){
taskMap.remove(taskId);
writeTaskListToFile();
}
}
@@ -163,7 +163,7 @@ public class JsonTaskList implements TaskList {
taskMap = result.stream()
.collect(HashMap::new,
(res, task) -> res.put(task.getId(), task),
(res, task) -> res.put(task.getId().orElse(0L), task),
(existing, replacement) -> {});
}