1 files changed, 13 insertions, 13 deletions
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/process/ProcessEngineImpl.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/process/ProcessEngineImpl.java
index 9274ea81..6e83a201 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/process/ProcessEngineImpl.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/process/ProcessEngineImpl.java
@@ -21,15 +21,13 @@ package at.gv.egiz.eaaf.core.impl.idp.process;
 
 import java.io.InputStream;
 import java.io.Serializable;
+import java.text.MessageFormat;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.commons.collections4.IterableUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
@@ -51,14 +49,17 @@ import at.gv.egiz.eaaf.core.impl.idp.process.model.ProcessNode;
 import at.gv.egiz.eaaf.core.impl.idp.process.model.StartEvent;
 import at.gv.egiz.eaaf.core.impl.idp.process.model.TaskInfo;
 import at.gv.egiz.eaaf.core.impl.idp.process.model.Transition;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Process engine implementation allowing starting and continuing processes as
  * well as providing means for cleanup actions.
  */
+@Slf4j
 public class ProcessEngineImpl implements ProcessEngine {
 
-  private final Logger log = LoggerFactory.getLogger(getClass());
+  private static final String ERROR_PROCESS_OBJECT_NOT_EXIST = 
+      "Process instance: {0} does not exist for pendingReq: {0}";
 
   @Autowired
   ProcessInstanceStoreDao piStoreDao;
@@ -156,15 +157,16 @@ public class ProcessEngineImpl implements ProcessEngine {
       if (StringUtils.isEmpty(pendingReq.getProcessInstanceId())) {
         log.error("Pending-request with id:" + pendingReq.getPendingRequestId()
             + " includes NO 'ProcessInstanceId'");
-        throw new ProcessExecutionException("Pending-request with id:"
-            + pendingReq.getPendingRequestId() + " includes NO 'ProcessInstanceId'");
+        throw new ProcessExecutionException(MessageFormat.format(ERROR_PROCESS_OBJECT_NOT_EXIST, 
+            pendingReq.getProcessInstanceId(), pendingReq.getPendingRequestId()));
+        
       }
 
       final ProcessInstance pi = loadProcessInstance(pendingReq.getProcessInstanceId());
 
       if (pi == null) {
-        throw new ProcessExecutionException(
-            "Process instance '" + pendingReq.getProcessInstanceId() + "' does not exist.");
+        throw new ProcessExecutionException(MessageFormat.format(ERROR_PROCESS_OBJECT_NOT_EXIST, 
+            pendingReq.getProcessInstanceId(), pendingReq.getPendingRequestId()));
 
       }
 
@@ -449,11 +451,9 @@ public class ProcessEngineImpl implements ProcessEngine {
 
     final ExecutionContext executionContext =
         new ExecutionContextImpl(piStore.getProcessInstanceId());
-
-    final Map<String, Serializable> executionContextData = piStore.getExecutionContextData();
-    for (final Entry<String, Serializable> el : executionContextData.entrySet()) {
-      executionContext.put(el.getKey(), el.getValue());
-    }
+    
+    piStore.getExecutionContextData().entrySet().stream().forEach(
+        el -> executionContext.put(el.getKey(), el.getValue()));
 
     final ProcessInstance pi = new ProcessInstance(
         processDefinitions.get(piStore.getProcessDefinitionId()), executionContext);