From ea5c828078a85ded556edd5ad765a770f6efcf6a Mon Sep 17 00:00:00 2001 From: "everywhere.z" Date: Sat, 17 Dec 2022 17:43:02 +0800 Subject: [PATCH] =?UTF-8?q?enhancement=20#I66KP6=20=E4=BB=8E=E5=BA=95?= =?UTF-8?q?=E5=B1=82=E6=94=B9=E5=8F=98NodeComponent=E5=92=8CNode=E4=B9=8B?= =?UTF-8?q?=E9=97=B4=E7=9A=84=E5=AE=9E=E4=BE=8B=E5=85=B3=E8=81=94=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../el/operator/base/OperatorHelper.java | 1 - .../yomahub/liteflow/core/NodeComponent.java | 87 +++++-------------- .../yomahub/liteflow/flow/element/Node.java | 26 +++--- .../flow/element/condition/Condition.java | 10 +-- .../flow/element/condition/ForCondition.java | 2 +- .../flow/element/condition/ThenCondition.java | 2 + .../flow/parallel/ParallelSupplier.java | 6 +- .../test/getChainName/cmp/CmpConfig.java | 22 ++--- .../liteflow/test/getChainName/cmp/ACmp.java | 2 +- .../liteflow/test/getChainName/cmp/BCmp.java | 2 +- .../liteflow/test/getChainName/cmp/CCmp.java | 2 +- .../liteflow/test/getChainName/cmp/DCmp.java | 2 +- .../liteflow/test/getChainName/cmp/ECmp.java | 4 +- .../liteflow/test/getChainName/cmp/FCmp.java | 2 +- .../liteflow/test/getChainName/cmp/GCmp.java | 2 +- .../liteflow/test/getChainName/cmp/HCmp.java | 2 +- .../liteflow/test/getChainName/cmp/JCmp.java | 2 +- .../liteflow/test/getChainName/cmp/KCmp.java | 2 +- .../liteflow/test/getChainName/cmp/ACmp.java | 2 +- .../liteflow/test/getChainName/cmp/BCmp.java | 2 +- .../liteflow/test/getChainName/cmp/CCmp.java | 2 +- .../liteflow/test/getChainName/cmp/DCmp.java | 2 +- .../liteflow/test/getChainName/cmp/ECmp.java | 4 +- .../liteflow/test/getChainName/cmp/FCmp.java | 2 +- .../liteflow/test/getChainName/cmp/GCmp.java | 2 +- .../liteflow/test/getChainName/cmp/HCmp.java | 2 +- .../liteflow/test/getChainName/cmp/JCmp.java | 2 +- .../liteflow/test/getChainName/cmp/KCmp.java | 2 +- .../liteflow/test/getChainName/cmp/ACmp.java | 2 +- .../liteflow/test/getChainName/cmp/BCmp.java | 2 +- .../liteflow/test/getChainName/cmp/CCmp.java | 2 +- .../liteflow/test/getChainName/cmp/DCmp.java | 2 +- .../liteflow/test/getChainName/cmp/ECmp.java | 4 +- .../liteflow/test/getChainName/cmp/FCmp.java | 2 +- .../liteflow/test/getChainName/cmp/GCmp.java | 2 +- .../liteflow/test/getChainName/cmp/HCmp.java | 2 +- .../liteflow/test/getChainName/cmp/JCmp.java | 2 +- .../liteflow/test/getChainName/cmp/KCmp.java | 2 +- .../liteflow/test/getChainName/cmp/ACmp.java | 2 +- .../liteflow/test/getChainName/cmp/BCmp.java | 2 +- .../liteflow/test/getChainName/cmp/CCmp.java | 2 +- .../liteflow/test/getChainName/cmp/DCmp.java | 2 +- .../liteflow/test/getChainName/cmp/ECmp.java | 4 +- .../liteflow/test/getChainName/cmp/FCmp.java | 2 +- .../liteflow/test/getChainName/cmp/GCmp.java | 2 +- .../liteflow/test/getChainName/cmp/HCmp.java | 2 +- .../liteflow/test/getChainName/cmp/JCmp.java | 2 +- .../liteflow/test/getChainName/cmp/KCmp.java | 2 +- 48 files changed, 102 insertions(+), 142 deletions(-) diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/base/OperatorHelper.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/base/OperatorHelper.java index c2ddcb779..401254036 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/base/OperatorHelper.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/base/OperatorHelper.java @@ -133,7 +133,6 @@ public class OperatorHelper { public static T convert(Object object, Class clazz, String errorMsg) throws QLException { try { if (clazz.isAssignableFrom(object.getClass())) { - if (clazz.equals(Node.class)) { Node node = (Node) object; return (T) node.copy(); diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeComponent.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeComponent.java index 7b714ac35..febdaedff 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeComponent.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeComponent.java @@ -12,6 +12,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.ttl.TransmittableThreadLocal; import com.yomahub.liteflow.flow.LiteflowResponse; +import com.yomahub.liteflow.flow.element.Node; import com.yomahub.liteflow.flow.executor.NodeExecutor; import com.yomahub.liteflow.flow.executor.DefaultNodeExecutor; import com.yomahub.liteflow.enums.NodeTypeEnum; @@ -58,7 +59,10 @@ public abstract class NodeComponent{ /** 节点执行器的类全名 */ private Class nodeExecutorClass = DefaultNodeExecutor.class; - /********************以下的属性为线程附加属性，并非不变属性********************/ + /**当前对象为单例，注册进spring上下文，但是node实例不是单例，这里通过对node实例的引用来获得一些链路属性**/ + private final TransmittableThreadLocal refNodeTL = new TransmittableThreadLocal<>(); + + /********************以下的属性为线程附加属性********************/ //当前slot的index private final TransmittableThreadLocal slotIndexTL = new TransmittableThreadLocal<>(); @@ -66,15 +70,6 @@ public abstract class NodeComponent{ //是否结束整个流程，这个只对串行流程有效，并行流程无效 private final TransmittableThreadLocal isEndTL = new TransmittableThreadLocal<>(); - //tag标签 - private final TransmittableThreadLocal tagTL = new TransmittableThreadLocal<>(); - - //当前流程名字 - private final TransmittableThreadLocal currChainNameTL = new TransmittableThreadLocal<>(); - - //组件外部参数 - private final TransmittableThreadLocal cmpDataTL = new TransmittableThreadLocal<>(); - public NodeComponent() { } @@ -83,7 +78,7 @@ public abstract class NodeComponent{ //在元数据里加入step信息 CmpStep cmpStep = new CmpStep(nodeId, name, CmpStepTypeEnum.SINGLE); - cmpStep.setTag(tagTL.get()); + cmpStep.setTag(this.getTag()); slot.addStep(cmpStep); StopWatch stopWatch = new StopWatch(); @@ -273,16 +268,8 @@ public abstract class NodeComponent{ this.nodeExecutorClass = nodeExecutorClass; } - public void setTag(String tag){ - this.tagTL.set(tag); - } - public String getTag(){ - return this.tagTL.get(); - } - - public void removeTag(){ - this.tagTL.remove(); + return this.refNodeTL.get().getTag(); } public MonitorBus getMonitorBus() { @@ -298,11 +285,11 @@ public abstract class NodeComponent{ } public T getSubChainReqData(){ - return getSlot().getChainReqData(this.getCurrChainName()); + return getSlot().getChainReqData(this.getCurrChainId()); } public T getSubChainReqDataInAsync(){ - return getSlot().getChainReqDataFromQueue(this.getCurrChainName()); + return getSlot().getChainReqDataFromQueue(this.getCurrChainId()); } /** @@ -326,61 +313,31 @@ public abstract class NodeComponent{ } } - /** - * - * @param currChainName 当前chain名称 - * @deprecated 请使用 {@link #setCurrChainId(String)} - */ - @Deprecated - public void setCurrChainName(String currChainName){ - this.currChainNameTL.set(currChainName); - } - - /** - * @deprecated 请使用 {@link #getCurrChainId()} - * @return String - */ - @Deprecated - public String getCurrChainName(){ - return this.currChainNameTL.get(); - } - - /** - * @deprecated 请使用 {@link #removeCurrChainId()} - */ - @Deprecated - public void removeCurrChainName(){ - this.currChainNameTL.remove(); - } - - public void setCurrChainId(String currChainName){ - this.currChainNameTL.set(currChainName); - } - public String getCurrChainId(){ - return this.currChainNameTL.get(); + return getRefNode().getCurrChainId(); } - public void removeCurrChainId(){ - this.currChainNameTL.remove(); + public Node getRefNode(){ + return this.refNodeTL.get(); } - public void setCmpData(String cmpData){ - this.cmpDataTL.set(cmpData); + public void setRefNode(Node refNode){ + this.refNodeTL.set(refNode); + } + + public void removeRefNode(){ + this.refNodeTL.remove(); } public T getCmpData(Class clazz){ - if (StrUtil.isBlank(this.cmpDataTL.get())){ + String cmpData = getRefNode().getCmpData(); + if (StrUtil.isBlank(cmpData)){ return null; } if (clazz.equals(String.class) || clazz.equals(Object.class)){ - return (T) this.cmpDataTL.get(); + return (T) cmpData; } - return JsonUtil.parseObject(this.cmpDataTL.get(), clazz); - } - - public void removeCmpData(){ - this.cmpDataTL.remove(); + return JsonUtil.parseObject(cmpData, clazz); } @Deprecated diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/Node.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/Node.java index b7a7f2f80..be9dacef2 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/Node.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/Node.java @@ -50,6 +50,8 @@ public class Node implements Executable,Cloneable{ private String cmpData; + private String currChainId; + public Node(){ } @@ -106,8 +108,7 @@ public class Node implements Executable,Cloneable{ try { //把线程属性赋值给组件对象 instance.setSlotIndex(slotIndex); - instance.setTag(tag); - instance.setCmpData(cmpData); + instance.setRefNode(this); LiteflowConfig liteflowConfig = LiteflowConfigGetter.get(); @@ -148,9 +149,7 @@ public class Node implements Executable,Cloneable{ //移除threadLocal里的信息 instance.removeSlotIndex(); instance.removeIsEnd(); - instance.removeTag(); - instance.removeCurrChainId(); - instance.removeCmpData(); + instance.removeRefNode(); } } @@ -162,8 +161,7 @@ public class Node implements Executable,Cloneable{ public boolean isAccess(Integer slotIndex) throws Exception { //把线程属性赋值给组件对象 instance.setSlotIndex(slotIndex); - instance.setTag(tag); - instance.setCmpData(cmpData); + instance.setRefNode(this); return instance.isAccess(); } @@ -210,11 +208,6 @@ public class Node implements Executable,Cloneable{ this.clazz = clazz; } - @Override - public void setCurrChainId(String currentChainId) { - instance.setCurrChainId(currentChainId); - } - public String getCmpData() { return cmpData; } @@ -222,4 +215,13 @@ public class Node implements Executable,Cloneable{ public void setCmpData(String cmpData) { this.cmpData = cmpData; } + + @Override + public void setCurrChainId(String currentChainId) { + this.currChainId = currentChainId; + } + + public String getCurrChainId() { + return currChainId; + } } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/Condition.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/Condition.java index 2b35361f6..392356a34 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/Condition.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/Condition.java @@ -32,7 +32,7 @@ public abstract class Condition implements Executable{ * 当前所在的ChainName * 如果对于子流程来说，那这个就是子流程所在的Chain */ - private String currChainName; + private String currChainId; @Override public ExecuteTypeEnum getExecuteType() { @@ -73,15 +73,15 @@ public abstract class Condition implements Executable{ */ @Deprecated public String getCurrChainName() { - return currChainName; + return currChainId; } public String getCurrChainId() { - return currChainName; + return currChainId; } @Override - public void setCurrChainId(String currChainName) { - this.currChainName = currChainName; + public void setCurrChainId(String currChainId) { + this.currChainId = currChainId; } } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/ForCondition.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/ForCondition.java index df6161bb7..f957e784c 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/ForCondition.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/ForCondition.java @@ -45,7 +45,7 @@ public class ForCondition extends LoopCondition{ executableItem.execute(slotIndex); //如果break组件不为空，则去执行 if (ObjectUtil.isNotNull(breakNode)){ - breakNode.setCurrChainName(this.getCurrChainName()); + breakNode.setCurrChainId(this.getCurrChainId()); breakNode.execute(slotIndex); Class originalBreakClass = LiteFlowProxyUtil.getUserClass(this.breakNode.getInstance().getClass()); boolean isBreak = slot.getBreakResult(originalBreakClass.getName()); diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/ThenCondition.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/ThenCondition.java index 842b488ad..f3dfa5c1c 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/ThenCondition.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/ThenCondition.java @@ -41,6 +41,7 @@ public class ThenCondition extends Condition { public void execute(Integer slotIndex) throws Exception { try{ for (PreCondition preCondition : preConditionList){ + preCondition.setCurrChainId(this.getCurrChainId()); preCondition.execute(slotIndex); } @@ -64,6 +65,7 @@ public class ThenCondition extends Condition { throw e; }finally { for (FinallyCondition finallyCondition : finallyConditionList){ + finallyCondition.setCurrChainId(this.getCurrChainId()); finallyCondition.execute(slotIndex); } } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/parallel/ParallelSupplier.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/parallel/ParallelSupplier.java index 0d3f37c6d..d472bbe2c 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/parallel/ParallelSupplier.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/parallel/ParallelSupplier.java @@ -29,11 +29,11 @@ public class ParallelSupplier implements Supplier { @Override public WhenFutureObj get() { try { - executableItem.setCurrChainName(currChainName); + executableItem.setCurrChainId(currChainName); executableItem.execute(slotIndex); - return WhenFutureObj.success(executableItem.getExecuteName()); + return WhenFutureObj.success(executableItem.getExecuteId()); } catch (Exception e){ - return WhenFutureObj.fail(executableItem.getExecuteName(), e); + return WhenFutureObj.fail(executableItem.getExecuteId(), e); } } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/CmpConfig.java b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/CmpConfig.java index d0d5ec801..45a690223 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/CmpConfig.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/CmpConfig.java @@ -12,67 +12,67 @@ public class CmpConfig { @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS,nodeId = "a") public void processA(NodeComponent bindCmp) { DefaultContext context = bindCmp.getFirstContextBean(); - context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainName()); + context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainId()); } @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS,nodeId = "b") public void processB(NodeComponent bindCmp) { DefaultContext context = bindCmp.getFirstContextBean(); - context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainName()); + context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainId()); } @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS,nodeId = "c") public void processC(NodeComponent bindCmp) { DefaultContext context = bindCmp.getFirstContextBean(); - context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainName()); + context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainId()); } @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS,nodeId = "d") public void processD(NodeComponent bindCmp) { DefaultContext context = bindCmp.getFirstContextBean(); - context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainName()); + context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainId()); } @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS,nodeId = "e") public void processE(NodeComponent bindCmp) { DefaultContext context = bindCmp.getFirstContextBean(); if (context.hasData(bindCmp.getNodeId())){ - context.setData(bindCmp.getNodeId(), context.getData(bindCmp.getNodeId()) + "_" + bindCmp.getCurrChainName()); + context.setData(bindCmp.getNodeId(), context.getData(bindCmp.getNodeId()) + "_" + bindCmp.getCurrChainId()); }else{ - context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainName()); + context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainId()); } } @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS,nodeId = "f") public void processF(NodeComponent bindCmp) { DefaultContext context = bindCmp.getFirstContextBean(); - context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainName()); + context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainId()); } @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS,nodeId = "g") public void processG(NodeComponent bindCmp) { DefaultContext context = bindCmp.getFirstContextBean(); - context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainName()); + context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainId()); } @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_SWITCH,nodeId = "h",nodeType = NodeTypeEnum.SWITCH) public String processSwitchH(NodeComponent bindCmp) throws Exception { DefaultContext context = bindCmp.getFirstContextBean(); - context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainName()); + context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainId()); return "j"; } @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS,nodeId = "j") public void processJ(NodeComponent bindCmp) { DefaultContext context = bindCmp.getFirstContextBean(); - context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainName()); + context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainId()); } @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS,nodeId = "k") public void process(NodeComponent bindCmp) { DefaultContext context = bindCmp.getFirstContextBean(); - context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainName()); + context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainId()); } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ACmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ACmp.java index 0a836cdca..6e4177c73 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ACmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ACmp.java @@ -19,6 +19,6 @@ public class ACmp{ @LiteflowMethod(LiteFlowMethodEnum.PROCESS) public void process(NodeComponent bindCmp) { DefaultContext context = bindCmp.getFirstContextBean(); - context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainName()); + context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/BCmp.java index 352fd5f36..e7a84d109 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/BCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/BCmp.java @@ -19,6 +19,6 @@ public class BCmp { @LiteflowMethod(LiteFlowMethodEnum.PROCESS) public void process(NodeComponent bindCmp) { DefaultContext context = bindCmp.getFirstContextBean(); - context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainName()); + context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/CCmp.java index 8112870be..a13f5ab71 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/CCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/CCmp.java @@ -19,6 +19,6 @@ public class CCmp { @LiteflowMethod(LiteFlowMethodEnum.PROCESS) public void process(NodeComponent bindCmp) { DefaultContext context = bindCmp.getFirstContextBean(); - context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainName()); + context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/DCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/DCmp.java index e9a743cda..6b57d565d 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/DCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/DCmp.java @@ -19,6 +19,6 @@ public class DCmp { @LiteflowMethod(LiteFlowMethodEnum.PROCESS) public void process(NodeComponent bindCmp) { DefaultContext context = bindCmp.getFirstContextBean(); - context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainName()); + context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ECmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ECmp.java index 76dba6ea5..714b3bdc2 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ECmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ECmp.java @@ -20,9 +20,9 @@ public class ECmp { public void process(NodeComponent bindCmp) { DefaultContext context = bindCmp.getFirstContextBean(); if (context.hasData(bindCmp.getNodeId())){ - context.setData(bindCmp.getNodeId(), context.getData(bindCmp.getNodeId()) + "_" + bindCmp.getCurrChainName()); + context.setData(bindCmp.getNodeId(), context.getData(bindCmp.getNodeId()) + "_" + bindCmp.getCurrChainId()); }else{ - context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainName()); + context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainId()); } } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/FCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/FCmp.java index cd021a27c..32e609f15 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/FCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/FCmp.java @@ -19,6 +19,6 @@ public class FCmp { @LiteflowMethod(LiteFlowMethodEnum.PROCESS) public void process(NodeComponent bindCmp) { DefaultContext context = bindCmp.getFirstContextBean(); - context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainName()); + context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/GCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/GCmp.java index 1832276e5..30973a2c2 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/GCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/GCmp.java @@ -19,6 +19,6 @@ public class GCmp { @LiteflowMethod(LiteFlowMethodEnum.PROCESS) public void process(NodeComponent bindCmp) { DefaultContext context = bindCmp.getFirstContextBean(); - context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainName()); + context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/HCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/HCmp.java index 33b2501f0..715426504 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/HCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/HCmp.java @@ -20,7 +20,7 @@ public class HCmp{ @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_SWITCH, nodeType = NodeTypeEnum.SWITCH) public String processSwitch(NodeComponent bindCmp) throws Exception { DefaultContext context = bindCmp.getFirstContextBean(); - context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainName()); + context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainId()); return "j"; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/JCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/JCmp.java index be1ef8f3d..60bba5854 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/JCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/JCmp.java @@ -19,6 +19,6 @@ public class JCmp { @LiteflowMethod(LiteFlowMethodEnum.PROCESS) public void process(NodeComponent bindCmp) { DefaultContext context = bindCmp.getFirstContextBean(); - context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainName()); + context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/KCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/KCmp.java index 52c1c8b30..cf124de75 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/KCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/KCmp.java @@ -19,6 +19,6 @@ public class KCmp { @LiteflowMethod(LiteFlowMethodEnum.PROCESS) public void process(NodeComponent bindCmp) { DefaultContext context = bindCmp.getFirstContextBean(); - context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainName()); + context.setData(bindCmp.getNodeId(), bindCmp.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ACmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ACmp.java index 39d61a16a..fbbb648f5 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ACmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ACmp.java @@ -15,6 +15,6 @@ public class ACmp extends NodeComponent { @Override public void process() { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/BCmp.java index 33826ddc8..15c8f3290 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/BCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/BCmp.java @@ -15,7 +15,7 @@ public class BCmp extends NodeComponent { @Override public void process() { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/CCmp.java index 94f8b51e4..8ebf6049e 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/CCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/CCmp.java @@ -15,7 +15,7 @@ public class CCmp extends NodeComponent { @Override public void process() { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/DCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/DCmp.java index c80aa3347..3e9dc89f3 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/DCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/DCmp.java @@ -15,7 +15,7 @@ public class DCmp extends NodeComponent { @Override public void process() { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ECmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ECmp.java index c0e1b96fe..6866fe683 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ECmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ECmp.java @@ -16,9 +16,9 @@ public class ECmp extends NodeComponent { public void process() { DefaultContext context = this.getFirstContextBean(); if (context.hasData(this.getNodeId())){ - context.setData(this.getNodeId(), context.getData(this.getNodeId()) + "_" + this.getCurrChainName()); + context.setData(this.getNodeId(), context.getData(this.getNodeId()) + "_" + this.getCurrChainId()); }else{ - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/FCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/FCmp.java index ecb6bd4ff..ce86b4d8f 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/FCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/FCmp.java @@ -15,7 +15,7 @@ public class FCmp extends NodeComponent { @Override public void process() { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/GCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/GCmp.java index 7f5ebb593..e3906e358 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/GCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/GCmp.java @@ -15,7 +15,7 @@ public class GCmp extends NodeComponent { @Override public void process() { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/HCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/HCmp.java index d9d68e79e..0937f270f 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/HCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/HCmp.java @@ -15,7 +15,7 @@ public class HCmp extends NodeSwitchComponent { @Override public String processSwitch() throws Exception { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); return "j"; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/JCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/JCmp.java index 04fbc2b16..2557792e0 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/JCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/JCmp.java @@ -15,7 +15,7 @@ public class JCmp extends NodeComponent { @Override public void process() { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/KCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/KCmp.java index 76bbfd4c5..78697101f 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/KCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/KCmp.java @@ -15,7 +15,7 @@ public class KCmp extends NodeComponent { @Override public void process() { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ACmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ACmp.java index 47aa2aa46..702c01563 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ACmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ACmp.java @@ -17,6 +17,6 @@ public class ACmp extends NodeComponent { @Override public void process() { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/BCmp.java index 97d505bd5..575825c32 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/BCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/BCmp.java @@ -17,7 +17,7 @@ public class BCmp extends NodeComponent { @Override public void process() { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/CCmp.java index 054f8e638..51246f598 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/CCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/CCmp.java @@ -17,7 +17,7 @@ public class CCmp extends NodeComponent { @Override public void process() { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/DCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/DCmp.java index 8aa5b9a35..57b24b52b 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/DCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/DCmp.java @@ -17,7 +17,7 @@ public class DCmp extends NodeComponent { @Override public void process() { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ECmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ECmp.java index 858ba7e30..7eaa14ebb 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ECmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ECmp.java @@ -18,9 +18,9 @@ public class ECmp extends NodeComponent { public void process() { DefaultContext context = this.getFirstContextBean(); if (context.hasData(this.getNodeId())){ - context.setData(this.getNodeId(), context.getData(this.getNodeId()) + "_" + this.getCurrChainName()); + context.setData(this.getNodeId(), context.getData(this.getNodeId()) + "_" + this.getCurrChainId()); }else{ - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/FCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/FCmp.java index 685f6bf78..edc3de432 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/FCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/FCmp.java @@ -17,7 +17,7 @@ public class FCmp extends NodeComponent { @Override public void process() { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/GCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/GCmp.java index a04b2a2ec..45319bd11 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/GCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/GCmp.java @@ -17,7 +17,7 @@ public class GCmp extends NodeComponent { @Override public void process() { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/HCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/HCmp.java index ac0e22a78..85d862ff8 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/HCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/HCmp.java @@ -17,7 +17,7 @@ public class HCmp extends NodeSwitchComponent { @Override public String processSwitch() throws Exception { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); return "j"; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/JCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/JCmp.java index 0e9052cc4..0ac39388b 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/JCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/JCmp.java @@ -17,7 +17,7 @@ public class JCmp extends NodeComponent { @Override public void process() { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/KCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/KCmp.java index 6d2d01652..c83b962ca 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/KCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/KCmp.java @@ -17,7 +17,7 @@ public class KCmp extends NodeComponent { @Override public void process() { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ACmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ACmp.java index 47aa2aa46..702c01563 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ACmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ACmp.java @@ -17,6 +17,6 @@ public class ACmp extends NodeComponent { @Override public void process() { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/BCmp.java index 97d505bd5..575825c32 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/BCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/BCmp.java @@ -17,7 +17,7 @@ public class BCmp extends NodeComponent { @Override public void process() { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/CCmp.java index 054f8e638..51246f598 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/CCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/CCmp.java @@ -17,7 +17,7 @@ public class CCmp extends NodeComponent { @Override public void process() { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/DCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/DCmp.java index 8aa5b9a35..57b24b52b 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/DCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/DCmp.java @@ -17,7 +17,7 @@ public class DCmp extends NodeComponent { @Override public void process() { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ECmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ECmp.java index 858ba7e30..7eaa14ebb 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ECmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/ECmp.java @@ -18,9 +18,9 @@ public class ECmp extends NodeComponent { public void process() { DefaultContext context = this.getFirstContextBean(); if (context.hasData(this.getNodeId())){ - context.setData(this.getNodeId(), context.getData(this.getNodeId()) + "_" + this.getCurrChainName()); + context.setData(this.getNodeId(), context.getData(this.getNodeId()) + "_" + this.getCurrChainId()); }else{ - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/FCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/FCmp.java index 685f6bf78..edc3de432 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/FCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/FCmp.java @@ -17,7 +17,7 @@ public class FCmp extends NodeComponent { @Override public void process() { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/GCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/GCmp.java index a04b2a2ec..45319bd11 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/GCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/GCmp.java @@ -17,7 +17,7 @@ public class GCmp extends NodeComponent { @Override public void process() { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/HCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/HCmp.java index ac0e22a78..85d862ff8 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/HCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/HCmp.java @@ -17,7 +17,7 @@ public class HCmp extends NodeSwitchComponent { @Override public String processSwitch() throws Exception { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); return "j"; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/JCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/JCmp.java index 0e9052cc4..0ac39388b 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/JCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/JCmp.java @@ -17,7 +17,7 @@ public class JCmp extends NodeComponent { @Override public void process() { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/KCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/KCmp.java index 6d2d01652..c83b962ca 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/KCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/getChainName/cmp/KCmp.java @@ -17,7 +17,7 @@ public class KCmp extends NodeComponent { @Override public void process() { DefaultContext context = this.getFirstContextBean(); - context.setData(this.getNodeId(), this.getCurrChainName()); + context.setData(this.getNodeId(), this.getCurrChainId()); } }