diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/annotation/LiteflowCondCmpDefine.java b/liteflow-core/src/main/java/com/yomahub/liteflow/annotation/LiteflowSwitchCmpDefine.java similarity index 78% rename from liteflow-core/src/main/java/com/yomahub/liteflow/annotation/LiteflowCondCmpDefine.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/annotation/LiteflowSwitchCmpDefine.java index 7700ee387..277f3dcb6 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/annotation/LiteflowCondCmpDefine.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/annotation/LiteflowSwitchCmpDefine.java @@ -6,5 +6,5 @@ import java.lang.annotation.*; @Retention(RetentionPolicy.RUNTIME) @Documented @Inherited -public @interface LiteflowCondCmpDefine { +public @interface LiteflowSwitchCmpDefine { } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/LiteFlowConditionBuilder.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/LiteFlowConditionBuilder.java index b008bb515..3a2aad951 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/LiteFlowConditionBuilder.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/LiteFlowConditionBuilder.java @@ -103,7 +103,7 @@ public class LiteFlowConditionBuilder { if (CollUtil.isEmpty(executableEntity.getNodeCondComponents())) { this.condition.getExecutableList().add(node); }else{ - buildCondNode(node, executableEntity.getNodeCondComponents()); + buildSwitchNode(node, executableEntity.getNodeCondComponents()); } } else if (hasChain(executableEntity.getId())) { Chain chain = FlowBus.getChain(executableEntity.getId()); @@ -125,7 +125,7 @@ public class LiteFlowConditionBuilder { } // 构建条件节点 - private void buildCondNode(Node node, List executableEntities) { + private void buildSwitchNode(Node node, List executableEntities) { if (CollUtil.isEmpty(executableEntities)) { return; } 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 70bc4d805..f662f91a1 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 @@ -32,9 +32,9 @@ public class LiteFlowNodeBuilder { return new LiteFlowNodeBuilder(NodeTypeEnum.COMMON); } - /*public static LiteFlowNodeBuilder createCommonCondNode() { + public static LiteFlowNodeBuilder createCommonCondNode() { return new LiteFlowNodeBuilder(NodeTypeEnum.SWITCH); - }*/ + } public static LiteFlowNodeBuilder createScriptNode() { return new LiteFlowNodeBuilder(NodeTypeEnum.SCRIPT); @@ -126,6 +126,8 @@ public class LiteFlowNodeBuilder { try { if (this.node.getType().equals(NodeTypeEnum.COMMON)) { FlowBus.addCommonNode(this.node.getId(), this.node.getName(), this.node.getClazz()); + } else if (this.node.getType().equals(NodeTypeEnum.SWITCH)) { + FlowBus.addSwitchNode(this.node.getId(), this.node.getName(), this.node.getClazz()); } else if (this.node.getType().equals(NodeTypeEnum.SCRIPT)) { FlowBus.addCommonScriptNode(this.node.getId(), this.node.getName(), this.node.getScript()); } else if (this.node.getType().equals(NodeTypeEnum.SWITCH_SCRIPT)) { diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ComponentInitializer.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ComponentInitializer.java index 8931576a2..99a07f3da 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ComponentInitializer.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ComponentInitializer.java @@ -1,5 +1,6 @@ package com.yomahub.liteflow.core; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.yomahub.liteflow.annotation.LiteflowRetry; @@ -42,7 +43,8 @@ public class ComponentInitializer { //先取传进来的name值(配置文件中配置的)，再看有没有配置@LiteflowComponent标注 //@LiteflowComponent标注只在spring体系下生效，这里用了spi机制取到相应环境下的实现类 nodeComponent.setName(desc); - if (nodeComponent.getType().equals(NodeTypeEnum.COMMON) && StrUtil.isBlank(nodeComponent.getName())){ + if (ListUtil.toList(NodeTypeEnum.COMMON, NodeTypeEnum.SWITCH).contains(type) + && StrUtil.isBlank(nodeComponent.getName())){ String name = LiteflowComponentSupportHolder.loadLiteflowComponentSupport().getCmpName(nodeComponent); nodeComponent.setName(name); } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeCondComponent.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeSwitchComponent.java similarity index 88% rename from liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeCondComponent.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeSwitchComponent.java index 49d13f868..1a5699666 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeCondComponent.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/core/NodeSwitchComponent.java @@ -11,7 +11,7 @@ package com.yomahub.liteflow.core; * 条件路由节点抽象类 * @author Bryan.Zhang */ -public abstract class NodeCondComponent extends NodeComponent { +public abstract class NodeSwitchComponent extends NodeComponent { @Override public void process() throws Exception { diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptCondComponent.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptSwitchComponent.java similarity index 88% rename from liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptCondComponent.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptSwitchComponent.java index d8a4aca23..526063ffa 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptCondComponent.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptSwitchComponent.java @@ -7,7 +7,7 @@ import com.yomahub.liteflow.script.ScriptExecutorFactory; * @author Bryan.Zhang * @since 2.6.0 */ -public class ScriptCondComponent extends NodeCondComponent{ +public class ScriptSwitchComponent extends NodeSwitchComponent { @Override public String processCond() throws Exception { diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/exception/NodeClassNotFoundException.java b/liteflow-core/src/main/java/com/yomahub/liteflow/exception/NodeClassNotFoundException.java new file mode 100644 index 000000000..022018485 --- /dev/null +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/exception/NodeClassNotFoundException.java @@ -0,0 +1,25 @@ +package com.yomahub.liteflow.exception; + +public class NodeClassNotFoundException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + /** + * 异常信息 + */ + private String message; + + public NodeClassNotFoundException(String message) { + this.message = message; + } + + @Override + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + +} diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/exception/NodeTypeCanNotGuessException.java b/liteflow-core/src/main/java/com/yomahub/liteflow/exception/NodeTypeCanNotGuessException.java new file mode 100644 index 000000000..4ca82d563 --- /dev/null +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/exception/NodeTypeCanNotGuessException.java @@ -0,0 +1,25 @@ +package com.yomahub.liteflow.exception; + +public class NodeTypeCanNotGuessException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + /** + * 异常信息 + */ + private String message; + + public NodeTypeCanNotGuessException(String message) { + this.message = message; + } + + @Override + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + +} diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/exception/NullNodeTypeException.java b/liteflow-core/src/main/java/com/yomahub/liteflow/exception/NullNodeTypeException.java new file mode 100644 index 000000000..1ed22830e --- /dev/null +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/exception/NullNodeTypeException.java @@ -0,0 +1,25 @@ +package com.yomahub.liteflow.exception; + +public class NullNodeTypeException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + /** + * 异常信息 + */ + private String message; + + public NullNodeTypeException(String message) { + this.message = message; + } + + @Override + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + +} 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 a042b7d90..08f1c625d 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 @@ -12,10 +12,8 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.yomahub.liteflow.core.ComponentInitializer; -import com.yomahub.liteflow.core.NodeComponent; -import com.yomahub.liteflow.core.ScriptComponent; -import com.yomahub.liteflow.core.ScriptCondComponent; +import com.yomahub.liteflow.core.*; +import com.yomahub.liteflow.exception.NullNodeTypeException; import com.yomahub.liteflow.flow.element.Chain; import com.yomahub.liteflow.flow.element.Node; import com.yomahub.liteflow.enums.FlowParserTypeEnum; @@ -81,7 +79,18 @@ public class FlowBus { } public static void addSpringScanNode(String nodeId, NodeComponent nodeComponent) { - nodeMap.put(nodeId, new Node(ComponentInitializer.loadInstance().initComponent(nodeComponent, NodeTypeEnum.COMMON, null, nodeId))); + NodeTypeEnum type = null; + if (nodeComponent instanceof NodeSwitchComponent){ + type = NodeTypeEnum.SWITCH; + } else if(nodeComponent instanceof NodeComponent){ + type = NodeTypeEnum.COMMON; + } + + if (type == null){ + throw new NullNodeTypeException(StrUtil.format("node type is null for node[{}]", nodeId)); + } + + nodeMap.put(nodeId, new Node(ComponentInitializer.loadInstance().initComponent(nodeComponent, type, null, nodeId))); } public static void addCommonNode(String nodeId, String name, String cmpClazzStr){ @@ -94,16 +103,30 @@ public class FlowBus { addNode(nodeId, name, NodeTypeEnum.COMMON, cmpClazz, null); } - public static void addCommonNode(String nodeId, String name, Class cmpClazz){ + public static void addCommonNode(String nodeId, String name, Class cmpClazz){ addNode(nodeId, name, NodeTypeEnum.COMMON, cmpClazz, null); } + public static void addSwitchNode(String nodeId, String name, String cmpClazzStr){ + Class cmpClazz; + try{ + cmpClazz = Class.forName(cmpClazzStr); + }catch (Exception e){ + throw new ComponentCannotRegisterException(e.getMessage()); + } + addNode(nodeId, name, NodeTypeEnum.SWITCH, cmpClazz, null); + } + + public static void addSwitchNode(String nodeId, String name, Class cmpClazz){ + addNode(nodeId, name, NodeTypeEnum.SWITCH, cmpClazz, null); + } + public static void addCommonScriptNode(String nodeId, String name, String script){ addNode(nodeId, name, NodeTypeEnum.SCRIPT, ScriptComponent.class, script); } public static void addSwitchScriptNode(String nodeId, String name, String script){ - addNode(nodeId, name, NodeTypeEnum.SWITCH_SCRIPT, ScriptCondComponent.class, script); + addNode(nodeId, name, NodeTypeEnum.SWITCH_SCRIPT, ScriptSwitchComponent.class, script); } private static void addNode(String nodeId, String name, NodeTypeEnum type, Class cmpClazz, String script) { @@ -111,7 +134,7 @@ public class FlowBus { //判断此类是否是声明式的组件，如果是声明式的组件，就用动态代理生成实例 //如果不是声明式的，就用传统的方式进行判断 NodeComponent cmpInstance = null; - if (LiteFlowProxyUtil.isMarkedCmp(cmpClazz)){ + if (LiteFlowProxyUtil.isDeclareCmp(cmpClazz)){ //这里的逻辑要仔细看下 //如果是spring体系，把原始的类往spring上下文中进行注册，那么会走到ComponentScanner中 //由于ComponentScanner中已经对原始类进行了动态代理，出来的对象已经变成了动态代理类，所以这时候的bean已经是NodeComponent的子类了 @@ -150,7 +173,7 @@ public class FlowBus { if (type.equals(NodeTypeEnum.SCRIPT)){ ((ScriptComponent)cmpInstance).loadScript(script); }else if(type.equals(NodeTypeEnum.SWITCH_SCRIPT)){ - ((ScriptCondComponent)cmpInstance).loadScript(script); + ((ScriptSwitchComponent)cmpInstance).loadScript(script); } } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/SwitchCondition.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/SwitchCondition.java index 076d31382..8fd05881a 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/SwitchCondition.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/SwitchCondition.java @@ -1,5 +1,6 @@ package com.yomahub.liteflow.flow.element.condition; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.yomahub.liteflow.enums.ConditionTypeEnum; @@ -25,7 +26,7 @@ public class SwitchCondition extends Condition{ @Override public void execute(Integer slotIndex) throws Exception { -// if (this.getSwitchNode().getType().equals(NodeTypeEnum.COMMON)){ + if (ListUtil.toList(NodeTypeEnum.SWITCH, NodeTypeEnum.SWITCH_SCRIPT).contains(this.getSwitchNode().getType())){ //先执行switch节点 this.getSwitchNode().execute(slotIndex); @@ -41,9 +42,9 @@ public class SwitchCondition extends Condition{ throw new NoSwitchTargetNodeException(errorInfo); } } -// }else{ -// throw new SwitchTypeErrorException("switch instance must be NodeCondComponent"); -// } + }else{ + throw new SwitchTypeErrorException("switch instance must be NodeCondComponent"); + } } @Override diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/BaseFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/BaseFlowParser.java index f914a06fe..b3c38531b 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/BaseFlowParser.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/BaseFlowParser.java @@ -1,17 +1,21 @@ package com.yomahub.liteflow.parser; +import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; +import com.yomahub.liteflow.annotation.LiteflowCmpDefine; +import com.yomahub.liteflow.annotation.LiteflowSwitchCmpDefine; import com.yomahub.liteflow.builder.LiteFlowChainBuilder; import com.yomahub.liteflow.builder.LiteFlowConditionBuilder; import com.yomahub.liteflow.builder.LiteFlowNodeBuilder; import com.yomahub.liteflow.builder.prop.ChainPropBean; import com.yomahub.liteflow.builder.prop.NodePropBean; +import com.yomahub.liteflow.core.NodeComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; import com.yomahub.liteflow.enums.ConditionTypeEnum; import com.yomahub.liteflow.enums.NodeTypeEnum; -import com.yomahub.liteflow.exception.EmptyConditionValueException; -import com.yomahub.liteflow.exception.NodeTypeNotSupportException; -import com.yomahub.liteflow.exception.NotSupportConditionException; +import com.yomahub.liteflow.exception.*; /** * 基类，用于存放通用方法 @@ -33,9 +37,40 @@ public abstract class BaseFlowParser implements FlowParser { String type = nodePropBean.getType(); String file = nodePropBean.getFile(); - //初始化type - if (StrUtil.isBlank(type)) { - type = NodeTypeEnum.COMMON.getCode(); + //先尝试自动推断类型 + if (StrUtil.isNotBlank(clazz)) { + try{ + //先尝试从继承的类型中推断 + Class c = Class.forName(clazz); + Object o = ReflectUtil.newInstanceIfPossible(c); + if (o instanceof NodeSwitchComponent){ + type = NodeTypeEnum.SWITCH.getCode(); + }else if(o instanceof NodeComponent){ + type = NodeTypeEnum.COMMON.getCode(); + } + + //再尝试声明式组件这部分的推断 + if (type == null){ + LiteflowCmpDefine liteflowCmpDefine = AnnotationUtil.getAnnotation(c, LiteflowCmpDefine.class); + if (liteflowCmpDefine != null){ + type = NodeTypeEnum.COMMON.getCode(); + } + } + + if (type == null){ + LiteflowSwitchCmpDefine liteflowSwitchCmpDefine = AnnotationUtil.getAnnotation(c, LiteflowSwitchCmpDefine.class); + if (liteflowSwitchCmpDefine != null){ + type = NodeTypeEnum.SWITCH.getCode(); + } + } + }catch (Exception e){ + throw new NodeClassNotFoundException(StrUtil.format("cannot find the node[{}]", clazz)); + } + } + + //因为脚本节点是必须设置type的，所以到这里type就全都有了，所以进行二次检查 + if (StrUtil.isBlank(type)){ + throw new NodeTypeCanNotGuessException(StrUtil.format("cannot guess the type of node[{}]", clazz)); } //检查nodeType是不是规定的类型 diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/util/LiteFlowProxyUtil.java b/liteflow-core/src/main/java/com/yomahub/liteflow/util/LiteFlowProxyUtil.java index 681f2b450..9418ab28e 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/util/LiteFlowProxyUtil.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/util/LiteFlowProxyUtil.java @@ -4,10 +4,10 @@ import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.yomahub.liteflow.annotation.LiteflowCmpDefine; -import com.yomahub.liteflow.annotation.LiteflowCondCmpDefine; +import com.yomahub.liteflow.annotation.LiteflowSwitchCmpDefine; import com.yomahub.liteflow.annotation.LiteflowMethod; import com.yomahub.liteflow.core.NodeComponent; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; import com.yomahub.liteflow.core.proxy.ComponentProxy; import com.yomahub.liteflow.exception.ComponentProxyErrorException; import org.slf4j.Logger; @@ -26,17 +26,17 @@ public class LiteFlowProxyUtil { private static final Logger LOG = LoggerFactory.getLogger(LiteFlowProxyUtil.class); //判断一个bean是否是声明式组件 - public static boolean isMarkedCmp(Class clazz){ + public static boolean isDeclareCmp(Class clazz){ //判断bean是否标记了@LiteflowCmpDefine或者@LiteflowCondCmpDefine这2个标注之一 boolean flag1 = clazz.getAnnotation(LiteflowCmpDefine.class) != null - || clazz.getAnnotation(LiteflowCondCmpDefine.class) != null; + || clazz.getAnnotation(LiteflowSwitchCmpDefine.class) != null; if (!flag1){ return false; } //看超类是否是NodeComponent和NodeCondComponent中的一个，如果不是，则说明满足条件。是的话，也不满足 - boolean flag2 = !ListUtil.toList(NodeComponent.class, NodeCondComponent.class).contains(clazz.getSuperclass()); + boolean flag2 = !ListUtil.toList(NodeComponent.class, NodeSwitchComponent.class).contains(clazz.getSuperclass()); if (!flag2){ return false; @@ -61,7 +61,7 @@ public class LiteFlowProxyUtil { public static NodeComponent proxy2NodeComponent(Object bean, String nodeId){ try{ LiteflowCmpDefine liteflowCmpDefine = bean.getClass().getAnnotation(LiteflowCmpDefine.class); - LiteflowCondCmpDefine liteflowCondCmpDefine = bean.getClass().getAnnotation(LiteflowCondCmpDefine.class); + LiteflowSwitchCmpDefine liteflowSwitchCmpDefine = bean.getClass().getAnnotation(LiteflowSwitchCmpDefine.class); ComponentProxy proxy; if (ObjectUtil.isNotNull(liteflowCmpDefine)){ @@ -69,9 +69,9 @@ public class LiteFlowProxyUtil { return (NodeComponent) proxy.getProxy(); } - if (ObjectUtil.isNotNull(liteflowCondCmpDefine)){ - proxy = new ComponentProxy(nodeId, bean, NodeCondComponent.class); - return (NodeCondComponent) proxy.getProxy(); + if (ObjectUtil.isNotNull(liteflowSwitchCmpDefine)){ + proxy = new ComponentProxy(nodeId, bean, NodeSwitchComponent.class); + return (NodeSwitchComponent) proxy.getProxy(); } throw new RuntimeException(); diff --git a/liteflow-spring/src/main/java/com/yomahub/liteflow/spring/ComponentScanner.java b/liteflow-spring/src/main/java/com/yomahub/liteflow/spring/ComponentScanner.java index 25439090c..13c5d4bdd 100644 --- a/liteflow-spring/src/main/java/com/yomahub/liteflow/spring/ComponentScanner.java +++ b/liteflow-spring/src/main/java/com/yomahub/liteflow/spring/ComponentScanner.java @@ -59,7 +59,7 @@ public class ComponentScanner implements BeanPostProcessor { //判断是不是声明式组件 //如果是，就缓存到类属性的map中 - if (LiteFlowProxyUtil.isMarkedCmp(bean.getClass())){ + if (LiteFlowProxyUtil.isDeclareCmp(bean.getClass())){ LOG.info("proxy component[{}] has been found", beanName); NodeComponent nodeComponent = LiteFlowProxyUtil.proxy2NodeComponent(bean, beanName); nodeComponentMap.put(beanName, nodeComponent); diff --git a/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java b/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java index 56869f5cf..461fe7282 100644 --- a/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java +++ b/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java @@ -1,15 +1,14 @@ package com.yomahub.liteflow.test.asyncNode.cmp; -import com.yomahub.liteflow.annotation.LiteflowCondCmpDefine; +import com.yomahub.liteflow.annotation.LiteflowSwitchCmpDefine; import com.yomahub.liteflow.annotation.LiteflowMethod; import com.yomahub.liteflow.core.NodeComponent; -import com.yomahub.liteflow.core.NodeCondComponent; import com.yomahub.liteflow.enums.LiteFlowMethodEnum; import org.springframework.stereotype.Component; @Component("e") -@LiteflowCondCmpDefine +@LiteflowSwitchCmpDefine public class ECmp{ @LiteflowMethod(LiteFlowMethodEnum.PROCESS_COND) diff --git a/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java b/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java index 48e19487e..b2c2b0c67 100644 --- a/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java +++ b/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java @@ -1,16 +1,14 @@ package com.yomahub.liteflow.test.asyncNode.cmp; -import com.yomahub.liteflow.annotation.LiteflowCmpDefine; -import com.yomahub.liteflow.annotation.LiteflowCondCmpDefine; +import com.yomahub.liteflow.annotation.LiteflowSwitchCmpDefine; import com.yomahub.liteflow.annotation.LiteflowMethod; import com.yomahub.liteflow.core.NodeComponent; -import com.yomahub.liteflow.core.NodeCondComponent; import com.yomahub.liteflow.enums.LiteFlowMethodEnum; import org.springframework.stereotype.Component; @Component("j") -@LiteflowCondCmpDefine +@LiteflowSwitchCmpDefine public class JCmp{ @LiteflowMethod(LiteFlowMethodEnum.PROCESS_COND) diff --git a/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java b/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java index 3fbb2daca..8e1524953 100644 --- a/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java +++ b/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java @@ -7,12 +7,12 @@ */ package com.yomahub.liteflow.test.builder.cmp1; -import com.yomahub.liteflow.annotation.LiteflowCondCmpDefine; +import com.yomahub.liteflow.annotation.LiteflowSwitchCmpDefine; import com.yomahub.liteflow.annotation.LiteflowMethod; import com.yomahub.liteflow.core.NodeComponent; import com.yomahub.liteflow.enums.LiteFlowMethodEnum; -@LiteflowCondCmpDefine +@LiteflowSwitchCmpDefine public class ECmp{ @LiteflowMethod(LiteFlowMethodEnum.PROCESS_COND) diff --git a/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/component/cmp2/FCondCmp.java b/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/component/cmp2/FCondCmp.java index f0c9898bb..aac5ccda0 100644 --- a/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/component/cmp2/FCondCmp.java +++ b/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/component/cmp2/FCondCmp.java @@ -1,9 +1,8 @@ package com.yomahub.liteflow.test.component.cmp2; -import com.yomahub.liteflow.annotation.LiteflowCondCmpDefine; +import com.yomahub.liteflow.annotation.LiteflowSwitchCmpDefine; import com.yomahub.liteflow.annotation.LiteflowMethod; import com.yomahub.liteflow.core.NodeComponent; -import com.yomahub.liteflow.core.NodeCondComponent; import com.yomahub.liteflow.enums.LiteFlowMethodEnum; import org.springframework.stereotype.Component; @@ -11,7 +10,7 @@ import java.util.Objects; @Component("f") -@LiteflowCondCmpDefine +@LiteflowSwitchCmpDefine public class FCondCmp{ @LiteflowMethod(LiteFlowMethodEnum.PROCESS_COND) public String processCond(NodeComponent bindCmp) { diff --git a/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java b/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java index d71fe1938..5efe37f08 100644 --- a/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java +++ b/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java @@ -7,14 +7,14 @@ */ package com.yomahub.liteflow.test.exception.cmp; -import com.yomahub.liteflow.annotation.LiteflowCondCmpDefine; +import com.yomahub.liteflow.annotation.LiteflowSwitchCmpDefine; import com.yomahub.liteflow.annotation.LiteflowMethod; import com.yomahub.liteflow.core.NodeComponent; import com.yomahub.liteflow.enums.LiteFlowMethodEnum; import org.springframework.stereotype.Component; @Component("e") -@LiteflowCondCmpDefine +@LiteflowSwitchCmpDefine public class ECmp{ @LiteflowMethod(LiteFlowMethodEnum.PROCESS_COND) diff --git a/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java b/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java index 7b15119d0..f64df6554 100644 --- a/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java +++ b/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java @@ -7,15 +7,14 @@ */ package com.yomahub.liteflow.test.parsecustom.cmp; -import com.yomahub.liteflow.annotation.LiteflowCondCmpDefine; +import com.yomahub.liteflow.annotation.LiteflowSwitchCmpDefine; import com.yomahub.liteflow.annotation.LiteflowMethod; import com.yomahub.liteflow.core.NodeComponent; -import com.yomahub.liteflow.core.NodeCondComponent; import com.yomahub.liteflow.enums.LiteFlowMethodEnum; import org.springframework.stereotype.Component; @Component("e") -@LiteflowCondCmpDefine +@LiteflowSwitchCmpDefine public class ECmp{ @LiteflowMethod(LiteFlowMethodEnum.PROCESS_COND) diff --git a/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java b/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java index 620495a5f..12e75248d 100644 --- a/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java +++ b/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java @@ -7,15 +7,14 @@ */ package com.yomahub.liteflow.test.parser.cmp; -import com.yomahub.liteflow.annotation.LiteflowCondCmpDefine; +import com.yomahub.liteflow.annotation.LiteflowSwitchCmpDefine; import com.yomahub.liteflow.annotation.LiteflowMethod; import com.yomahub.liteflow.core.NodeComponent; -import com.yomahub.liteflow.core.NodeCondComponent; import com.yomahub.liteflow.enums.LiteFlowMethodEnum; import org.springframework.stereotype.Component; @Component("e") -@LiteflowCondCmpDefine +@LiteflowSwitchCmpDefine public class ECmp{ @LiteflowMethod(LiteFlowMethodEnum.PROCESS_COND) diff --git a/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java b/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java index 7639fc6ba..2f7d90d31 100644 --- a/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java +++ b/liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java @@ -7,16 +7,14 @@ */ package com.yomahub.liteflow.test.tag.cmp; -import com.yomahub.liteflow.annotation.LiteflowCmpDefine; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.annotation.LiteflowCondCmpDefine; +import com.yomahub.liteflow.annotation.LiteflowSwitchCmpDefine; import com.yomahub.liteflow.annotation.LiteflowMethod; import com.yomahub.liteflow.core.NodeComponent; -import com.yomahub.liteflow.core.NodeCondComponent; import com.yomahub.liteflow.enums.LiteFlowMethodEnum; @LiteflowComponent("c") -@LiteflowCondCmpDefine +@LiteflowSwitchCmpDefine public class CCmp{ @LiteflowMethod(LiteFlowMethodEnum.PROCESS_COND) diff --git a/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java index e798f3ca5..946f2b64f 100644 --- a/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java +++ b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java @@ -1,9 +1,9 @@ package com.yomahub.liteflow.test.asyncNode.cmp; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; -public class ECmp extends NodeCondComponent { +public class ECmp extends NodeSwitchComponent { @Override public String processCond() throws Exception { diff --git a/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java index fdb3a3b1a..70e8418c0 100644 --- a/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java +++ b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java @@ -1,9 +1,9 @@ package com.yomahub.liteflow.test.asyncNode.cmp; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; -public class JCmp extends NodeCondComponent { +public class JCmp extends NodeSwitchComponent { @Override public String processCond() throws Exception { diff --git a/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/base/cmp/ECmp.java b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/base/cmp/ECmp.java index 16d4d82db..7c3c96069 100644 --- a/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/base/cmp/ECmp.java +++ b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/base/cmp/ECmp.java @@ -7,9 +7,9 @@ */ package com.yomahub.liteflow.test.base.cmp; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; -public class ECmp extends NodeCondComponent { +public class ECmp extends NodeSwitchComponent { @Override public String processCond() throws Exception { diff --git a/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/builder/cmp/ECmp.java b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/builder/cmp/ECmp.java index 4b11789ac..5720b816b 100644 --- a/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/builder/cmp/ECmp.java +++ b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/builder/cmp/ECmp.java @@ -7,9 +7,9 @@ */ package com.yomahub.liteflow.test.builder.cmp; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; -public class ECmp extends NodeCondComponent { +public class ECmp extends NodeSwitchComponent { @Override public String processCond() throws Exception { diff --git a/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/component/cmp2/FCondCmp.java b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java similarity index 77% rename from liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/component/cmp2/FCondCmp.java rename to liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java index 617c8c765..1e5ad720f 100644 --- a/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/component/cmp2/FCondCmp.java +++ b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java @@ -1,9 +1,9 @@ package com.yomahub.liteflow.test.component.cmp2; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; import java.util.Objects; -public class FCondCmp extends NodeCondComponent { +public class FSwitchCmp extends NodeSwitchComponent { @Override public String processCond() { Integer requestData = this.getRequestData(); diff --git a/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java index 2b318ef35..bbccef0bc 100644 --- a/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java +++ b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java @@ -7,9 +7,9 @@ */ package com.yomahub.liteflow.test.exception.cmp; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; -public class ECmp extends NodeCondComponent { +public class ECmp extends NodeSwitchComponent { @Override public String processCond() throws Exception { diff --git a/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java index 58c074738..5e0d2935a 100644 --- a/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java +++ b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java @@ -7,9 +7,9 @@ */ package com.yomahub.liteflow.test.parsecustom.cmp; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; -public class ECmp extends NodeCondComponent { +public class ECmp extends NodeSwitchComponent { @Override public String processCond() throws Exception { diff --git a/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java index c0b73ca59..514e09576 100644 --- a/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java +++ b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java @@ -7,9 +7,9 @@ */ package com.yomahub.liteflow.test.parser.cmp; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; -public class ECmp extends NodeCondComponent { +public class ECmp extends NodeSwitchComponent { @Override public String processCond() throws Exception { diff --git a/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java index 2cbff0cb3..074a0312b 100644 --- a/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java +++ b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java @@ -7,9 +7,9 @@ */ package com.yomahub.liteflow.test.tag.cmp; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; -public class CCmp extends NodeCondComponent { +public class CCmp extends NodeSwitchComponent { @Override public String processCond() throws Exception { diff --git a/liteflow-testcase-nospring/src/test/resources/component/flow.xml b/liteflow-testcase-nospring/src/test/resources/component/flow.xml index d688461e3..38014c737 100644 --- a/liteflow-testcase-nospring/src/test/resources/component/flow.xml +++ b/liteflow-testcase-nospring/src/test/resources/component/flow.xml @@ -6,7 +6,7 @@ - + diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java index 19e9b27bf..636bea632 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java @@ -1,11 +1,11 @@ package com.yomahub.liteflow.test.asyncNode.cmp; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; import org.springframework.stereotype.Component; @Component("e") -public class ECmp extends NodeCondComponent { +public class ECmp extends NodeSwitchComponent { @Override public String processCond() throws Exception { diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java index 41d95782d..912833cd2 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java @@ -1,11 +1,11 @@ package com.yomahub.liteflow.test.asyncNode.cmp; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; import org.springframework.stereotype.Component; @Component("j") -public class JCmp extends NodeCondComponent { +public class JCmp extends NodeSwitchComponent { @Override public String processCond() throws Exception { diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/ECmp.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/ECmp.java index 8e03dad40..e2cf20e7b 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/ECmp.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/ECmp.java @@ -1,10 +1,10 @@ package com.yomahub.liteflow.test.base.cmp; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; import org.springframework.stereotype.Component; @Component("e") -public class ECmp extends NodeCondComponent { +public class ECmp extends NodeSwitchComponent { @Override public String processCond() throws Exception { return "d"; diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java index 0530a0d4d..82a224318 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java @@ -7,9 +7,9 @@ */ package com.yomahub.liteflow.test.builder.cmp1; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; -public class ECmp extends NodeCondComponent { +public class ECmp extends NodeSwitchComponent { @Override public String processCond() throws Exception { diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/component/cmp2/FCondCmp.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java similarity index 80% rename from liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/component/cmp2/FCondCmp.java rename to liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java index 3fc0af788..5d1d06183 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/component/cmp2/FCondCmp.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java @@ -1,13 +1,13 @@ package com.yomahub.liteflow.test.component.cmp2; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; import org.springframework.stereotype.Component; import java.util.Objects; @Component("f") -public class FCondCmp extends NodeCondComponent { +public class FSwitchCmp extends NodeSwitchComponent { @Override public String processCond() { Integer requestData = this.getRequestData(); diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java index ec1f8c544..bad2a367a 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java @@ -7,15 +7,11 @@ */ package com.yomahub.liteflow.test.exception.cmp; -import cn.hutool.core.util.StrUtil; -import com.yomahub.liteflow.core.NodeComponent; -import com.yomahub.liteflow.core.NodeCondComponent; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.yomahub.liteflow.core.NodeSwitchComponent; import org.springframework.stereotype.Component; @Component("e") -public class ECmp extends NodeCondComponent { +public class ECmp extends NodeSwitchComponent { @Override public String processCond() throws Exception { diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java index 15990c8bf..8b0ea909c 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java @@ -7,11 +7,11 @@ */ package com.yomahub.liteflow.test.parsecustom.cmp; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; import org.springframework.stereotype.Component; @Component("e") -public class ECmp extends NodeCondComponent { +public class ECmp extends NodeSwitchComponent { @Override public String processCond() throws Exception { diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java index 22133bfa3..bab2c2f26 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java @@ -7,12 +7,11 @@ */ package com.yomahub.liteflow.test.parser.cmp; -import com.yomahub.liteflow.core.NodeComponent; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; import org.springframework.stereotype.Component; @Component("e") -public class ECmp extends NodeCondComponent { +public class ECmp extends NodeSwitchComponent { @Override public String processCond() throws Exception { diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java index 40bb27d70..1c058d296 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java @@ -8,10 +8,10 @@ package com.yomahub.liteflow.test.tag.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; @LiteflowComponent("c") -public class CCmp extends NodeCondComponent { +public class CCmp extends NodeSwitchComponent { @Override public String processCond() throws Exception { diff --git a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java index 19e9b27bf..636bea632 100644 --- a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java +++ b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/ECmp.java @@ -1,11 +1,11 @@ package com.yomahub.liteflow.test.asyncNode.cmp; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; import org.springframework.stereotype.Component; @Component("e") -public class ECmp extends NodeCondComponent { +public class ECmp extends NodeSwitchComponent { @Override public String processCond() throws Exception { diff --git a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java index 41d95782d..912833cd2 100644 --- a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java +++ b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/asyncNode/cmp/JCmp.java @@ -1,11 +1,11 @@ package com.yomahub.liteflow.test.asyncNode.cmp; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; import org.springframework.stereotype.Component; @Component("j") -public class JCmp extends NodeCondComponent { +public class JCmp extends NodeSwitchComponent { @Override public String processCond() throws Exception { diff --git a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java index 0530a0d4d..82a224318 100644 --- a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java +++ b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java @@ -7,9 +7,9 @@ */ package com.yomahub.liteflow.test.builder.cmp1; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; -public class ECmp extends NodeCondComponent { +public class ECmp extends NodeSwitchComponent { @Override public String processCond() throws Exception { diff --git a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/component/cmp2/FCondCmp.java b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java similarity index 80% rename from liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/component/cmp2/FCondCmp.java rename to liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java index 3fc0af788..5d1d06183 100644 --- a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/component/cmp2/FCondCmp.java +++ b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/component/cmp2/FSwitchCmp.java @@ -1,13 +1,13 @@ package com.yomahub.liteflow.test.component.cmp2; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; import org.springframework.stereotype.Component; import java.util.Objects; @Component("f") -public class FCondCmp extends NodeCondComponent { +public class FSwitchCmp extends NodeSwitchComponent { @Override public String processCond() { Integer requestData = this.getRequestData(); diff --git a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/config/cmp/ECmp.java b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/config/cmp/ECmp.java index cda3d96ac..629a99912 100644 --- a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/config/cmp/ECmp.java +++ b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/config/cmp/ECmp.java @@ -7,11 +7,11 @@ */ package com.yomahub.liteflow.test.config.cmp; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; import org.springframework.stereotype.Component; @Component("e") -public class ECmp extends NodeCondComponent { +public class ECmp extends NodeSwitchComponent { @Override public String processCond() throws Exception { diff --git a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java index 39cef1a95..bad2a367a 100644 --- a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java +++ b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/exception/cmp/ECmp.java @@ -7,11 +7,11 @@ */ package com.yomahub.liteflow.test.exception.cmp; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; import org.springframework.stereotype.Component; @Component("e") -public class ECmp extends NodeCondComponent { +public class ECmp extends NodeSwitchComponent { @Override public String processCond() throws Exception { diff --git a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java index 76af9f013..0077d454d 100644 --- a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java +++ b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/parsecustom/cmp/ECmp.java @@ -7,11 +7,11 @@ */ package com.yomahub.liteflow.test.parsecustom.cmp; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; import org.springframework.stereotype.Component; @Component("e") -public class ECmp extends NodeCondComponent { +public class ECmp extends NodeSwitchComponent { @Override public String processCond() throws Exception { diff --git a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java index 9f13c991d..bab2c2f26 100644 --- a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java +++ b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/parser/cmp/ECmp.java @@ -7,11 +7,11 @@ */ package com.yomahub.liteflow.test.parser.cmp; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; import org.springframework.stereotype.Component; @Component("e") -public class ECmp extends NodeCondComponent { +public class ECmp extends NodeSwitchComponent { @Override public String processCond() throws Exception { diff --git a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java index 40bb27d70..1c058d296 100644 --- a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java +++ b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/tag/cmp/CCmp.java @@ -8,10 +8,10 @@ package com.yomahub.liteflow.test.tag.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeCondComponent; +import com.yomahub.liteflow.core.NodeSwitchComponent; @LiteflowComponent("c") -public class CCmp extends NodeCondComponent { +public class CCmp extends NodeSwitchComponent { @Override public String processCond() throws Exception {