public/liteFlow
1
0
Fork 0
mirror of https://gitee.com/dromara/liteFlow.git synced 2026-05-14 20:22:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

!39 对放入数据槽的value进行非null判断，增加两个无需参数的执行chain的方法

Browse Source 
Merge pull request !39 from LeoLee/bug_I4LUQ5
This commit is contained in:
铂赛东
2021-12-13 09:33:35 +00:00
committed by Gitee
parent c425997b3c f80778e744
commit 89637b2aaf
15 changed files with 398 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
liteflow-core/src/main/java/com/yomahub/liteflow/core/FlowExecutor.java
View File

@@ -278,6 +278,17 @@ public class FlowExecutor {
this.execute(chainId, param, slotClazz, slotIndex, true);
}
/**
* 无参执行器
* @Author LeoLee
* @Date 17:52 2021/12/10
* @param chainId 业务链id
* @return com.yomahub.liteflow.entity.data.DefaultSlot
*/
public DefaultSlot execute(String chainId) throws Exception {
return this.execute(chainId, DefaultSlot.class, null, false);
}
public DefaultSlot execute(String chainId, Object param) throws Exception {
return this.execute(chainId, param, DefaultSlot.class, null, false);
}
@@ -286,8 +297,39 @@ public class FlowExecutor {
return this.execute(chainId, param, slotClazz, null, false);
}
/**
* 有param的execute方法，将会对param进行判断，若为null，抛出逻辑异常NullParamException
* @Author: LeoLee
* @Date: 2021/12/11 15:34
*/
public <T extends Slot> T execute(String chainId, Object param, Class<T> slotClazz,
Integer slotIndex, boolean isInnerChain) throws Exception {
if (ObjectUtil.isNull(param)) {
//data slot is a ConcurrentHashMap, so null value will trigger NullPointerException
throw new NullParamException("data slot can't accept null param");
}
return this.execute0(chainId, param, slotClazz, slotIndex, isInnerChain);
}
/**
* 无param的execute方法，没有param参数
* 调用execute0时，param默认给null，之后会在doExecute方法中进行判断，如果param为null，则不进行slot数据槽设置
* @Author: LeoLee
* @Date: 2021/12/11 15:35
*/
public <T extends Slot> T execute(String chainId, Class<T> slotClazz,
Integer slotIndex, boolean isInnerChain) throws Exception {
//默认param为null，在doExecute中会被过滤
return this.execute0(chainId, null, slotClazz, slotIndex, isInnerChain);
}
/**
* doExecute私有封装
* 为了区别无param和有param的执行方法
* @Author LeoLee
* @Date 17:53 2021/12/10
*/
private <T extends Slot> T execute0(String chainId, Object param, Class<T> slotClazz, Integer slotIndex, boolean isInnerChain) throws Exception {
T slot = this.doExecute(chainId, param, slotClazz, slotIndex, isInnerChain);
if (ObjectUtil.isNotNull(slot.getException())) {
throw slot.getException();
@@ -296,6 +338,17 @@ public class FlowExecutor {
}
}
/**
* 无param执行器
* @Param: [chainId] 业务链id
* @Return: com.yomahub.liteflow.entity.data.LiteflowResponse<com.yomahub.liteflow.entity.data.DefaultSlot>
* @Author: LeoLee
* @Date: 2021/12/11 15:54
*/
public LiteflowResponse<DefaultSlot> execute2Resp(String chainId) {
return this.execute2Resp(chainId, DefaultSlot.class, null, false);
}
public LiteflowResponse<DefaultSlot> execute2Resp(String chainId, Object param) {
return this.execute2Resp(chainId, param, DefaultSlot.class);
}
@@ -306,8 +359,39 @@ public class FlowExecutor {
private final ArrayList<Class<? extends Exception>> notFailExceptionList = ListUtil.toList(ChainEndException.class);
/**
* 带param参数的execute2Resp方法，会对param进行判断
* 如果param为null，则抛出NullParamException
* @Author: LeoLee
* @Date: 2021/12/11 15:55
*/
public <T extends Slot> LiteflowResponse<T> execute2Resp(String chainId, Object param, Class<T> slotClazz, Integer slotIndex,
boolean isInnerChain) {
if (ObjectUtil.isNull(param)) {
//data slot is a ConcurrentHashMap, so null value will trigger NullPointerException
throw new NullParamException("data slot can't accept null param");
}
return execute2Resp0(chainId, param, slotClazz, slotIndex, isInnerChain);
}
/**
* 无param参数的execute2Resp方法
* 调用doExecute方法时，param默认传递null，会在doExecute房中进行
* @Author: LeoLee
* @Date: 2021/12/11 16:10
*/
public <T extends Slot> LiteflowResponse<T> execute2Resp(String chainId, Class<T> slotClazz, Integer slotIndex,
boolean isInnerChain) {
//默认param为null，在doExecute中会被过滤
return execute2Resp0(chainId, null, slotClazz, slotIndex, isInnerChain);
}
/**
* doExecute私有封装
* @Author LeoLee
* @Date 17:54 2021/12/10
*/
private <T extends Slot> LiteflowResponse<T> execute2Resp0(String chainId, Object param, Class<T> slotClazz, Integer slotIndex, boolean isInnerChain) {
LiteflowResponse<T> response = new LiteflowResponse<>();
T slot = doExecute(chainId, param, slotClazz, slotIndex, isInnerChain);
@@ -349,10 +433,16 @@ public class FlowExecutor {
}
if (!isInnerChain) {
slot.setRequestData(param);
//对param进行判空，如果为null，则不进行slot设置
if (ObjectUtil.isNotNull(param)) {
slot.setRequestData(param);
}
slot.setChainName(chainId);
} else {
slot.setChainReqData(chainId, param);
//对param进行判空，如果为null，则不进行slot设置
if (ObjectUtil.isNotNull(param)) {
slot.setChainReqData(chainId, param);
}
}
Chain chain = null;

28
liteflow-core/src/main/java/com/yomahub/liteflow/entity/data/AbsSlot.java
View File

@@ -7,6 +7,8 @@
*/
package com.yomahub.liteflow.entity.data;
import cn.hutool.core.util.ObjectUtil;
import com.yomahub.liteflow.exception.NullParamException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Iterator;
@@ -47,6 +49,14 @@ public abstract class AbsSlot implements Slot {
protected ConcurrentHashMap<String, Object> dataMap = new ConcurrentHashMap<String, Object>();
private <T> void dataMapPut(String key, T t) {
if (ObjectUtil.isNull(t)) {
//data slot is a ConcurrentHashMap, so null value will trigger NullPointerException
throw new NullParamException("data slot can't accept null param");
}
dataMap.put(key, t);
}
public <T> T getInput(String nodeId){
return (T)dataMap.get(NODE_INPUT_PREFIX + nodeId);
}
@@ -56,11 +66,11 @@ public abstract class AbsSlot implements Slot {
}
public <T> void setInput(String nodeId,T t){
dataMap.put(NODE_INPUT_PREFIX + nodeId, t);
dataMapPut(NODE_INPUT_PREFIX + nodeId, t);
}
public <T> void setOutput(String nodeId,T t){
dataMap.put(NODE_OUTPUT_PREFIX + nodeId, t);
dataMapPut(NODE_OUTPUT_PREFIX + nodeId, t);
}
public <T> T getRequestData(){
@@ -68,7 +78,7 @@ public abstract class AbsSlot implements Slot {
}
public <T> void setRequestData(T t){
dataMap.put(REQUEST, t);
dataMapPut(REQUEST, t);
}
public <T> T getResponseData(){
@@ -76,7 +86,7 @@ public abstract class AbsSlot implements Slot {
}
public <T> void setResponseData(T t){
dataMap.put(RESPONSE, t);
dataMapPut(RESPONSE, t);
}
public <T> T getChainReqData(String chainId) {
@@ -84,7 +94,7 @@ public abstract class AbsSlot implements Slot {
}
public <T> void setChainReqData(String chainId, T t) {
dataMap.put(CHAIN_REQ_PREFIX + chainId, t);
dataMapPut(CHAIN_REQ_PREFIX + chainId, t);
}
public boolean hasData(String key){
@@ -96,7 +106,7 @@ public abstract class AbsSlot implements Slot {
}
public <T> void setData(String key, T t){
dataMap.put(key, t);
dataMapPut(key, t);
}
public <T> void setPrivateDeliveryData(String nodeId, T t){
@@ -124,7 +134,7 @@ public abstract class AbsSlot implements Slot {
}
public <T> void setCondResult(String key, T t){
dataMap.put(COND_NODE_PREFIX + key, t);
dataMapPut(COND_NODE_PREFIX + key, t);
}
public <T> T getCondResult(String key){
@@ -132,7 +142,7 @@ public abstract class AbsSlot implements Slot {
}
public void setChainName(String chainName) {
dataMap.put(CHAINNAME, chainName);
dataMapPut(CHAINNAME, chainName);
}
public String getChainName() {
@@ -178,6 +188,6 @@ public abstract class AbsSlot implements Slot {
@Override
public void setException(Exception e) {
this.dataMap.put(EXCEPTION, e);
dataMapPut(EXCEPTION, e);
}
}

31
liteflow-core/src/main/java/com/yomahub/liteflow/exception/NullParamException.java Normal file
View File

@@ -0,0 +1,31 @@
package com.yomahub.liteflow.exception;
import java.io.Serializable;
/**
* null param exception
* when param is null, dataMap (ConcurrentHashMap) cann't accept a null value
*
* @Author LeoLee
* @Date 2021/12/10 16:47
* @Version 1.0
*/
public class NullParamException extends RuntimeException implements Serializable {
private static final long serialVersionUID = -864259139568071245L;
private String message;
public NullParamException(String message) {
this.message = message;
}
@Override
public String getMessage() {
return message;
}
public void setMessage(String message) {
this.message = message;
}
}

43
liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/nullParam/NullParamTest.java Normal file
View File

@@ -0,0 +1,43 @@
package com.yomahub.liteflow.test.nullParam;
import com.yomahub.liteflow.core.FlowExecutor;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
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;
/**
* 单元测试:传递null param导致NPE的优化代码
*
* @Author LeoLee
* @Date 2021/12/9 16:58
* @Version 1.0
*/
@RunWith(SpringRunner.class)
@TestPropertySource(value = "classpath:/nullParam/application.properties")
@SpringBootTest(classes = NullParamTest.class)
@EnableAutoConfiguration
@ComponentScan({"com.yomahub.liteflow.test.nullParam.cmp"})
public class NullParamTest {
@Autowired
private FlowExecutor flowExecutor;
/**
* 支持无参的flow执行，以及param 为null时的异常抛出
* @Author LeoLee
* @Date 17:25 2021/12/9
*/
@Test
public void testNullParam() throws Exception {
//flowExecutor.execute("chain1", null);//NullParamException: data slot can't accept null param
flowExecutor.execute("chain1");
//flowExecutor.execute2Resp("chain1", null);//NullParamException: data slot can't accept null param
flowExecutor.execute2Resp("chain1");
}
}

22
liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/nullParam/cmp/ACmp.java Normal file
View File

@@ -0,0 +1,22 @@
/**
* <p>Title: liteflow</p>
* <p>Description: 轻量级的组件式流程框架</p>
* @author Bryan.Zhang
* @email weenyc31@163.com
* @Date 2020/4/1
*/
package com.yomahub.liteflow.test.nullParam.cmp;
import com.yomahub.liteflow.core.NodeComponent;
import org.springframework.stereotype.Component;
@Component("a")
public class ACmp extends NodeComponent {
@Override
public void process() {
System.out.println("ACmp executed!");
System.out.println("get request data:" + this.getSlot().getRequestData());
this.getSlot().setInput("BCmp", "param for BCmp");
}
}

23
liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/nullParam/cmp/BCmp.java Normal file
View File

@@ -0,0 +1,23 @@
/**
* <p>Title: liteflow</p>
* <p>Description: 轻量级的组件式流程框架</p>
* @author Bryan.Zhang
* @email weenyc31@163.com
* @Date 2020/4/1
*/
package com.yomahub.liteflow.test.nullParam.cmp;
import com.yomahub.liteflow.core.NodeComponent;
import org.springframework.stereotype.Component;
@Component("b")
public class BCmp extends NodeComponent {
@Override
public void process() {
System.out.println("BCmp executed!");
System.out.println("BCmp param:" + this.getSlot().getInput("BCmp"));
this.getSlot().setOutput("CCmp", "param for CCmp");
}
}

22
liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/nullParam/cmp/CCmp.java Normal file
View File

@@ -0,0 +1,22 @@
/**
* <p>Title: liteflow</p>
* <p>Description: 轻量级的组件式流程框架</p>
* @author Bryan.Zhang
* @email weenyc31@163.com
* @Date 2020/4/1
*/
package com.yomahub.liteflow.test.nullParam.cmp;
import com.yomahub.liteflow.core.NodeComponent;
import org.springframework.stereotype.Component;
@Component("c")
public class CCmp extends NodeComponent {
@Override
public void process() {
System.out.println("CCmp executed!");
System.out.println("CCmp param:" + this.getSlot().getOutput("CCmp"));
}
}

2
liteflow-testcase-springboot/src/test/resources/nullParam/application.properties Normal file
View File

@@ -0,0 +1,2 @@
liteflow.rule-source=nullParam/flow.xml
liteflow.print-banner=true

8
liteflow-testcase-springboot/src/test/resources/nullParam/flow.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<flow>
<chain name="chain1">
<!--同步执行-->
<then value="a,b"/>
<when value="c"/>
</chain>
</flow>

38
liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/nullParam/NullParamTest.java Normal file
View File

@@ -0,0 +1,38 @@
package com.yomahub.liteflow.test.nullParam;
import com.yomahub.liteflow.core.FlowExecutor;
import com.yomahub.liteflow.test.BaseTest;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import javax.annotation.Resource;
/**
* 单元测试:传递null param导致NPE的优化代码
*
* @Author LeoLee
* @Date 2021/12/11
* @Version V1.0
**/
@RunWith(SpringRunner.class)
@ContextConfiguration("classpath:/nullParam/application-local.xml")
public class NullParamTest extends BaseTest {
@Resource
private FlowExecutor flowExecutor;
/**
* 支持无参的flow执行，以及param 为null时的异常抛出
* @Author: LeoLee
* @Date: 2021/12/11 21:38
*/
@Test
public void testNullParam() throws Exception {
//flowExecutor.execute("chain1", null);//NullParamException: data slot can't accept null param
flowExecutor.execute("chain1");
//flowExecutor.execute2Resp("chain1", null);//NullParamException: data slot can't accept null param
flowExecutor.execute2Resp("chain1");
}
}

22
liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/nullParam/cmp/ACmp.java Normal file
View File

@@ -0,0 +1,22 @@
/**
* <p>Title: liteflow</p>
* <p>Description: 轻量级的组件式流程框架</p>
* @author Bryan.Zhang
* @email weenyc31@163.com
* @Date 2020/4/1
*/
package com.yomahub.liteflow.test.nullParam.cmp;
import com.yomahub.liteflow.core.NodeComponent;
import org.springframework.stereotype.Component;
@Component("a")
public class ACmp extends NodeComponent {
@Override
public void process() {
System.out.println("ACmp executed!");
System.out.println("get request data:" + this.getSlot().getRequestData());
this.getSlot().setInput("BCmp", "param for BCmp");
}
}

23
liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/nullParam/cmp/BCmp.java Normal file
View File

@@ -0,0 +1,23 @@
/**
* <p>Title: liteflow</p>
* <p>Description: 轻量级的组件式流程框架</p>
* @author Bryan.Zhang
* @email weenyc31@163.com
* @Date 2020/4/1
*/
package com.yomahub.liteflow.test.nullParam.cmp;
import com.yomahub.liteflow.core.NodeComponent;
import org.springframework.stereotype.Component;
@Component("b")
public class BCmp extends NodeComponent {
@Override
public void process() {
System.out.println("BCmp executed!");
System.out.println("BCmp param:" + this.getSlot().getInput("BCmp"));
this.getSlot().setOutput("CCmp", "param for CCmp");
}
}

22
liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/nullParam/cmp/CCmp.java Normal file
View File

@@ -0,0 +1,22 @@
/**
* <p>Title: liteflow</p>
* <p>Description: 轻量级的组件式流程框架</p>
* @author Bryan.Zhang
* @email weenyc31@163.com
* @Date 2020/4/1
*/
package com.yomahub.liteflow.test.nullParam.cmp;
import com.yomahub.liteflow.core.NodeComponent;
import org.springframework.stereotype.Component;
@Component("c")
public class CCmp extends NodeComponent {
@Override
public void process() {
System.out.println("CCmp executed!");
System.out.println("CCmp param:" + this.getSlot().getOutput("CCmp"));
}
}

23
liteflow-testcase-springnative/src/test/resources/nullParam/application-local.xml Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://www.springframework.org/schema/beans"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-4.0.xsd">
<context:component-scan base-package="com.yomahub.liteflow.test.nullParam.cmp" />
<bean id="springAware" class="com.yomahub.liteflow.util.SpringAware"/>
<bean class="com.yomahub.liteflow.spring.ComponentScanner"/>
<bean id="liteflowConfig" class="com.yomahub.liteflow.property.LiteflowConfig">
<property name="ruleSource" value="nullParam/flow.xml"/>
</bean>
<bean id="flowExecutor" class="com.yomahub.liteflow.core.FlowExecutor">
<property name="liteflowConfig" ref="liteflowConfig"/>
</bean>
</beans>

8
liteflow-testcase-springnative/src/test/resources/nullParam/flow.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<flow>
<chain name="chain1">
<!--同步执行-->
<then value="a,b"/>
<when value="c"/>
</chain>
</flow>