bug #I5CB1Y 声明式组件无法进入beforeProcess和afterProcess方法

bug #I5C7LM 声明式组件的方法名自定义会出问题

liteflow-core/pom.xml

@@ -9,7 +9,7 @@
     <parent>
 		<groupId>com.yomahub</groupId>
 		<artifactId>liteflow</artifactId>
-		<version>2.7.2</version>
+		<version>2.7.3</version>
 	</parent>
 
 	<dependencies>

liteflow-core/src/main/java/com/yomahub/liteflow/core/proxy/ComponentProxy.java

@@ -1,5 +1,6 @@
 package com.yomahub.liteflow.core.proxy;
 
+import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.*;
 import com.yomahub.liteflow.annotation.LiteflowMethod;
 import com.yomahub.liteflow.core.NodeComponent;
@@ -100,15 +101,16 @@ public class ComponentProxy {
             //获取当前调用方法，是否在被代理的对象方法里面(根据@LiteFlowMethod这个标注去判断)
             //如果在里面，则返回那个LiteFlowMethodBean，不在则返回null
             LiteFlowMethodBean liteFlowMethodBean = liteFlowMethodBeanList.stream().filter(
-                    liteFlowMethodBean1 -> liteFlowMethodBean1.getMethod().getName().equals(method.getName())
+                    liteFlowMethodBean1 -> liteFlowMethodBean1.getMethodName().equals(method.getName())
             ).findFirst().orElse(null);
 
             //如果被代理的对象里有此标注标的方法，则调用此被代理的对象里的方法，如果没有，则调用父类里的方法
-            if (liteFlowMethodBean != null){
+            //beforeProcess和afterProcess这2个方法除外
+            if (!ListUtil.toList("beforeProcess","afterProcess").contains(liteFlowMethodBean.getMethodName())) {
                 //进行检查，检查被代理的bean里是否有且仅有NodeComponent这个类型的参数
                 boolean checkFlag = liteFlowMethodBean.getMethod().getParameterTypes().length == 1
                         && Arrays.asList(liteFlowMethodBean.getMethod().getParameterTypes()).contains(NodeComponent.class);
-                if (!checkFlag){
+                if (!checkFlag) {
                     String errMsg = StrUtil.format("Method[{}.{}] must have NodeComponent parameter(and only one parameter)", bean.getClass().getName(), liteFlowMethodBean.getMethod().getName());
                     LOG.error(errMsg);
                     throw new ComponentMethodDefineErrorException(errMsg);
@@ -120,9 +122,12 @@ public class ComponentProxy {
                     InvocationTargetException targetEx = (InvocationTargetException)e;
                     throw targetEx.getTargetException();
                 }
-            }else{
-                //理论上来说这句应该执行不到，因为前面在设置拦截对象类型的时候，已经根据当前bean所覆盖的方法进行了动态判断
-                return method.invoke(proxy, args);
+            }
+            try{
+                return liteFlowMethodBean.getMethod().invoke(bean, args);
+            }catch (Exception e){
+                InvocationTargetException targetEx = (InvocationTargetException)e;
+                throw targetEx.getTargetException();
             }
         }
     }

liteflow-core/src/main/java/com/yomahub/liteflow/util/LOGOPrinter.java

@@ -19,7 +19,7 @@ public class LOGOPrinter {
 		str.append("		| |    | |  | | |  _| _____| |_  | |  | | | \\ \\ /\\ / / \n");
 		str.append("		| |___ | |  | | | |__|_____|  _| | |__| |_| |\\ V  V /  \n");
 		str.append("		|_____|___| |_| |_____|    |_|   |_____\\___/  \\_/\\_/   \n\n");
-		str.append("		Version: v2.7.2\n");
+		str.append("		Version: v2.7.3\n");
 		str.append("		轻量且强大的规则引擎框架。\n");
 		str.append("		Small but powerful rules engine.\n");
 		str.append("================================================================================================\n");

liteflow-script-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>liteflow</artifactId>
         <groupId>com.yomahub</groupId>
-        <version>2.7.2</version>
+        <version>2.7.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

liteflow-script-groovy/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>liteflow</artifactId>
         <groupId>com.yomahub</groupId>
-        <version>2.7.2</version>
+        <version>2.7.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

liteflow-script-qlexpress/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>liteflow</artifactId>
         <groupId>com.yomahub</groupId>
-        <version>2.7.2</version>
+        <version>2.7.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

liteflow-spring-boot-starter/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <artifactId>liteflow</artifactId>
         <groupId>com.yomahub</groupId>
-        <version>2.7.2</version>
+        <version>2.7.3</version>
     </parent>
 
     <dependencies>

liteflow-spring/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>liteflow</artifactId>
         <groupId>com.yomahub</groupId>
-        <version>2.7.2</version>
+        <version>2.7.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

liteflow-testcase-declare-component/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>liteflow</artifactId>
         <groupId>com.yomahub</groupId>
-        <version>2.7.2</version>
+        <version>2.7.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/customMethodName/CustomMethodNameSpringbootTest.java

@@ -0,0 +1,38 @@
+package com.yomahub.liteflow.test.customMethodName;
+
+import com.yomahub.liteflow.core.FlowExecutor;
+import com.yomahub.liteflow.flow.LiteflowResponse;
+import com.yomahub.liteflow.slot.DefaultContext;
+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;
+
+/**
+ * 声明式组件自定义方法的测试用例
+ * @author Bryan.Zhang
+ * @since 2.7.2
+ */
+@RunWith(SpringRunner.class)
+@TestPropertySource(value = "classpath:/customMethodName/application.properties")
+@SpringBootTest(classes = CustomMethodNameSpringbootTest.class)
+@EnableAutoConfiguration
+@ComponentScan({"com.yomahub.liteflow.test.customMethodName.cmp"})
+public class CustomMethodNameSpringbootTest extends BaseTest {
+
+    @Resource
+    private FlowExecutor flowExecutor;
+
+    @Test
+    public void testCustomMethodName() throws Exception{
+        LiteflowResponse<DefaultContext> response = flowExecutor.execute2Resp("chain1", "arg");
+        Assert.assertTrue(response.isSuccess());
+    }
+}

liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/customMethodName/cmp/ACmp.java

@@ -0,0 +1,46 @@
+/**
+ * <p>Title: liteflow</p>
+ * <p>Description: 轻量级的组件式流程框架</p>
+ * @author Bryan.Zhang
+ * @email weenyc31@163.com
+ * @Date 2020/4/1
+ */
+package com.yomahub.liteflow.test.customMethodName.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.slot.DefaultContext;
+import com.yomahub.liteflow.slot.Slot;
+import org.springframework.stereotype.Component;
+
+@Component("a")
+@LiteflowCmpDefine
+public class ACmp{
+
+	@LiteflowMethod(LiteFlowMethodEnum.PROCESS)
+	public void processAcmp(NodeComponent bindCmp) {
+		System.out.println("ACmp executed!");
+	}
+
+	@LiteflowMethod(LiteFlowMethodEnum.IS_ACCESS)
+	public boolean isAcmpAccess(NodeComponent bindCmp){
+		return true;
+	}
+
+	@LiteflowMethod(LiteFlowMethodEnum.BEFORE_PROCESS)
+	public void beforeAcmp(String nodeId, Slot<DefaultContext> slot){
+		System.out.println("before A");
+	}
+
+	@LiteflowMethod(LiteFlowMethodEnum.AFTER_PROCESS)
+	public void afterAcmp(String nodeId, Slot<DefaultContext> slot){
+		System.out.println("after A");
+	}
+
+	@LiteflowMethod(LiteFlowMethodEnum.ON_SUCCESS)
+	public void onAcmpSuccess(NodeComponent bindCmp){
+		System.out.println("Acmp success");
+	}
+}

liteflow-testcase-declare-component/src/test/java/com/yomahub/liteflow/test/customMethodName/cmp/BCmp.java

@@ -0,0 +1,25 @@
+/**
+ * <p>Title: liteflow</p>
+ * <p>Description: 轻量级的组件式流程框架</p>
+ * @author Bryan.Zhang
+ * @email weenyc31@163.com
+ * @Date 2020/4/1
+ */
+package com.yomahub.liteflow.test.customMethodName.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 org.springframework.stereotype.Component;
+
+@Component("b")
+@LiteflowCmpDefine
+public class BCmp{
+
+	@LiteflowMethod(LiteFlowMethodEnum.PROCESS)
+	public void processBcmp(NodeComponent bindCmp) {
+		System.out.println("BCmp executed!");
+	}
+
+}

liteflow-testcase-declare-component/src/test/resources/customMethodName/application.properties

@@ -0,0 +1 @@
+liteflow.rule-source=customMethodName/flow.xml

liteflow-testcase-declare-component/src/test/resources/customMethodName/flow.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<flow>
+    <chain name="chain1">
+        <then value="a,b"/>
+    </chain>
+</flow>

liteflow-testcase-nospring/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>liteflow</artifactId>
         <groupId>com.yomahub</groupId>
-        <version>2.7.2</version>
+        <version>2.7.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

liteflow-testcase-script-groovy/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>liteflow</artifactId>
         <groupId>com.yomahub</groupId>
-        <version>2.7.2</version>
+        <version>2.7.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

liteflow-testcase-script-qlexpress/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>liteflow</artifactId>
         <groupId>com.yomahub</groupId>
-        <version>2.7.2</version>
+        <version>2.7.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

liteflow-testcase-springboot/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>liteflow</artifactId>
         <groupId>com.yomahub</groupId>
-        <version>2.7.2</version>
+        <version>2.7.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

liteflow-testcase-springnative/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>liteflow</artifactId>
         <groupId>com.yomahub</groupId>
-        <version>2.7.2</version>
+        <version>2.7.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -5,7 +5,7 @@
 	<groupId>com.yomahub</groupId>
     <artifactId>liteflow</artifactId>
     <packaging>pom</packaging>
-    <version>2.7.2</version>
+    <version>2.7.3</version>
 	<name>liteflow</name>
 	<description>a lightweight and practical micro-process framework</description>
 	<url>https://github.com/bryan31/liteflow</url>