From 17ccf4791a18d72a7bdb8f88149a75aac5f7b7e5 Mon Sep 17 00:00:00 2001 From: "everywhere.z" Date: Sun, 3 Jul 2022 00:50:50 +0800 Subject: [PATCH] =?UTF-8?q?cond=E8=BF=99=E7=A7=8D=E5=8D=95=E8=AF=8D?= =?UTF-8?q?=E6=94=B9=E6=88=90switch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yomahub/liteflow/core/NodeSwitchComponent.java | 4 ++-- .../liteflow/core/ScriptSwitchComponent.java | 2 +- .../yomahub/liteflow/enums/LiteFlowMethodEnum.java | 2 +- .../yomahub/liteflow/test/asyncNode/cmp/ECmp.java | 4 ++-- .../yomahub/liteflow/test/asyncNode/cmp/JCmp.java | 4 ++-- .../yomahub/liteflow/test/builder/cmp1/ECmp.java | 4 ++-- .../liteflow/test/component/cmp2/FCondCmp.java | 4 ++-- .../yomahub/liteflow/test/exception/cmp/ECmp.java | 4 ++-- .../yomahub/liteflow/test/parsecustom/cmp/ECmp.java | 4 ++-- .../com/yomahub/liteflow/test/parser/cmp/ECmp.java | 4 ++-- .../com/yomahub/liteflow/test/tag/cmp/CCmp.java | 4 ++-- .../yomahub/liteflow/test/asyncNode/cmp/ECmp.java | 2 +- .../yomahub/liteflow/test/asyncNode/cmp/JCmp.java | 2 +- .../liteflow/test/base/BaseELSpringbootTest.java | 6 ++++++ .../yomahub/liteflow/test/base/cmp/ESwitchCmp.java | 2 +- .../yomahub/liteflow/test/base/cmp/GSwitchCmp.java | 2 +- .../yomahub/liteflow/test/base/cmp/XSwitchCmp.java | 2 +- .../yomahub/liteflow/test/builder/cmp1/ECmp.java | 2 +- .../liteflow/test/component/cmp2/FSwitchCmp.java | 2 +- .../yomahub/liteflow/test/exception/cmp/ECmp.java | 2 +- .../yomahub/liteflow/test/parsecustom/cmp/ECmp.java | 2 +- .../com/yomahub/liteflow/test/parser/cmp/ECmp.java | 2 +- .../com/yomahub/liteflow/test/tag/cmp/CCmp.java | 2 +- .../src/test/resources/base/flow.el.xml | 13 +++++++++++++ .../yomahub/liteflow/test/asyncNode/cmp/ECmp.java | 4 ++-- .../yomahub/liteflow/test/asyncNode/cmp/JCmp.java | 4 ++-- .../yomahub/liteflow/test/builder/cmp1/ECmp.java | 4 ++-- .../liteflow/test/component/cmp2/FCondCmp.java | 4 ++-- .../yomahub/liteflow/test/exception/cmp/ECmp.java | 4 ++-- .../yomahub/liteflow/test/parsecustom/cmp/ECmp.java | 4 ++-- .../com/yomahub/liteflow/test/parser/cmp/ECmp.java | 4 ++-- .../com/yomahub/liteflow/test/tag/cmp/CCmp.java | 4 ++-- .../yomahub/liteflow/test/asyncNode/cmp/ECmp.java | 2 +- .../yomahub/liteflow/test/asyncNode/cmp/JCmp.java | 2 +- .../com/yomahub/liteflow/test/base/cmp/ECmp.java | 2 +- .../com/yomahub/liteflow/test/builder/cmp/ECmp.java | 2 +- .../liteflow/test/component/cmp2/FSwitchCmp.java | 2 +- .../yomahub/liteflow/test/exception/cmp/ECmp.java | 2 +- .../yomahub/liteflow/test/parsecustom/cmp/ECmp.java | 2 +- .../com/yomahub/liteflow/test/parser/cmp/ECmp.java | 2 +- .../com/yomahub/liteflow/test/tag/cmp/CCmp.java | 2 +- .../yomahub/liteflow/test/asyncNode/cmp/ECmp.java | 2 +- .../yomahub/liteflow/test/asyncNode/cmp/JCmp.java | 2 +- .../com/yomahub/liteflow/test/base/cmp/ECmp.java | 2 +- .../yomahub/liteflow/test/builder/cmp1/ECmp.java | 2 +- .../liteflow/test/component/cmp2/FSwitchCmp.java | 2 +- .../yomahub/liteflow/test/exception/cmp/ECmp.java | 2 +- .../yomahub/liteflow/test/parsecustom/cmp/ECmp.java | 2 +- .../com/yomahub/liteflow/test/parser/cmp/ECmp.java | 2 +- .../com/yomahub/liteflow/test/tag/cmp/CCmp.java | 2 +- .../yomahub/liteflow/test/asyncNode/cmp/ECmp.java | 2 +- .../yomahub/liteflow/test/asyncNode/cmp/JCmp.java | 2 +- .../yomahub/liteflow/test/builder/cmp1/ECmp.java | 2 +- .../liteflow/test/component/cmp2/FSwitchCmp.java | 2 +- .../com/yomahub/liteflow/test/config/cmp/ECmp.java | 2 +- .../yomahub/liteflow/test/exception/cmp/ECmp.java | 2 +- .../yomahub/liteflow/test/parsecustom/cmp/ECmp.java | 2 +- .../com/yomahub/liteflow/test/parser/cmp/ECmp.java | 2 +- .../com/yomahub/liteflow/test/tag/cmp/CCmp.java | 2 +- 59 files changed, 93 insertions(+), 74 deletions(-) diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeSwitchComponent.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeSwitchComponent.java index ebb8f28e2..1ebe9d5a3 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeSwitchComponent.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeSwitchComponent.java @@ -15,11 +15,11 @@ public abstract class NodeSwitchComponent extends NodeComponent { @Override public void process() throws Exception { - String nodeId = this.processCond(); + String nodeId = this.processSwitch(); this.getSlot().setSwitchResult(this.getClass().getName(), nodeId); } //用以返回路由节点的beanId - public abstract String processCond() throws Exception; + public abstract String processSwitch() throws Exception; } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptSwitchComponent.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptSwitchComponent.java index 526063ffa..99b19f825 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptSwitchComponent.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptSwitchComponent.java @@ -10,7 +10,7 @@ import com.yomahub.liteflow.script.ScriptExecutorFactory; public class ScriptSwitchComponent extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { return (String)ScriptExecutorFactory.loadInstance().getScriptExecutor().execute(getNodeId(), getSlotIndex()); } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/enums/LiteFlowMethodEnum.java b/liteflow-core/src/main/java/com/yomahub/liteflow/enums/LiteFlowMethodEnum.java index 6b7f9f370..eb5c57fb0 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/enums/LiteFlowMethodEnum.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/enums/LiteFlowMethodEnum.java @@ -2,7 +2,7 @@ package com.yomahub.liteflow.enums; public enum LiteFlowMethodEnum { PROCESS("process"), - PROCESS_COND("processCond"), + PROCESS_SWITCH("processSwitch"), IS_ACCESS("isAccess"), IS_END("isEnd"), diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java index 461fe7282..d4142abc0 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java @@ -11,8 +11,8 @@ import org.springframework.stereotype.Component; @LiteflowSwitchCmpDefine public class ECmp{ - @LiteflowMethod(LiteFlowMethodEnum.PROCESS_COND) - public String processCond(NodeComponent bindCmp) throws Exception { + @LiteflowMethod(LiteFlowMethodEnum.PROCESS_SWITCH) + public String processSwitch(NodeComponent bindCmp) throws Exception { System.out.println("Ecomp executed!"); return "g"; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java index b2c2b0c67..cf77ff942 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java @@ -11,8 +11,8 @@ import org.springframework.stereotype.Component; @LiteflowSwitchCmpDefine public class JCmp{ - @LiteflowMethod(LiteFlowMethodEnum.PROCESS_COND) - public String processCond(NodeComponent bindCmp) throws Exception { + @LiteflowMethod(LiteFlowMethodEnum.PROCESS_SWITCH) + public String processSwitch(NodeComponent bindCmp) throws Exception { System.out.println("Jcomp executed!"); return "chain3"; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java index 8e1524953..0e4627ec5 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java @@ -15,8 +15,8 @@ import com.yomahub.liteflow.enums.LiteFlowMethodEnum; @LiteflowSwitchCmpDefine public class ECmp{ - @LiteflowMethod(LiteFlowMethodEnum.PROCESS_COND) - public String processCond(NodeComponent bindCmp) throws Exception { + @LiteflowMethod(LiteFlowMethodEnum.PROCESS_SWITCH) + public String processSwitch(NodeComponent bindCmp) throws Exception { System.out.println("ECmp executed!"); return "chain2"; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/component/cmp2/FCondCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/component/cmp2/FCondCmp.java index aac5ccda0..456c80743 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/component/cmp2/FCondCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/component/cmp2/FCondCmp.java @@ -12,8 +12,8 @@ import java.util.Objects; @Component("f") @LiteflowSwitchCmpDefine public class FCondCmp{ - @LiteflowMethod(LiteFlowMethodEnum.PROCESS_COND) - public String processCond(NodeComponent bindCmp) { + @LiteflowMethod(LiteFlowMethodEnum.PROCESS_SWITCH) + public String processSwitch(NodeComponent bindCmp) { Integer requestData = bindCmp.getRequestData(); if (Objects.isNull(requestData)){ return "d"; diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java index 5efe37f08..db2706e6a 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java @@ -17,8 +17,8 @@ import org.springframework.stereotype.Component; @LiteflowSwitchCmpDefine public class ECmp{ - @LiteflowMethod(LiteFlowMethodEnum.PROCESS_COND) - public String processCond(NodeComponent bindCmp) throws Exception { + @LiteflowMethod(LiteFlowMethodEnum.PROCESS_SWITCH) + public String processSwitch(NodeComponent bindCmp) throws Exception { return "a"; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java index f64df6554..987613cc7 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java @@ -17,8 +17,8 @@ import org.springframework.stereotype.Component; @LiteflowSwitchCmpDefine public class ECmp{ - @LiteflowMethod(LiteFlowMethodEnum.PROCESS_COND) - public String processCond(NodeComponent bindCmp) throws Exception { + @LiteflowMethod(LiteFlowMethodEnum.PROCESS_SWITCH) + public String processSwitch(NodeComponent bindCmp) throws Exception { return "g"; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java index 12e75248d..1f0188896 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java @@ -17,8 +17,8 @@ import org.springframework.stereotype.Component; @LiteflowSwitchCmpDefine public class ECmp{ - @LiteflowMethod(LiteFlowMethodEnum.PROCESS_COND) - public String processCond(NodeComponent bindCmp) throws Exception { + @LiteflowMethod(LiteFlowMethodEnum.PROCESS_SWITCH) + public String processSwitch(NodeComponent bindCmp) throws Exception { return "g"; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java index 2f7d90d31..6081c09c0 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java @@ -17,8 +17,8 @@ import com.yomahub.liteflow.enums.LiteFlowMethodEnum; @LiteflowSwitchCmpDefine public class CCmp{ - @LiteflowMethod(LiteFlowMethodEnum.PROCESS_COND) - public String processCond(NodeComponent bindCmp) throws Exception { + @LiteflowMethod(LiteFlowMethodEnum.PROCESS_SWITCH) + public String processSwitch(NodeComponent bindCmp) throws Exception { if(bindCmp.getTag().equals("2")){ return "e"; }else{ diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java index 636bea632..caff1beb8 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Component; public class ECmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { System.out.println("Ecomp executed!"); return "g"; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java index 912833cd2..66bb9cab9 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Component; public class JCmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { System.out.println("Jcomp executed!"); return "chain3"; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/base/BaseELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/base/BaseELSpringbootTest.java index e312aefb0..894c1a630 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/base/BaseELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/base/BaseELSpringbootTest.java @@ -56,4 +56,10 @@ public class BaseELSpringbootTest extends BaseTest { Assert.assertTrue(response.isSuccess()); } + //用变量来声明短流程 + @Test + public void testBase5() throws Exception{ + LiteflowResponse response = flowExecutor.execute2Resp("chain5", "arg"); + Assert.assertTrue(response.isSuccess()); + } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/ESwitchCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/ESwitchCmp.java index fe912ad65..b05adaf5f 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/ESwitchCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/ESwitchCmp.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; public class ESwitchCmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { return "d"; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/GSwitchCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/GSwitchCmp.java index 5490e6865..e03617149 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/GSwitchCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/GSwitchCmp.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; public class GSwitchCmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { return "then_1001"; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/XSwitchCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/XSwitchCmp.java index 13c28c618..c873266e6 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/XSwitchCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/XSwitchCmp.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; public class XSwitchCmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { return "w01"; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java index 82a224318..e30f7f831 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java @@ -12,7 +12,7 @@ import com.yomahub.liteflow.core.NodeSwitchComponent; public class ECmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { System.out.println("ECmp executed!"); return "chain2"; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java index 5d1d06183..5f4951f54 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java @@ -9,7 +9,7 @@ import java.util.Objects; @Component("f") public class FSwitchCmp extends NodeSwitchComponent { @Override - public String processCond() { + public String processSwitch() { Integer requestData = this.getRequestData(); if (Objects.isNull(requestData)){ return "d"; diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java index bad2a367a..5911c2e3f 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; public class ECmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { return "a"; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java index 8b0ea909c..4f3a0d1e8 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; public class ECmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { return "g"; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java index bab2c2f26..e86aca5dc 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; public class ECmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { return "g"; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java index 1c058d296..ceedd8abe 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java @@ -14,7 +14,7 @@ import com.yomahub.liteflow.core.NodeSwitchComponent; public class CCmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { if(this.getTag().equals("2")){ return "e"; }else{ diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/base/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/base/flow.el.xml index cd11ba12a..177565dd5 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/base/flow.el.xml +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/base/flow.el.xml @@ -37,4 +37,17 @@ z ) + + + t1 = THEN(c, WHEN(j,k)); + w1 = WHEN(q, THEN(p, r)).id("w01"); + t2 = THEN(h, i); + + THEN( + a,b, + WHEN(t1, d, t2 ), + SWITCH(x).to(m, n, w1), + z + ); + \ No newline at end of file diff --git a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java index 461fe7282..d4142abc0 100644 --- a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java +++ b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java @@ -11,8 +11,8 @@ import org.springframework.stereotype.Component; @LiteflowSwitchCmpDefine public class ECmp{ - @LiteflowMethod(LiteFlowMethodEnum.PROCESS_COND) - public String processCond(NodeComponent bindCmp) throws Exception { + @LiteflowMethod(LiteFlowMethodEnum.PROCESS_SWITCH) + public String processSwitch(NodeComponent bindCmp) throws Exception { System.out.println("Ecomp executed!"); return "g"; } diff --git a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java index b2c2b0c67..cf77ff942 100644 --- a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java +++ b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java @@ -11,8 +11,8 @@ import org.springframework.stereotype.Component; @LiteflowSwitchCmpDefine public class JCmp{ - @LiteflowMethod(LiteFlowMethodEnum.PROCESS_COND) - public String processCond(NodeComponent bindCmp) throws Exception { + @LiteflowMethod(LiteFlowMethodEnum.PROCESS_SWITCH) + public String processSwitch(NodeComponent bindCmp) throws Exception { System.out.println("Jcomp executed!"); return "chain3"; } diff --git a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java index 8e1524953..0e4627ec5 100644 --- a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java +++ b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java @@ -15,8 +15,8 @@ import com.yomahub.liteflow.enums.LiteFlowMethodEnum; @LiteflowSwitchCmpDefine public class ECmp{ - @LiteflowMethod(LiteFlowMethodEnum.PROCESS_COND) - public String processCond(NodeComponent bindCmp) throws Exception { + @LiteflowMethod(LiteFlowMethodEnum.PROCESS_SWITCH) + public String processSwitch(NodeComponent bindCmp) throws Exception { System.out.println("ECmp executed!"); return "chain2"; } diff --git a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/component/cmp2/FCondCmp.java b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/component/cmp2/FCondCmp.java index aac5ccda0..456c80743 100644 --- a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/component/cmp2/FCondCmp.java +++ b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/component/cmp2/FCondCmp.java @@ -12,8 +12,8 @@ import java.util.Objects; @Component("f") @LiteflowSwitchCmpDefine public class FCondCmp{ - @LiteflowMethod(LiteFlowMethodEnum.PROCESS_COND) - public String processCond(NodeComponent bindCmp) { + @LiteflowMethod(LiteFlowMethodEnum.PROCESS_SWITCH) + public String processSwitch(NodeComponent bindCmp) { Integer requestData = bindCmp.getRequestData(); if (Objects.isNull(requestData)){ return "d"; diff --git a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java index 5efe37f08..db2706e6a 100644 --- a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java +++ b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java @@ -17,8 +17,8 @@ import org.springframework.stereotype.Component; @LiteflowSwitchCmpDefine public class ECmp{ - @LiteflowMethod(LiteFlowMethodEnum.PROCESS_COND) - public String processCond(NodeComponent bindCmp) throws Exception { + @LiteflowMethod(LiteFlowMethodEnum.PROCESS_SWITCH) + public String processSwitch(NodeComponent bindCmp) throws Exception { return "a"; } } diff --git a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java index f64df6554..987613cc7 100644 --- a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java +++ b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java @@ -17,8 +17,8 @@ import org.springframework.stereotype.Component; @LiteflowSwitchCmpDefine public class ECmp{ - @LiteflowMethod(LiteFlowMethodEnum.PROCESS_COND) - public String processCond(NodeComponent bindCmp) throws Exception { + @LiteflowMethod(LiteFlowMethodEnum.PROCESS_SWITCH) + public String processSwitch(NodeComponent bindCmp) throws Exception { return "g"; } } diff --git a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java index 12e75248d..1f0188896 100644 --- a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java +++ b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java @@ -17,8 +17,8 @@ import org.springframework.stereotype.Component; @LiteflowSwitchCmpDefine public class ECmp{ - @LiteflowMethod(LiteFlowMethodEnum.PROCESS_COND) - public String processCond(NodeComponent bindCmp) throws Exception { + @LiteflowMethod(LiteFlowMethodEnum.PROCESS_SWITCH) + public String processSwitch(NodeComponent bindCmp) throws Exception { return "g"; } } diff --git a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java index 2f7d90d31..6081c09c0 100644 --- a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java +++ b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java @@ -17,8 +17,8 @@ import com.yomahub.liteflow.enums.LiteFlowMethodEnum; @LiteflowSwitchCmpDefine public class CCmp{ - @LiteflowMethod(LiteFlowMethodEnum.PROCESS_COND) - public String processCond(NodeComponent bindCmp) throws Exception { + @LiteflowMethod(LiteFlowMethodEnum.PROCESS_SWITCH) + public String processSwitch(NodeComponent bindCmp) throws Exception { if(bindCmp.getTag().equals("2")){ return "e"; }else{ diff --git a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java index 946f2b64f..656b81396 100644 --- a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java +++ b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java @@ -6,7 +6,7 @@ import com.yomahub.liteflow.core.NodeSwitchComponent; public class ECmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { System.out.println("Ecomp executed!"); return "g"; } diff --git a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java index 70e8418c0..0a954eb39 100644 --- a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java +++ b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java @@ -6,7 +6,7 @@ import com.yomahub.liteflow.core.NodeSwitchComponent; public class JCmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { System.out.println("Jcomp executed!"); return "chain3"; } diff --git a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/base/cmp/ECmp.java b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/base/cmp/ECmp.java index 7c3c96069..df59cd643 100644 --- a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/base/cmp/ECmp.java +++ b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/base/cmp/ECmp.java @@ -12,7 +12,7 @@ import com.yomahub.liteflow.core.NodeSwitchComponent; public class ECmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { return "g"; } } diff --git a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/builder/cmp/ECmp.java b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/builder/cmp/ECmp.java index 5720b816b..9fedf9f30 100644 --- a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/builder/cmp/ECmp.java +++ b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/builder/cmp/ECmp.java @@ -12,7 +12,7 @@ import com.yomahub.liteflow.core.NodeSwitchComponent; public class ECmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { System.out.println("ECmp executed!"); return "chain2"; } diff --git a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java index 1e5ad720f..105340090 100644 --- a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java +++ b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java @@ -5,7 +5,7 @@ import java.util.Objects; public class FSwitchCmp extends NodeSwitchComponent { @Override - public String processCond() { + public String processSwitch() { Integer requestData = this.getRequestData(); if (Objects.isNull(requestData)){ return "d"; diff --git a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java index bbccef0bc..693148818 100644 --- a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java +++ b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java @@ -12,7 +12,7 @@ import com.yomahub.liteflow.core.NodeSwitchComponent; public class ECmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { return "a"; } } diff --git a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java index 5e0d2935a..41b930228 100644 --- a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java +++ b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java @@ -12,7 +12,7 @@ import com.yomahub.liteflow.core.NodeSwitchComponent; public class ECmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { return "g"; } } diff --git a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java index 514e09576..ca04a9bde 100644 --- a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java +++ b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java @@ -12,7 +12,7 @@ import com.yomahub.liteflow.core.NodeSwitchComponent; public class ECmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { return "g"; } } diff --git a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java index 074a0312b..84242cf0b 100644 --- a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java +++ b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java @@ -12,7 +12,7 @@ import com.yomahub.liteflow.core.NodeSwitchComponent; public class CCmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { if(this.getTag().equals("2")){ return "e"; }else{ diff --git a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java index 636bea632..caff1beb8 100644 --- a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java +++ b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Component; public class ECmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { System.out.println("Ecomp executed!"); return "g"; } diff --git a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java index 912833cd2..66bb9cab9 100644 --- a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java +++ b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Component; public class JCmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { System.out.println("Jcomp executed!"); return "chain3"; } diff --git a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/ECmp.java b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/ECmp.java index e2cf20e7b..e2a2a226a 100644 --- a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/ECmp.java +++ b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/ECmp.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; @Component("e") public class ECmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { return "d"; } } diff --git a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java index 82a224318..e30f7f831 100644 --- a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java +++ b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java @@ -12,7 +12,7 @@ import com.yomahub.liteflow.core.NodeSwitchComponent; public class ECmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { System.out.println("ECmp executed!"); return "chain2"; } diff --git a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java index 5d1d06183..5f4951f54 100644 --- a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java +++ b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java @@ -9,7 +9,7 @@ import java.util.Objects; @Component("f") public class FSwitchCmp extends NodeSwitchComponent { @Override - public String processCond() { + public String processSwitch() { Integer requestData = this.getRequestData(); if (Objects.isNull(requestData)){ return "d"; diff --git a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java index bad2a367a..5911c2e3f 100644 --- a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java +++ b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; public class ECmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { return "a"; } } diff --git a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java index 8b0ea909c..4f3a0d1e8 100644 --- a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java +++ b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; public class ECmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { return "g"; } } diff --git a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java index bab2c2f26..e86aca5dc 100644 --- a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java +++ b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; public class ECmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { return "g"; } } diff --git a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java index 1c058d296..ceedd8abe 100644 --- a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java +++ b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java @@ -14,7 +14,7 @@ import com.yomahub.liteflow.core.NodeSwitchComponent; public class CCmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { if(this.getTag().equals("2")){ return "e"; }else{ diff --git a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java index 636bea632..caff1beb8 100644 --- a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java +++ b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Component; public class ECmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { System.out.println("Ecomp executed!"); return "g"; } diff --git a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java index 912833cd2..66bb9cab9 100644 --- a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java +++ b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Component; public class JCmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { System.out.println("Jcomp executed!"); return "chain3"; } diff --git a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java index 82a224318..e30f7f831 100644 --- a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java +++ b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java @@ -12,7 +12,7 @@ import com.yomahub.liteflow.core.NodeSwitchComponent; public class ECmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { System.out.println("ECmp executed!"); return "chain2"; } diff --git a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java index 5d1d06183..5f4951f54 100644 --- a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java +++ b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java @@ -9,7 +9,7 @@ import java.util.Objects; @Component("f") public class FSwitchCmp extends NodeSwitchComponent { @Override - public String processCond() { + public String processSwitch() { Integer requestData = this.getRequestData(); if (Objects.isNull(requestData)){ return "d"; diff --git a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/config/cmp/ECmp.java b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/config/cmp/ECmp.java index 629a99912..eceb073cd 100644 --- a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/config/cmp/ECmp.java +++ b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/config/cmp/ECmp.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; public class ECmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { return "g"; } } diff --git a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java index bad2a367a..5911c2e3f 100644 --- a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java +++ b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; public class ECmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { return "a"; } } diff --git a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java index 0077d454d..44d672a9a 100644 --- a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java +++ b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; public class ECmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { return "g"; } } diff --git a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java index bab2c2f26..e86aca5dc 100644 --- a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java +++ b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; public class ECmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { return "g"; } } diff --git a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java index 1c058d296..ceedd8abe 100644 --- a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java +++ b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java @@ -14,7 +14,7 @@ import com.yomahub.liteflow.core.NodeSwitchComponent; public class CCmp extends NodeSwitchComponent { @Override - public String processCond() throws Exception { + public String processSwitch() throws Exception { if(this.getTag().equals("2")){ return "e"; }else{