From c0ab592cef3e7ddf39a87bed62a1361770b48bae Mon Sep 17 00:00:00 2001
From: "michele.artini" <michele.artini@isti.cnr.it>
Date: Thu, 18 Jan 2024 10:02:40 +0100
Subject: [PATCH] refactoring env

---
 .../src/main/java/eu/dnetlib/wfs/utils/GraphUtils.java    | 4 ++--
 .../src/main/java/eu/dnetlib/wfs/nodes/ProcessNode.java   | 2 +-
 .../src/main/java/eu/dnetlib/wfs/procs/ProcessEngine.java | 8 ++++----
 .../main/java/eu/dnetlib/wfs/procs/WorkflowProcess.java   | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dnet-app/libs/dnet-wf-common/src/main/java/eu/dnetlib/wfs/utils/GraphUtils.java b/dnet-app/libs/dnet-wf-common/src/main/java/eu/dnetlib/wfs/utils/GraphUtils.java
index 304892f..f774ce8 100644
--- a/dnet-app/libs/dnet-wf-common/src/main/java/eu/dnetlib/wfs/utils/GraphUtils.java
+++ b/dnet-app/libs/dnet-wf-common/src/main/java/eu/dnetlib/wfs/utils/GraphUtils.java
@@ -146,10 +146,10 @@ public class GraphUtils {
 
 	private static Function<RuntimeEnv, Boolean> generateFunction(final String condition) {
 		if (StringUtils.isBlank(condition)) { return env -> true; }
-		return token -> {
+		return env -> {
 			final ExpressionParser parser = new SpelExpressionParser();
 
-			final StandardEvaluationContext context = new StandardEvaluationContext(token.getAttributes());
+			final StandardEvaluationContext context = new StandardEvaluationContext(env.getAttributes());
 			context.addPropertyAccessor(new MapAccessor());
 
 			return parser.parseExpression(condition).getValue(context, Boolean.class);
diff --git a/dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/nodes/ProcessNode.java b/dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/nodes/ProcessNode.java
index 646fe7c..80dd2d9 100644
--- a/dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/nodes/ProcessNode.java
+++ b/dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/nodes/ProcessNode.java
@@ -52,7 +52,7 @@ public abstract class ProcessNode implements BeanNameAware {
 				public void onSuccess(final RuntimeEnv env) {
 					try {
 						saveOutputParams(env);
-						ProcessNode.this.engine.releaseToken(ProcessNode.this.process, ProcessNode.this.graphNode, env);
+						ProcessNode.this.engine.releaseEnv(ProcessNode.this.process, ProcessNode.this.graphNode, env);
 					} catch (final WorkflowManagerException e) {
 						onFail(env, e);
 					}
diff --git a/dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/procs/ProcessEngine.java b/dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/procs/ProcessEngine.java
index 4ae4745..28fee7b 100644
--- a/dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/procs/ProcessEngine.java
+++ b/dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/procs/ProcessEngine.java
@@ -216,16 +216,16 @@ public class ProcessEngine {
 		}
 	}
 
-	public void releaseToken(final WorkflowProcess process, final RuntimeNode oldGraphNode, final RuntimeEnv oldEnv) {
+	public void releaseEnv(final WorkflowProcess process, final RuntimeNode oldGraphNode, final RuntimeEnv oldEnv) {
 		try {
 			for (final RuntimeNode graphNode : GraphUtils.nextNodes(process.getJobDetails().getGraph(), oldGraphNode, oldEnv)) {
 				if (graphNode.isJoin() || graphNode.isSuccessNode()) {
 
-					if (!process.getPausedJoinNodeTokens().containsKey(graphNode.getName())) {
-						process.getPausedJoinNodeTokens().put(graphNode.getName(), new ArrayList<>());
+					if (!process.getPausedJoinNodeEnvs().containsKey(graphNode.getName())) {
+						process.getPausedJoinNodeEnvs().put(graphNode.getName(), new ArrayList<>());
 					}
 
-					final List<RuntimeEnv> list = process.getPausedJoinNodeTokens().get(graphNode.getName());
+					final List<RuntimeEnv> list = process.getPausedJoinNodeEnvs().get(graphNode.getName());
 
 					list.add(oldEnv);
 
diff --git a/dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/procs/WorkflowProcess.java b/dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/procs/WorkflowProcess.java
index b9a7f91..82302ed 100644
--- a/dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/procs/WorkflowProcess.java
+++ b/dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/procs/WorkflowProcess.java
@@ -29,7 +29,7 @@ public class WorkflowProcess implements Comparable<WorkflowProcess> {
 	private ProcessCallback callback;
 	private List<RuntimeEnv> envs = new CopyOnWriteArrayList<>();
 
-	private final Map<String, List<RuntimeEnv>> pausedJoinNodeTokens = new HashMap<>();
+	private final Map<String, List<RuntimeEnv>> pausedJoinNodeEnvs = new HashMap<>();
 	private final Map<String, String> outputParams = new HashMap<>();
 
 	private Throwable error;
@@ -47,8 +47,8 @@ public class WorkflowProcess implements Comparable<WorkflowProcess> {
 		return this.jobDetails;
 	}
 
-	public Map<String, List<RuntimeEnv>> getPausedJoinNodeTokens() {
-		return this.pausedJoinNodeTokens;
+	public Map<String, List<RuntimeEnv>> getPausedJoinNodeEnvs() {
+		return this.pausedJoinNodeEnvs;
 	}
 
 	public List<RuntimeEnv> getEnvs() {