1
0
Эх сурвалжийг харах

cond这种单词改成switch

everywhere.z 2 жил өмнө
parent
commit
17ccf4791a
59 өөрчлөгдсөн 93 нэмэгдсэн , 74 устгасан
  1. 2 2
      liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeSwitchComponent.java
  2. 1 1
      liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptSwitchComponent.java
  3. 1 1
      liteflow-core/src/main/java/com/yomahub/liteflow/enums/LiteFlowMethodEnum.java
  4. 2 2
      liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java
  5. 2 2
      liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java
  6. 2 2
      liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java
  7. 2 2
      liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/component/cmp2/FCondCmp.java
  8. 2 2
      liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java
  9. 2 2
      liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java
  10. 2 2
      liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java
  11. 2 2
      liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java
  12. 1 1
      liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java
  13. 1 1
      liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java
  14. 6 0
      liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/base/BaseELSpringbootTest.java
  15. 1 1
      liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/ESwitchCmp.java
  16. 1 1
      liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/GSwitchCmp.java
  17. 1 1
      liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/XSwitchCmp.java
  18. 1 1
      liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java
  19. 1 1
      liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java
  20. 1 1
      liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java
  21. 1 1
      liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java
  22. 1 1
      liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java
  23. 1 1
      liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java
  24. 13 0
      liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/base/flow.el.xml
  25. 2 2
      liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java
  26. 2 2
      liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java
  27. 2 2
      liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java
  28. 2 2
      liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/component/cmp2/FCondCmp.java
  29. 2 2
      liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java
  30. 2 2
      liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java
  31. 2 2
      liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java
  32. 2 2
      liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java
  33. 1 1
      liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java
  34. 1 1
      liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java
  35. 1 1
      liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/base/cmp/ECmp.java
  36. 1 1
      liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/builder/cmp/ECmp.java
  37. 1 1
      liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java
  38. 1 1
      liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java
  39. 1 1
      liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java
  40. 1 1
      liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java
  41. 1 1
      liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java
  42. 1 1
      liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java
  43. 1 1
      liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java
  44. 1 1
      liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/ECmp.java
  45. 1 1
      liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java
  46. 1 1
      liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java
  47. 1 1
      liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java
  48. 1 1
      liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java
  49. 1 1
      liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java
  50. 1 1
      liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java
  51. 1 1
      liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java
  52. 1 1
      liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java
  53. 1 1
      liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java
  54. 1 1
      liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java
  55. 1 1
      liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/config/cmp/ECmp.java
  56. 1 1
      liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java
  57. 1 1
      liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java
  58. 1 1
      liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java
  59. 1 1
      liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java

+ 2 - 2
liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeSwitchComponent.java

@@ -15,11 +15,11 @@ public abstract class NodeSwitchComponent extends NodeComponent {
 
 
 	@Override
 	@Override
 	public void process() throws Exception {
 	public void process() throws Exception {
-		String nodeId = this.processCond();
+		String nodeId = this.processSwitch();
 		this.getSlot().setSwitchResult(this.getClass().getName(), nodeId);
 		this.getSlot().setSwitchResult(this.getClass().getName(), nodeId);
 	}
 	}
 
 
 	//用以返回路由节点的beanId
 	//用以返回路由节点的beanId
-	public abstract String processCond() throws Exception;
+	public abstract String processSwitch() throws Exception;
 
 
 }
 }

+ 1 - 1
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 {
 public class ScriptSwitchComponent extends NodeSwitchComponent {
 
 
     @Override
     @Override
-    public String processCond() throws Exception {
+    public String processSwitch() throws Exception {
         return (String)ScriptExecutorFactory.loadInstance().getScriptExecutor().execute(getNodeId(), getSlotIndex());
         return (String)ScriptExecutorFactory.loadInstance().getScriptExecutor().execute(getNodeId(), getSlotIndex());
     }
     }
 
 

+ 1 - 1
liteflow-core/src/main/java/com/yomahub/liteflow/enums/LiteFlowMethodEnum.java

@@ -2,7 +2,7 @@ package com.yomahub.liteflow.enums;
 
 
 public enum LiteFlowMethodEnum {
 public enum LiteFlowMethodEnum {
     PROCESS("process"),
     PROCESS("process"),
-    PROCESS_COND("processCond"),
+    PROCESS_SWITCH("processSwitch"),
     IS_ACCESS("isAccess"),
     IS_ACCESS("isAccess"),
 
 
     IS_END("isEnd"),
     IS_END("isEnd"),

+ 2 - 2
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
 @LiteflowSwitchCmpDefine
 public class ECmp{
 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!");
         System.out.println("Ecomp executed!");
         return "g";
         return "g";
     }
     }

+ 2 - 2
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
 @LiteflowSwitchCmpDefine
 public class JCmp{
 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!");
         System.out.println("Jcomp executed!");
         return "chain3";
         return "chain3";
     }
     }

+ 2 - 2
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
 @LiteflowSwitchCmpDefine
 public class ECmp{
 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!");
 		System.out.println("ECmp executed!");
 		return "chain2";
 		return "chain2";
 	}
 	}

+ 2 - 2
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")
 @Component("f")
 @LiteflowSwitchCmpDefine
 @LiteflowSwitchCmpDefine
 public class FCondCmp{
 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();
         Integer requestData = bindCmp.getRequestData();
         if (Objects.isNull(requestData)){
         if (Objects.isNull(requestData)){
             return "d";
             return "d";

+ 2 - 2
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
 @LiteflowSwitchCmpDefine
 public class ECmp{
 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";
 		return "a";
 	}
 	}
 }
 }

+ 2 - 2
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
 @LiteflowSwitchCmpDefine
 public class ECmp{
 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";
 		return "g";
 	}
 	}
 }
 }

+ 2 - 2
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
 @LiteflowSwitchCmpDefine
 public class ECmp{
 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";
 		return "g";
 	}
 	}
 }
 }

+ 2 - 2
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
 @LiteflowSwitchCmpDefine
 public class CCmp{
 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")){
 		if(bindCmp.getTag().equals("2")){
 			return "e";
 			return "e";
 		}else{
 		}else{

+ 1 - 1
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 {
 public class ECmp extends NodeSwitchComponent {
 
 
     @Override
     @Override
-    public String processCond() throws Exception {
+    public String processSwitch() throws Exception {
         System.out.println("Ecomp executed!");
         System.out.println("Ecomp executed!");
         return "g";
         return "g";
     }
     }

+ 1 - 1
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 {
 public class JCmp extends NodeSwitchComponent {
 
 
     @Override
     @Override
-    public String processCond() throws Exception {
+    public String processSwitch() throws Exception {
         System.out.println("Jcomp executed!");
         System.out.println("Jcomp executed!");
         return "chain3";
         return "chain3";
     }
     }

+ 6 - 0
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());
         Assert.assertTrue(response.isSuccess());
     }
     }
 
 
+    //用变量来声明短流程
+    @Test
+    public void testBase5() throws Exception{
+        LiteflowResponse response = flowExecutor.execute2Resp("chain5", "arg");
+        Assert.assertTrue(response.isSuccess());
+    }
 }
 }

+ 1 - 1
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 {
 public class ESwitchCmp extends NodeSwitchComponent {
 
 
 	@Override
 	@Override
-	public String processCond() throws Exception {
+	public String processSwitch() throws Exception {
 		return "d";
 		return "d";
 	}
 	}
 }
 }

+ 1 - 1
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 {
 public class GSwitchCmp extends NodeSwitchComponent {
 
 
 	@Override
 	@Override
-	public String processCond() throws Exception {
+	public String processSwitch() throws Exception {
 		return "then_1001";
 		return "then_1001";
 	}
 	}
 }
 }

+ 1 - 1
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 {
 public class XSwitchCmp extends NodeSwitchComponent {
 
 
 	@Override
 	@Override
-	public String processCond() throws Exception {
+	public String processSwitch() throws Exception {
 		return "w01";
 		return "w01";
 	}
 	}
 }
 }

+ 1 - 1
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 {
 public class ECmp extends NodeSwitchComponent {
 
 
 	@Override
 	@Override
-	public String processCond() throws Exception {
+	public String processSwitch() throws Exception {
 		System.out.println("ECmp executed!");
 		System.out.println("ECmp executed!");
 		return "chain2";
 		return "chain2";
 	}
 	}

+ 1 - 1
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")
 @Component("f")
 public class FSwitchCmp extends NodeSwitchComponent {
 public class FSwitchCmp extends NodeSwitchComponent {
     @Override
     @Override
-    public String processCond() {
+    public String processSwitch() {
         Integer requestData = this.getRequestData();
         Integer requestData = this.getRequestData();
         if (Objects.isNull(requestData)){
         if (Objects.isNull(requestData)){
             return "d";
             return "d";

+ 1 - 1
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 {
 public class ECmp extends NodeSwitchComponent {
 
 
 	@Override
 	@Override
-	public String processCond() throws Exception {
+	public String processSwitch() throws Exception {
 		return "a";
 		return "a";
 	}
 	}
 }
 }

+ 1 - 1
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 {
 public class ECmp extends NodeSwitchComponent {
 
 
 	@Override
 	@Override
-	public String processCond() throws Exception {
+	public String processSwitch() throws Exception {
 		return "g";
 		return "g";
 	}
 	}
 }
 }

+ 1 - 1
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 {
 public class ECmp extends NodeSwitchComponent {
 
 
 	@Override
 	@Override
-	public String processCond() throws Exception {
+	public String processSwitch() throws Exception {
 		return "g";
 		return "g";
 	}
 	}
 }
 }

+ 1 - 1
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 {
 public class CCmp extends NodeSwitchComponent {
 
 
 	@Override
 	@Override
-	public String processCond() throws Exception {
+	public String processSwitch() throws Exception {
 		if(this.getTag().equals("2")){
 		if(this.getTag().equals("2")){
 			return "e";
 			return "e";
 		}else{
 		}else{

+ 13 - 0
liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/base/flow.el.xml

@@ -37,4 +37,17 @@
             z
             z
         )
         )
     </chain>
     </chain>
+
+    <chain name="chain5">
+        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
+        );
+    </chain>
 </flow>
 </flow>

+ 2 - 2
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
 @LiteflowSwitchCmpDefine
 public class ECmp{
 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!");
         System.out.println("Ecomp executed!");
         return "g";
         return "g";
     }
     }

+ 2 - 2
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
 @LiteflowSwitchCmpDefine
 public class JCmp{
 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!");
         System.out.println("Jcomp executed!");
         return "chain3";
         return "chain3";
     }
     }

+ 2 - 2
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
 @LiteflowSwitchCmpDefine
 public class ECmp{
 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!");
 		System.out.println("ECmp executed!");
 		return "chain2";
 		return "chain2";
 	}
 	}

+ 2 - 2
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")
 @Component("f")
 @LiteflowSwitchCmpDefine
 @LiteflowSwitchCmpDefine
 public class FCondCmp{
 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();
         Integer requestData = bindCmp.getRequestData();
         if (Objects.isNull(requestData)){
         if (Objects.isNull(requestData)){
             return "d";
             return "d";

+ 2 - 2
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
 @LiteflowSwitchCmpDefine
 public class ECmp{
 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";
 		return "a";
 	}
 	}
 }
 }

+ 2 - 2
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
 @LiteflowSwitchCmpDefine
 public class ECmp{
 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";
 		return "g";
 	}
 	}
 }
 }

+ 2 - 2
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
 @LiteflowSwitchCmpDefine
 public class ECmp{
 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";
 		return "g";
 	}
 	}
 }
 }

+ 2 - 2
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
 @LiteflowSwitchCmpDefine
 public class CCmp{
 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")){
 		if(bindCmp.getTag().equals("2")){
 			return "e";
 			return "e";
 		}else{
 		}else{

+ 1 - 1
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 {
 public class ECmp extends NodeSwitchComponent {
 
 
     @Override
     @Override
-    public String processCond() throws Exception {
+    public String processSwitch() throws Exception {
         System.out.println("Ecomp executed!");
         System.out.println("Ecomp executed!");
         return "g";
         return "g";
     }
     }

+ 1 - 1
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 {
 public class JCmp extends NodeSwitchComponent {
 
 
     @Override
     @Override
-    public String processCond() throws Exception {
+    public String processSwitch() throws Exception {
         System.out.println("Jcomp executed!");
         System.out.println("Jcomp executed!");
         return "chain3";
         return "chain3";
     }
     }

+ 1 - 1
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 {
 public class ECmp extends NodeSwitchComponent {
 
 
 	@Override
 	@Override
-	public String processCond() throws Exception {
+	public String processSwitch() throws Exception {
 		return "g";
 		return "g";
 	}
 	}
 }
 }

+ 1 - 1
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 {
 public class ECmp extends NodeSwitchComponent {
 
 
 	@Override
 	@Override
-	public String processCond() throws Exception {
+	public String processSwitch() throws Exception {
 		System.out.println("ECmp executed!");
 		System.out.println("ECmp executed!");
 		return "chain2";
 		return "chain2";
 	}
 	}

+ 1 - 1
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 {
 public class FSwitchCmp extends NodeSwitchComponent {
     @Override
     @Override
-    public String processCond() {
+    public String processSwitch() {
         Integer requestData = this.getRequestData();
         Integer requestData = this.getRequestData();
         if (Objects.isNull(requestData)){
         if (Objects.isNull(requestData)){
             return "d";
             return "d";

+ 1 - 1
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 {
 public class ECmp extends NodeSwitchComponent {
 
 
 	@Override
 	@Override
-	public String processCond() throws Exception {
+	public String processSwitch() throws Exception {
 		return "a";
 		return "a";
 	}
 	}
 }
 }

+ 1 - 1
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 {
 public class ECmp extends NodeSwitchComponent {
 
 
 	@Override
 	@Override
-	public String processCond() throws Exception {
+	public String processSwitch() throws Exception {
 		return "g";
 		return "g";
 	}
 	}
 }
 }

+ 1 - 1
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 {
 public class ECmp extends NodeSwitchComponent {
 
 
 	@Override
 	@Override
-	public String processCond() throws Exception {
+	public String processSwitch() throws Exception {
 		return "g";
 		return "g";
 	}
 	}
 }
 }

+ 1 - 1
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 {
 public class CCmp extends NodeSwitchComponent {
 
 
 	@Override
 	@Override
-	public String processCond() throws Exception {
+	public String processSwitch() throws Exception {
 		if(this.getTag().equals("2")){
 		if(this.getTag().equals("2")){
 			return "e";
 			return "e";
 		}else{
 		}else{

+ 1 - 1
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 {
 public class ECmp extends NodeSwitchComponent {
 
 
     @Override
     @Override
-    public String processCond() throws Exception {
+    public String processSwitch() throws Exception {
         System.out.println("Ecomp executed!");
         System.out.println("Ecomp executed!");
         return "g";
         return "g";
     }
     }

+ 1 - 1
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 {
 public class JCmp extends NodeSwitchComponent {
 
 
     @Override
     @Override
-    public String processCond() throws Exception {
+    public String processSwitch() throws Exception {
         System.out.println("Jcomp executed!");
         System.out.println("Jcomp executed!");
         return "chain3";
         return "chain3";
     }
     }

+ 1 - 1
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")
 @Component("e")
 public class ECmp extends NodeSwitchComponent {
 public class ECmp extends NodeSwitchComponent {
     @Override
     @Override
-    public String processCond() throws Exception {
+    public String processSwitch() throws Exception {
         return "d";
         return "d";
     }
     }
 }
 }

+ 1 - 1
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 {
 public class ECmp extends NodeSwitchComponent {
 
 
 	@Override
 	@Override
-	public String processCond() throws Exception {
+	public String processSwitch() throws Exception {
 		System.out.println("ECmp executed!");
 		System.out.println("ECmp executed!");
 		return "chain2";
 		return "chain2";
 	}
 	}

+ 1 - 1
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")
 @Component("f")
 public class FSwitchCmp extends NodeSwitchComponent {
 public class FSwitchCmp extends NodeSwitchComponent {
     @Override
     @Override
-    public String processCond() {
+    public String processSwitch() {
         Integer requestData = this.getRequestData();
         Integer requestData = this.getRequestData();
         if (Objects.isNull(requestData)){
         if (Objects.isNull(requestData)){
             return "d";
             return "d";

+ 1 - 1
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 {
 public class ECmp extends NodeSwitchComponent {
 
 
 	@Override
 	@Override
-	public String processCond() throws Exception {
+	public String processSwitch() throws Exception {
 		return "a";
 		return "a";
 	}
 	}
 }
 }

+ 1 - 1
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 {
 public class ECmp extends NodeSwitchComponent {
 
 
 	@Override
 	@Override
-	public String processCond() throws Exception {
+	public String processSwitch() throws Exception {
 		return "g";
 		return "g";
 	}
 	}
 }
 }

+ 1 - 1
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 {
 public class ECmp extends NodeSwitchComponent {
 
 
 	@Override
 	@Override
-	public String processCond() throws Exception {
+	public String processSwitch() throws Exception {
 		return "g";
 		return "g";
 	}
 	}
 }
 }

+ 1 - 1
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 {
 public class CCmp extends NodeSwitchComponent {
 
 
 	@Override
 	@Override
-	public String processCond() throws Exception {
+	public String processSwitch() throws Exception {
 		if(this.getTag().equals("2")){
 		if(this.getTag().equals("2")){
 			return "e";
 			return "e";
 		}else{
 		}else{

+ 1 - 1
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 {
 public class ECmp extends NodeSwitchComponent {
 
 
     @Override
     @Override
-    public String processCond() throws Exception {
+    public String processSwitch() throws Exception {
         System.out.println("Ecomp executed!");
         System.out.println("Ecomp executed!");
         return "g";
         return "g";
     }
     }

+ 1 - 1
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 {
 public class JCmp extends NodeSwitchComponent {
 
 
     @Override
     @Override
-    public String processCond() throws Exception {
+    public String processSwitch() throws Exception {
         System.out.println("Jcomp executed!");
         System.out.println("Jcomp executed!");
         return "chain3";
         return "chain3";
     }
     }

+ 1 - 1
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 {
 public class ECmp extends NodeSwitchComponent {
 
 
 	@Override
 	@Override
-	public String processCond() throws Exception {
+	public String processSwitch() throws Exception {
 		System.out.println("ECmp executed!");
 		System.out.println("ECmp executed!");
 		return "chain2";
 		return "chain2";
 	}
 	}

+ 1 - 1
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")
 @Component("f")
 public class FSwitchCmp extends NodeSwitchComponent {
 public class FSwitchCmp extends NodeSwitchComponent {
     @Override
     @Override
-    public String processCond() {
+    public String processSwitch() {
         Integer requestData = this.getRequestData();
         Integer requestData = this.getRequestData();
         if (Objects.isNull(requestData)){
         if (Objects.isNull(requestData)){
             return "d";
             return "d";

+ 1 - 1
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 {
 public class ECmp extends NodeSwitchComponent {
 
 
 	@Override
 	@Override
-	public String processCond() throws Exception {
+	public String processSwitch() throws Exception {
 		return "g";
 		return "g";
 	}
 	}
 }
 }

+ 1 - 1
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 {
 public class ECmp extends NodeSwitchComponent {
 
 
 	@Override
 	@Override
-	public String processCond() throws Exception {
+	public String processSwitch() throws Exception {
 		return "a";
 		return "a";
 	}
 	}
 }
 }

+ 1 - 1
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 {
 public class ECmp extends NodeSwitchComponent {
 
 
 	@Override
 	@Override
-	public String processCond() throws Exception {
+	public String processSwitch() throws Exception {
 		return "g";
 		return "g";
 	}
 	}
 }
 }

+ 1 - 1
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 {
 public class ECmp extends NodeSwitchComponent {
 
 
 	@Override
 	@Override
-	public String processCond() throws Exception {
+	public String processSwitch() throws Exception {
 		return "g";
 		return "g";
 	}
 	}
 }
 }

+ 1 - 1
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 {
 public class CCmp extends NodeSwitchComponent {
 
 
 	@Override
 	@Override
-	public String processCond() throws Exception {
+	public String processSwitch() throws Exception {
 		if(this.getTag().equals("2")){
 		if(this.getTag().equals("2")){
 			return "e";
 			return "e";
 		}else{
 		}else{