From ea3148b836f2224d9cf2628af6a48bdb738dbf41 Mon Sep 17 00:00:00 2001 From: Francisco Javier Tirado Sarti Date: Tue, 31 Oct 2023 12:24:40 +0100 Subject: [PATCH] [KOGITO-9785] Walters comments --- .../CompositeContextNodeVisitor.java | 5 ----- .../factory/AbstractCompositeNodeFactory.java | 5 ----- .../workflow/core/node/StateBasedNode.java | 19 ------------------- 3 files changed, 29 deletions(-) diff --git a/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/canonical/CompositeContextNodeVisitor.java b/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/canonical/CompositeContextNodeVisitor.java index 688570b95eb..4b7655c7102 100644 --- a/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/canonical/CompositeContextNodeVisitor.java +++ b/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/canonical/CompositeContextNodeVisitor.java @@ -30,7 +30,6 @@ import com.github.javaparser.ast.expr.BooleanLiteralExpr; import com.github.javaparser.ast.expr.LongLiteralExpr; import com.github.javaparser.ast.expr.MethodCallExpr; -import com.github.javaparser.ast.expr.StringLiteralExpr; import com.github.javaparser.ast.stmt.BlockStmt; public class CompositeContextNodeVisitor extends AbstractCompositeNodeVisitor { @@ -80,10 +79,6 @@ public void visitNode(String factoryField, T node, BlockStmt body, VariableScope body.addStatement(getFactoryMethod(getNodeId(node), CompositeContextNodeFactory.METHOD_AUTO_COMPLETE, new BooleanLiteralExpr(node.isAutoComplete()))); - String timeout = node.getTimeout(); - if (timeout != null) { - body.addStatement(getFactoryMethod(getNodeId(node), "timeout", new StringLiteralExpr(timeout))); - } addNodeMappings(node, body, getNodeId(node)); visitNodes(getNodeId(node), node.getNodes(), body, scope, metadata); visitConnections(getNodeId(node), node.getNodes(), body); diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/ruleflow/core/factory/AbstractCompositeNodeFactory.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/ruleflow/core/factory/AbstractCompositeNodeFactory.java index 160e23e0087..90beff2c764 100644 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/ruleflow/core/factory/AbstractCompositeNodeFactory.java +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/ruleflow/core/factory/AbstractCompositeNodeFactory.java @@ -40,11 +40,6 @@ protected CompositeContextNode getCompositeNode() { return (CompositeContextNode) node; } - public T timeout(String timeout) { - getCompositeNode().setTimeout(timeout); - return (T) this; - } - @Override public T variable(String name, DataType type) { return variable(name, type, null); diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/core/node/StateBasedNode.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/core/node/StateBasedNode.java index 5f7bd9774d6..6caee781421 100755 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/core/node/StateBasedNode.java +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/core/node/StateBasedNode.java @@ -24,13 +24,9 @@ import java.util.Map; import org.jbpm.process.core.timer.Timer; -import org.jbpm.process.instance.impl.actions.CompleteStateBasedNodeInstanceAction; import org.jbpm.workflow.core.DroolsAction; -import org.jbpm.workflow.core.impl.DroolsConsequenceAction; import org.jbpm.workflow.core.impl.ExtendedNodeImpl; -import static org.jbpm.ruleflow.core.Metadata.ACTION; - public class StateBasedNode extends ExtendedNodeImpl { private static final long serialVersionUID = 510l; @@ -39,25 +35,10 @@ public class StateBasedNode extends ExtendedNodeImpl { private List boundaryEvents; - private transient String duration; - public Map getTimers() { return timers; } - public void setTimeout(String duration) { - this.duration = duration; - Timer timer = new Timer(); - timer.setDelay(duration); - DroolsConsequenceAction timeoutAction = new DroolsConsequenceAction("java", null); - timeoutAction.setMetaData(ACTION, new CompleteStateBasedNodeInstanceAction(getNodeUniqueId())); - addTimer(timer, timeoutAction); - } - - public String getTimeout() { - return duration; - } - public void addTimer(Timer timer, DroolsAction action) { if (timers == null) { timers = new HashMap<>();