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 725568831..ccf5aa2e5 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 @@ -40,7 +40,6 @@ public abstract class XmlFlowParser { } //xml形式的主要解析过程 - @SuppressWarnings("unchecked") public void parse(Document document) throws Exception { try { Element rootElement = document.getRootElement(); diff --git a/liteflow-spring-boot-starter/pom.xml b/liteflow-spring-boot-starter/pom.xml index 8430bb604..96f0d7612 100644 --- a/liteflow-spring-boot-starter/pom.xml +++ b/liteflow-spring-boot-starter/pom.xml @@ -29,6 +29,20 @@ spring-boot-configuration-processor ${springboot.version} + + + + org.springframework.boot + spring-boot-starter-test + ${springboot.version} + test + + + org.aspectj + aspectjweaver + 1.8.13 + test + @@ -38,14 +52,6 @@ spring-boot-maven-plugin ${springboot.version} - - org.apache.maven.plugins - maven-surefire-plugin - 2.18.1 - - true - - diff --git a/liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/aspect/CmpAspect.java b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/aspect/CmpAspect.java similarity index 91% rename from liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/aspect/CmpAspect.java rename to liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/aspect/CmpAspect.java index 028d5801b..22a94daa7 100644 --- a/liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/aspect/CmpAspect.java +++ b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/aspect/CmpAspect.java @@ -3,7 +3,6 @@ package com.yomahub.liteflow.test.aop.aspect; import cn.hutool.core.util.StrUtil; import com.yomahub.liteflow.aop.ICmpAroundAspect; import com.yomahub.liteflow.entity.data.Slot; -import org.springframework.stereotype.Component; public class CmpAspect implements ICmpAroundAspect { @Override diff --git a/liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/aspect/CustomAspect.java b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/aspect/CustomAspect.java similarity index 100% rename from liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/aspect/CustomAspect.java rename to liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/aspect/CustomAspect.java diff --git a/liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/cmp1/ACmp.java b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/cmp1/ACmp.java similarity index 100% rename from liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/cmp1/ACmp.java rename to liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/cmp1/ACmp.java diff --git a/liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/cmp1/BCmp.java b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/cmp1/BCmp.java similarity index 100% rename from liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/cmp1/BCmp.java rename to liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/cmp1/BCmp.java diff --git a/liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/cmp1/CCmp.java b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/cmp1/CCmp.java similarity index 100% rename from liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/cmp1/CCmp.java rename to liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/cmp1/CCmp.java diff --git a/liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/cmp2/DCmp.java b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/cmp2/DCmp.java similarity index 100% rename from liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/cmp2/DCmp.java rename to liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/cmp2/DCmp.java diff --git a/liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/cmp2/ECmp.java b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/cmp2/ECmp.java similarity index 100% rename from liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/cmp2/ECmp.java rename to liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/cmp2/ECmp.java diff --git a/liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/LFCustomAOPTest.java b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/run/LFCustomAOPTest.java similarity index 91% rename from liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/LFCustomAOPTest.java rename to liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/run/LFCustomAOPTest.java index b6b67f2cc..2c5b4bf27 100644 --- a/liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/LFCustomAOPTest.java +++ b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/run/LFCustomAOPTest.java @@ -1,12 +1,9 @@ -package com.yomahub.liteflow.test.aop; +package com.yomahub.liteflow.test.aop.run; import com.yomahub.liteflow.core.FlowExecutor; -import com.yomahub.liteflow.core.NodeComponent; import com.yomahub.liteflow.entity.data.LiteflowResponse; import com.yomahub.liteflow.entity.data.Slot; import com.yomahub.liteflow.test.aop.aspect.CustomAspect; -import com.yomahub.liteflow.test.aop.cmp1.ACmp; -import com.yomahub.liteflow.util.SpringAware; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/LFGlobalAOPTest.java b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/run/LFGlobalAOPTest.java similarity index 98% rename from liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/LFGlobalAOPTest.java rename to liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/run/LFGlobalAOPTest.java index d060bfc00..f9bf9277b 100644 --- a/liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/LFGlobalAOPTest.java +++ b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/aop/run/LFGlobalAOPTest.java @@ -1,4 +1,4 @@ -package com.yomahub.liteflow.test.aop; +package com.yomahub.liteflow.test.aop.run; import com.yomahub.liteflow.core.FlowExecutor; import com.yomahub.liteflow.entity.data.LiteflowResponse; diff --git a/liteflow-test/src/test/resources/aop/flow.xml b/liteflow-spring-boot-starter/src/test/resources/aop/flow.xml similarity index 100% rename from liteflow-test/src/test/resources/aop/flow.xml rename to liteflow-spring-boot-starter/src/test/resources/aop/flow.xml diff --git a/liteflow-test/src/test/resources/application-aop.properties b/liteflow-spring-boot-starter/src/test/resources/application-aop.properties similarity index 100% rename from liteflow-test/src/test/resources/application-aop.properties rename to liteflow-spring-boot-starter/src/test/resources/application-aop.properties diff --git a/liteflow-test/pom.xml b/liteflow-test/pom.xml deleted file mode 100644 index 89c137087..000000000 --- a/liteflow-test/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - liteflow - com.yomahub - 2.5.0-SNAPSHOT - - 4.0.0 - - liteflow-test - - - - - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - - - - - org.springframework.boot - spring-boot-starter - - - - com.yomahub - liteflow-spring-boot-starter - ${project.parent.version} - - - - org.aspectj - aspectjweaver - 1.8.13 - - - - org.springframework.boot - spring-boot-starter-test - test - - - - org.springframework.boot - spring-boot-configuration-processor - true - - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${springboot.version} - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - true - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index a5a22648b..a050aea89 100644 --- a/pom.xml +++ b/pom.xml @@ -211,7 +211,6 @@ liteflow-core liteflow-spring-boot-starter - liteflow-test liteflow-test-springboot liteflow-test-spring