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

!104 优化 Operator 代码 2

Browse Source 
Merge pull request !104 from nmnl/dev
This commit is contained in:
铂赛东
2022-09-13 05:27:55 +00:00
committed by Gitee
parent d0611d5d50 5427553cb2
commit 088b415179
8 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
liteflow-core/src/main/java/com/yomahub/liteflow/builder/LiteFlowChainBuilder.java
View File

@@ -2,7 +2,6 @@ package com.yomahub.liteflow.builder;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.util.StrUtil;
import com.yomahub.liteflow.enums.ConditionTypeEnum;
import com.yomahub.liteflow.flow.FlowBus;

1
liteflow-core/src/main/java/com/yomahub/liteflow/builder/LiteFlowWhenConditionBuilder.java
View File

@@ -2,7 +2,6 @@ package com.yomahub.liteflow.builder;
import cn.hutool.core.util.StrUtil;
import com.yomahub.liteflow.common.LocalDefaultFlowConstant;
import com.yomahub.liteflow.enums.ConditionTypeEnum;
import com.yomahub.liteflow.flow.element.condition.Condition;
import com.yomahub.liteflow.flow.element.condition.WhenCondition;

9
liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/LiteFlowChainELBuilder.java
View File

@@ -11,9 +11,10 @@ import com.yomahub.liteflow.exception.FlowSystemException;
import com.yomahub.liteflow.flow.FlowBus;
import com.yomahub.liteflow.flow.element.Chain;
import com.yomahub.liteflow.flow.element.Executable;
import com.yomahub.liteflow.flow.element.condition.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.yomahub.liteflow.flow.element.condition.Condition;
import com.yomahub.liteflow.flow.element.condition.FinallyCondition;
import com.yomahub.liteflow.flow.element.condition.PreCondition;
import java.util.ArrayList;
import java.util.List;
@@ -25,8 +26,6 @@ import java.util.List;
*/
public class LiteFlowChainELBuilder {
private final Logger LOG = LoggerFactory.getLogger(this.getClass());
private Chain chain;
//这是主体的Condition，不包含前置和后置

6
liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/AnyOperator.java
View File

@@ -19,15 +19,13 @@ public class AnyOperator extends BaseOperator {
WhenCondition whenCondition = OperatorHelper.convert(objects[0], WhenCondition.class);
boolean any = false;
if (objects[1] instanceof Boolean) {
any = Boolean.parseBoolean(objects[1].toString().toLowerCase());
// any
whenCondition.setAny(Boolean.parseBoolean(objects[1].toString().toLowerCase()));
} else {
throw new QLException("the parameter must be boolean type");
}
whenCondition.setAny(any);
return whenCondition;
}
}

6
liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/IdOperator.java
View File

@@ -23,16 +23,14 @@ public class IdOperator extends BaseOperator {
Condition condition = OperatorHelper.convert(objects[0], Condition.class);
String id;
if (objects[1] instanceof String) {
id = objects[1].toString();
// id
condition.setId(objects[1].toString());
} else {
LOG.error("the parameter must be String type!");
throw new QLException("the parameter must be String type");
}
condition.setId(id);
return condition;
}
}

6
liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/IgnoreErrorOperator.java
View File

@@ -19,15 +19,13 @@ public class IgnoreErrorOperator extends BaseOperator {
WhenCondition condition = OperatorHelper.convert(objects[0], WhenCondition.class);
boolean ignoreError = false;
if (objects[1] instanceof Boolean) {
ignoreError = Boolean.parseBoolean(objects[1].toString().toLowerCase());
// ignoreError
condition.setErrorResume(Boolean.parseBoolean(objects[1].toString().toLowerCase()));
} else {
throw new QLException("The parameter must be boolean type");
}
condition.setErrorResume(ignoreError);
return condition;
}
}

6
liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/TagOperator.java
View File

@@ -20,7 +20,7 @@ public class TagOperator extends BaseOperator {
Node node = OperatorHelper.convert(objects[0], Node.class);
String tag = null;
String tag ;
if (objects[1] instanceof String) {
tag = objects[1].toString();
} else {
@@ -30,7 +30,9 @@ public class TagOperator extends BaseOperator {
//这里为什么要clone一个呢？
//因为tag是跟着chain走的。而在el上下文里的放的都是同一个node，如果多个同样的node tag不同，则这里必须copy
Node copyNode = FlowBus.copyNode(node.getId());
if (null == copyNode){
throw new QLException("The Node must be not null");
}
copyNode.setTag(tag);
return copyNode;

6
liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ThreadPoolOperator.java
View File

@@ -19,15 +19,13 @@ public class ThreadPoolOperator extends BaseOperator {
WhenCondition whenCondition = OperatorHelper.convert(objects[0], WhenCondition.class);
String threadPoolClazz = null;
if (objects[1] instanceof String) {
threadPoolClazz = objects[1].toString();
// threadPoolClazz
whenCondition.setThreadExecutorClass(objects[1].toString());
} else {
throw new QLException("the parameter must be String type");
}
whenCondition.setThreadExecutorClass(threadPoolClazz);
return whenCondition;
}
}