diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/AndOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/AndOperator.java index 73b68f6f4..0e5f731ab 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/AndOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/AndOperator.java @@ -22,7 +22,7 @@ public class AndOperator extends BaseOperator { andOrCondition.setBooleanConditionType(BooleanConditionTypeEnum.AND); for (Object object : objects){ - OperatorHelper.checkObjectMustBeBooleanItem(object); + OperatorHelper.checkObjMustBeBooleanTypeItem(object); Executable item = OperatorHelper.convert(object, Executable.class); andOrCondition.addItem(item); diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/BreakOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/BreakOperator.java index f89a7c332..43a76d114 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/BreakOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/BreakOperator.java @@ -1,12 +1,8 @@ package com.yomahub.liteflow.builder.el.operator; -import cn.hutool.core.collection.ListUtil; -import com.ql.util.express.exception.QLException; import com.yomahub.liteflow.builder.el.operator.base.BaseOperator; import com.yomahub.liteflow.builder.el.operator.base.OperatorHelper; -import com.yomahub.liteflow.enums.NodeTypeEnum; import com.yomahub.liteflow.flow.element.Executable; -import com.yomahub.liteflow.flow.element.Node; import com.yomahub.liteflow.flow.element.condition.LoopCondition; /** @@ -26,8 +22,8 @@ public class BreakOperator extends BaseOperator { LoopCondition condition = OperatorHelper.convert(objects[0], LoopCondition.class, errorMsg); // 获得需要执行的可执行表达式 + OperatorHelper.checkObjMustBeBooleanTypeItem(objects[1]); Executable breakItem = OperatorHelper.convert(objects[1], Executable.class); - OperatorHelper.checkObjectMustBeBooleanItem(breakItem); condition.setBreakItem(breakItem); return condition; } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/CatchOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/CatchOperator.java index 362b484d7..4c19f3809 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/CatchOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/CatchOperator.java @@ -19,6 +19,8 @@ public class CatchOperator extends BaseOperator { public CatchCondition build(Object[] objects) throws Exception { OperatorHelper.checkObjectSizeEq(objects, 1); + OperatorHelper.checkObjMustBeCommonTypeItem(objects[0]); + Executable catchItem = OperatorHelper.convert(objects[0], Executable.class); CatchCondition catchCondition = new CatchCondition(); diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/DefaultOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/DefaultOperator.java index 876475c21..d3ef55c4b 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/DefaultOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/DefaultOperator.java @@ -17,9 +17,13 @@ public class DefaultOperator extends BaseOperator { public SwitchCondition build(Object[] objects) throws Exception { OperatorHelper.checkObjectSizeEqTwo(objects); - SwitchCondition switchCondition = OperatorHelper.convert(objects[0], SwitchCondition.class); + String errorMsg = "The caller must be SwitchCondition item"; + SwitchCondition switchCondition = OperatorHelper.convert(objects[0], SwitchCondition.class, errorMsg); + + OperatorHelper.checkObjMustBeCommonTypeItem(objects[1]); Executable target = OperatorHelper.convert(objects[1], Executable.class); + switchCondition.setDefaultExecutor(target); return switchCondition; diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/DoOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/DoOperator.java index edc4c2380..c6b3a5f4a 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/DoOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/DoOperator.java @@ -24,6 +24,7 @@ public class DoOperator extends BaseOperator { String errorMsg = "The caller must be CatchCondition item"; CatchCondition condition = OperatorHelper.convert(objects[0], CatchCondition.class, errorMsg); // 获得需要执行的可执行表达式 + OperatorHelper.checkObjMustBeCommonTypeItem(objects[1]); Executable doExecutableItem = OperatorHelper.convert(objects[1], Executable.class); condition.setDoItem(doExecutableItem); return condition; @@ -33,6 +34,7 @@ public class DoOperator extends BaseOperator { // DO关键字有可能用在FOR后面，也有可能用于WHILE后面，所以这里要进行判断是不是这两种类型的超类LoopCondition LoopCondition condition = OperatorHelper.convert(objects[0], LoopCondition.class, errorMsg); // 获得需要执行的可执行表达式 + OperatorHelper.checkObjMustBeCommonTypeItem(objects[1]); Executable doExecutableItem = OperatorHelper.convert(objects[1], Executable.class); condition.setDoExecutor(doExecutableItem); return condition; diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ElifOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ElifOperator.java index 06ba9ea6d..e29e9f4d4 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ElifOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ElifOperator.java @@ -1,12 +1,8 @@ package com.yomahub.liteflow.builder.el.operator; -import cn.hutool.core.collection.ListUtil; -import com.ql.util.express.exception.QLException; import com.yomahub.liteflow.builder.el.operator.base.BaseOperator; import com.yomahub.liteflow.builder.el.operator.base.OperatorHelper; -import com.yomahub.liteflow.enums.NodeTypeEnum; import com.yomahub.liteflow.flow.element.Executable; -import com.yomahub.liteflow.flow.element.Node; import com.yomahub.liteflow.flow.element.condition.IfCondition; /** @@ -22,13 +18,15 @@ public class ElifOperator extends BaseOperator { OperatorHelper.checkObjectSizeEqThree(objects); // 解析caller - IfCondition ifCondition = OperatorHelper.convert(objects[0], IfCondition.class); + String errorMsg = "The caller must be IfCondition item"; + IfCondition ifCondition = OperatorHelper.convert(objects[0], IfCondition.class, errorMsg); // 解析第一个参数 + OperatorHelper.checkObjMustBeBooleanTypeItem(objects[1]); Executable ifItem = OperatorHelper.convert(objects[1], Executable.class); - OperatorHelper.checkObjectMustBeBooleanItem(ifItem); // 解析第二个参数 + OperatorHelper.checkObjMustBeCommonTypeItem(objects[2]); Executable trueCaseExecutableItem = OperatorHelper.convert(objects[2], Executable.class); // 构建一个内部的IfCondition diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ElseOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ElseOperator.java index 8c6b37e01..028788014 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ElseOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ElseOperator.java @@ -18,8 +18,10 @@ public class ElseOperator extends BaseOperator { // 参数只能是1个，但这里为什么是2个呢？第一个是caller，第二个才是参数 OperatorHelper.checkObjectSizeEqTwo(objects); - IfCondition ifCondition = OperatorHelper.convert(objects[0], IfCondition.class); + String errorMsg = "The caller must be IfCondition item"; + IfCondition ifCondition = OperatorHelper.convert(objects[0], IfCondition.class, errorMsg); + OperatorHelper.checkObjMustBeCommonTypeItem(objects[1]); Executable elseExecutableItem = OperatorHelper.convert(objects[1], Executable.class); // 因为当中可能会有多个ELIF，所以并不知道这个ELSE前面有没有ELIF， diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/FinallyOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/FinallyOperator.java index d374b0a89..b759b6cac 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/FinallyOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/FinallyOperator.java @@ -20,7 +20,9 @@ public class FinallyOperator extends BaseOperator { FinallyCondition finallyCondition = new FinallyCondition(); for (Object obj : objects) { - finallyCondition.addExecutable(OperatorHelper.convert(obj, Executable.class)); + OperatorHelper.checkObjMustBeCommonTypeItem(obj); + Executable item = OperatorHelper.convert(obj, Executable.class); + finallyCondition.addExecutable(item); } return finallyCondition; } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ForOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ForOperator.java index e87f9c279..039374a70 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ForOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ForOperator.java @@ -26,10 +26,8 @@ public class ForOperator extends BaseOperator { Node node; if (objects[0] instanceof Node) { + OperatorHelper.checkObjMustBeForTypeItem(objects[0]); node = OperatorHelper.convert(objects[0], Node.class); - if (!ListUtil.toList(NodeTypeEnum.FOR, NodeTypeEnum.FOR_SCRIPT, NodeTypeEnum.FALLBACK).contains(node.getType())) { - throw new QLException("The parameter must be for-node item"); - } } else if (objects[0] instanceof Integer) { Integer forCount = OperatorHelper.convert(objects[0], Integer.class); diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/IdOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/IdOperator.java index 3420f10f6..d70b9c8d3 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/IdOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/IdOperator.java @@ -16,7 +16,8 @@ public class IdOperator extends BaseOperator { public Condition build(Object[] objects) throws Exception { OperatorHelper.checkObjectSizeEqTwo(objects); - Condition condition = OperatorHelper.convert(objects[0], Condition.class); + String errorMsg = "The caller must be Condition item"; + Condition condition = OperatorHelper.convert(objects[0], Condition.class, errorMsg); String id = OperatorHelper.convert(objects[1], String.class); diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/IfOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/IfOperator.java index ddf6d4b9b..4589829ef 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/IfOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/IfOperator.java @@ -1,15 +1,9 @@ package com.yomahub.liteflow.builder.el.operator; -import cn.hutool.core.collection.ListUtil; -import com.ql.util.express.exception.QLException; import com.yomahub.liteflow.builder.el.operator.base.BaseOperator; import com.yomahub.liteflow.builder.el.operator.base.OperatorHelper; -import com.yomahub.liteflow.enums.NodeTypeEnum; import com.yomahub.liteflow.flow.element.Executable; -import com.yomahub.liteflow.flow.element.Node; -import com.yomahub.liteflow.flow.element.condition.AndOrCondition; import com.yomahub.liteflow.flow.element.condition.IfCondition; -import com.yomahub.liteflow.flow.element.condition.NotCondition; /** * EL规则中的IF的操作符 @@ -24,15 +18,18 @@ public class IfOperator extends BaseOperator { OperatorHelper.checkObjectSizeEq(objects, 2, 3); // 解析第一个参数 + OperatorHelper.checkObjMustBeBooleanTypeItem(objects[0]); Executable ifItem = OperatorHelper.convert(objects[0], Executable.class); - OperatorHelper.checkObjectMustBeBooleanItem(ifItem); + // 解析第二个参数 + OperatorHelper.checkObjMustBeCommonTypeItem(objects[1]); Executable trueCaseExecutableItem = OperatorHelper.convert(objects[1], Executable.class); // 解析第三个参数，如果有的话 Executable falseCaseExecutableItem = null; if (objects.length == 3) { + OperatorHelper.checkObjMustBeCommonTypeItem(objects[2]); falseCaseExecutableItem = OperatorHelper.convert(objects[2], Executable.class); } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/IgnoreErrorOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/IgnoreErrorOperator.java index 8ce63b2d7..b140dce46 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/IgnoreErrorOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/IgnoreErrorOperator.java @@ -17,7 +17,8 @@ public class IgnoreErrorOperator extends BaseOperator { public WhenCondition build(Object[] objects) throws Exception { OperatorHelper.checkObjectSizeEqTwo(objects); - WhenCondition condition = OperatorHelper.convert(objects[0], WhenCondition.class); + String errorMsg = "The caller must be WhenCondition item"; + WhenCondition condition = OperatorHelper.convert(objects[0], WhenCondition.class, errorMsg); Boolean ignoreError = OperatorHelper.convert(objects[1], Boolean.class); condition.setIgnoreError(ignoreError); diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/IteratorOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/IteratorOperator.java index 696fdc1e6..0d29a7f07 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/IteratorOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/IteratorOperator.java @@ -14,10 +14,9 @@ public class IteratorOperator extends BaseOperator { public IteratorCondition build(Object[] objects) throws Exception { OperatorHelper.checkObjectSizeEq(objects, 1); + OperatorHelper.checkObjMustBeIteratorTypeItem(objects[0]); + Node node = OperatorHelper.convert(objects[0], Node.class); - if (!ListUtil.toList(NodeTypeEnum.ITERATOR, NodeTypeEnum.FALLBACK).contains(node.getType())) { - throw new QLException("The parameter must be iterator-node item"); - } IteratorCondition iteratorCondition = new IteratorCondition(); iteratorCondition.setIteratorNode(node); diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/MustOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/MustOperator.java index 9c819d3be..b3e3f0c28 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/MustOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/MustOperator.java @@ -21,7 +21,8 @@ public class MustOperator extends BaseOperator { public WhenCondition build(Object[] objects) throws Exception { OperatorHelper.checkObjectSizeGtTwo(objects); - WhenCondition whenCondition = OperatorHelper.convert(objects[0], WhenCondition.class); + String errorMsg = "The caller must be WhenCondition item"; + WhenCondition whenCondition = OperatorHelper.convert(objects[0], WhenCondition.class, errorMsg); // 解析指定完成的任务 ID 集合 Set specifyIdSet = new HashSet<>(); diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/NodeOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/NodeOperator.java index 5735dcd87..9a9d3b919 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/NodeOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/NodeOperator.java @@ -3,7 +3,7 @@ package com.yomahub.liteflow.builder.el.operator; import com.yomahub.liteflow.builder.el.operator.base.BaseOperator; import com.yomahub.liteflow.builder.el.operator.base.OperatorHelper; import com.yomahub.liteflow.flow.FlowBus; -import com.yomahub.liteflow.flow.element.FallbackNodeProxy; +import com.yomahub.liteflow.flow.element.FallbackNode; import com.yomahub.liteflow.flow.element.Node; /** @@ -25,7 +25,7 @@ public class NodeOperator extends BaseOperator { return FlowBus.getNode(nodeId); } else { // 生成代理节点 - return new FallbackNodeProxy(nodeId); + return new FallbackNode(nodeId); } } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/NotOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/NotOperator.java index cbe58ab85..a2c147dbd 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/NotOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/NotOperator.java @@ -3,8 +3,6 @@ package com.yomahub.liteflow.builder.el.operator; import com.yomahub.liteflow.builder.el.operator.base.BaseOperator; import com.yomahub.liteflow.builder.el.operator.base.OperatorHelper; import com.yomahub.liteflow.flow.element.Executable; -import com.yomahub.liteflow.flow.element.condition.AndOrCondition; -import com.yomahub.liteflow.flow.element.condition.BooleanConditionTypeEnum; import com.yomahub.liteflow.flow.element.condition.NotCondition; /** @@ -20,7 +18,7 @@ public class NotOperator extends BaseOperator { OperatorHelper.checkObjectSizeEqOne(objects); Object object = objects[0]; - OperatorHelper.checkObjectMustBeBooleanItem(object); + OperatorHelper.checkObjMustBeBooleanTypeItem(object); Executable item = OperatorHelper.convert(object, Executable.class); NotCondition notCondition = new NotCondition(); diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/OrOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/OrOperator.java index ffe0a91ae..d084a7536 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/OrOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/OrOperator.java @@ -22,7 +22,7 @@ public class OrOperator extends BaseOperator { andOrCondition.setBooleanConditionType(BooleanConditionTypeEnum.OR); for (Object object : objects){ - OperatorHelper.checkObjectMustBeBooleanItem(object); + OperatorHelper.checkObjMustBeBooleanTypeItem(object); Executable item = OperatorHelper.convert(object, Executable.class); andOrCondition.addItem(item); diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ParallelOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ParallelOperator.java index 44232b353..77627a74f 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ParallelOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ParallelOperator.java @@ -16,7 +16,8 @@ public class ParallelOperator extends BaseOperator { public LoopCondition build(Object[] objects) throws Exception { OperatorHelper.checkObjectSizeEqTwo(objects); - LoopCondition loopCondition = OperatorHelper.convert(objects[0], LoopCondition.class); + String errorMsg = "The caller must be LoopCondition item"; + LoopCondition loopCondition = OperatorHelper.convert(objects[0], LoopCondition.class, errorMsg); Boolean parallel = OperatorHelper.convert(objects[1], Boolean.class); loopCondition.setParallel(parallel); diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/PreOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/PreOperator.java index 27c65ad06..affcfc090 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/PreOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/PreOperator.java @@ -19,6 +19,7 @@ public class PreOperator extends BaseOperator { PreCondition preCondition = new PreCondition(); for (Object obj : objects) { + OperatorHelper.checkObjMustBeCommonTypeItem(obj); preCondition.addExecutable(OperatorHelper.convert(obj, Executable.class)); } return preCondition; diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/SwitchOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/SwitchOperator.java index 041628ee3..c1d0ad3d9 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/SwitchOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/SwitchOperator.java @@ -20,10 +20,8 @@ public class SwitchOperator extends BaseOperator { public SwitchCondition build(Object[] objects) throws Exception { OperatorHelper.checkObjectSizeEqOne(objects); + OperatorHelper.checkObjMustBeSwitchTypeItem(objects[0]); Node switchNode = OperatorHelper.convert(objects[0], Node.class); - if (!ListUtil.toList(NodeTypeEnum.SWITCH, NodeTypeEnum.SWITCH_SCRIPT, NodeTypeEnum.FALLBACK).contains(switchNode.getType())) { - throw new QLException("The caller must be Switch item"); - } SwitchCondition switchCondition = new SwitchCondition(); switchCondition.setSwitchNode(switchNode); diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ThenOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ThenOperator.java index 619e69c7a..7d944a5b5 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ThenOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ThenOperator.java @@ -19,6 +19,7 @@ public class ThenOperator extends BaseOperator { ThenCondition thenCondition = new ThenCondition(); for (Object obj : objects) { + OperatorHelper.checkObjMustBeCommonTypeItem(obj); thenCondition.addExecutable(OperatorHelper.convert(obj, Executable.class)); } return thenCondition; diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ThreadPoolOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ThreadPoolOperator.java index a5b0791c8..d6ad98b2f 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ThreadPoolOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ThreadPoolOperator.java @@ -16,7 +16,8 @@ public class ThreadPoolOperator extends BaseOperator { public WhenCondition build(Object[] objects) throws Exception { OperatorHelper.checkObjectSizeEqTwo(objects); - WhenCondition whenCondition = OperatorHelper.convert(objects[0], WhenCondition.class); + String errorMsg = "The caller must be WhenCondition item"; + WhenCondition whenCondition = OperatorHelper.convert(objects[0], WhenCondition.class, errorMsg); whenCondition.setThreadExecutorClass(OperatorHelper.convert(objects[1], String.class)); diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ToOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ToOperator.java index 806e559a2..d38722a03 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ToOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ToOperator.java @@ -17,9 +17,11 @@ public class ToOperator extends BaseOperator { public SwitchCondition build(Object[] objects) throws Exception { OperatorHelper.checkObjectSizeGtTwo(objects); - SwitchCondition switchCondition = OperatorHelper.convert(objects[0], SwitchCondition.class); + String errorMsg = "The caller must be SwitchCondition item"; + SwitchCondition switchCondition = OperatorHelper.convert(objects[0], SwitchCondition.class, errorMsg); for (int i = 1; i < objects.length; i++) { + OperatorHelper.checkObjMustBeCommonTypeItem(objects[i]); Executable target = OperatorHelper.convert(objects[i], Executable.class); switchCondition.addTargetItem(target); } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/WhenOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/WhenOperator.java index 011c47275..00cfa58e0 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/WhenOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/WhenOperator.java @@ -4,6 +4,8 @@ import com.yomahub.liteflow.builder.el.operator.base.BaseOperator; import com.yomahub.liteflow.builder.el.operator.base.OperatorHelper; import com.yomahub.liteflow.flow.element.Executable; import com.yomahub.liteflow.flow.element.condition.WhenCondition; +import com.yomahub.liteflow.property.LiteflowConfig; +import com.yomahub.liteflow.property.LiteflowConfigGetter; /** * EL规则中的WHEN的操作符 @@ -18,8 +20,12 @@ public class WhenOperator extends BaseOperator { OperatorHelper.checkObjectSizeGtZero(objects); WhenCondition whenCondition = new WhenCondition(); + + LiteflowConfig liteflowConfig = LiteflowConfigGetter.get(); for (Object obj : objects) { + OperatorHelper.checkObjMustBeCommonTypeItem(obj); whenCondition.addExecutable(OperatorHelper.convert(obj, Executable.class)); + whenCondition.setThreadExecutorClass(liteflowConfig.getThreadExecutorClass()); } return whenCondition; } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/WhileOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/WhileOperator.java index a2b5c26c6..19425064c 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/WhileOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/WhileOperator.java @@ -1,12 +1,8 @@ package com.yomahub.liteflow.builder.el.operator; -import cn.hutool.core.collection.ListUtil; -import com.ql.util.express.exception.QLException; import com.yomahub.liteflow.builder.el.operator.base.BaseOperator; import com.yomahub.liteflow.builder.el.operator.base.OperatorHelper; -import com.yomahub.liteflow.enums.NodeTypeEnum; import com.yomahub.liteflow.flow.element.Executable; -import com.yomahub.liteflow.flow.element.Node; import com.yomahub.liteflow.flow.element.condition.WhileCondition; /** @@ -21,8 +17,8 @@ public class WhileOperator extends BaseOperator { public WhileCondition build(Object[] objects) throws Exception { OperatorHelper.checkObjectSizeEqOne(objects); + OperatorHelper.checkObjMustBeBooleanTypeItem(objects[0]); Executable whileItem = OperatorHelper.convert(objects[0], Executable.class); - OperatorHelper.checkObjectMustBeBooleanItem(whileItem); WhileCondition whileCondition = new WhileCondition(); whileCondition.setWhileItem(whileItem); diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/base/OperatorHelper.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/base/OperatorHelper.java index 298cdc254..c54681a63 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/base/OperatorHelper.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/base/OperatorHelper.java @@ -3,8 +3,12 @@ package com.yomahub.liteflow.builder.el.operator.base; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.StrUtil; import com.ql.util.express.exception.QLException; +import com.yomahub.liteflow.enums.ConditionTypeEnum; +import com.yomahub.liteflow.enums.ExecuteTypeEnum; import com.yomahub.liteflow.enums.NodeTypeEnum; import com.yomahub.liteflow.exception.DataNotFoundException; +import com.yomahub.liteflow.flow.element.Condition; +import com.yomahub.liteflow.flow.element.Executable; import com.yomahub.liteflow.flow.element.Node; import com.yomahub.liteflow.flow.element.condition.AndOrCondition; import com.yomahub.liteflow.flow.element.condition.NotCondition; @@ -137,18 +141,100 @@ public class OperatorHelper { } } + /** + * 检查对象是否为一个正常可执行的对象。 + * 大部分的Node,Condition,Chain都是正常可执行的对象，这个检查是为了避免THEN(sw,if)类的情况(sw是选择组件，if是条件组件)，这种就不能放在THEN里 + */ + public static void checkObjMustBeCommonTypeItem(Object object) throws Exception{ + if (!(object instanceof Executable)){ + throw new QLException("The parameter must be Executable item."); + } + Executable item = (Executable) object; + if (item.getExecuteType().equals(ExecuteTypeEnum.NODE)){ + Node node = (Node) item; + if (!ListUtil.toList(NodeTypeEnum.COMMON, NodeTypeEnum.SCRIPT, NodeTypeEnum.FALLBACK).contains(node.getType())){ + throw new QLException(StrUtil.format("The node[{}] must be a common type component", node.getId())); + } + } + } + /** * 所谓Boolean item，指的是那些最终的结果值为布尔类型的Item * 布尔类型的items有，if，while，break类型的Node，以及AndOrCondition以及NotCondition */ - public static void checkObjectMustBeBooleanItem(Object object) throws Exception{ - if (!(object instanceof Node && ListUtil.toList( - NodeTypeEnum.IF, NodeTypeEnum.IF_SCRIPT, - NodeTypeEnum.WHILE, NodeTypeEnum.WHILE_SCRIPT, - NodeTypeEnum.BREAK, NodeTypeEnum.BREAK_SCRIPT, NodeTypeEnum.FALLBACK) - .contains(((Node) object).getType()) - || object instanceof AndOrCondition || object instanceof NotCondition)) { - throw new QLException("The first parameter must be boolean type Node or boolean type condition"); + public static void checkObjMustBeBooleanTypeItem(Object object) throws Exception{ + if (!(object instanceof Executable)){ + throw new QLException("The parameter must be Executable item."); + } + Executable item = (Executable) object; + if (item.getExecuteType().equals(ExecuteTypeEnum.NODE)){ + Node node = (Node) item; + if (!ListUtil.toList(NodeTypeEnum.IF, + NodeTypeEnum.IF_SCRIPT, + NodeTypeEnum.WHILE, + NodeTypeEnum.WHILE_SCRIPT, + NodeTypeEnum.BREAK, + NodeTypeEnum.BREAK_SCRIPT, + NodeTypeEnum.FALLBACK).contains(node.getType())){ + throw new QLException(StrUtil.format("The node[{}] must be boolean type Node.", node.getId())); + } + }else if(item.getExecuteType().equals(ExecuteTypeEnum.CONDITION)){ + Condition condition = (Condition) item; + if (!ListUtil.toList(ConditionTypeEnum.TYPE_AND_OR_OPT, ConditionTypeEnum.TYPE_NOT_OPT).contains(condition.getConditionType())){ + throw new QLException(StrUtil.format("The condition[{}] must be boolean type Condition.", condition.getId())); + } + }else{ + throw new QLException("The parameter error."); + } + } + + public static void checkObjMustBeForTypeItem(Object object) throws Exception{ + if (!(object instanceof Executable)){ + throw new QLException("The parameter must be Executable item."); + } + Executable item = (Executable) object; + if (item.getExecuteType().equals(ExecuteTypeEnum.NODE)){ + Node node = (Node) item; + if (!ListUtil.toList(NodeTypeEnum.FOR, + NodeTypeEnum.FOR_SCRIPT, + NodeTypeEnum.FALLBACK).contains(node.getType())){ + throw new QLException(StrUtil.format("The node[{}] must be For type Node.", node.getId())); + } + }else{ + throw new QLException("The parameter error."); + } + } + + public static void checkObjMustBeIteratorTypeItem(Object object) throws Exception{ + if (!(object instanceof Executable)){ + throw new QLException("The parameter must be Executable item."); + } + Executable item = (Executable) object; + if (item.getExecuteType().equals(ExecuteTypeEnum.NODE)){ + Node node = (Node) item; + if (!ListUtil.toList(NodeTypeEnum.ITERATOR, + NodeTypeEnum.FALLBACK).contains(node.getType())){ + throw new QLException(StrUtil.format("The node[{}] must be Iterator type Node.", node.getId())); + } + }else{ + throw new QLException("The parameter error."); + } + } + + public static void checkObjMustBeSwitchTypeItem(Object object) throws Exception{ + if (!(object instanceof Executable)){ + throw new QLException("The parameter must be Executable item."); + } + Executable item = (Executable) object; + if (item.getExecuteType().equals(ExecuteTypeEnum.NODE)){ + Node node = (Node) item; + if (!ListUtil.toList(NodeTypeEnum.SWITCH, + NodeTypeEnum.SWITCH_SCRIPT, + NodeTypeEnum.FALLBACK).contains(node.getType())){ + throw new QLException(StrUtil.format("The node[{}] must be Switch type Node.", node.getId())); + } + }else{ + throw new QLException("The parameter error."); } } } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/enums/NodeTypeEnum.java b/liteflow-core/src/main/java/com/yomahub/liteflow/enums/NodeTypeEnum.java index d86a63e45..7ca1efff7 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/enums/NodeTypeEnum.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/enums/NodeTypeEnum.java @@ -34,8 +34,6 @@ public enum NodeTypeEnum { BREAK("break", "循环跳出", false, NodeBreakComponent.class), ITERATOR("iterator", "循环迭代", false, NodeIteratorComponent.class), - - FALLBACK("fallback", "降级", false, null), SCRIPT("script", "脚本", true, ScriptCommonComponent.class), @@ -47,7 +45,9 @@ public enum NodeTypeEnum { WHILE_SCRIPT("while_script", "循环条件脚本", true, ScriptWhileComponent.class), - BREAK_SCRIPT("break_script", "循环跳出脚本", true, ScriptBreakComponent.class); + BREAK_SCRIPT("break_script", "循环跳出脚本", true, ScriptBreakComponent.class), + + FALLBACK("fallback", "降级", false, null); private static final LFLog LOG = LFLoggerManager.getLogger(NodeTypeEnum.class); @@ -120,7 +120,7 @@ public enum NodeTypeEnum { } for (NodeTypeEnum e : NodeTypeEnum.values()) { - if (e.getMappingClazz().equals(superClazz)) { + if (e.getMappingClazz() != null && e.getMappingClazz().equals(superClazz)) { return e; } } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/FallbackNodeProxy.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/FallbackNode.java similarity index 97% rename from liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/FallbackNodeProxy.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/FallbackNode.java index e19119c93..966f37a61 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/FallbackNodeProxy.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/FallbackNode.java @@ -23,7 +23,7 @@ import com.yomahub.liteflow.slot.Slot; * @author DaleLee * @since 2.11.1 */ -public class FallbackNodeProxy extends Node { +public class FallbackNode extends Node { // 原节点 id private String expectedNodeId; @@ -31,11 +31,11 @@ public class FallbackNodeProxy extends Node { // 降级节点 private Node fallbackNode; - public FallbackNodeProxy() { + public FallbackNode() { this.setType(NodeTypeEnum.FALLBACK); } - public FallbackNodeProxy(String expectedNodeId) { + public FallbackNode(String expectedNodeId) { this(); this.expectedNodeId = expectedNodeId; } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/WhileCondition.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/WhileCondition.java index e616db763..df85bfe86 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/WhileCondition.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/WhileCondition.java @@ -39,7 +39,7 @@ public class WhileCondition extends LoopCondition { int index = 0; if(!this.isParallel()){ //串行循环 - while (getWhileResult(slotIndex)) { + while (getWhileResult(slotIndex, index)) { executableItem.setCurrChainId(this.getCurrChainId()); setLoopIndex(executableItem, index); executableItem.execute(slotIndex); @@ -60,7 +60,7 @@ public class WhileCondition extends LoopCondition { List> futureList = new ArrayList<>(); //获取并行循环的线程池 ExecutorService parallelExecutor = ExecutorHelper.loadInstance().buildLoopParallelExecutor(); - while (getWhileResult(slotIndex)){ + while (getWhileResult(slotIndex, index)){ CompletableFuture future = CompletableFuture.supplyAsync(new LoopParallelSupplier(executableItem, this.getCurrChainId(), slotIndex, index), parallelExecutor); futureList.add(future); @@ -81,10 +81,11 @@ public class WhileCondition extends LoopCondition { } } - private boolean getWhileResult(Integer slotIndex) throws Exception { + private boolean getWhileResult(Integer slotIndex, int loopIndex) throws Exception { Executable whileItem = this.getWhileItem(); // 执行while组件 whileItem.setCurrChainId(this.getCurrChainId()); + setLoopIndex(whileItem, loopIndex); whileItem.execute(slotIndex); return whileItem.getItemResultMetaValue(slotIndex); diff --git a/liteflow-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/liteflow-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 92197d877..f5eb0bec5 100644 --- a/liteflow-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/liteflow-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -214,13 +214,6 @@ "description": "Custom thread pool implement for parallel-loop executor.", "sourceType": "com.yomahub.liteflow.springboot.LiteflowProperty", "defaultValue": "com.yomahub.liteflow.thread.LiteFlowDefaultParallelLoopExecutorBuilder" - }, - { - "name": "liteflow.fallback-cmp-enable", - "type": "java.lang.Boolean", - "description": "Enable fallback component.", - "sourceType": "com.yomahub.liteflow.springboot.LiteflowProperty", - "defaultValue": false } ] } \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-python-springboot/src/test/java/com/yomahub/liteflow/test/script/python/common/ScriptPythonCommonELTest.java b/liteflow-testcase-el/liteflow-testcase-el-script-python-springboot/src/test/java/com/yomahub/liteflow/test/script/python/common/ScriptPythonCommonELTest.java index 7deeb878f..36f360b5b 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-script-python-springboot/src/test/java/com/yomahub/liteflow/test/script/python/common/ScriptPythonCommonELTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-script-python-springboot/src/test/java/com/yomahub/liteflow/test/script/python/common/ScriptPythonCommonELTest.java @@ -26,7 +26,7 @@ import javax.annotation.Resource; @TestPropertySource(value = "classpath:/common/application.properties") @SpringBootTest(classes = ScriptPythonCommonELTest.class) @EnableAutoConfiguration -@ComponentScan({ "com.yomahub.liteflow.test.script.python.common.cmp" }) +@ComponentScan({ "com.yomahub.liteflow.test.script.python.common.cmp","com.yomahub.liteflow.test.script.python.common.domain" }) public class ScriptPythonCommonELTest extends BaseTest { @Resource @@ -40,6 +40,7 @@ public class ScriptPythonCommonELTest extends BaseTest { Assertions.assertTrue(response.isSuccess()); Assertions.assertEquals(Integer.valueOf(30), context.getData("s1")); Assertions.assertEquals("杰克", context.getData("name")); + Assertions.assertEquals("hi,jack", context.getData("td")); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-python-springboot/src/test/java/com/yomahub/liteflow/test/script/python/common/domain/TestDomain.java b/liteflow-testcase-el/liteflow-testcase-el-script-python-springboot/src/test/java/com/yomahub/liteflow/test/script/python/common/domain/TestDomain.java new file mode 100644 index 000000000..9ab0f929a --- /dev/null +++ b/liteflow-testcase-el/liteflow-testcase-el-script-python-springboot/src/test/java/com/yomahub/liteflow/test/script/python/common/domain/TestDomain.java @@ -0,0 +1,13 @@ +package com.yomahub.liteflow.test.script.python.common.domain; + +import com.yomahub.liteflow.script.annotation.ScriptBean; +import org.springframework.stereotype.Component; + +@Component +@ScriptBean("td") +public class TestDomain { + + public String sayHi(String name){ + return "hi," + name; + } +} diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-python-springboot/src/test/resources/common/flow.xml b/liteflow-testcase-el/liteflow-testcase-el-script-python-springboot/src/test/resources/common/flow.xml index 43e774df2..b43fdc9ba 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-script-python-springboot/src/test/resources/common/flow.xml +++ b/liteflow-testcase-el/liteflow-testcase-el-script-python-springboot/src/test/resources/common/flow.xml @@ -16,10 +16,11 @@ b=10 if a>5: b=5 - print 'hello' + print '你好'.decode('UTF-8') else: print 'hi' defaultContext.setData("s1",a*b) + defaultContext.setData("td", td.sayHi("jack")) ]]> diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/pom.xml b/liteflow-testcase-el/liteflow-testcase-el-springboot/pom.xml index 5a7a63a07..2d0f915a0 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/pom.xml +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/pom.xml @@ -19,6 +19,12 @@ ${revision} + + com.yomahub + liteflow-el-builder + ${revision} + + org.springframework.boot spring-boot-starter-test diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/fallback/FallbackELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/fallback/FallbackELSpringbootTest.java index dfa7f1ab1..e0485ab0b 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/fallback/FallbackELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/fallback/FallbackELSpringbootTest.java @@ -1,5 +1,8 @@ package com.yomahub.liteflow.test.fallback; +import com.yomahub.liteflow.builder.el.ELBus; +import com.yomahub.liteflow.builder.el.ELWrapper; +import com.yomahub.liteflow.builder.el.LiteFlowChainELBuilder; import com.yomahub.liteflow.core.FlowExecutor; import com.yomahub.liteflow.flow.LiteflowResponse; import com.yomahub.liteflow.test.BaseTest; @@ -222,4 +225,13 @@ public class FallbackELSpringbootTest extends BaseTest { String stepStr2 = response2.getExecuteStepStrWithoutTime(); Assertions.assertTrue("c==>ifn2".equals(stepStr2) || "ifn2==>c".equals(stepStr2)); } + + @Test + public void testWithElBuild(){ + ELWrapper el = ELBus.then("a", "b", "az"); + LiteFlowChainELBuilder.createChain().setChainId("elBuilder").setEL(el.toEL()).build(); + LiteflowResponse response = flowExecutor.execute2Resp("elBuilder"); + Assertions.assertTrue(response.isSuccess()); + Assertions.assertEquals("a==>b==>c", response.getExecuteStepStrWithoutTime()); + } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/CCmp.java index eb8bc9d64..9de22280d 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/CCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/CCmp.java @@ -15,7 +15,6 @@ public class CCmp extends NodeComponent { @Override public void process() { - System.out.println(this.getLoopIndex()); System.out.println("CCmp executed!"); } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/DCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/DCmp.java index de42f8651..21602bea3 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/DCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/DCmp.java @@ -16,15 +16,7 @@ public class DCmp extends NodeComponent { @Override public void process() { - DefaultContext context = this.getFirstContextBean(); - String key = "test"; - if (context.hasData(key)) { - int count = context.getData(key); - context.setData(key, ++count); - } - else { - context.setData(key, 1); - } + System.out.println("DCmp executed!"); } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/YCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/YCmp.java index c4bb114c9..b70b16114 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/YCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/YCmp.java @@ -10,9 +10,7 @@ public class YCmp extends NodeBreakComponent { @Override public boolean processBreak() throws Exception { - DefaultContext context = this.getFirstContextBean(); - int count = context.getData("test"); - return count > 3; + return this.getLoopIndex() > 2; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/ZCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/ZCmp.java index c7bb40e7c..1d464cae7 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/ZCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/ZCmp.java @@ -10,15 +10,7 @@ public class ZCmp extends NodeWhileComponent { @Override public boolean processWhile() throws Exception { - DefaultContext context = this.getFirstContextBean(); - String key = "test"; - if (context.hasData(key)) { - int count = context.getData("test"); - return count < 5; - } - else { - return true; - } + return this.getLoopIndex()<5; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-dynamic/src/test/java/com/yomahub/liteflow/test/sql/SQLWithXmlELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-dynamic/src/test/java/com/yomahub/liteflow/test/sql/SQLWithXmlELSpringbootTest.java index d694f7bf8..5282642e5 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-dynamic/src/test/java/com/yomahub/liteflow/test/sql/SQLWithXmlELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-dynamic/src/test/java/com/yomahub/liteflow/test/sql/SQLWithXmlELSpringbootTest.java @@ -1,8 +1,13 @@ package com.yomahub.liteflow.test.sql; +import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; +import com.baomidou.dynamic.datasource.ds.ItemDataSource; import com.yomahub.liteflow.core.FlowExecutor; import com.yomahub.liteflow.flow.LiteflowResponse; import com.yomahub.liteflow.test.BaseTest; +import com.zaxxer.hikari.HikariDataSource; +import com.zaxxer.hikari.HikariPoolMXBean; +import com.zaxxer.hikari.pool.HikariPool; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -13,6 +18,11 @@ import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringExtension; import javax.annotation.Resource; +import javax.sql.DataSource; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.TimeUnit; /** * @author tangkc @@ -27,6 +37,7 @@ public class SQLWithXmlELSpringbootTest extends BaseTest { @Resource private FlowExecutor flowExecutor; + @Test public void testSQLWithXml() { LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); diff --git a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-dynamic/src/test/resources/application-dynamic-data-source-xml.properties b/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-dynamic/src/test/resources/application-dynamic-data-source-xml.properties index 8645c0b2e..283b01e89 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-dynamic/src/test/resources/application-dynamic-data-source-xml.properties +++ b/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-dynamic/src/test/resources/application-dynamic-data-source-xml.properties @@ -4,6 +4,9 @@ liteflow.rule-source-ext-data={\ "chainApplicationNameField":"application_name",\ "chainNameField":"chain_name",\ "elDataField":"EL_DATA",\ + "pollingEnabled": true,\ + "pollingIntervalSeconds": 10,\ + "pollingStartSeconds": 5,\ "scriptTableName":"script_node_table",\ "scriptApplicationNameField":"application_name",\ "scriptIdField":"script_node_id",\ @@ -21,11 +24,15 @@ spring.datasource.dynamic.datasource.h2-first.username=root1 spring.datasource.dynamic.datasource.h2-first.password=123456 spring.datasource.dynamic.datasource.h2-first.init.schema=classpath:/sql/schema.sql spring.datasource.dynamic.datasource.h2-first.init.data=classpath:/sql/data.sql +spring.datasource.dynamic.datasource.h2-first.hikari.min-idle=1 +spring.datasource.dynamic.datasource.h2-first.hikari.max-pool-size=5 spring.datasource.dynamic.datasource.h2-second.url=jdbc:h2:mem:test_db2 spring.datasource.dynamic.datasource.h2-second.username=root2 spring.datasource.dynamic.datasource.h2-second.password=123456 spring.datasource.dynamic.datasource.h2-second.init.schema=classpath:/sql/second/schema.sql spring.datasource.dynamic.datasource.h2-second.init.data=classpath:/sql/second/data.sql +spring.datasource.dynamic.datasource.h2-second.hikari.min-idle=1 +spring.datasource.dynamic.datasource.h2-second.hikari.max-pool-size=5 diff --git a/pom.xml b/pom.xml index 771a686dc..789f9544e 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ - 2.11.4-BETA3 + 2.11.4 UTF-8 UTF-8 8