From 0ef87467cd6a095c452c5be056dd552979258255 Mon Sep 17 00:00:00 2001 From: "everywhere.z" Date: Tue, 4 Oct 2022 23:36:06 +0800 Subject: [PATCH] =?UTF-8?q?enhancement=20#I5U5O6=20=E5=AF=B9=E5=A3=B0?= =?UTF-8?q?=E6=98=8E=E5=BC=8F=E7=B1=BB&=E6=96=B9=E6=B3=95=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E4=BA=86=E9=87=8D=E6=9E=84=EF=BC=8C=E6=8F=90=E5=8D=87?= =?UTF-8?q?=E4=BA=86=E4=BD=BF=E7=94=A8=E5=8F=8B=E5=A5=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../annotation/LiteflowCmpDefine.java | 14 +++++ .../yomahub/liteflow/enums/NodeTypeEnum.java | 57 ++++++++++++++++++- .../MixDefineELDeclMultiSpringbootTest.java | 39 +++++++++++++ .../test/mixDefine/cmp/CmpConfig.java | 34 +++++++++++ .../mixDefine/application.properties | 1 + .../src/test/resources/mixDefine/flow.el.xml | 6 ++ .../yomahub/liteflow/test/base/cmp/ACmp.java | 3 + .../yomahub/liteflow/test/base/cmp/BCmp.java | 3 + .../yomahub/liteflow/test/base/cmp/CCmp.java | 3 + .../yomahub/liteflow/test/base/cmp/DCmp.java | 3 + 10 files changed, 162 insertions(+), 1 deletion(-) create mode 100644 liteflow-core/src/main/java/com/yomahub/liteflow/annotation/LiteflowCmpDefine.java create mode 100644 liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/mixDefine/MixDefineELDeclMultiSpringbootTest.java create mode 100644 liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/mixDefine/cmp/CmpConfig.java create mode 100644 liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/resources/mixDefine/application.properties create mode 100644 liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/resources/mixDefine/flow.el.xml diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/annotation/LiteflowCmpDefine.java b/liteflow-core/src/main/java/com/yomahub/liteflow/annotation/LiteflowCmpDefine.java new file mode 100644 index 000000000..e3df930db --- /dev/null +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/annotation/LiteflowCmpDefine.java @@ -0,0 +1,14 @@ +package com.yomahub.liteflow.annotation; + +import com.yomahub.liteflow.enums.NodeTypeEnum; + +import java.lang.annotation.*; + +@Target({ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +@Documented +@Inherited +public @interface LiteflowCmpDefine { + + NodeTypeEnum value() default NodeTypeEnum.COMMON; +} 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 dc265d8ae..221d575a4 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 @@ -1,12 +1,18 @@ package com.yomahub.liteflow.enums; import cn.hutool.core.annotation.AnnotationUtil; -import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.yomahub.liteflow.annotation.LiteflowCmpDefine; import com.yomahub.liteflow.annotation.LiteflowMethod; import com.yomahub.liteflow.core.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import java.lang.reflect.Method; import java.util.Arrays; import java.util.Objects; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Predicate; /** * 节点类型枚举 @@ -38,6 +44,9 @@ public enum NodeTypeEnum { BREAK_SCRIPT("break_script", "循环跳出脚本", true, ScriptBreakComponent.class) ; + + private static final Logger LOG = LoggerFactory.getLogger(NodeTypeEnum.class); + private String code; private String name; @@ -116,6 +125,52 @@ public enum NodeTypeEnum { public static NodeTypeEnum guessType(Class clazz){ NodeTypeEnum nodeType = guessTypeBySuperClazz(clazz); if (nodeType == null){ + //尝试从类声明处进行推断 + LiteflowCmpDefine liteflowCmpDefine = clazz.getAnnotation(LiteflowCmpDefine.class); + if (liteflowCmpDefine != null){ + //类声明方式中@LiteflowMethod是无需设置nodeId的 + //但是如果设置了，那么核心逻辑其实是取类上定义的id的 + //这种可以运行，但是理解起来不大好理解，所以给出提示，建议不要这么做 + boolean mixDefined = Arrays.stream(clazz.getDeclaredMethods()).anyMatch(method -> { + LiteflowMethod liteflowMethod = AnnotationUtil.getAnnotation(method, LiteflowMethod.class); + if (liteflowMethod != null){ + return StrUtil.isNotBlank(liteflowMethod.nodeId()); + }else{ + return false; + } + }); + + if (mixDefined){ + LOG.warn("[[[WARNING!!!]]]The @liteflowMethod in the class[{}] defined by @liteflowCmpDefine should not configure the nodeId again!", + clazz.getName()); + } + + + //在返回之前，还要对方法级别的@LiteflowMethod进行检查，如果存在方法上的类型与类上的不一致时，给予警告信息 + AtomicReference differenceTypeMethod = new AtomicReference<>(); + boolean hasDifferenceNodeType = Arrays.stream(clazz.getDeclaredMethods()).anyMatch(method -> { + LiteflowMethod liteflowMethod = AnnotationUtil.getAnnotation(method, LiteflowMethod.class); + if (liteflowMethod != null){ + if (!liteflowMethod.nodeType().equals(liteflowCmpDefine.value())){ + differenceTypeMethod.set(method); + return true; + }else{ + return false; + } + }else{ + return false; + } + }); + + //表示存在不一样的类型 + if (hasDifferenceNodeType){ + LOG.warn("[[[WARNING!!!]]]The nodeType in @liteflowCmpDefine declared on the class[{}] does not match the nodeType in @liteflowMethod declared on the method[{}]!", + clazz.getName(), differenceTypeMethod.get().getName()); + } + + return liteflowCmpDefine.value(); + } + //再尝试声明式组件这部分的推断 LiteflowMethod liteflowMethod = Arrays.stream(clazz.getDeclaredMethods()).map( method -> AnnotationUtil.getAnnotation(method, LiteflowMethod.class) diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/mixDefine/MixDefineELDeclMultiSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/mixDefine/MixDefineELDeclMultiSpringbootTest.java new file mode 100644 index 000000000..d6a1a133e --- /dev/null +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/mixDefine/MixDefineELDeclMultiSpringbootTest.java @@ -0,0 +1,39 @@ +package com.yomahub.liteflow.test.mixDefine; + +import com.yomahub.liteflow.core.FlowExecutor; +import com.yomahub.liteflow.flow.LiteflowResponse; +import com.yomahub.liteflow.test.BaseTest; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.test.context.TestPropertySource; +import org.springframework.test.context.junit4.SpringRunner; + +import javax.annotation.Resource; + +/** + * springboot环境最普通的例子测试 + * @author Bryan.Zhang + * @since 2.6.4 + */ +@RunWith(SpringRunner.class) +@TestPropertySource(value = "classpath:/mixDefine/application.properties") +@SpringBootTest(classes = MixDefineELDeclMultiSpringbootTest.class) +@EnableAutoConfiguration +@ComponentScan({"com.yomahub.liteflow.test.mixDefine.cmp"}) +public class MixDefineELDeclMultiSpringbootTest extends BaseTest { + + @Resource + private FlowExecutor flowExecutor; + + //类声明和方法声明一起定义 + @Test + public void testMixDefine1() throws Exception{ + LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); + Assert.assertTrue(response.isSuccess()); + } + +} diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/mixDefine/cmp/CmpConfig.java b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/mixDefine/cmp/CmpConfig.java new file mode 100644 index 000000000..5a6b2716f --- /dev/null +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/mixDefine/cmp/CmpConfig.java @@ -0,0 +1,34 @@ +package com.yomahub.liteflow.test.mixDefine.cmp; + +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.LiteFlowMethodEnum; +import com.yomahub.liteflow.enums.NodeTypeEnum; +import com.yomahub.liteflow.test.base.cmp.TestDomain; + +import javax.annotation.Resource; + +@LiteflowComponent("a") +@LiteflowCmpDefine(NodeTypeEnum.COMMON) +public class CmpConfig { + + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS) + public void processA(NodeComponent bindCmp) { + System.out.println("ACmp executed!"); + } + + + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "c") + public void processC(NodeComponent bindCmp) { + System.out.println("CCmp executed!"); + } + + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS_IF, nodeId = "d", nodeType = NodeTypeEnum.IF) + public boolean processIf(NodeComponent bindCmp) { + return true; + } +} + + diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/resources/mixDefine/application.properties b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/resources/mixDefine/application.properties new file mode 100644 index 000000000..fefe792a3 --- /dev/null +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/resources/mixDefine/application.properties @@ -0,0 +1 @@ +liteflow.rule-source=mixDefine/flow.el.xml \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/resources/mixDefine/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/resources/mixDefine/flow.el.xml new file mode 100644 index 000000000..a3492d996 --- /dev/null +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/resources/mixDefine/flow.el.xml @@ -0,0 +1,6 @@ + + + + THEN(a, c); + + \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/ACmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/ACmp.java index 1a8b30f0c..72946b216 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/ACmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/ACmp.java @@ -7,12 +7,15 @@ */ package com.yomahub.liteflow.test.base.cmp; +import com.yomahub.liteflow.annotation.LiteflowCmpDefine; import com.yomahub.liteflow.annotation.LiteflowMethod; import com.yomahub.liteflow.core.NodeComponent; import com.yomahub.liteflow.enums.LiteFlowMethodEnum; +import com.yomahub.liteflow.enums.NodeTypeEnum; import org.springframework.stereotype.Component; @Component("a") +@LiteflowCmpDefine(NodeTypeEnum.COMMON) public class ACmp{ @LiteflowMethod(LiteFlowMethodEnum.PROCESS) diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/BCmp.java index edfc6c906..77b842db1 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/BCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/BCmp.java @@ -7,12 +7,15 @@ */ package com.yomahub.liteflow.test.base.cmp; +import com.yomahub.liteflow.annotation.LiteflowCmpDefine; import com.yomahub.liteflow.annotation.LiteflowMethod; 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.COMMON) public class BCmp{ @LiteflowMethod(LiteFlowMethodEnum.PROCESS) diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/CCmp.java index ff609c6c3..968509588 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/CCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/CCmp.java @@ -7,12 +7,15 @@ */ package com.yomahub.liteflow.test.base.cmp; +import com.yomahub.liteflow.annotation.LiteflowCmpDefine; import com.yomahub.liteflow.annotation.LiteflowMethod; import com.yomahub.liteflow.core.NodeComponent; import com.yomahub.liteflow.enums.LiteFlowMethodEnum; +import com.yomahub.liteflow.enums.NodeTypeEnum; import org.springframework.stereotype.Component; @Component("c") +@LiteflowCmpDefine(NodeTypeEnum.COMMON) public class CCmp{ @LiteflowMethod(LiteFlowMethodEnum.PROCESS) diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/DCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/DCmp.java index e61970859..4f7e88a54 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/DCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/base/cmp/DCmp.java @@ -7,14 +7,17 @@ */ package com.yomahub.liteflow.test.base.cmp; +import com.yomahub.liteflow.annotation.LiteflowCmpDefine; import com.yomahub.liteflow.annotation.LiteflowMethod; import com.yomahub.liteflow.core.NodeComponent; import com.yomahub.liteflow.enums.LiteFlowMethodEnum; +import com.yomahub.liteflow.enums.NodeTypeEnum; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Component("d") +@LiteflowCmpDefine(NodeTypeEnum.COMMON) public class DCmp{ @Resource