diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/annotation/FallbackCmp.java b/liteflow-core/src/main/java/com/yomahub/liteflow/annotation/FallbackCmp.java index a1e9ae2b..dbc1cf57 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/annotation/FallbackCmp.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/annotation/FallbackCmp.java @@ -1,5 +1,6 @@ package com.yomahub.liteflow.annotation; +import com.yomahub.liteflow.enums.BooleanTypeEnum; import com.yomahub.liteflow.enums.NodeTypeEnum; import java.lang.annotation.Documented; @@ -20,4 +21,6 @@ import java.lang.annotation.Target; @Documented @Inherited public @interface FallbackCmp { + + BooleanTypeEnum value() default BooleanTypeEnum.NOT_BOOL; } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/LiteFlowNodeBuilder.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/LiteFlowNodeBuilder.java index afb817c9..8832c23e 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/LiteFlowNodeBuilder.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/LiteFlowNodeBuilder.java @@ -34,22 +34,14 @@ public class LiteFlowNodeBuilder { return new LiteFlowNodeBuilder(NodeTypeEnum.SWITCH); } - public static LiteFlowNodeBuilder createIfNode() { - return new LiteFlowNodeBuilder(NodeTypeEnum.IF); + public static LiteFlowNodeBuilder createBooleanNode() { + return new LiteFlowNodeBuilder(NodeTypeEnum.BOOLEAN); } public static LiteFlowNodeBuilder createForNode() { return new LiteFlowNodeBuilder(NodeTypeEnum.FOR); } - public static LiteFlowNodeBuilder createWhileNode() { - return new LiteFlowNodeBuilder(NodeTypeEnum.WHILE); - } - - public static LiteFlowNodeBuilder createBreakNode() { - return new LiteFlowNodeBuilder(NodeTypeEnum.BREAK); - } - public static LiteFlowNodeBuilder createIteratorNode() { return new LiteFlowNodeBuilder(NodeTypeEnum.ITERATOR); } @@ -62,22 +54,14 @@ public class LiteFlowNodeBuilder { return new LiteFlowNodeBuilder(NodeTypeEnum.SWITCH_SCRIPT); } - public static LiteFlowNodeBuilder createScriptIfNode() { - return new LiteFlowNodeBuilder(NodeTypeEnum.IF_SCRIPT); + public static LiteFlowNodeBuilder createScriptBooleanNode() { + return new LiteFlowNodeBuilder(NodeTypeEnum.BOOLEAN_SCRIPT); } public static LiteFlowNodeBuilder createScriptForNode() { return new LiteFlowNodeBuilder(NodeTypeEnum.FOR_SCRIPT); } - public static LiteFlowNodeBuilder createScriptWhileNode() { - return new LiteFlowNodeBuilder(NodeTypeEnum.WHILE_SCRIPT); - } - - public static LiteFlowNodeBuilder createScriptBreakNode() { - return new LiteFlowNodeBuilder(NodeTypeEnum.BREAK_SCRIPT); - } - public LiteFlowNodeBuilder() { this.node = new Node(); } 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 0de9cbf3..ee0be1f6 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 @@ -167,12 +167,8 @@ public class OperatorHelper { 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, + if (!ListUtil.toList(NodeTypeEnum.BOOLEAN, + NodeTypeEnum.BOOLEAN_SCRIPT, NodeTypeEnum.FALLBACK).contains(node.getType())){ throw new QLException(StrUtil.format("The node[{}] must be boolean type Node.", node.getId())); } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeIfComponent.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeBooleanComponent.java similarity index 62% rename from liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeIfComponent.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeBooleanComponent.java index c8dc973f..5625fe78 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeIfComponent.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeBooleanComponent.java @@ -1,23 +1,22 @@ package com.yomahub.liteflow.core; import com.yomahub.liteflow.slot.DataBus; -import com.yomahub.liteflow.core.proxy.LiteFlowProxyUtil; /** - * IF节点抽象类 + * BOOLEAN类型的抽象节点 * * @author Bryan.Zhang - * @since 2.8.5 + * @since 2.12.0 */ -public abstract class NodeIfComponent extends NodeComponent { +public abstract class NodeBooleanComponent extends NodeComponent { @Override public void process() throws Exception { - boolean result = this.processIf(); + boolean result = this.processBoolean(); this.getSlot().setIfResult(this.getMetaValueKey(), result); } - public abstract boolean processIf() throws Exception; + public abstract boolean processBoolean() throws Exception; @Override @SuppressWarnings("unchecked") diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeBreakComponent.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeBreakComponent.java deleted file mode 100644 index 35d838b1..00000000 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeBreakComponent.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.yomahub.liteflow.core; - -import com.yomahub.liteflow.slot.DataBus; -import com.yomahub.liteflow.slot.Slot; -import com.yomahub.liteflow.core.proxy.LiteFlowProxyUtil; - -/** - * 循环跳出节点逻辑抽象类 - * - * @author Bryan.Zhang - * @since 2.9.0 - */ -public abstract class NodeBreakComponent extends NodeComponent { - - @Override - public void process() throws Exception { - boolean breakFlag = processBreak(); - Slot slot = this.getSlot(); - slot.setBreakResult(this.getMetaValueKey(), breakFlag); - } - - public abstract boolean processBreak() throws Exception; - - @Override - @SuppressWarnings("unchecked") - public Boolean getItemResultMetaValue(Integer slotIndex) { - return DataBus.getSlot(slotIndex).getBreakResult(this.getMetaValueKey()); - } - -} diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeWhileComponent.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeWhileComponent.java deleted file mode 100644 index 07e66374..00000000 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeWhileComponent.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.yomahub.liteflow.core; - -import com.yomahub.liteflow.slot.DataBus; -import com.yomahub.liteflow.slot.Slot; -import com.yomahub.liteflow.core.proxy.LiteFlowProxyUtil; - -/** - * WHILE条件节点抽象类 - * - * @author Bryan.Zhang - * @since 2.9.0 - */ -public abstract class NodeWhileComponent extends NodeComponent { - - @Override - public void process() throws Exception { - boolean whileFlag = processWhile(); - Slot slot = this.getSlot(); - slot.setWhileResult(this.getMetaValueKey(), whileFlag); - } - - public abstract boolean processWhile() throws Exception; - - @Override - @SuppressWarnings("unchecked") - public Boolean getItemResultMetaValue(Integer slotIndex) { - return DataBus.getSlot(slotIndex).getWhileResult(this.getMetaValueKey()); - } - -} diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptIfComponent.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptBooleanComponent.java similarity index 74% rename from liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptIfComponent.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptBooleanComponent.java index a55cb8ed..99556353 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptIfComponent.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptBooleanComponent.java @@ -3,18 +3,16 @@ package com.yomahub.liteflow.core; import com.yomahub.liteflow.script.ScriptExecuteWrap; import com.yomahub.liteflow.script.ScriptExecutorFactory; -import java.util.Map; - /** - * 脚本IF节点 + * 脚本BOOLEAN节点 * * @author Bryan.Zhang - * @since 2.8.5 + * @since 2.12.0 */ -public class ScriptIfComponent extends NodeIfComponent implements ScriptComponent { +public class ScriptBooleanComponent extends NodeBooleanComponent implements ScriptComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { ScriptExecuteWrap wrap = this.buildWrap(this); return (boolean) ScriptExecutorFactory.loadInstance() .getScriptExecutor(this.getRefNode().getLanguage()) diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptBreakComponent.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptBreakComponent.java deleted file mode 100644 index 379993cb..00000000 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptBreakComponent.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.yomahub.liteflow.core; - -import com.yomahub.liteflow.script.ScriptExecuteWrap; -import com.yomahub.liteflow.script.ScriptExecutorFactory; - -import java.util.Map; - -/** - * 脚本BREAK节点 - * - * @author Bryan.Zhang - * @since 2.9.0 - */ -public class ScriptBreakComponent extends NodeBreakComponent implements ScriptComponent { - - @Override - public boolean processBreak() throws Exception { - ScriptExecuteWrap wrap = this.buildWrap(this); - return (boolean) ScriptExecutorFactory.loadInstance() - .getScriptExecutor(this.getRefNode().getLanguage()) - .execute(wrap); - } - - @Override - public void loadScript(String script, String language) { - ScriptExecutorFactory.loadInstance().getScriptExecutor(language).load(getNodeId(), script); - } - -} diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptComponent.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptComponent.java index c6fe3163..77fa7ffe 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptComponent.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptComponent.java @@ -21,10 +21,8 @@ public interface ScriptComponent { { put(NodeTypeEnum.SCRIPT, ScriptCommonComponent.class); put(NodeTypeEnum.SWITCH_SCRIPT, ScriptSwitchComponent.class); - put(NodeTypeEnum.IF_SCRIPT, ScriptIfComponent.class); + put(NodeTypeEnum.BOOLEAN_SCRIPT, ScriptBooleanComponent.class); put(NodeTypeEnum.FOR_SCRIPT, ScriptForComponent.class); - put(NodeTypeEnum.WHILE_SCRIPT, ScriptWhileComponent.class); - put(NodeTypeEnum.BREAK_SCRIPT, ScriptBreakComponent.class); } }; diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptWhileComponent.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptWhileComponent.java deleted file mode 100644 index ef07d31e..00000000 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptWhileComponent.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.yomahub.liteflow.core; - -import com.yomahub.liteflow.script.ScriptExecuteWrap; -import com.yomahub.liteflow.script.ScriptExecutorFactory; - -import java.util.Map; - -/** - * 脚本WHILE节点 - * - * @author Bryan.Zhang - * @since 2.9.0 - */ -public class ScriptWhileComponent extends NodeWhileComponent implements ScriptComponent { - - @Override - public boolean processWhile() throws Exception { - ScriptExecuteWrap wrap = this.buildWrap(this); - return (boolean) ScriptExecutorFactory.loadInstance() - .getScriptExecutor(this.getRefNode().getLanguage()) - .execute(wrap); - } - - @Override - public void loadScript(String script, String language) { - ScriptExecutorFactory.loadInstance().getScriptExecutor(language).load(getNodeId(), script); - } - -} diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/enums/BooleanTypeEnum.java b/liteflow-core/src/main/java/com/yomahub/liteflow/enums/BooleanTypeEnum.java new file mode 100644 index 00000000..33ec3525 --- /dev/null +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/enums/BooleanTypeEnum.java @@ -0,0 +1,13 @@ +package com.yomahub.liteflow.enums; + +/** + * 布尔节点的细分TYPE + * 主要用于组件降级 + * + * @author Bryan.Zhang + * @since 2.12.0 + */ +public enum BooleanTypeEnum { + + NOT_BOOL,IF,WHILE,BREAK +} diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/enums/LiteFlowMethodEnum.java b/liteflow-core/src/main/java/com/yomahub/liteflow/enums/LiteFlowMethodEnum.java index be015b2a..5b6d0034 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/enums/LiteFlowMethodEnum.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/enums/LiteFlowMethodEnum.java @@ -4,10 +4,8 @@ public enum LiteFlowMethodEnum { PROCESS("process", true), PROCESS_SWITCH("processSwitch", true), - PROCESS_IF("processIf", true), + PROCESS_BOOLEAN("processBoolean", true), PROCESS_FOR("processFor", true), - PROCESS_WHILE("processWhile", true), - PROCESS_BREAK("processBreak", true), PROCESS_ITERATOR("processIterator", true), 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 7ca1efff..a02ae628 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 @@ -25,28 +25,20 @@ public enum NodeTypeEnum { SWITCH("switch", "选择", false, NodeSwitchComponent.class), - IF("if", "条件", false, NodeIfComponent.class), + BOOLEAN("boolean", "布尔", false, NodeBooleanComponent.class), FOR("for", "循环次数", false, NodeForComponent.class), - WHILE("while", "循环条件", false, NodeWhileComponent.class), - - BREAK("break", "循环跳出", false, NodeBreakComponent.class), - ITERATOR("iterator", "循环迭代", false, NodeIteratorComponent.class), SCRIPT("script", "脚本", true, ScriptCommonComponent.class), SWITCH_SCRIPT("switch_script", "选择脚本", true, ScriptSwitchComponent.class), - IF_SCRIPT("if_script", "条件脚本", true, ScriptIfComponent.class), + BOOLEAN_SCRIPT("boolean_script", "布尔脚本", true, ScriptBooleanComponent.class), FOR_SCRIPT("for_script", "循环次数脚本", true, ScriptForComponent.class), - WHILE_SCRIPT("while_script", "循环条件脚本", true, ScriptWhileComponent.class), - - BREAK_SCRIPT("break_script", "循环跳出脚本", true, ScriptBreakComponent.class), - FALLBACK("fallback", "降级", false, null); private static final LFLog LOG = LFLoggerManager.getLogger(NodeTypeEnum.class); diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/FlowBus.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/FlowBus.java index f39a0b21..34a11d3a 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/FlowBus.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/FlowBus.java @@ -16,6 +16,7 @@ import com.yomahub.liteflow.core.ComponentInitializer; import com.yomahub.liteflow.core.NodeComponent; import com.yomahub.liteflow.core.ScriptComponent; import com.yomahub.liteflow.core.proxy.DeclWarpBean; +import com.yomahub.liteflow.enums.BooleanTypeEnum; import com.yomahub.liteflow.enums.FlowParserTypeEnum; import com.yomahub.liteflow.enums.NodeTypeEnum; import com.yomahub.liteflow.exception.ComponentCannotRegisterException; @@ -59,7 +60,7 @@ public class FlowBus { private static final Map nodeMap; - private static final Map fallbackNodeMap; + private static final Map fallbackNodeMap; private static AtomicBoolean initStat = new AtomicBoolean(false); @@ -261,7 +262,12 @@ public class FlowBus { } public static Node getFallBackNode(NodeTypeEnum nodeType) { - return fallbackNodeMap.get(nodeType); + return getFallBackNode(nodeType, BooleanTypeEnum.NOT_BOOL); + } + + public static Node getFallBackNode(NodeTypeEnum nodeType, BooleanTypeEnum booleanTypeEnum){ + String key = StrUtil.format("{}_{}", nodeType.name(), booleanTypeEnum.name()); + return fallbackNodeMap.get(key); } public static void cleanCache() { @@ -322,7 +328,8 @@ public class FlowBus { } NodeTypeEnum nodeType = node.getType(); - fallbackNodeMap.put(nodeType, node); + String key = StrUtil.format("{}_{}", nodeType.name(), fallbackCmp.value().name()); + fallbackNodeMap.put(key, node); } // 重新加载脚本 diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/FallbackNode.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/FallbackNode.java index ea200796..f6302b91 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/FallbackNode.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/FallbackNode.java @@ -3,6 +3,7 @@ package com.yomahub.liteflow.flow.element; import cn.hutool.core.text.StrFormatter; import cn.hutool.core.util.ObjectUtil; import com.yomahub.liteflow.core.NodeComponent; +import com.yomahub.liteflow.enums.BooleanTypeEnum; import com.yomahub.liteflow.enums.ConditionTypeEnum; import com.yomahub.liteflow.enums.NodeTypeEnum; import com.yomahub.liteflow.exception.FallbackCmpNotFoundException; @@ -89,7 +90,8 @@ public class FallbackNode extends Node { return findNodeInIterator((IteratorCondition) condition); case TYPE_NOT_OPT: case TYPE_AND_OR_OPT: - return FlowBus.getFallBackNode(NodeTypeEnum.IF); + //组件降级用在与并或中，只能用在IF表达式中 + return FlowBus.getFallBackNode(NodeTypeEnum.BOOLEAN, BooleanTypeEnum.IF); default: return null; } @@ -99,7 +101,7 @@ public class FallbackNode extends Node { Executable ifItem = ifCondition.getIfItem(); if (ifItem == this) { // 需要条件组件 - return FlowBus.getFallBackNode(NodeTypeEnum.IF); + return FlowBus.getFallBackNode(NodeTypeEnum.BOOLEAN, BooleanTypeEnum.IF); } // 需要普通组件 @@ -127,7 +129,7 @@ public class FallbackNode extends Node { private Node findNodeInWhile(WhileCondition whileCondition) { Executable whileItem = whileCondition.getWhileItem(); if (whileItem == this) { - return FlowBus.getFallBackNode(NodeTypeEnum.WHILE); + return FlowBus.getFallBackNode(NodeTypeEnum.BOOLEAN, BooleanTypeEnum.WHILE); } return findNodeInLoop(whileCondition); @@ -145,7 +147,7 @@ public class FallbackNode extends Node { private Node findNodeInLoop(LoopCondition loopCondition) { Executable breakItem = loopCondition.getExecutableOne(ConditionKey.BREAK_KEY); if (breakItem == this) { - return FlowBus.getFallBackNode(NodeTypeEnum.BREAK); + return FlowBus.getFallBackNode(NodeTypeEnum.BOOLEAN, BooleanTypeEnum.BREAK); } return FlowBus.getFallBackNode(NodeTypeEnum.COMMON); diff --git a/liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/NodeIfComponentOfMethod.java b/liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/NodeBooleanComponentOfMethod.java similarity index 80% rename from liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/NodeIfComponentOfMethod.java rename to liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/NodeBooleanComponentOfMethod.java index ac25d7c7..46f16025 100644 --- a/liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/NodeIfComponentOfMethod.java +++ b/liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/NodeBooleanComponentOfMethod.java @@ -1,6 +1,6 @@ package com.yomahub.liteflow.solon; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import com.yomahub.liteflow.enums.LiteFlowMethodEnum; import com.yomahub.liteflow.exception.LiteFlowException; import org.noear.solon.core.BeanWrap; @@ -11,7 +11,7 @@ import java.lang.reflect.Method; * @author noear * @since 1.11 */ -public class NodeIfComponentOfMethod extends NodeIfComponent { +public class NodeBooleanComponentOfMethod extends NodeBooleanComponent { final BeanWrap beanWrap; @@ -19,7 +19,7 @@ public class NodeIfComponentOfMethod extends NodeIfComponent { final LiteFlowMethodEnum methodEnum; - public NodeIfComponentOfMethod(BeanWrap beanWrap, Method method, LiteFlowMethodEnum methodEnum) { + public NodeBooleanComponentOfMethod(BeanWrap beanWrap, Method method, LiteFlowMethodEnum methodEnum) { this.beanWrap = beanWrap; this.method = method; this.methodEnum = methodEnum; @@ -45,7 +45,7 @@ public class NodeIfComponentOfMethod extends NodeIfComponent { } @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { return (boolean) exec(); } diff --git a/liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/NodeBreakComponentOfMethod.java b/liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/NodeBreakComponentOfMethod.java deleted file mode 100644 index 9b16e8be..00000000 --- a/liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/NodeBreakComponentOfMethod.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.yomahub.liteflow.solon; - -import com.yomahub.liteflow.core.NodeBreakComponent; -import com.yomahub.liteflow.enums.LiteFlowMethodEnum; -import com.yomahub.liteflow.exception.LiteFlowException; -import org.noear.solon.core.BeanWrap; - -import java.lang.reflect.Method; - -/** - * @author noear - * @since 1.11 - */ -public class NodeBreakComponentOfMethod extends NodeBreakComponent { - - final BeanWrap beanWrap; - - final Method method; - - final LiteFlowMethodEnum methodEnum; - - public NodeBreakComponentOfMethod(BeanWrap beanWrap, Method method, LiteFlowMethodEnum methodEnum) { - this.beanWrap = beanWrap; - this.method = method; - this.methodEnum = methodEnum; - - if (method.getParameterCount() > 1) { - String methodFullName = beanWrap.clz().getName() + "::" + method.getName(); - throw new LiteFlowException( - "NodeBreakComponent method parameter cannot be more than one: " + methodFullName); - } - - if (method.getReturnType() != Boolean.class && method.getReturnType() != boolean.class) { - String methodFullName = beanWrap.clz().getName() + "::" + method.getName(); - throw new LiteFlowException("NodeBreakComponent method returnType can only be boolean: " + methodFullName); - } - } - - private Object exec() throws Exception { - if (method.getParameterCount() == 0) { - return method.invoke(beanWrap.get()); - } - else { - return method.invoke(beanWrap.get(), this); - } - } - - @Override - public boolean processBreak() throws Exception { - return (boolean) exec(); - } - -} diff --git a/liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/NodeWhileComponentOfMethod.java b/liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/NodeWhileComponentOfMethod.java deleted file mode 100644 index cf99791e..00000000 --- a/liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/NodeWhileComponentOfMethod.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.yomahub.liteflow.solon; - -import com.yomahub.liteflow.core.NodeWhileComponent; -import com.yomahub.liteflow.enums.LiteFlowMethodEnum; -import com.yomahub.liteflow.exception.LiteFlowException; -import org.noear.solon.core.BeanWrap; - -import java.lang.reflect.Method; - -/** - * @author noear - * @since 1.11 - */ -public class NodeWhileComponentOfMethod extends NodeWhileComponent { - - final BeanWrap beanWrap; - - final Method method; - - final LiteFlowMethodEnum methodEnum; - - public NodeWhileComponentOfMethod(BeanWrap beanWrap, Method method, LiteFlowMethodEnum methodEnum) { - this.beanWrap = beanWrap; - this.method = method; - this.methodEnum = methodEnum; - - if (method.getParameterCount() > 1) { - String methodFullName = beanWrap.clz().getName() + "::" + method.getName(); - throw new LiteFlowException( - "NodeWhileComponent method parameter cannot be more than one: " + methodFullName); - } - - if (method.getReturnType() != Boolean.class && method.getReturnType() != boolean.class) { - String methodFullName = beanWrap.clz().getName() + "::" + method.getName(); - throw new LiteFlowException("NodeWhileComponent method returnType can only be boolean: " + methodFullName); - } - } - - private Object exec() throws Exception { - if (method.getParameterCount() == 0) { - return method.invoke(beanWrap.get()); - } - else { - return method.invoke(beanWrap.get(), this); - } - } - - @Override - public boolean processWhile() throws Exception { - return (boolean) exec(); - } - -} diff --git a/liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/integration/XPluginImpl.java b/liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/integration/XPluginImpl.java index 0fbc1dfa..9a321111 100644 --- a/liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/integration/XPluginImpl.java +++ b/liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/integration/XPluginImpl.java @@ -58,18 +58,12 @@ public class XPluginImpl implements Plugin { case PROCESS_SWITCH: node1 = new NodeSwitchComponentOfMethod(bw, method, anno.value()); break; - case PROCESS_IF: - node1 = new NodeIfComponentOfMethod(bw, method, anno.value()); + case PROCESS_BOOLEAN: + node1 = new NodeBooleanComponentOfMethod(bw, method, anno.value()); break; case PROCESS_FOR: node1 = new NodeForComponentOfMethod(bw, method, anno.value()); break; - case PROCESS_WHILE: - node1 = new NodeWhileComponentOfMethod(bw, method, anno.value()); - break; - case PROCESS_BREAK: - node1 = new NodeBreakComponentOfMethod(bw, method, anno.value()); - break; default: node1 = new NodeComponentOfMethod(bw, method, anno.value()); } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/cmp/CmpConfig.java b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/cmp/CmpConfig.java index 9c9f7850..bbbc5e41 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/cmp/CmpConfig.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/cmp/CmpConfig.java @@ -25,7 +25,7 @@ public class CmpConfig { System.out.println("BCmp executed!"); } - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_IF, nodeId = "c", nodeType = NodeTypeEnum.IF) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN, nodeId = "c", nodeType = NodeTypeEnum.BOOLEAN) public boolean processIfC(NodeComponent bindCmp) throws Exception{ return true; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/CmpConfig.java b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/CmpConfig.java index 4957712c..28a3129d 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/CmpConfig.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/CmpConfig.java @@ -30,7 +30,7 @@ public class CmpConfig { System.out.println("DCmp executed!"); } - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_IF, nodeId = "x1", nodeType = NodeTypeEnum.IF) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN, nodeId = "x1", nodeType = NodeTypeEnum.BOOLEAN) public boolean processIfX1(NodeComponent bindCmp) throws Exception { return Boolean.parseBoolean(bindCmp.getTag()); } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/iterator/cmp/CmpConfig.java b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/iterator/cmp/CmpConfig.java index fede383f..f638ddfa 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/iterator/cmp/CmpConfig.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/iterator/cmp/CmpConfig.java @@ -29,7 +29,7 @@ public class CmpConfig { } } - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BREAK, nodeId = "b", nodeType = NodeTypeEnum.BREAK) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN, nodeId = "b", nodeType = NodeTypeEnum.BOOLEAN) public boolean processB(NodeComponent bindCmp) { return bindCmp.getLoopIndex() == 1; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/CmpConfig.java b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/CmpConfig.java index 52902d55..3d70742d 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/CmpConfig.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/CmpConfig.java @@ -59,14 +59,14 @@ public class CmpConfig { return 3; } - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BREAK, nodeId = "y", nodeType = NodeTypeEnum.BREAK) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN, nodeId = "y", nodeType = NodeTypeEnum.BOOLEAN) public boolean processY(NodeComponent bindCmp) { DefaultContext context = bindCmp.getFirstContextBean(); int count = context.getData("test"); return count > 3; } - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_WHILE, nodeId = "z", nodeType = NodeTypeEnum.WHILE) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN, nodeId = "z", nodeType = NodeTypeEnum.BOOLEAN) public boolean processZ(NodeComponent bindCmp) { DefaultContext context = bindCmp.getFirstContextBean(); String key = "test"; diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/CmpConfig.java b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/CmpConfig.java index 2e2194df..efc87c7c 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/CmpConfig.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/CmpConfig.java @@ -69,7 +69,7 @@ public class CmpConfig { System.out.println("DCmp executed!"); } - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_IF, nodeId = "f", nodeType = NodeTypeEnum.IF) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN, nodeId = "f", nodeType = NodeTypeEnum.BOOLEAN) public boolean processIf(NodeComponent bindCmp) throws Exception { return true; } @@ -79,7 +79,7 @@ public class CmpConfig { return "b"; } - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_WHILE, nodeId = "w", nodeType = NodeTypeEnum.WHILE) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN, nodeId = "w", nodeType = NodeTypeEnum.BOOLEAN) public boolean processWhile(NodeComponent bindCmp) throws Exception { // 判断是否切换了 chain if (!executedChain.contains(bindCmp.getCurrChainId())) { diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/CmpConfig.java b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/CmpConfig.java index db6967be..18f23a08 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/CmpConfig.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/CmpConfig.java @@ -69,7 +69,7 @@ public class CmpConfig { System.out.println("DCmp executed!"); } - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_IF, nodeId = "f", nodeType = NodeTypeEnum.IF) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN, nodeId = "f", nodeType = NodeTypeEnum.BOOLEAN) public boolean processIf(NodeComponent bindCmp) throws Exception { return true; } @@ -79,7 +79,7 @@ public class CmpConfig { return "b"; } - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_WHILE, nodeId = "w", nodeType = NodeTypeEnum.WHILE) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN, nodeId = "w", nodeType = NodeTypeEnum.BOOLEAN) public boolean processWhile(NodeComponent bindCmp) throws Exception { // 判断是否切换了 chain if (!executedChain.contains(bindCmp.getCurrChainId())) { diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/CmpConfig.java b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/CmpConfig.java index 83fedcab..91164fdd 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/CmpConfig.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/CmpConfig.java @@ -94,7 +94,7 @@ public class CmpConfig { return 3; } - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BREAK, nodeId = "y", nodeType = NodeTypeEnum.BREAK) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN, nodeId = "y", nodeType = NodeTypeEnum.BOOLEAN) public boolean processY(NodeComponent bindCmp) { DefaultContext context = bindCmp.getFirstContextBean(); int count = 0; @@ -104,7 +104,7 @@ public class CmpConfig { return count > 3; } - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_WHILE, nodeId = "z", nodeType = NodeTypeEnum.WHILE) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN, nodeId = "z", nodeType = NodeTypeEnum.BOOLEAN) public boolean processZ(NodeComponent bindCmp) { DefaultContext context = bindCmp.getFirstContextBean(); String key = "test"; diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/retry/cmp/CmpConfig.java b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/retry/cmp/CmpConfig.java index 996ace9e..9750a61d 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/retry/cmp/CmpConfig.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/retry/cmp/CmpConfig.java @@ -51,7 +51,7 @@ public class CmpConfig { else return "a"; } - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_IF, nodeId = "f", nodeType = NodeTypeEnum.IF) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN, nodeId = "f", nodeType = NodeTypeEnum.BOOLEAN) public boolean processF(NodeComponent bindCmp) { System.out.println("FCmp executed!"); flagf ++; @@ -77,7 +77,7 @@ public class CmpConfig { else flagm = 0; } - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_WHILE, nodeId = "n", nodeType = NodeTypeEnum.WHILE) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN, nodeId = "n", nodeType = NodeTypeEnum.BOOLEAN) public boolean processN(NodeComponent bindCmp) { flagn ++; System.out.println("NCmp executed!"); diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/CmpConfig.java b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/CmpConfig.java index b8854501..58941d99 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/CmpConfig.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/CmpConfig.java @@ -102,13 +102,13 @@ public class CmpConfig { System.out.println("GCmp rollback!"); } - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BREAK, nodeId = "h", nodeType = NodeTypeEnum.BREAK) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN, nodeId = "h", nodeType = NodeTypeEnum.BOOLEAN) public int processH(NodeComponent bindCmp) { System.out.println("HCmp executed!"); throw new RuntimeException(); } - @LiteflowMethod(value = LiteFlowMethodEnum.ROLLBACK, nodeId = "h", nodeType = NodeTypeEnum.BREAK) + @LiteflowMethod(value = LiteFlowMethodEnum.ROLLBACK, nodeId = "h", nodeType = NodeTypeEnum.BOOLEAN) public void rollbackH() throws Exception { System.out.println("HCmp rollback!"); } @@ -124,24 +124,24 @@ public class CmpConfig { System.out.println("ICmp rollback!"); } - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_WHILE, nodeId = "w", nodeType = NodeTypeEnum.WHILE) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN, nodeId = "w", nodeType = NodeTypeEnum.BOOLEAN) public boolean processW(NodeComponent bindCmp) { System.out.println("WCmp executed!"); return true; } - @LiteflowMethod(value = LiteFlowMethodEnum.ROLLBACK, nodeId = "w", nodeType = NodeTypeEnum.WHILE) + @LiteflowMethod(value = LiteFlowMethodEnum.ROLLBACK, nodeId = "w", nodeType = NodeTypeEnum.BOOLEAN) public void rollbackW() throws Exception { System.out.println("WCmp rollback!"); } - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_IF, nodeId = "x", nodeType = NodeTypeEnum.IF) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN, nodeId = "x", nodeType = NodeTypeEnum.BOOLEAN) public boolean processX(NodeComponent bindCmp) { System.out.println("XCmp executed!"); return true; } - @LiteflowMethod(value = LiteFlowMethodEnum.ROLLBACK, nodeId = "x", nodeType = NodeTypeEnum.IF) + @LiteflowMethod(value = LiteFlowMethodEnum.ROLLBACK, nodeId = "x", nodeType = NodeTypeEnum.BOOLEAN) public void rollbackX() throws Exception { System.out.println("XCmp rollback!"); } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/cmp/CCmp.java index 9666e714..15b2d01a 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/cmp/CCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/cmp/CCmp.java @@ -8,9 +8,9 @@ import com.yomahub.liteflow.enums.NodeTypeEnum; import org.springframework.stereotype.Component; @Component("c") -@LiteflowCmpDefine(NodeTypeEnum.IF) +@LiteflowCmpDefine(NodeTypeEnum.BOOLEAN) public class CCmp { - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_IF, nodeType = NodeTypeEnum.IF) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN, nodeType = NodeTypeEnum.BOOLEAN) public boolean processIf(NodeComponent bindCmp) throws Exception { return true; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/BreakCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/BreakCmp.java index fcbd8e7e..0fb9436f 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/BreakCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/BreakCmp.java @@ -5,15 +5,16 @@ import com.yomahub.liteflow.annotation.LiteflowCmpDefine; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.annotation.LiteflowMethod; import com.yomahub.liteflow.core.NodeComponent; +import com.yomahub.liteflow.enums.BooleanTypeEnum; import com.yomahub.liteflow.enums.LiteFlowMethodEnum; import com.yomahub.liteflow.enums.NodeTypeEnum; @LiteflowComponent("bn1") -@LiteflowCmpDefine(NodeTypeEnum.BREAK) -@FallbackCmp +@LiteflowCmpDefine(NodeTypeEnum.BOOLEAN) +@FallbackCmp(BooleanTypeEnum.BREAK) public class BreakCmp { - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BREAK) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN) public boolean processBreak(NodeComponent bindCmp) throws Exception { return true; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp1.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp1.java index bd1c6f51..5899ae0e 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp1.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp1.java @@ -8,10 +8,10 @@ import com.yomahub.liteflow.enums.LiteFlowMethodEnum; import com.yomahub.liteflow.enums.NodeTypeEnum; @LiteflowComponent("ifn1") -@LiteflowCmpDefine(NodeTypeEnum.IF) +@LiteflowCmpDefine(NodeTypeEnum.BOOLEAN) public class IfCmp1 { - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_IF) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN) public boolean processIf(NodeComponent bindCmp) throws Exception { return true; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp2.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp2.java index 5af938e8..88787398 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp2.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp2.java @@ -5,15 +5,16 @@ import com.yomahub.liteflow.annotation.LiteflowCmpDefine; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.annotation.LiteflowMethod; import com.yomahub.liteflow.core.NodeComponent; +import com.yomahub.liteflow.enums.BooleanTypeEnum; import com.yomahub.liteflow.enums.LiteFlowMethodEnum; import com.yomahub.liteflow.enums.NodeTypeEnum; @LiteflowComponent("ifn2") -@LiteflowCmpDefine(NodeTypeEnum.IF) -@FallbackCmp +@LiteflowCmpDefine(NodeTypeEnum.BOOLEAN) +@FallbackCmp(BooleanTypeEnum.IF) public class IfCmp2 { - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_IF) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN) public boolean processIf(NodeComponent bindCmp) throws Exception { return false; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp1.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp1.java index 0d65cfb1..8f030ec7 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp1.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp1.java @@ -11,14 +11,14 @@ import java.util.HashSet; import java.util.Set; @LiteflowComponent("wn1") -@LiteflowCmpDefine(NodeTypeEnum.WHILE) +@LiteflowCmpDefine(NodeTypeEnum.BOOLEAN) public class WhileCmp1 { private int count = 0; // 执行过的 chain Set executedChain = new HashSet<>(); - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_WHILE) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN) public boolean processWhile(NodeComponent bindCmp) throws Exception { // 判断是否切换了 chain if (!executedChain.contains(bindCmp.getCurrChainId())) { diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp2.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp2.java index a9bef49b..31ff5d86 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp2.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp2.java @@ -5,15 +5,16 @@ import com.yomahub.liteflow.annotation.LiteflowCmpDefine; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.annotation.LiteflowMethod; import com.yomahub.liteflow.core.NodeComponent; +import com.yomahub.liteflow.enums.BooleanTypeEnum; import com.yomahub.liteflow.enums.LiteFlowMethodEnum; import com.yomahub.liteflow.enums.NodeTypeEnum; @LiteflowComponent("wn2") -@LiteflowCmpDefine(NodeTypeEnum.WHILE) -@FallbackCmp +@LiteflowCmpDefine(NodeTypeEnum.BOOLEAN) +@FallbackCmp(BooleanTypeEnum.WHILE) public class WhileCmp2 { - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_WHILE) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN) public boolean processWhile(NodeComponent bindCmp) throws Exception { return false; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/X1Cmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/X1Cmp.java index 79c6b3bb..dccf513a 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/X1Cmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/X1Cmp.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Component; @Component("x1") public class X1Cmp { - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_IF, nodeType = NodeTypeEnum.IF) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN, nodeType = NodeTypeEnum.BOOLEAN) public boolean processIf(NodeComponent bindCmp) throws Exception { return Boolean.parseBoolean(bindCmp.getTag()); } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/iterator/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/iterator/cmp/BCmp.java index 58181ba8..93aead7c 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/iterator/cmp/BCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/iterator/cmp/BCmp.java @@ -3,17 +3,17 @@ package com.yomahub.liteflow.test.iterator.cmp; import com.yomahub.liteflow.annotation.LiteflowCmpDefine; import com.yomahub.liteflow.annotation.LiteflowMethod; -import com.yomahub.liteflow.core.NodeBreakComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import com.yomahub.liteflow.core.NodeComponent; import com.yomahub.liteflow.enums.LiteFlowMethodEnum; import com.yomahub.liteflow.enums.NodeTypeEnum; import org.springframework.stereotype.Component; @Component("b") -@LiteflowCmpDefine(NodeTypeEnum.BREAK) +@LiteflowCmpDefine(NodeTypeEnum.BOOLEAN) public class BCmp { - @LiteflowMethod(LiteFlowMethodEnum.PROCESS_BREAK) + @LiteflowMethod(LiteFlowMethodEnum.PROCESS_BOOLEAN) public boolean processBreak(NodeComponent bindCmp) throws Exception { return bindCmp.getLoopIndex() == 1; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/YCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/YCmp.java index 34967f9f..70ab241f 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/YCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/YCmp.java @@ -10,7 +10,7 @@ import com.yomahub.liteflow.slot.DefaultContext; @LiteflowComponent("y") public class YCmp { - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BREAK, nodeType = NodeTypeEnum.BREAK) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN, nodeType = NodeTypeEnum.BOOLEAN) public boolean processBreak(NodeComponent bindCmp) throws Exception { DefaultContext context = bindCmp.getFirstContextBean(); int count = context.getData("test"); diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/ZCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/ZCmp.java index ec494511..0b2509c9 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/ZCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/loop/cmp/ZCmp.java @@ -10,7 +10,7 @@ import com.yomahub.liteflow.slot.DefaultContext; @LiteflowComponent("z") public class ZCmp { - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_WHILE, nodeType = NodeTypeEnum.WHILE) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN, nodeType = NodeTypeEnum.BOOLEAN) public boolean processWhile(NodeComponent bindCmp) throws Exception { DefaultContext context = bindCmp.getFirstContextBean(); String key = "test"; diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/FCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/FCmp.java index 652e2e68..6990eca9 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/FCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/FCmp.java @@ -8,10 +8,10 @@ import com.yomahub.liteflow.enums.LiteFlowMethodEnum; import com.yomahub.liteflow.enums.NodeTypeEnum; @LiteflowComponent("f") -@LiteflowCmpDefine(NodeTypeEnum.IF) +@LiteflowCmpDefine(NodeTypeEnum.BOOLEAN) public class FCmp { - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_IF, nodeType = NodeTypeEnum.IF) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN, nodeType = NodeTypeEnum.BOOLEAN) public boolean processIf(NodeComponent bindCmp) throws Exception { return true; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/WCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/WCmp.java index 4809d114..afd560a1 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/WCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/WCmp.java @@ -11,14 +11,14 @@ import java.util.HashSet; import java.util.Set; @LiteflowComponent("w") -@LiteflowCmpDefine(NodeTypeEnum.WHILE) +@LiteflowCmpDefine(NodeTypeEnum.BOOLEAN) public class WCmp { private int count = 0; // 执行过的 chain Set executedChain = new HashSet<>(); - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_WHILE, nodeType = NodeTypeEnum.WHILE) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN, nodeType = NodeTypeEnum.BOOLEAN) public boolean processWhile(NodeComponent bindCmp) throws Exception { // 判断是否切换了 chain if (!executedChain.contains(bindCmp.getCurrChainId())) { diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/FCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/FCmp.java index f2b3bd1c..43c16cf0 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/FCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/FCmp.java @@ -8,10 +8,10 @@ import com.yomahub.liteflow.enums.LiteFlowMethodEnum; import com.yomahub.liteflow.enums.NodeTypeEnum; @LiteflowComponent("f") -@LiteflowCmpDefine(NodeTypeEnum.IF) +@LiteflowCmpDefine(NodeTypeEnum.BOOLEAN) public class FCmp { - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_IF, nodeType = NodeTypeEnum.IF) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN, nodeType = NodeTypeEnum.BOOLEAN) public boolean processIf(NodeComponent bindCmp) throws Exception { return true; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/WCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/WCmp.java index 4085405c..ee756d3e 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/WCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/WCmp.java @@ -11,14 +11,14 @@ import java.util.HashSet; import java.util.Set; @LiteflowComponent("w") -@LiteflowCmpDefine(NodeTypeEnum.WHILE) +@LiteflowCmpDefine(NodeTypeEnum.BOOLEAN) public class WCmp { private int count = 0; // 执行过的 chain Set executedChain = new HashSet<>(); - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_WHILE, nodeType = NodeTypeEnum.WHILE) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN, nodeType = NodeTypeEnum.BOOLEAN) public boolean processWhile(NodeComponent bindCmp) throws Exception { // 判断是否切换了 chain if (!executedChain.contains(bindCmp.getCurrChainId())) { diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/YCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/YCmp.java index 9e7713c3..b1311b01 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/YCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/YCmp.java @@ -10,7 +10,7 @@ import com.yomahub.liteflow.slot.DefaultContext; @LiteflowComponent("y") public class YCmp { - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BREAK, nodeType = NodeTypeEnum.BREAK) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN, nodeType = NodeTypeEnum.BOOLEAN) public boolean processBreak(NodeComponent bindCmp) throws Exception { DefaultContext context = bindCmp.getFirstContextBean(); int count = 0; diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/ZCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/ZCmp.java index 8f01b2c2..b89bf6c2 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/ZCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/ZCmp.java @@ -10,7 +10,7 @@ import com.yomahub.liteflow.slot.DefaultContext; @LiteflowComponent("z") public class ZCmp { - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_WHILE, nodeType = NodeTypeEnum.WHILE) + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_BOOLEAN, nodeType = NodeTypeEnum.BOOLEAN) public boolean processWhile(NodeComponent bindCmp) throws Exception { DefaultContext context = bindCmp.getFirstContextBean(); String key = "test"; diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/retry/cmp/FCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/retry/cmp/FCmp.java index 1bc95f54..81704f49 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/retry/cmp/FCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/retry/cmp/FCmp.java @@ -1,13 +1,13 @@ package com.yomahub.liteflow.test.retry.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; @LiteflowComponent("f") -public class FCmp extends NodeIfComponent { +public class FCmp extends NodeBooleanComponent { int flag = 0; @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { System.out.println("FCmp executed!"); flag ++; if(flag < 4) throw new RuntimeException(); diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/retry/cmp/NCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/retry/cmp/NCmp.java index ac0434c9..e72524ab 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/retry/cmp/NCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/retry/cmp/NCmp.java @@ -1,14 +1,14 @@ package com.yomahub.liteflow.test.retry.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; @LiteflowComponent("n") -public class NCmp extends NodeWhileComponent { +public class NCmp extends NodeBooleanComponent { int flag = 0; @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { flag ++; System.out.println("NCmp executed!"); if(flag < 4) throw new RuntimeException(); diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/HCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/HCmp.java index 19ebef9b..a2d3ebe5 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/HCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/HCmp.java @@ -1,13 +1,13 @@ package com.yomahub.liteflow.test.rollback.cmp; -import com.yomahub.liteflow.core.NodeBreakComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.springframework.stereotype.Component; @Component("h") -public class HCmp extends NodeBreakComponent { +public class HCmp extends NodeBooleanComponent { @Override - public boolean processBreak() throws Exception { + public boolean processBoolean() throws Exception { System.out.println("HCmp executed!"); throw new RuntimeException(); } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/WCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/WCmp.java index 3f0fd80d..81233ca7 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/WCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/WCmp.java @@ -1,13 +1,13 @@ package com.yomahub.liteflow.test.rollback.cmp; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.springframework.stereotype.Component; @Component("w") -public class WCmp extends NodeWhileComponent { +public class WCmp extends NodeBooleanComponent { @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { System.out.println("WCmp executed!"); return true; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/XCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/XCmp.java index 9928246c..7d161a2d 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/XCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/XCmp.java @@ -1,12 +1,12 @@ package com.yomahub.liteflow.test.rollback.cmp; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.springframework.stereotype.Component; @Component("x") -public class XCmp extends NodeIfComponent { +public class XCmp extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { System.out.println("XCmp executed!"); return true; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/abstractChain/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/abstractChain/cmp/CCmp.java index d2481191..f5b11e2b 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/abstractChain/cmp/CCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/abstractChain/cmp/CCmp.java @@ -1,11 +1,11 @@ package com.yomahub.liteflow.test.abstractChain.cmp; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; -public class CCmp extends NodeIfComponent { +public class CCmp extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { //do your biz return true; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/fallback/cmp/BreakCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/fallback/cmp/BreakCmp.java index 155bdfae..a3d1c7af 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/fallback/cmp/BreakCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/fallback/cmp/BreakCmp.java @@ -1,13 +1,14 @@ package com.yomahub.liteflow.test.fallback.cmp; import com.yomahub.liteflow.annotation.FallbackCmp; -import com.yomahub.liteflow.core.NodeBreakComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; +import com.yomahub.liteflow.enums.BooleanTypeEnum; -@FallbackCmp -public class BreakCmp extends NodeBreakComponent { +@FallbackCmp(BooleanTypeEnum.BREAK) +public class BreakCmp extends NodeBooleanComponent { @Override - public boolean processBreak() throws Exception { + public boolean processBoolean() throws Exception { return true; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp1.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp1.java index 5437cc8f..bb607e5d 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp1.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp1.java @@ -1,11 +1,11 @@ package com.yomahub.liteflow.test.fallback.cmp; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; -public class IfCmp1 extends NodeIfComponent { +public class IfCmp1 extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { return true; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp2.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp2.java index 67187c39..a83ac4e6 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp2.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp2.java @@ -1,13 +1,14 @@ package com.yomahub.liteflow.test.fallback.cmp; import com.yomahub.liteflow.annotation.FallbackCmp; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; +import com.yomahub.liteflow.enums.BooleanTypeEnum; -@FallbackCmp -public class IfCmp2 extends NodeIfComponent { +@FallbackCmp(BooleanTypeEnum.IF) +public class IfCmp2 extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { return false; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp1.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp1.java index d525911b..9d7f40f7 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp1.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp1.java @@ -1,18 +1,18 @@ package com.yomahub.liteflow.test.fallback.cmp; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import java.util.HashSet; import java.util.Set; -public class WhileCmp1 extends NodeWhileComponent { +public class WhileCmp1 extends NodeBooleanComponent { private int count = 0; // 执行过的 chain Set executedChain = new HashSet<>(); @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { // 判断是否切换了 chain if (!executedChain.contains(this.getCurrChainId())) { count = 0; diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp2.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp2.java index 531a77d7..5954a768 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp2.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp2.java @@ -1,13 +1,14 @@ package com.yomahub.liteflow.test.fallback.cmp; import com.yomahub.liteflow.annotation.FallbackCmp; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; +import com.yomahub.liteflow.enums.BooleanTypeEnum; -@FallbackCmp -public class WhileCmp2 extends NodeWhileComponent { +@FallbackCmp(BooleanTypeEnum.WHILE) +public class WhileCmp2 extends NodeBooleanComponent { @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { return false; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/X1Cmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/X1Cmp.java index 65e08778..552f1efc 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/X1Cmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/X1Cmp.java @@ -7,12 +7,12 @@ */ package com.yomahub.liteflow.test.ifelse.cmp; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; -public class X1Cmp extends NodeIfComponent { +public class X1Cmp extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { return Boolean.parseBoolean(this.getTag()); } diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/iterator/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/iterator/cmp/BCmp.java index 2240c45d..dfd877c7 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/iterator/cmp/BCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/iterator/cmp/BCmp.java @@ -1,12 +1,12 @@ package com.yomahub.liteflow.test.iterator.cmp; -import com.yomahub.liteflow.core.NodeBreakComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; -public class BCmp extends NodeBreakComponent { +public class BCmp extends NodeBooleanComponent { @Override - public boolean processBreak() throws Exception { + public boolean processBoolean() throws Exception { return this.getLoopIndex() == 1; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/loop/cmp/YCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/loop/cmp/YCmp.java index c201f9eb..42474f04 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/loop/cmp/YCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/loop/cmp/YCmp.java @@ -1,12 +1,12 @@ package com.yomahub.liteflow.test.loop.cmp; -import com.yomahub.liteflow.core.NodeBreakComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import com.yomahub.liteflow.slot.DefaultContext; -public class YCmp extends NodeBreakComponent { +public class YCmp extends NodeBooleanComponent { @Override - public boolean processBreak() throws Exception { + public boolean processBoolean() throws Exception { DefaultContext context = this.getFirstContextBean(); int count = context.getData("test"); return count > 3; diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/loop/cmp/ZCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/loop/cmp/ZCmp.java index 657bc890..7638978f 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/loop/cmp/ZCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/loop/cmp/ZCmp.java @@ -1,12 +1,12 @@ package com.yomahub.liteflow.test.loop.cmp; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import com.yomahub.liteflow.slot.DefaultContext; -public class ZCmp extends NodeWhileComponent { +public class ZCmp extends NodeBooleanComponent { @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { DefaultContext context = this.getFirstContextBean(); String key = "test"; if (context.hasData(key)) { diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/FCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/FCmp.java index 8b003e02..b1ec5b04 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/FCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/FCmp.java @@ -1,10 +1,10 @@ package com.yomahub.liteflow.test.maxWaitMilliseconds.cmp; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; -public class FCmp extends NodeIfComponent { +public class FCmp extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { return true; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/WCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/WCmp.java index 3f0c50cc..5b23a8ff 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/WCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/WCmp.java @@ -1,18 +1,18 @@ package com.yomahub.liteflow.test.maxWaitMilliseconds.cmp; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import java.util.HashSet; import java.util.Set; -public class WCmp extends NodeWhileComponent { +public class WCmp extends NodeBooleanComponent { private int count = 0; // 执行过的 chain Set executedChain = new HashSet<>(); @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { // 判断是否切换了 chain if (!executedChain.contains(this.getCurrChainId())) { count = 0; diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/FCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/FCmp.java index d22ecdf4..4f4650ae 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/FCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/FCmp.java @@ -1,10 +1,10 @@ package com.yomahub.liteflow.test.maxWaitSeconds.cmp; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; -public class FCmp extends NodeIfComponent { +public class FCmp extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { return true; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/WCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/WCmp.java index ecad318d..c6641d23 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/WCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/WCmp.java @@ -1,18 +1,18 @@ package com.yomahub.liteflow.test.maxWaitSeconds.cmp; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import java.util.HashSet; import java.util.Set; -public class WCmp extends NodeWhileComponent { +public class WCmp extends NodeBooleanComponent { private int count = 0; // 执行过的 chain Set executedChain = new HashSet<>(); @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { // 判断是否切换了 chain if (!executedChain.contains(this.getCurrChainId())) { count = 0; diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/YCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/YCmp.java index 692bf695..26292f82 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/YCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/YCmp.java @@ -1,12 +1,12 @@ package com.yomahub.liteflow.test.parallelLoop.cmp; -import com.yomahub.liteflow.core.NodeBreakComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import com.yomahub.liteflow.slot.DefaultContext; -public class YCmp extends NodeBreakComponent { +public class YCmp extends NodeBooleanComponent { @Override - public boolean processBreak() throws Exception { + public boolean processBoolean() throws Exception { DefaultContext context = this.getFirstContextBean(); int count = 0; if(context.hasData("test")) { diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/ZCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/ZCmp.java index dc4bdfc5..7eccbcef 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/ZCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/ZCmp.java @@ -1,12 +1,12 @@ package com.yomahub.liteflow.test.parallelLoop.cmp; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import com.yomahub.liteflow.slot.DefaultContext; -public class ZCmp extends NodeWhileComponent { +public class ZCmp extends NodeBooleanComponent { @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { DefaultContext context = this.getFirstContextBean(); String key = "test"; if (context.hasData(key)) { diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/retry/cmp/FCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/retry/cmp/FCmp.java index 6135b944..b09f5b29 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/retry/cmp/FCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/retry/cmp/FCmp.java @@ -1,12 +1,12 @@ package com.yomahub.liteflow.test.retry.cmp; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; -public class FCmp extends NodeIfComponent { +public class FCmp extends NodeBooleanComponent { int flag = 0; @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { System.out.println("FCmp executed!"); flag ++; if(flag < 4) throw new RuntimeException(); diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/retry/cmp/NCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/retry/cmp/NCmp.java index 709dce3a..bb28da95 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/retry/cmp/NCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/retry/cmp/NCmp.java @@ -1,13 +1,13 @@ package com.yomahub.liteflow.test.retry.cmp; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; -public class NCmp extends NodeWhileComponent { +public class NCmp extends NodeBooleanComponent { int flag = 0; @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { flag ++; System.out.println("NCmp executed!"); if(flag < 4) throw new RuntimeException(); diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/rollback/cmp/HCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/rollback/cmp/HCmp.java index 7f8378ce..1ecfc387 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/rollback/cmp/HCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/rollback/cmp/HCmp.java @@ -1,11 +1,11 @@ package com.yomahub.liteflow.test.rollback.cmp; -import com.yomahub.liteflow.core.NodeBreakComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; -public class HCmp extends NodeBreakComponent { +public class HCmp extends NodeBooleanComponent { @Override - public boolean processBreak() throws Exception { + public boolean processBoolean() throws Exception { System.out.println("HCmp executed!"); throw new RuntimeException(); } diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/rollback/cmp/WCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/rollback/cmp/WCmp.java index 921e83e7..1d7c7333 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/rollback/cmp/WCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/rollback/cmp/WCmp.java @@ -1,11 +1,11 @@ package com.yomahub.liteflow.test.rollback.cmp; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; -public class WCmp extends NodeWhileComponent { +public class WCmp extends NodeBooleanComponent { @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { System.out.println("WCmp executed!"); return true; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/rollback/cmp/XCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/rollback/cmp/XCmp.java index 120006ac..c4731337 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/rollback/cmp/XCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/rollback/cmp/XCmp.java @@ -1,10 +1,10 @@ package com.yomahub.liteflow.test.rollback.cmp; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; -public class XCmp extends NodeIfComponent { +public class XCmp extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { System.out.println("XCmp executed!"); return true; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/getnodes/cmp/FCmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/getnodes/cmp/FCmp.java index c975811c..35beaf2e 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/getnodes/cmp/FCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/getnodes/cmp/FCmp.java @@ -1,12 +1,12 @@ package com.yomahub.liteflow.test.script.graaljs.getnodes.cmp; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.springframework.stereotype.Component; @Component("f") -public class FCmp extends NodeIfComponent { +public class FCmp extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { return true; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/getnodes/flow.xml b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/getnodes/flow.xml index 78a84de6..13e96568 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/getnodes/flow.xml +++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/getnodes/flow.xml @@ -19,13 +19,13 @@ ]]> - + - + diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/ifelse/flow.xml b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/ifelse/flow.xml index db5d0d59..f69385aa 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/ifelse/flow.xml +++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/ifelse/flow.xml @@ -1,13 +1,13 @@ - + - + diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/loop/flow.xml b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/loop/flow.xml index 603cf721..b960180d 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/loop/flow.xml +++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/loop/flow.xml @@ -8,14 +8,14 @@ ]]> - + 3; ]]> - + - + - + diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/resources/loop/flow.xml b/liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/resources/loop/flow.xml index a6ef34ab..850fdb0d 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/resources/loop/flow.xml +++ b/liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/resources/loop/flow.xml @@ -8,14 +8,14 @@ ]]> - + 3 ]]> - + - + - + - + diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/ifelse/flow.xml b/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/ifelse/flow.xml index db5d0d59..f69385aa 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/ifelse/flow.xml +++ b/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/ifelse/flow.xml @@ -1,13 +1,13 @@ - + - + diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/loop/flow.xml b/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/loop/flow.xml index 603cf721..b960180d 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/loop/flow.xml +++ b/liteflow-testcase-el/liteflow-testcase-el-script-javascript-springboot/src/test/resources/loop/flow.xml @@ -8,14 +8,14 @@ ]]> - + 3; ]]> - + - + - + diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-qlexpress-springboot/src/test/resources/loop/flow.xml b/liteflow-testcase-el/liteflow-testcase-el-script-qlexpress-springboot/src/test/resources/loop/flow.xml index b775bb49..fd5cb0a6 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-script-qlexpress-springboot/src/test/resources/loop/flow.xml +++ b/liteflow-testcase-el/liteflow-testcase-el-script-qlexpress-springboot/src/test/resources/loop/flow.xml @@ -8,14 +8,14 @@ ]]> - + 3; ]]> - + executedChain = new HashSet<>(); @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { // 判断是否切换了 chain if (!executedChain.contains(this.getCurrChainId())) { count = 0; diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp2.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp2.java index b198faa0..3f88484e 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp2.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp2.java @@ -2,14 +2,15 @@ package com.yomahub.liteflow.test.fallback.cmp; import com.yomahub.liteflow.annotation.FallbackCmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; +import com.yomahub.liteflow.enums.BooleanTypeEnum; @LiteflowComponent("wn2") -@FallbackCmp -public class WhileCmp2 extends NodeWhileComponent { +@FallbackCmp(BooleanTypeEnum.WHILE) +public class WhileCmp2 extends NodeBooleanComponent { @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { return false; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/X1Cmp.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/X1Cmp.java index d8af1a88..66a5eaa8 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/X1Cmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/X1Cmp.java @@ -7,14 +7,14 @@ */ package com.yomahub.liteflow.test.ifelse.cmp; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.noear.solon.annotation.Component; @Component("x1") -public class X1Cmp extends NodeIfComponent { +public class X1Cmp extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { return Boolean.parseBoolean(this.getTag()); } diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/loop/cmp/YCmp.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/loop/cmp/YCmp.java index c4bb114c..449f0dfa 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/loop/cmp/YCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/loop/cmp/YCmp.java @@ -1,15 +1,15 @@ package com.yomahub.liteflow.test.loop.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeBreakComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import com.yomahub.liteflow.core.NodeForComponent; import com.yomahub.liteflow.slot.DefaultContext; @LiteflowComponent("y") -public class YCmp extends NodeBreakComponent { +public class YCmp extends NodeBooleanComponent { @Override - public boolean processBreak() throws Exception { + public boolean processBoolean() throws Exception { DefaultContext context = this.getFirstContextBean(); int count = context.getData("test"); return count > 3; diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/loop/cmp/ZCmp.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/loop/cmp/ZCmp.java index c7bb40e7..bba3dd60 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/loop/cmp/ZCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/loop/cmp/ZCmp.java @@ -1,15 +1,15 @@ package com.yomahub.liteflow.test.loop.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeBreakComponent; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import com.yomahub.liteflow.slot.DefaultContext; @LiteflowComponent("z") -public class ZCmp extends NodeWhileComponent { +public class ZCmp extends NodeBooleanComponent { @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { DefaultContext context = this.getFirstContextBean(); String key = "test"; if (context.hasData(key)) { diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/FCmp.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/FCmp.java index dbed3216..970fb121 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/FCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/FCmp.java @@ -1,12 +1,12 @@ package com.yomahub.liteflow.test.maxWaitMilliseconds.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; @LiteflowComponent("f") -public class FCmp extends NodeIfComponent { +public class FCmp extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { return true; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/WCmp.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/WCmp.java index 433c8bec..f881557d 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/WCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/WCmp.java @@ -1,20 +1,20 @@ package com.yomahub.liteflow.test.maxWaitMilliseconds.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import java.util.HashSet; import java.util.Set; @LiteflowComponent("w") -public class WCmp extends NodeWhileComponent { +public class WCmp extends NodeBooleanComponent { private int count = 0; // 执行过的 chain Set executedChain = new HashSet<>(); @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { // 判断是否切换了 chain if (!executedChain.contains(this.getCurrChainId())) { count = 0; diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/FCmp.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/FCmp.java index 89ef9f92..7674a4f4 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/FCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/FCmp.java @@ -1,12 +1,12 @@ package com.yomahub.liteflow.test.maxWaitSeconds.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; @LiteflowComponent("f") -public class FCmp extends NodeIfComponent { +public class FCmp extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { return true; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/WCmp.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/WCmp.java index 1db12e3d..ead8b1ae 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/WCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/WCmp.java @@ -1,20 +1,20 @@ package com.yomahub.liteflow.test.maxWaitSeconds.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import java.util.HashSet; import java.util.Set; @LiteflowComponent("w") -public class WCmp extends NodeWhileComponent { +public class WCmp extends NodeBooleanComponent { private int count = 0; // 执行过的 chain Set executedChain = new HashSet<>(); @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { // 判断是否切换了 chain if (!executedChain.contains(this.getCurrChainId())) { count = 0; diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/YCmp.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/YCmp.java index 0712fd95..61df5c75 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/YCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/YCmp.java @@ -1,14 +1,14 @@ package com.yomahub.liteflow.test.parallelLoop.cmp; -import com.yomahub.liteflow.core.NodeBreakComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import com.yomahub.liteflow.slot.DefaultContext; import org.noear.solon.annotation.Component; @Component("y") -public class YCmp extends NodeBreakComponent { +public class YCmp extends NodeBooleanComponent { @Override - public boolean processBreak() throws Exception { + public boolean processBoolean() throws Exception { DefaultContext context = this.getFirstContextBean(); int count = 0; if(context.hasData("test")) { diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/ZCmp.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/ZCmp.java index 33245477..edf604ba 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/ZCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/ZCmp.java @@ -1,14 +1,14 @@ package com.yomahub.liteflow.test.parallelLoop.cmp; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import com.yomahub.liteflow.slot.DefaultContext; import org.noear.solon.annotation.Component; @Component("z") -public class ZCmp extends NodeWhileComponent { +public class ZCmp extends NodeBooleanComponent { @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { DefaultContext context = this.getFirstContextBean(); String key = "test"; if (context.hasData(key)) { diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/retry/cmp/FCmp.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/retry/cmp/FCmp.java index 54df152d..fe2a0770 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/retry/cmp/FCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/retry/cmp/FCmp.java @@ -1,13 +1,13 @@ package com.yomahub.liteflow.test.retry.cmp; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.noear.solon.annotation.Component; @Component("f") -public class FCmp extends NodeIfComponent { +public class FCmp extends NodeBooleanComponent { int flag = 0; @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { System.out.println("FCmp executed!"); flag ++; if(flag < 4) throw new RuntimeException(); diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/retry/cmp/NCmp.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/retry/cmp/NCmp.java index 5605c729..463bc84a 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/retry/cmp/NCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/retry/cmp/NCmp.java @@ -1,14 +1,14 @@ package com.yomahub.liteflow.test.retry.cmp; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.noear.solon.annotation.Component; @Component("n") -public class NCmp extends NodeWhileComponent { +public class NCmp extends NodeBooleanComponent { int flag = 0; @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { flag ++; System.out.println("NCmp executed!"); if(flag < 4) throw new RuntimeException(); diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/rollback/cmp/HCmp.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/rollback/cmp/HCmp.java index f2935ff6..4918dccf 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/rollback/cmp/HCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/rollback/cmp/HCmp.java @@ -1,13 +1,13 @@ package com.yomahub.liteflow.test.rollback.cmp; -import com.yomahub.liteflow.core.NodeBreakComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.noear.solon.annotation.Component; @Component("h") -public class HCmp extends NodeBreakComponent { +public class HCmp extends NodeBooleanComponent { @Override - public boolean processBreak() throws Exception { + public boolean processBoolean() throws Exception { System.out.println("HCmp executed!"); throw new RuntimeException(); } diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/rollback/cmp/WCmp.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/rollback/cmp/WCmp.java index 6e72a9c8..b25b04ca 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/rollback/cmp/WCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/rollback/cmp/WCmp.java @@ -1,13 +1,13 @@ package com.yomahub.liteflow.test.rollback.cmp; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.noear.solon.annotation.Component; @Component("w") -public class WCmp extends NodeWhileComponent { +public class WCmp extends NodeBooleanComponent { @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { System.out.println("WCmp executed!"); return true; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/rollback/cmp/XCmp.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/rollback/cmp/XCmp.java index d165ba32..8a468e24 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/rollback/cmp/XCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/rollback/cmp/XCmp.java @@ -1,12 +1,12 @@ package com.yomahub.liteflow.test.rollback.cmp; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.noear.solon.annotation.Component;; @Component("x") -public class XCmp extends NodeIfComponent { +public class XCmp extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { System.out.println("XCmp executed!"); return true; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/cmp/CCmp.java index e2c16b4a..c89cb352 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/cmp/CCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/cmp/CCmp.java @@ -1,13 +1,13 @@ package com.yomahub.liteflow.test.abstractChain.cmp; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.springframework.stereotype.Component; @Component("c") -public class CCmp extends NodeIfComponent { +public class CCmp extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { //do your biz return true; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/BK.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/BK.java index 54353a35..dc0844ba 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/BK.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/BK.java @@ -1,12 +1,12 @@ package com.yomahub.liteflow.test.booleanOpt.cmp; -import com.yomahub.liteflow.core.NodeBreakComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.springframework.stereotype.Component; @Component("bk") -public class BK extends NodeBreakComponent { +public class BK extends NodeBooleanComponent { @Override - public boolean processBreak() throws Exception { + public boolean processBoolean() throws Exception { int index = this.getLoopIndex(); return index > 2; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/W1.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/W1.java index 24e4d686..e2cb66e2 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/W1.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/W1.java @@ -7,14 +7,14 @@ */ package com.yomahub.liteflow.test.booleanOpt.cmp; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.springframework.stereotype.Component; @Component("w1") -public class W1 extends NodeWhileComponent { +public class W1 extends NodeBooleanComponent { @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { return true; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/W2.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/W2.java index 07007d85..7c9581d2 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/W2.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/W2.java @@ -7,14 +7,14 @@ */ package com.yomahub.liteflow.test.booleanOpt.cmp; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.springframework.stereotype.Component; @Component("w2") -public class W2 extends NodeWhileComponent { +public class W2 extends NodeBooleanComponent { @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { return false; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/X1.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/X1.java index afa69979..b6e2d7f2 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/X1.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/X1.java @@ -1,12 +1,12 @@ package com.yomahub.liteflow.test.booleanOpt.cmp; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.springframework.stereotype.Component; @Component("x1") -public class X1 extends NodeIfComponent { +public class X1 extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { return true; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/X2.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/X2.java index 266c7457..1152e5c8 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/X2.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/X2.java @@ -1,12 +1,12 @@ package com.yomahub.liteflow.test.booleanOpt.cmp; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.springframework.stereotype.Component; @Component("x2") -public class X2 extends NodeIfComponent { +public class X2 extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { return true; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/X3.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/X3.java index dea18a14..6df5c4b6 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/X3.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/X3.java @@ -1,12 +1,12 @@ package com.yomahub.liteflow.test.booleanOpt.cmp; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.springframework.stereotype.Component; @Component("x3") -public class X3 extends NodeIfComponent { +public class X3 extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { return false; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/X4.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/X4.java index 1de35a3b..ecfe9f94 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/X4.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/booleanOpt/cmp/X4.java @@ -1,12 +1,12 @@ package com.yomahub.liteflow.test.booleanOpt.cmp; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.springframework.stereotype.Component; @Component("x4") -public class X4 extends NodeIfComponent { +public class X4 extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { return false; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/BreakCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/BreakCmp.java index 32813ffe..f528524e 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/BreakCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/BreakCmp.java @@ -2,14 +2,15 @@ package com.yomahub.liteflow.test.fallback.cmp; import com.yomahub.liteflow.annotation.FallbackCmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeBreakComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; +import com.yomahub.liteflow.enums.BooleanTypeEnum; @LiteflowComponent("bn1") -@FallbackCmp -public class BreakCmp extends NodeBreakComponent { +@FallbackCmp(BooleanTypeEnum.BREAK) +public class BreakCmp extends NodeBooleanComponent { @Override - public boolean processBreak() throws Exception { + public boolean processBoolean() throws Exception { return true; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp1.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp1.java index 62b47dec..6d999baa 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp1.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp1.java @@ -1,13 +1,13 @@ package com.yomahub.liteflow.test.fallback.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; @LiteflowComponent("ifn1") -public class IfCmp1 extends NodeIfComponent { +public class IfCmp1 extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { return true; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp2.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp2.java index c5b20fcd..5be4620b 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp2.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp2.java @@ -2,14 +2,15 @@ package com.yomahub.liteflow.test.fallback.cmp; import com.yomahub.liteflow.annotation.FallbackCmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; +import com.yomahub.liteflow.enums.BooleanTypeEnum; @LiteflowComponent("ifn2") -@FallbackCmp -public class IfCmp2 extends NodeIfComponent { +@FallbackCmp(BooleanTypeEnum.IF) +public class IfCmp2 extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { return false; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp1.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp1.java index 6769480c..f732ca79 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp1.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp1.java @@ -1,20 +1,20 @@ package com.yomahub.liteflow.test.fallback.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import java.util.HashSet; import java.util.Set; @LiteflowComponent("wn1") -public class WhileCmp1 extends NodeWhileComponent { +public class WhileCmp1 extends NodeBooleanComponent { private int count = 0; // 执行过的 chain Set executedChain = new HashSet<>(); @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { // 判断是否切换了 chain if (!executedChain.contains(this.getCurrChainId())) { count = 0; diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp2.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp2.java index b198faa0..3f88484e 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp2.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp2.java @@ -2,14 +2,15 @@ package com.yomahub.liteflow.test.fallback.cmp; import com.yomahub.liteflow.annotation.FallbackCmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; +import com.yomahub.liteflow.enums.BooleanTypeEnum; @LiteflowComponent("wn2") -@FallbackCmp -public class WhileCmp2 extends NodeWhileComponent { +@FallbackCmp(BooleanTypeEnum.WHILE) +public class WhileCmp2 extends NodeBooleanComponent { @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { return false; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/X1Cmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/X1Cmp.java index ad0f8158..b707e277 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/X1Cmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/X1Cmp.java @@ -7,14 +7,14 @@ */ package com.yomahub.liteflow.test.ifelse.cmp; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.springframework.stereotype.Component; @Component("x1") -public class X1Cmp extends NodeIfComponent { +public class X1Cmp extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { return Boolean.parseBoolean(this.getTag()); } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/X2Cmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/X2Cmp.java index 70453289..d74b46fb 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/X2Cmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/X2Cmp.java @@ -7,14 +7,14 @@ */ package com.yomahub.liteflow.test.ifelse.cmp; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.springframework.stereotype.Component; @Component("x2") -public class X2Cmp extends NodeIfComponent { +public class X2Cmp extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { return true; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/iterator/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/iterator/cmp/BCmp.java index c0eccdb9..172d424c 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/iterator/cmp/BCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/iterator/cmp/BCmp.java @@ -1,15 +1,15 @@ package com.yomahub.liteflow.test.iterator.cmp; -import com.yomahub.liteflow.core.NodeBreakComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import com.yomahub.liteflow.core.NodeComponent; import org.springframework.stereotype.Component; @Component("b") -public class BCmp extends NodeBreakComponent { +public class BCmp extends NodeBooleanComponent { @Override - public boolean processBreak() throws Exception { + public boolean processBoolean() throws Exception { return this.getLoopIndex() == 1; } 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 b70b1611..a4ad69cf 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 @@ -1,15 +1,15 @@ package com.yomahub.liteflow.test.loop.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeBreakComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import com.yomahub.liteflow.core.NodeForComponent; import com.yomahub.liteflow.slot.DefaultContext; @LiteflowComponent("y") -public class YCmp extends NodeBreakComponent { +public class YCmp extends NodeBooleanComponent { @Override - public boolean processBreak() throws Exception { + public boolean processBoolean() throws Exception { 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 1d464cae..d8baa25a 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 @@ -1,15 +1,15 @@ package com.yomahub.liteflow.test.loop.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeBreakComponent; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import com.yomahub.liteflow.slot.DefaultContext; @LiteflowComponent("z") -public class ZCmp extends NodeWhileComponent { +public class ZCmp extends NodeBooleanComponent { @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { return this.getLoopIndex()<5; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/FCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/FCmp.java index dbed3216..970fb121 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/FCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/FCmp.java @@ -1,12 +1,12 @@ package com.yomahub.liteflow.test.maxWaitMilliseconds.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; @LiteflowComponent("f") -public class FCmp extends NodeIfComponent { +public class FCmp extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { return true; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/WCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/WCmp.java index 433c8bec..f881557d 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/WCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/WCmp.java @@ -1,20 +1,20 @@ package com.yomahub.liteflow.test.maxWaitMilliseconds.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import java.util.HashSet; import java.util.Set; @LiteflowComponent("w") -public class WCmp extends NodeWhileComponent { +public class WCmp extends NodeBooleanComponent { private int count = 0; // 执行过的 chain Set executedChain = new HashSet<>(); @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { // 判断是否切换了 chain if (!executedChain.contains(this.getCurrChainId())) { count = 0; diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/FCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/FCmp.java index 89ef9f92..7674a4f4 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/FCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/FCmp.java @@ -1,12 +1,12 @@ package com.yomahub.liteflow.test.maxWaitSeconds.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; @LiteflowComponent("f") -public class FCmp extends NodeIfComponent { +public class FCmp extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { return true; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/WCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/WCmp.java index 1db12e3d..ead8b1ae 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/WCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/WCmp.java @@ -1,20 +1,20 @@ package com.yomahub.liteflow.test.maxWaitSeconds.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import java.util.HashSet; import java.util.Set; @LiteflowComponent("w") -public class WCmp extends NodeWhileComponent { +public class WCmp extends NodeBooleanComponent { private int count = 0; // 执行过的 chain Set executedChain = new HashSet<>(); @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { // 判断是否切换了 chain if (!executedChain.contains(this.getCurrChainId())) { count = 0; diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/YCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/YCmp.java index 2ac45518..ea6a0359 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/YCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/YCmp.java @@ -2,7 +2,7 @@ package com.yomahub.liteflow.test.parallelLoop.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.annotation.LiteflowMethod; -import com.yomahub.liteflow.core.NodeBreakComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import com.yomahub.liteflow.core.NodeComponent; import com.yomahub.liteflow.enums.LiteFlowMethodEnum; import com.yomahub.liteflow.enums.NodeTypeEnum; @@ -10,10 +10,10 @@ import com.yomahub.liteflow.slot.DefaultContext; import org.springframework.stereotype.Component; @Component("y") -public class YCmp extends NodeBreakComponent { +public class YCmp extends NodeBooleanComponent { @Override - public boolean processBreak() throws Exception { + public boolean processBoolean() throws Exception { DefaultContext context = this.getFirstContextBean(); int count = 0; if(context.hasData("test")) { diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/ZCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/ZCmp.java index d1dfaf65..cd89c805 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/ZCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/ZCmp.java @@ -3,17 +3,17 @@ package com.yomahub.liteflow.test.parallelLoop.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.annotation.LiteflowMethod; import com.yomahub.liteflow.core.NodeComponent; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import com.yomahub.liteflow.enums.LiteFlowMethodEnum; import com.yomahub.liteflow.enums.NodeTypeEnum; import com.yomahub.liteflow.slot.DefaultContext; import org.springframework.stereotype.Component; @Component("z") -public class ZCmp extends NodeWhileComponent { +public class ZCmp extends NodeBooleanComponent { @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { DefaultContext context = this.getFirstContextBean(); String key = "test"; if (context.hasData(key)) { diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/retry/cmp/FCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/retry/cmp/FCmp.java index 1bc95f54..81704f49 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/retry/cmp/FCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/retry/cmp/FCmp.java @@ -1,13 +1,13 @@ package com.yomahub.liteflow.test.retry.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; @LiteflowComponent("f") -public class FCmp extends NodeIfComponent { +public class FCmp extends NodeBooleanComponent { int flag = 0; @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { System.out.println("FCmp executed!"); flag ++; if(flag < 4) throw new RuntimeException(); diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/retry/cmp/NCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/retry/cmp/NCmp.java index ac0434c9..e72524ab 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/retry/cmp/NCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/retry/cmp/NCmp.java @@ -1,14 +1,14 @@ package com.yomahub.liteflow.test.retry.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; @LiteflowComponent("n") -public class NCmp extends NodeWhileComponent { +public class NCmp extends NodeBooleanComponent { int flag = 0; @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { flag ++; System.out.println("NCmp executed!"); if(flag < 4) throw new RuntimeException(); diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/HCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/HCmp.java index 19ebef9b..a2d3ebe5 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/HCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/HCmp.java @@ -1,13 +1,13 @@ package com.yomahub.liteflow.test.rollback.cmp; -import com.yomahub.liteflow.core.NodeBreakComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.springframework.stereotype.Component; @Component("h") -public class HCmp extends NodeBreakComponent { +public class HCmp extends NodeBooleanComponent { @Override - public boolean processBreak() throws Exception { + public boolean processBoolean() throws Exception { System.out.println("HCmp executed!"); throw new RuntimeException(); } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/WCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/WCmp.java index 3f0fd80d..81233ca7 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/WCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/WCmp.java @@ -1,13 +1,13 @@ package com.yomahub.liteflow.test.rollback.cmp; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.springframework.stereotype.Component; @Component("w") -public class WCmp extends NodeWhileComponent { +public class WCmp extends NodeBooleanComponent { @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { System.out.println("WCmp executed!"); return true; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/XCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/XCmp.java index 9928246c..7d161a2d 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/XCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/rollback/cmp/XCmp.java @@ -1,12 +1,12 @@ package com.yomahub.liteflow.test.rollback.cmp; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.springframework.stereotype.Component; @Component("x") -public class XCmp extends NodeIfComponent { +public class XCmp extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { System.out.println("XCmp executed!"); return true; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/abstractChain/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/abstractChain/cmp/CCmp.java index e2c16b4a..c89cb352 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/abstractChain/cmp/CCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/abstractChain/cmp/CCmp.java @@ -1,13 +1,13 @@ package com.yomahub.liteflow.test.abstractChain.cmp; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.springframework.stereotype.Component; @Component("c") -public class CCmp extends NodeIfComponent { +public class CCmp extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { //do your biz return true; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/fallback/cmp/BreakCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/fallback/cmp/BreakCmp.java index 32813ffe..f528524e 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/fallback/cmp/BreakCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/fallback/cmp/BreakCmp.java @@ -2,14 +2,15 @@ package com.yomahub.liteflow.test.fallback.cmp; import com.yomahub.liteflow.annotation.FallbackCmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeBreakComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; +import com.yomahub.liteflow.enums.BooleanTypeEnum; @LiteflowComponent("bn1") -@FallbackCmp -public class BreakCmp extends NodeBreakComponent { +@FallbackCmp(BooleanTypeEnum.BREAK) +public class BreakCmp extends NodeBooleanComponent { @Override - public boolean processBreak() throws Exception { + public boolean processBoolean() throws Exception { return true; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp1.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp1.java index 62b47dec..6d999baa 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp1.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp1.java @@ -1,13 +1,13 @@ package com.yomahub.liteflow.test.fallback.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; @LiteflowComponent("ifn1") -public class IfCmp1 extends NodeIfComponent { +public class IfCmp1 extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { return true; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp2.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp2.java index c5b20fcd..5be4620b 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp2.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/fallback/cmp/IfCmp2.java @@ -2,14 +2,15 @@ package com.yomahub.liteflow.test.fallback.cmp; import com.yomahub.liteflow.annotation.FallbackCmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; +import com.yomahub.liteflow.enums.BooleanTypeEnum; @LiteflowComponent("ifn2") -@FallbackCmp -public class IfCmp2 extends NodeIfComponent { +@FallbackCmp(BooleanTypeEnum.IF) +public class IfCmp2 extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { return false; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp1.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp1.java index 6769480c..f732ca79 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp1.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp1.java @@ -1,20 +1,20 @@ package com.yomahub.liteflow.test.fallback.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import java.util.HashSet; import java.util.Set; @LiteflowComponent("wn1") -public class WhileCmp1 extends NodeWhileComponent { +public class WhileCmp1 extends NodeBooleanComponent { private int count = 0; // 执行过的 chain Set executedChain = new HashSet<>(); @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { // 判断是否切换了 chain if (!executedChain.contains(this.getCurrChainId())) { count = 0; diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp2.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp2.java index b198faa0..3f88484e 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp2.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/fallback/cmp/WhileCmp2.java @@ -2,14 +2,15 @@ package com.yomahub.liteflow.test.fallback.cmp; import com.yomahub.liteflow.annotation.FallbackCmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; +import com.yomahub.liteflow.enums.BooleanTypeEnum; @LiteflowComponent("wn2") -@FallbackCmp -public class WhileCmp2 extends NodeWhileComponent { +@FallbackCmp(BooleanTypeEnum.WHILE) +public class WhileCmp2 extends NodeBooleanComponent { @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { return false; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/X1Cmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/X1Cmp.java index ad0f8158..b707e277 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/X1Cmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/ifelse/cmp/X1Cmp.java @@ -7,14 +7,14 @@ */ package com.yomahub.liteflow.test.ifelse.cmp; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.springframework.stereotype.Component; @Component("x1") -public class X1Cmp extends NodeIfComponent { +public class X1Cmp extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { return Boolean.parseBoolean(this.getTag()); } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/iterator/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/iterator/cmp/BCmp.java index e6dcd45a..e06262e8 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/iterator/cmp/BCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/iterator/cmp/BCmp.java @@ -1,14 +1,14 @@ package com.yomahub.liteflow.test.iterator.cmp; -import com.yomahub.liteflow.core.NodeBreakComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.springframework.stereotype.Component; @Component("b") -public class BCmp extends NodeBreakComponent { +public class BCmp extends NodeBooleanComponent { @Override - public boolean processBreak() throws Exception { + public boolean processBoolean() throws Exception { return this.getLoopIndex() == 1; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/loop/cmp/YCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/loop/cmp/YCmp.java index 6a820a63..1ff92b00 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/loop/cmp/YCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/loop/cmp/YCmp.java @@ -1,14 +1,14 @@ package com.yomahub.liteflow.test.loop.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeBreakComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import com.yomahub.liteflow.slot.DefaultContext; @LiteflowComponent("y") -public class YCmp extends NodeBreakComponent { +public class YCmp extends NodeBooleanComponent { @Override - public boolean processBreak() throws Exception { + public boolean processBoolean() throws Exception { DefaultContext context = this.getFirstContextBean(); int count = context.getData("test"); return count > 3; diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/loop/cmp/ZCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/loop/cmp/ZCmp.java index 78c621f2..209bcbb4 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/loop/cmp/ZCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/loop/cmp/ZCmp.java @@ -1,14 +1,14 @@ package com.yomahub.liteflow.test.loop.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import com.yomahub.liteflow.slot.DefaultContext; @LiteflowComponent("z") -public class ZCmp extends NodeWhileComponent { +public class ZCmp extends NodeBooleanComponent { @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { DefaultContext context = this.getFirstContextBean(); String key = "test"; if (context.hasData(key)) { diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/FCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/FCmp.java index dbed3216..970fb121 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/FCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/FCmp.java @@ -1,12 +1,12 @@ package com.yomahub.liteflow.test.maxWaitMilliseconds.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; @LiteflowComponent("f") -public class FCmp extends NodeIfComponent { +public class FCmp extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { return true; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/WCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/WCmp.java index 433c8bec..f881557d 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/WCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/cmp/WCmp.java @@ -1,20 +1,20 @@ package com.yomahub.liteflow.test.maxWaitMilliseconds.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import java.util.HashSet; import java.util.Set; @LiteflowComponent("w") -public class WCmp extends NodeWhileComponent { +public class WCmp extends NodeBooleanComponent { private int count = 0; // 执行过的 chain Set executedChain = new HashSet<>(); @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { // 判断是否切换了 chain if (!executedChain.contains(this.getCurrChainId())) { count = 0; diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/FCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/FCmp.java index 89ef9f92..7674a4f4 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/FCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/FCmp.java @@ -1,12 +1,12 @@ package com.yomahub.liteflow.test.maxWaitSeconds.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; @LiteflowComponent("f") -public class FCmp extends NodeIfComponent { +public class FCmp extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { return true; } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/WCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/WCmp.java index 1db12e3d..ead8b1ae 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/WCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/cmp/WCmp.java @@ -1,20 +1,20 @@ package com.yomahub.liteflow.test.maxWaitSeconds.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import java.util.HashSet; import java.util.Set; @LiteflowComponent("w") -public class WCmp extends NodeWhileComponent { +public class WCmp extends NodeBooleanComponent { private int count = 0; // 执行过的 chain Set executedChain = new HashSet<>(); @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { // 判断是否切换了 chain if (!executedChain.contains(this.getCurrChainId())) { count = 0; diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/YCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/YCmp.java index 8975f7f3..dee9e189 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/YCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/YCmp.java @@ -1,14 +1,14 @@ package com.yomahub.liteflow.test.parallelLoop.cmp; -import com.yomahub.liteflow.core.NodeBreakComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import com.yomahub.liteflow.slot.DefaultContext; import org.springframework.stereotype.Component; @Component("y") -public class YCmp extends NodeBreakComponent { +public class YCmp extends NodeBooleanComponent { @Override - public boolean processBreak() throws Exception { + public boolean processBoolean() throws Exception { DefaultContext context = this.getFirstContextBean(); int count = 0; if(context.hasData("test")) { diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/ZCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/ZCmp.java index 844a6ff2..134489c6 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/ZCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/parallelLoop/cmp/ZCmp.java @@ -1,14 +1,14 @@ package com.yomahub.liteflow.test.parallelLoop.cmp; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import com.yomahub.liteflow.slot.DefaultContext; import org.springframework.stereotype.Component; @Component("z") -public class ZCmp extends NodeWhileComponent { +public class ZCmp extends NodeBooleanComponent { @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { DefaultContext context = this.getFirstContextBean(); String key = "test"; if (context.hasData(key)) { diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/retry/cmp/FCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/retry/cmp/FCmp.java index ee942ea6..5172ab90 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/retry/cmp/FCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/retry/cmp/FCmp.java @@ -1,13 +1,13 @@ package com.yomahub.liteflow.test.retry.cmp; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.springframework.stereotype.Component; @Component("f") -public class FCmp extends NodeIfComponent { +public class FCmp extends NodeBooleanComponent { int flag = 0; @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { System.out.println("FCmp executed!"); flag ++; if(flag < 4) throw new RuntimeException(); diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/retry/cmp/NCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/retry/cmp/NCmp.java index ff24b004..5543be3b 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/retry/cmp/NCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/retry/cmp/NCmp.java @@ -1,14 +1,14 @@ package com.yomahub.liteflow.test.retry.cmp; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.springframework.stereotype.Component; @Component("n") -public class NCmp extends NodeWhileComponent { +public class NCmp extends NodeBooleanComponent { int flag = 0; @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { flag ++; System.out.println("NCmp executed!"); if(flag < 4) throw new RuntimeException(); diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/rollback/cmp/HCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/rollback/cmp/HCmp.java index 19ebef9b..a2d3ebe5 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/rollback/cmp/HCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/rollback/cmp/HCmp.java @@ -1,13 +1,13 @@ package com.yomahub.liteflow.test.rollback.cmp; -import com.yomahub.liteflow.core.NodeBreakComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.springframework.stereotype.Component; @Component("h") -public class HCmp extends NodeBreakComponent { +public class HCmp extends NodeBooleanComponent { @Override - public boolean processBreak() throws Exception { + public boolean processBoolean() throws Exception { System.out.println("HCmp executed!"); throw new RuntimeException(); } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/rollback/cmp/WCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/rollback/cmp/WCmp.java index 3f0fd80d..81233ca7 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/rollback/cmp/WCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/rollback/cmp/WCmp.java @@ -1,13 +1,13 @@ package com.yomahub.liteflow.test.rollback.cmp; -import com.yomahub.liteflow.core.NodeWhileComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.springframework.stereotype.Component; @Component("w") -public class WCmp extends NodeWhileComponent { +public class WCmp extends NodeBooleanComponent { @Override - public boolean processWhile() throws Exception { + public boolean processBoolean() throws Exception { System.out.println("WCmp executed!"); return true; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/rollback/cmp/XCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/rollback/cmp/XCmp.java index 9928246c..7d161a2d 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/rollback/cmp/XCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/rollback/cmp/XCmp.java @@ -1,12 +1,12 @@ package com.yomahub.liteflow.test.rollback.cmp; -import com.yomahub.liteflow.core.NodeIfComponent; +import com.yomahub.liteflow.core.NodeBooleanComponent; import org.springframework.stereotype.Component; @Component("x") -public class XCmp extends NodeIfComponent { +public class XCmp extends NodeBooleanComponent { @Override - public boolean processIf() throws Exception { + public boolean processBoolean() throws Exception { System.out.println("XCmp executed!"); return true; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-dynamic/src/test/resources/sql/data.sql b/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-dynamic/src/test/resources/sql/data.sql index dda527ee..f6875cc6 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-dynamic/src/test/resources/sql/data.sql +++ b/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-dynamic/src/test/resources/sql/data.sql @@ -8,7 +8,7 @@ INSERT INTO EL_TABLE (APPLICATION_NAME,CHAIN_NAME,EL_DATA) values ('demo','chain DELETE FROM SCRIPT_NODE_TABLE; -INSERT INTO SCRIPT_NODE_TABLE (APPLICATION_NAME,SCRIPT_NODE_ID,SCRIPT_NODE_NAME,SCRIPT_NODE_TYPE,SCRIPT_NODE_DATA,SCRIPT_LANGUAGE) values ('demo','x0','if 脚本','if_script','return true','groovy'); -INSERT INTO SCRIPT_NODE_TABLE (APPLICATION_NAME,SCRIPT_NODE_ID,SCRIPT_NODE_NAME,SCRIPT_NODE_TYPE,SCRIPT_NODE_DATA,SCRIPT_LANGUAGE) values ('demo','x1','if 脚本','if_script','return false','groovy'); +INSERT INTO SCRIPT_NODE_TABLE (APPLICATION_NAME,SCRIPT_NODE_ID,SCRIPT_NODE_NAME,SCRIPT_NODE_TYPE,SCRIPT_NODE_DATA,SCRIPT_LANGUAGE) values ('demo','x0','if 脚本','boolean_script','return true','groovy'); +INSERT INTO SCRIPT_NODE_TABLE (APPLICATION_NAME,SCRIPT_NODE_ID,SCRIPT_NODE_NAME,SCRIPT_NODE_TYPE,SCRIPT_NODE_DATA,SCRIPT_LANGUAGE) values ('demo','x1','if 脚本','boolean_script','return false','groovy'); -INSERT INTO SCRIPT_NODE_TABLE (APPLICATION_NAME,SCRIPT_NODE_ID,SCRIPT_NODE_NAME,SCRIPT_NODE_TYPE,SCRIPT_NODE_DATA,SCRIPT_LANGUAGE) values ('demo','x2','python脚本','if_script','return true','js'); +INSERT INTO SCRIPT_NODE_TABLE (APPLICATION_NAME,SCRIPT_NODE_ID,SCRIPT_NODE_NAME,SCRIPT_NODE_TYPE,SCRIPT_NODE_DATA,SCRIPT_LANGUAGE) values ('demo','x2','python脚本','boolean_script','return true','js'); diff --git a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-dynamic/src/test/resources/sql/second/data.sql b/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-dynamic/src/test/resources/sql/second/data.sql index 35412b6a..2b83a068 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-dynamic/src/test/resources/sql/second/data.sql +++ b/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-dynamic/src/test/resources/sql/second/data.sql @@ -17,11 +17,11 @@ FROM SCRIPT_NODE_TABLE; INSERT INTO SCRIPT_NODE_TABLE (APPLICATION_NAME, SCRIPT_NODE_ID, SCRIPT_NODE_NAME, SCRIPT_NODE_TYPE, SCRIPT_NODE_DATA, SCRIPT_LANGUAGE) -values ('demo', 'x01', 'if 脚本', 'if_script', 'return true', 'groovy'); +values ('demo', 'x01', 'if 脚本', 'boolean_script', 'return true', 'groovy'); INSERT INTO SCRIPT_NODE_TABLE (APPLICATION_NAME, SCRIPT_NODE_ID, SCRIPT_NODE_NAME, SCRIPT_NODE_TYPE, SCRIPT_NODE_DATA, SCRIPT_LANGUAGE) -values ('demo', 'x11', 'if 脚本', 'if_script', 'return false', 'groovy'); +values ('demo', 'x11', 'if 脚本', 'boolean_script', 'return false', 'groovy'); INSERT INTO SCRIPT_NODE_TABLE (APPLICATION_NAME, SCRIPT_NODE_ID, SCRIPT_NODE_NAME, SCRIPT_NODE_TYPE, SCRIPT_NODE_DATA, SCRIPT_LANGUAGE) -values ('demo', 'x21', 'python脚本', 'if_script', 'return true', 'js'); +values ('demo', 'x21', 'python脚本', 'boolean_script', 'return true', 'js'); diff --git a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot/src/test/resources/sql/data.sql b/liteflow-testcase-el/liteflow-testcase-el-sql-springboot/src/test/resources/sql/data.sql index 5900dfa0..5453c149 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot/src/test/resources/sql/data.sql +++ b/liteflow-testcase-el/liteflow-testcase-el-sql-springboot/src/test/resources/sql/data.sql @@ -8,7 +8,7 @@ INSERT INTO EL_TABLE (APPLICATION_NAME,CHAIN_NAME,EL_DATA) values ('demo','chain DELETE FROM SCRIPT_NODE_TABLE; -INSERT INTO SCRIPT_NODE_TABLE (APPLICATION_NAME,SCRIPT_NODE_ID,SCRIPT_NODE_NAME,SCRIPT_NODE_TYPE,SCRIPT_NODE_DATA,SCRIPT_LANGUAGE) values ('demo','x0','if 脚本','if_script','return true','groovy'); -INSERT INTO SCRIPT_NODE_TABLE (APPLICATION_NAME,SCRIPT_NODE_ID,SCRIPT_NODE_NAME,SCRIPT_NODE_TYPE,SCRIPT_NODE_DATA,SCRIPT_LANGUAGE) values ('demo','x1','if 脚本','if_script','return true','groovy'); +INSERT INTO SCRIPT_NODE_TABLE (APPLICATION_NAME,SCRIPT_NODE_ID,SCRIPT_NODE_NAME,SCRIPT_NODE_TYPE,SCRIPT_NODE_DATA,SCRIPT_LANGUAGE) values ('demo','x0','if 脚本','boolean_script','return true','groovy'); +INSERT INTO SCRIPT_NODE_TABLE (APPLICATION_NAME,SCRIPT_NODE_ID,SCRIPT_NODE_NAME,SCRIPT_NODE_TYPE,SCRIPT_NODE_DATA,SCRIPT_LANGUAGE) values ('demo','x1','if 脚本','boolean_script','return true','groovy'); -INSERT INTO SCRIPT_NODE_TABLE (APPLICATION_NAME,SCRIPT_NODE_ID,SCRIPT_NODE_NAME,SCRIPT_NODE_TYPE,SCRIPT_NODE_DATA,SCRIPT_LANGUAGE) values ('demo','x2','python脚本','if_script','return true','js'); +INSERT INTO SCRIPT_NODE_TABLE (APPLICATION_NAME,SCRIPT_NODE_ID,SCRIPT_NODE_NAME,SCRIPT_NODE_TYPE,SCRIPT_NODE_DATA,SCRIPT_LANGUAGE) values ('demo','x2','python脚本','boolean_script','return true','js'); diff --git a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot/src/test/resources/sql/sql-lite/data.sql b/liteflow-testcase-el/liteflow-testcase-el-sql-springboot/src/test/resources/sql/sql-lite/data.sql index dda527ee..f6875cc6 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot/src/test/resources/sql/sql-lite/data.sql +++ b/liteflow-testcase-el/liteflow-testcase-el-sql-springboot/src/test/resources/sql/sql-lite/data.sql @@ -8,7 +8,7 @@ INSERT INTO EL_TABLE (APPLICATION_NAME,CHAIN_NAME,EL_DATA) values ('demo','chain DELETE FROM SCRIPT_NODE_TABLE; -INSERT INTO SCRIPT_NODE_TABLE (APPLICATION_NAME,SCRIPT_NODE_ID,SCRIPT_NODE_NAME,SCRIPT_NODE_TYPE,SCRIPT_NODE_DATA,SCRIPT_LANGUAGE) values ('demo','x0','if 脚本','if_script','return true','groovy'); -INSERT INTO SCRIPT_NODE_TABLE (APPLICATION_NAME,SCRIPT_NODE_ID,SCRIPT_NODE_NAME,SCRIPT_NODE_TYPE,SCRIPT_NODE_DATA,SCRIPT_LANGUAGE) values ('demo','x1','if 脚本','if_script','return false','groovy'); +INSERT INTO SCRIPT_NODE_TABLE (APPLICATION_NAME,SCRIPT_NODE_ID,SCRIPT_NODE_NAME,SCRIPT_NODE_TYPE,SCRIPT_NODE_DATA,SCRIPT_LANGUAGE) values ('demo','x0','if 脚本','boolean_script','return true','groovy'); +INSERT INTO SCRIPT_NODE_TABLE (APPLICATION_NAME,SCRIPT_NODE_ID,SCRIPT_NODE_NAME,SCRIPT_NODE_TYPE,SCRIPT_NODE_DATA,SCRIPT_LANGUAGE) values ('demo','x1','if 脚本','boolean_script','return false','groovy'); -INSERT INTO SCRIPT_NODE_TABLE (APPLICATION_NAME,SCRIPT_NODE_ID,SCRIPT_NODE_NAME,SCRIPT_NODE_TYPE,SCRIPT_NODE_DATA,SCRIPT_LANGUAGE) values ('demo','x2','python脚本','if_script','return true','js'); +INSERT INTO SCRIPT_NODE_TABLE (APPLICATION_NAME,SCRIPT_NODE_ID,SCRIPT_NODE_NAME,SCRIPT_NODE_TYPE,SCRIPT_NODE_DATA,SCRIPT_LANGUAGE) values ('demo','x2','python脚本','boolean_script','return true','js');