From bc338b1dc78697ebd2165f822dad90be7093a0c2 Mon Sep 17 00:00:00 2001
From: BerndBreier <33351391+BerndBreier@users.noreply.github.com>
Date: Thu, 4 Jan 2018 10:36:15 +0100
Subject: [PATCH] TSK-66 implemented comments from Marcel: use J8 stream for
 loops

---
 .../java/pro/taskana/impl/TaskQueryImpl.java     | 16 ++++++++--------
 .../java/pro/taskana/impl/TaskServiceImpl.java   | 15 +++++++--------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java
index e06c823e8..756f00176 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java
@@ -186,10 +186,10 @@ public class TaskQueryImpl implements TaskQuery {
             taskanaEngineImpl.openConnection();
             checkAuthorization();
             List<TaskImpl> tasks = taskanaEngineImpl.getSqlSession().selectList(LINK_TO_MAPPER, this);
-            for (TaskImpl taskImpl : tasks) {
-                TaskServiceImpl.setPrimaryObjRef(taskImpl);
-                result.add(taskImpl);
-            }
+            tasks.stream().forEach(t -> {
+                TaskServiceImpl.setPrimaryObjRef(t);
+                result.add(t);
+            });
             return result;
         } finally {
             taskanaEngineImpl.returnConnection();
@@ -210,10 +210,10 @@ public class TaskQueryImpl implements TaskQuery {
             checkAuthorization();
             RowBounds rowBounds = new RowBounds(offset, limit);
             List<TaskImpl> tasks = taskanaEngineImpl.getSqlSession().selectList(LINK_TO_MAPPER, this, rowBounds);
-            for (TaskImpl taskImpl : tasks) {
-                TaskServiceImpl.setPrimaryObjRef(taskImpl);
-                result.add(taskImpl);
-            }
+            tasks.stream().forEach(t -> {
+                TaskServiceImpl.setPrimaryObjRef(t);
+                result.add(t);
+            });
             return result;
         } finally {
             taskanaEngineImpl.returnConnection();
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
index 92de69ed1..918cc15a4 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
@@ -276,10 +276,10 @@ public class TaskServiceImpl implements TaskService {
             taskanaEngineImpl.openConnection();
             workbasketService.checkAuthorization(workbasketKey, WorkbasketAuthorization.READ);
             List<TaskImpl> tasks = taskMapper.findTasksByWorkbasketIdAndState(workbasketKey, taskState);
-            for (TaskImpl taskImpl : tasks) {
-                setPrimaryObjRef(taskImpl);
-                results.add(taskImpl);
-            }
+            tasks.stream().forEach(t -> {
+                TaskServiceImpl.setPrimaryObjRef(t);
+                results.add(t);
+            });
         } finally {
             taskanaEngineImpl.returnConnection();
             if (LOGGER.isDebugEnabled()) {
@@ -304,8 +304,6 @@ public class TaskServiceImpl implements TaskService {
             oldTaskImpl = (TaskImpl) getTaskById(newTaskImpl.getId());
             standardUpdateActions(oldTaskImpl, newTaskImpl);
 
-            Timestamp now = new Timestamp(System.currentTimeMillis());
-            newTaskImpl.setModified(now);
             taskMapper.update(newTaskImpl);
             LOGGER.debug("Method updateTask() updated task '{}' for user '{}'.", task.getId(), userId);
 
@@ -440,7 +438,7 @@ public class TaskServiceImpl implements TaskService {
             newTaskImpl.setPlanned(oldTaskImpl.getPlanned());
         }
 
-        // if no business process id is provided, a unique id is created.
+        // if no business process id is provided, use the id of the old task.
         if (newTaskImpl.getBusinessProcessId() == null) {
             newTaskImpl.setBusinessProcessId(oldTaskImpl.getBusinessProcessId());
         }
@@ -466,7 +464,8 @@ public class TaskServiceImpl implements TaskService {
                 newTaskImpl.setPriority(classification.getPriority());
             }
         }
-
+        Timestamp now = new Timestamp(System.currentTimeMillis());
+        newTaskImpl.setModified(now);
     }
 
 }