enhancement #ID8XF9 对QLExpress4的支持

liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/base/BaseELSpringbootTest.java

@@ -97,8 +97,17 @@ public class BaseELSpringbootTest extends BaseTest {
 		// 应返回 chain2
 		Assertions.assertEquals("chain2", response.getChainId());
 
-		LiteflowResponse response1 = flowExecutor.execute2RespWithEL("t1=THEN(c, WHEN(j,k));w1 = WHEN(q, THEN(p, r)).id('w01');t2 = THEN(h, i);\n" +
-				"THEN(a,b,WHEN(t1, d, t2 ),SWITCH(x).to(m, n, w1),z);");
+		LiteflowResponse response1 = flowExecutor.execute2RespWithEL("t1 = THEN(c, WHEN(j,k));\n" +
+                "        w1 = WHEN(q, THEN(p, r)).id(\"w01\");\n" +
+                "        t2 = THEN(h, i);\n" +
+                "\n" +
+                "        THEN(\n" +
+                "        a,b,\n" +
+                "        WHEN(t1, d, t2 ),\n" +
+                "        SWITCH(x).to(m, n, w1),\n" +
+                "        z\n" +
+                "        );\n" +
+                "        THEN(a,b,b,a,SWITCH(e).TO(d,b));");
 		Assertions.assertTrue(response1.isSuccess());
 		// 应返回 chain5
 		Assertions.assertEquals("chain5", response1.getChainId());

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

@@ -2,7 +2,55 @@
 <!DOCTYPE flow PUBLIC  "liteflow" "liteflow.dtd">
 <flow>
     <chain name="chain1">
+        THEN(a,b,b,a);
+    </chain>
+
+    <chain name="chain2">
+        THEN(
+        a,b,
+        SWITCH(e).to(d,f)
+        );
+    </chain>
+
+    <chain name="chain3">
+        THEN(
+        a,
+        WHEN(
+        c,
+        SWITCH(g).to(b, d, THEN(h,i).id("then_1001"))
+        )
+        );
+    </chain>
+
+    <chain name="chain4">
+        THEN(
+        a,b,
+        WHEN(
+        THEN(c, WHEN(j,k)),
+        d,
+        THEN(h, i)
+        ),
+        SWITCH(x).to(
+        m,
+        n,
+        WHEN(q, THEN(p, r)).id("w01")
+        ),
+        z
+        );
+    </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
+        );
         THEN(a,b,b,a,SWITCH(e).TO(d,b))
     </chain>
 
-</flow>
+</flow>

pom.xml

@@ -58,7 +58,7 @@
 		<zkclient.version>0.10</zkclient.version>
 		<jetcd.version>0.7.3</jetcd.version>
 		<nacos.version>1.4.4</nacos.version>
-		<qlexpress.version>4.0.5</qlexpress.version>
+		<qlexpress.version>4.0.6-SNAPSHOT</qlexpress.version>
 		<groovy.version>3.0.25</groovy.version>
 		<graalvm.version>22.0.0</graalvm.version>
 		<bytebuddy.version>1.17.7</bytebuddy.version>