KingChan
/
liteFlow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STYLE #I8VSD6 调整 checkObjectSizeGteTwo 名称、注释、判断 避免误解

This commit is contained in:
guorunze 2024-01-15 16:20:05 +08:00
parent e33fd3b0f7
commit e60a60e12f
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/AndOperator.java
View File

@ -16,7 +16,7 @@ import com.yomahub.liteflow.flow.element.condition.BooleanConditionTypeEnum;
public class AndOperator extends BaseOperator<AndOrCondition> { public class AndOperator extends BaseOperator<AndOrCondition> {
@Override @Override
public AndOrCondition build(Object[] objects) throws Exception { public AndOrCondition build(Object[] objects) throws Exception {
OperatorHelper.checkObjectSizeGtTwo(objects); OperatorHelper.checkObjectSizeGteTwo(objects);
AndOrCondition andOrCondition = new AndOrCondition(); AndOrCondition andOrCondition = new AndOrCondition();
andOrCondition.setBooleanConditionType(BooleanConditionTypeEnum.AND); andOrCondition.setBooleanConditionType(BooleanConditionTypeEnum.AND);

2
liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/MustOperator.java
View File

@ -19,7 +19,7 @@ public class MustOperator extends BaseOperator<WhenCondition> {
@Override @Override
public WhenCondition build(Object[] objects) throws Exception { public WhenCondition build(Object[] objects) throws Exception {
OperatorHelper.checkObjectSizeGtTwo(objects); OperatorHelper.checkObjectSizeGteTwo(objects);
String errorMsg = "The caller must be WhenCondition item"; String errorMsg = "The caller must be WhenCondition item";
WhenCondition whenCondition = OperatorHelper.convert(objects[0], WhenCondition.class, errorMsg); WhenCondition whenCondition = OperatorHelper.convert(objects[0], WhenCondition.class, errorMsg);

2
liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/OrOperator.java
View File

@ -16,7 +16,7 @@ import com.yomahub.liteflow.flow.element.condition.BooleanConditionTypeEnum;
public class OrOperator extends BaseOperator<AndOrCondition> { public class OrOperator extends BaseOperator<AndOrCondition> {
@Override @Override
public AndOrCondition build(Object[] objects) throws Exception { public AndOrCondition build(Object[] objects) throws Exception {
OperatorHelper.checkObjectSizeGtTwo(objects); OperatorHelper.checkObjectSizeGteTwo(objects);
AndOrCondition andOrCondition = new AndOrCondition(); AndOrCondition andOrCondition = new AndOrCondition();
andOrCondition.setBooleanConditionType(BooleanConditionTypeEnum.OR); andOrCondition.setBooleanConditionType(BooleanConditionTypeEnum.OR);

2
liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ToOperator.java
View File

@ -15,7 +15,7 @@ public class ToOperator extends BaseOperator<SwitchCondition> {
@Override @Override
public SwitchCondition build(Object[] objects) throws Exception { public SwitchCondition build(Object[] objects) throws Exception {
OperatorHelper.checkObjectSizeGtTwo(objects); OperatorHelper.checkObjectSizeGteTwo(objects);
String errorMsg = "The caller must be SwitchCondition item"; String errorMsg = "The caller must be SwitchCondition item";
SwitchCondition switchCondition = OperatorHelper.convert(objects[0], SwitchCondition.class, errorMsg); SwitchCondition switchCondition = OperatorHelper.convert(objects[0], SwitchCondition.class, errorMsg);

8
liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/base/OperatorHelper.java
View File

@ -10,8 +10,6 @@ import com.yomahub.liteflow.exception.DataNotFoundException;
import com.yomahub.liteflow.flow.element.Condition; import com.yomahub.liteflow.flow.element.Condition;
import com.yomahub.liteflow.flow.element.Executable; import com.yomahub.liteflow.flow.element.Executable;
import com.yomahub.liteflow.flow.element.Node; import com.yomahub.liteflow.flow.element.Node;
import com.yomahub.liteflow.flow.element.condition.AndOrCondition;
import com.yomahub.liteflow.flow.element.condition.NotCondition;
import java.util.Objects; import java.util.Objects;
@ -35,13 +33,13 @@ public class OperatorHelper {
} }
/** /**
* 检查参数数量，大于 2 * 检查参数数量，大于等于 2
* @param objects objects * @param objects objects
* @throws QLException QLException * @throws QLException QLException
*/ */
public static void checkObjectSizeGtTwo(Object[] objects) throws QLException { public static void checkObjectSizeGteTwo(Object[] objects) throws QLException {
checkObjectSizeGtZero(objects); checkObjectSizeGtZero(objects);
if (objects.length <= 1) { if (objects.length < 2) {
throw new QLException("parameter error"); throw new QLException("parameter error");
} }
} }