diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/XmlFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/XmlFlowParser.java index f42e1c01d..91109a7c5 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/XmlFlowParser.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/XmlFlowParser.java @@ -82,9 +82,7 @@ public abstract class XmlFlowParser { } } else { for (Entry componentEntry : ComponentScaner.nodeComponentMap.entrySet()) { - if (!FlowBus.containNode(componentEntry.getKey())) { - FlowBus.addNode(componentEntry.getKey(), new Node(componentEntry.getKey(), componentEntry.getValue().getClass().getName(), componentEntry.getValue())); - } + FlowBus.addNode(componentEntry.getKey(), new Node(componentEntry.getKey(), componentEntry.getValue().getClass().getName(), componentEntry.getValue())); } } diff --git a/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/run/LFCustomAOPTest.java b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/LFCustomAOPTest.java similarity index 95% rename from liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/run/LFCustomAOPTest.java rename to liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/LFCustomAOPTest.java index 2c5b4bf27..84cca735a 100644 --- a/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/run/LFCustomAOPTest.java +++ b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/LFCustomAOPTest.java @@ -1,4 +1,4 @@ -package com.yomahub.liteflow.test.aop.run; +package com.yomahub.liteflow.test.aop; import com.yomahub.liteflow.core.FlowExecutor; import com.yomahub.liteflow.entity.data.LiteflowResponse; @@ -12,6 +12,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Import; import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; import javax.annotation.Resource; diff --git a/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/run/LFGlobalAOPTest.java b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/LFGlobalAOPTest.java similarity index 95% rename from liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/run/LFGlobalAOPTest.java rename to liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/LFGlobalAOPTest.java index f9bf9277b..794145d29 100644 --- a/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/run/LFGlobalAOPTest.java +++ b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/LFGlobalAOPTest.java @@ -1,4 +1,4 @@ -package com.yomahub.liteflow.test.aop.run; +package com.yomahub.liteflow.test.aop; import com.yomahub.liteflow.core.FlowExecutor; import com.yomahub.liteflow.entity.data.LiteflowResponse; @@ -12,6 +12,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Import; import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; import javax.annotation.Resource; diff --git a/liteflow-spring-boot-starter/src/test/resources/application-aop.properties b/liteflow-spring-boot-starter/src/test/resources/application-aop.properties index f9075d1c6..9f1862ffe 100644 --- a/liteflow-spring-boot-starter/src/test/resources/application-aop.properties +++ b/liteflow-spring-boot-starter/src/test/resources/application-aop.properties @@ -1 +1 @@ -liteflow.rule-source=aop/flow.xml \ No newline at end of file +liteflow.rule-source=flow.xml \ No newline at end of file diff --git a/liteflow-spring-boot-starter/src/test/resources/aop/flow.xml b/liteflow-spring-boot-starter/src/test/resources/flow.xml similarity index 100% rename from liteflow-spring-boot-starter/src/test/resources/aop/flow.xml rename to liteflow-spring-boot-starter/src/test/resources/flow.xml