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 2ee50e717..c61f4218f 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 @@ -10,7 +10,6 @@ package com.yomahub.liteflow.flow; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.yomahub.liteflow.core.*; import com.yomahub.liteflow.enums.FlowParserTypeEnum; @@ -22,7 +21,6 @@ import com.yomahub.liteflow.flow.element.Node; import com.yomahub.liteflow.parser.el.LocalJsonFlowELParser; import com.yomahub.liteflow.parser.el.LocalXmlFlowELParser; import com.yomahub.liteflow.parser.el.LocalYmlFlowELParser; -import com.yomahub.liteflow.script.ScriptExecutor; import com.yomahub.liteflow.script.ScriptExecutorFactory; import com.yomahub.liteflow.script.exception.ScriptLoadException; import com.yomahub.liteflow.script.exception.ScriptSpiException; @@ -36,10 +34,8 @@ import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.function.Consumer; import java.util.stream.Collectors; /** @@ -86,7 +82,10 @@ public class FlowBus { return nodeMap.containsKey(nodeId); } - public static void addSpringScanNode(String nodeId, NodeComponent nodeComponent) { + /** + * 添加已托管的节点(如:Spring、Solon 管理的节点) + * */ + public static void addManagedNode(String nodeId, NodeComponent nodeComponent) { // 根据class来猜测类型 NodeTypeEnum type = NodeTypeEnum.guessType(nodeComponent.getClass()); 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 2d643b304..55d494ff6 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 @@ -3,7 +3,6 @@ package com.yomahub.liteflow.solon.integration; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.annotation.LiteflowMethod; import com.yomahub.liteflow.core.NodeComponent; -import com.yomahub.liteflow.enums.LiteFlowMethodEnum; import com.yomahub.liteflow.flow.FlowBus; import com.yomahub.liteflow.solon.*; import com.yomahub.liteflow.solon.config.LiteflowAutoConfiguration; @@ -50,7 +49,7 @@ public class XPluginImpl implements Plugin { NodeComponent node1 = bw.raw(); node1.setNodeId(bw.name()); - FlowBus.addSpringScanNode(bw.name(), bw.raw()); + FlowBus.addManagedNode(bw.name(), bw.raw()); }); context.beanExtractorAdd(LiteflowMethod.class, (bw, method, anno) -> { @@ -79,7 +78,7 @@ public class XPluginImpl implements Plugin { node1.setNodeId(nodeId); node1.setType(anno.nodeType()); - FlowBus.addSpringScanNode(nodeId, node1); + FlowBus.addManagedNode(nodeId, node1); }); context.beanBuilderAdd(LiteflowComponent.class, (clz, bw, anno) -> { @@ -90,7 +89,7 @@ public class XPluginImpl implements Plugin { node1.setNodeId(nodeId); node1.setName(anno.name()); - FlowBus.addSpringScanNode(nodeId, node1); + FlowBus.addManagedNode(nodeId, node1); } else { context.beanExtract(bw); // 尝试提取 LiteflowMethod 函数 diff --git a/liteflow-spring/src/main/java/com/yomahub/liteflow/spi/spring/SpringContextCmpInit.java b/liteflow-spring/src/main/java/com/yomahub/liteflow/spi/spring/SpringContextCmpInit.java index fe387b9b2..fc30abb4c 100644 --- a/liteflow-spring/src/main/java/com/yomahub/liteflow/spi/spring/SpringContextCmpInit.java +++ b/liteflow-spring/src/main/java/com/yomahub/liteflow/spi/spring/SpringContextCmpInit.java @@ -19,7 +19,7 @@ public class SpringContextCmpInit implements ContextCmpInit { public void initCmp() { for (Map.Entry componentEntry : ComponentScanner.nodeComponentMap.entrySet()) { if (!FlowBus.containNode(componentEntry.getKey())) { - FlowBus.addSpringScanNode(componentEntry.getKey(), componentEntry.getValue()); + FlowBus.addManagedNode(componentEntry.getKey(), componentEntry.getValue()); } } }