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

!65 调整LiteflowConfig包装类型

Browse Source 
Merge pull request !65 from nmnl/dev
This commit is contained in:
铂赛东
2022-06-17 10:50:20 +00:00
committed by Gitee
parent b559ff79cd 19a6104545
commit bf935fc707
4 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,27 +9,33 @@
package com.yomahub.liteflow.core;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.util.*;
import cn.hutool.core.util.BooleanUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.util.StrUtil;
import com.google.common.collect.Lists;
import com.yomahub.liteflow.slot.DataBus;
import com.yomahub.liteflow.flow.LiteflowResponse;
import com.yomahub.liteflow.slot.DefaultContext;
import com.yomahub.liteflow.slot.Slot;
import com.yomahub.liteflow.flow.element.Chain;
import com.yomahub.liteflow.flow.element.Node;
import com.yomahub.liteflow.enums.FlowParserTypeEnum;
import com.yomahub.liteflow.exception.*;
import com.yomahub.liteflow.flow.FlowBus;
import com.yomahub.liteflow.flow.LiteflowResponse;
import com.yomahub.liteflow.flow.element.Chain;
import com.yomahub.liteflow.flow.element.Node;
import com.yomahub.liteflow.parser.*;
import com.yomahub.liteflow.property.LiteflowConfig;
import com.yomahub.liteflow.property.LiteflowConfigGetter;
import com.yomahub.liteflow.slot.DataBus;
import com.yomahub.liteflow.slot.DefaultContext;
import com.yomahub.liteflow.slot.Slot;
import com.yomahub.liteflow.spi.holder.ContextAwareHolder;
import com.yomahub.liteflow.thread.ExecutorHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.*;
import java.util.concurrent.*;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.Future;
/**
* 流程规则主要执行器类
@@ -68,7 +74,7 @@ public class FlowExecutor {
LiteflowConfigGetter.setLiteflowConfig(liteflowConfig);
//设置FlowExecutor的Holder，虽然大部分地方都可以通过Spring上下文获取到，但放入Holder，还是为了某些地方能方便的取到
FlowExecutorHolder.setHolder(this);
if (liteflowConfig.isParseOnStart()) {
if (BooleanUtil.isTrue(liteflowConfig.isParseOnStart())) {
this.init();
}
//初始化DataBus
@@ -118,7 +124,7 @@ public class FlowExecutor {
rulePathList.add(path);
//支持多类型的配置文件，分别解析
if (liteflowConfig.isSupportMultipleType()) {
if (BooleanUtil.isTrue(liteflowConfig.isSupportMultipleType())) {
if (ObjectUtil.isNotNull(parser)) {
parser.parseMain(ListUtil.toList(path));
} else {
@@ -136,7 +142,7 @@ public class FlowExecutor {
}
//单类型的配置文件，需要一起解析
if (!liteflowConfig.isSupportMultipleType()) {
if (BooleanUtil.isFalse(liteflowConfig.isSupportMultipleType())) {
//检查Parser是否只有一个，因为多个不同的parser会造成子流程的混乱
if (parserNameSet.size() > 1) {
String errorMsg = "cannot have multiple different parsers";

5
liteflow-core/src/main/java/com/yomahub/liteflow/monitor/MonitorBus.java
View File

@@ -7,8 +7,9 @@
*/
package com.yomahub.liteflow.monitor;
import com.yomahub.liteflow.slot.DataBus;
import cn.hutool.core.util.BooleanUtil;
import com.yomahub.liteflow.property.LiteflowConfig;
import com.yomahub.liteflow.slot.DataBus;
import com.yomahub.liteflow.util.BoundedPriorityBlockingQueue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,7 +41,7 @@ public class MonitorBus {
public MonitorBus(LiteflowConfig liteflowConfig) {
this.liteflowConfig = liteflowConfig;
if(liteflowConfig.getEnableLog()){
if(BooleanUtil.isTrue(liteflowConfig.getEnableLog())){
this.printLogScheduler.scheduleAtFixedRate(new MonitorTimeTask(this), liteflowConfig.getDelay(), liteflowConfig.getPeriod(), TimeUnit.MILLISECONDS);
}
}

14
liteflow-core/src/main/java/com/yomahub/liteflow/property/LiteflowConfig.java
View File

@@ -8,10 +8,8 @@
*/
package com.yomahub.liteflow.property;
import cn.hutool.core.util.BooleanUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.sun.org.apache.xpath.internal.operations.Bool;
/**
* liteflow的配置实体类
@@ -88,7 +86,7 @@ public class LiteflowConfig {
public Boolean getEnable() {
if (ObjectUtil.isNull(enable)) {
return true;
return Boolean.TRUE;
} else {
return enable;
}
@@ -168,7 +166,7 @@ public class LiteflowConfig {
public Boolean getEnableLog() {
if (ObjectUtil.isNull(enableLog)) {
return false;
return Boolean.FALSE;
} else {
return enableLog;
}
@@ -204,7 +202,7 @@ public class LiteflowConfig {
public Boolean isParseOnStart() {
if (ObjectUtil.isNull(parseOnStart)) {
return true;
return Boolean.TRUE;
} else {
return parseOnStart;
}
@@ -216,7 +214,7 @@ public class LiteflowConfig {
public Boolean isSupportMultipleType() {
if (ObjectUtil.isNull(supportMultipleType)) {
return false;
return Boolean.FALSE;
} else {
return supportMultipleType;
}
@@ -226,7 +224,7 @@ public class LiteflowConfig {
this.supportMultipleType = supportMultipleType;
}
public int getRetryCount() {
public Integer getRetryCount() {
if (ObjectUtil.isNull(retryCount) || retryCount < 0) {
return 0;
} else {
@@ -234,7 +232,7 @@ public class LiteflowConfig {
}
}
public void setRetryCount(int retryCount) {
public void setRetryCount(Integer retryCount) {
this.retryCount = retryCount;
}

1
liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/config/LiteflowPropertyAutoConfiguration.java
View File

@@ -3,7 +3,6 @@ package com.yomahub.liteflow.springboot.config;
import com.yomahub.liteflow.property.LiteflowConfig;
import com.yomahub.liteflow.springboot.LiteflowMonitorProperty;
import com.yomahub.liteflow.springboot.LiteflowProperty;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;