enhancement #I5GS5F 优化Id生成器的Holder类的逻辑

2026-05-14 20:22:07 +08:00 · 2022-07-12 23:46:31 +08:00
parent 55b8194b76
commit 71b054df6a
20 changed files with 77 additions and 91 deletions
--- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ToOperator.java
+++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/ToOperator.java
@@ -24,7 +24,7 @@ public class ToOperator extends Operator {
                throw new Exception();
            }

-            if (objects.length <= 2){
+            if (objects.length <= 1){
                LOG.error("parameter error");
                throw new Exception();
            }
--- a/liteflow-core/src/main/java/com/yomahub/liteflow/core/FlowExecutor.java
+++ b/liteflow-core/src/main/java/com/yomahub/liteflow/core/FlowExecutor.java
@@ -19,6 +19,7 @@ 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.flow.id.IdGeneratorHolder;
 import com.yomahub.liteflow.parser.*;
 import com.yomahub.liteflow.parser.base.FlowParser;
 import com.yomahub.liteflow.parser.el.*;
@@ -113,6 +114,9 @@ public class FlowExecutor {
        //在非spring体系下是一个空实现，等于不做此步骤
        ContextCmpInitHolder.loadContextCmpInit().initCmp();

+        //进行id生成器的初始化
+        IdGeneratorHolder.init();
+
        //如果没有配置规则文件路径，就停止初始化。
        //规则文件路径不是一定要有，因为liteflow分基于规则和基于代码两种，有可能是动态代码构建的
        if (StrUtil.isBlank(liteflowConfig.getRuleSource())) {
--- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/WhenCondition.java
+++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/WhenCondition.java
@@ -10,7 +10,6 @@ package com.yomahub.liteflow.flow.element.condition;
 import cn.hutool.core.util.StrUtil;
 import com.yomahub.liteflow.enums.ConditionTypeEnum;
 import com.yomahub.liteflow.exception.WhenExecuteException;
-import com.yomahub.liteflow.flow.element.Executable;
 import com.yomahub.liteflow.flow.parallel.CompletableFutureTimeout;
 import com.yomahub.liteflow.flow.parallel.ParallelSupplier;
 import com.yomahub.liteflow.flow.parallel.WhenFutureObj;
@@ -26,7 +25,6 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;

 /**
--- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/executor/NodeExecutorHelper.java
+++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/executor/NodeExecutorHelper.java
@@ -32,8 +32,7 @@ public class NodeExecutorHelper {
    }

    public NodeExecutor buildNodeExecutor(Class<? extends NodeExecutor> nodeExecutorClass) {
-        // 高频操作-采取apache判空操作-效率高于hutool的isBlank将近3倍
-        if (ObjectUtil.isNull(nodeExecutorClass)) {
+        if (nodeExecutorClass == null) {
            // 此处使用默认的节点执行器进行执行
            nodeExecutorClass = DefaultNodeExecutor.class;
        }
--- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/id/IdGeneratorHelper.java
+++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/id/IdGeneratorHelper.java
@@ -1,59 +0,0 @@
-package com.yomahub.liteflow.flow.id;
-
-import cn.hutool.core.util.StrUtil;
-import com.yomahub.liteflow.exception.RequestIdGeneratorException;
-import com.yomahub.liteflow.property.LiteflowConfig;
-import com.yomahub.liteflow.property.LiteflowConfigGetter;
-import com.yomahub.liteflow.spi.holder.ContextAwareHolder;
-
-import java.util.Objects;
-
-/**
- * Id 生成器帮助器
- *
- * @author tangkc
- */
-public class IdGeneratorHelper {
-
-    private static RequestIdGenerator requestIdGenerator;
-
-    private volatile static IdGeneratorHelper INSTANCE;
-
-    private IdGeneratorHelper() {
-
-    }
-
-    public static IdGeneratorHelper getInstance() {
-        if (Objects.isNull(INSTANCE)) {
-            //这里加同步锁是为了避免启动后第一次多并发获取requestId而造成重复初始化的场景
-            //并非每次都会执行这个同步锁，所以不存在性能问题
-            synchronized (IdGeneratorHelper.class) {
-                if (Objects.isNull(INSTANCE)) {
-                    INSTANCE = new IdGeneratorHelper();
-                    LiteflowConfig liteflowConfig = LiteflowConfigGetter.get();
-                    String requestIdGeneratorClass = liteflowConfig.getRequestIdGeneratorClass();
-                    if (StrUtil.isBlank(requestIdGeneratorClass)) {
-                        requestIdGenerator = new DefaultRequestIdGenerator();
-                    }
-                    try {
-                        Class<RequestIdGenerator> idGenerateClass = (Class<RequestIdGenerator>) Class.forName(requestIdGeneratorClass);
-                        requestIdGenerator = ContextAwareHolder.loadContextAware().registerBean(idGenerateClass);
-                    } catch (Exception e) {
-                        throw new RequestIdGeneratorException(e.getMessage());
-                    }
-                }
-            }
-        }
-
-        return INSTANCE;
-    }
-
-    public String generate() {
-        return requestIdGenerator.generate();
-    }
-
-    public void clear(){
-        INSTANCE = null;
-    }
-
-}
--- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/id/IdGeneratorHolder.java
+++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/id/IdGeneratorHolder.java
@@ -0,0 +1,59 @@
+package com.yomahub.liteflow.flow.id;
+
+import cn.hutool.core.util.StrUtil;
+import com.yomahub.liteflow.exception.RequestIdGeneratorException;
+import com.yomahub.liteflow.property.LiteflowConfig;
+import com.yomahub.liteflow.property.LiteflowConfigGetter;
+import com.yomahub.liteflow.spi.holder.ContextAwareHolder;
+
+/**
+ * Id 生成器帮助器
+ *
+ * @author tangkc
+ */
+public class IdGeneratorHolder {
+
+    private RequestIdGenerator requestIdGenerator;
+
+    private static IdGeneratorHolder INSTANCE;
+
+    public static void init(){
+        try{
+            INSTANCE = new IdGeneratorHolder();
+            LiteflowConfig liteflowConfig = LiteflowConfigGetter.get();
+            String requestIdGeneratorClass = liteflowConfig.getRequestIdGeneratorClass();
+
+            RequestIdGenerator requestIdGenerator;
+            if (StrUtil.isBlank(requestIdGeneratorClass)) {
+                requestIdGenerator = new DefaultRequestIdGenerator();
+            } else {
+                Class<RequestIdGenerator> idGenerateClass = (Class<RequestIdGenerator>) Class.forName(requestIdGeneratorClass);
+                requestIdGenerator = ContextAwareHolder.loadContextAware().registerBean(idGenerateClass);
+            }
+            INSTANCE.setRequestIdGenerator(requestIdGenerator);
+        }catch (Exception e) {
+            throw new RequestIdGeneratorException(e.getMessage());
+        }
+    }
+
+    public static IdGeneratorHolder getInstance() {
+        return INSTANCE;
+    }
+
+    public String generate() {
+        return requestIdGenerator.generate();
+    }
+
+    public RequestIdGenerator getRequestIdGenerator() {
+        return requestIdGenerator;
+    }
+
+    public void setRequestIdGenerator(RequestIdGenerator requestIdGenerator) {
+        this.requestIdGenerator = requestIdGenerator;
+    }
+
+    public void clear(){
+        INSTANCE = null;
+    }
+
+}
--- a/liteflow-core/src/main/java/com/yomahub/liteflow/slot/Slot.java
+++ b/liteflow-core/src/main/java/com/yomahub/liteflow/slot/Slot.java
@@ -11,7 +11,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.yomahub.liteflow.exception.NoSuchContextBeanException;
 import com.yomahub.liteflow.exception.NullParamException;
 import com.yomahub.liteflow.flow.entity.CmpStep;
-import com.yomahub.liteflow.flow.id.IdGeneratorHelper;
+import com.yomahub.liteflow.flow.id.IdGeneratorHolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@@ -223,7 +223,7 @@ public class Slot{
 	}

 	public void generateRequestId() {
-		metaDataMap.put(REQUEST_ID, IdGeneratorHelper.getInstance().generate());
+		metaDataMap.put(REQUEST_ID, IdGeneratorHolder.getInstance().generate());
 	}

 	public String getRequestId() {
--- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/BaseTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/BaseTest.java
@@ -1,7 +1,7 @@
 package com.yomahub.liteflow.test;

 import com.yomahub.liteflow.flow.FlowBus;
-import com.yomahub.liteflow.flow.id.IdGeneratorHelper;
+import com.yomahub.liteflow.flow.id.IdGeneratorHolder;
 import com.yomahub.liteflow.property.LiteflowConfigGetter;
 import com.yomahub.liteflow.spi.holder.SpiFactoryCleaner;
 import com.yomahub.liteflow.spring.ComponentScanner;
@@ -17,7 +17,6 @@ public class BaseTest {
        ExecutorHelper.loadInstance().clearExecutorServiceMap();
        SpiFactoryCleaner.clean();
        LiteflowConfigGetter.clean();
-        IdGeneratorHelper.getInstance().clear();
    }

 }
--- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/BaseTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/BaseTest.java
@@ -2,7 +2,7 @@ package com.yomahub.liteflow.test;

 import com.yomahub.liteflow.core.FlowExecutorHolder;
 import com.yomahub.liteflow.flow.FlowBus;
-import com.yomahub.liteflow.flow.id.IdGeneratorHelper;
+import com.yomahub.liteflow.flow.id.IdGeneratorHolder;
 import com.yomahub.liteflow.property.LiteflowConfigGetter;
 import com.yomahub.liteflow.spi.holder.SpiFactoryCleaner;
 import com.yomahub.liteflow.thread.ExecutorHelper;
@@ -17,6 +17,5 @@ public class BaseTest {
        SpiFactoryCleaner.clean();
        LiteflowConfigGetter.clean();
        FlowExecutorHolder.clean();
-        IdGeneratorHelper.getInstance().clear();
    }
 }
--- a/liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/java/com/yomahub/liteflow/test/BaseTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-groovy-springboot/src/test/java/com/yomahub/liteflow/test/BaseTest.java
@@ -1,7 +1,7 @@
 package com.yomahub.liteflow.test;

 import com.yomahub.liteflow.flow.FlowBus;
-import com.yomahub.liteflow.flow.id.IdGeneratorHelper;
+import com.yomahub.liteflow.flow.id.IdGeneratorHolder;
 import com.yomahub.liteflow.property.LiteflowConfigGetter;
 import com.yomahub.liteflow.spi.holder.SpiFactoryCleaner;
 import com.yomahub.liteflow.spring.ComponentScanner;
@@ -17,6 +17,5 @@ public class BaseTest {
        ExecutorHelper.loadInstance().clearExecutorServiceMap();
        SpiFactoryCleaner.clean();
        LiteflowConfigGetter.clean();
-        IdGeneratorHelper.getInstance().clear();
    }
 }
--- a/liteflow-testcase-el/liteflow-testcase-el-script-qlexpress-springboot/src/test/java/com/yomahub/liteflow/test/BaseTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-qlexpress-springboot/src/test/java/com/yomahub/liteflow/test/BaseTest.java
@@ -1,7 +1,7 @@
 package com.yomahub.liteflow.test;

 import com.yomahub.liteflow.flow.FlowBus;
-import com.yomahub.liteflow.flow.id.IdGeneratorHelper;
+import com.yomahub.liteflow.flow.id.IdGeneratorHolder;
 import com.yomahub.liteflow.property.LiteflowConfigGetter;
 import com.yomahub.liteflow.spi.holder.SpiFactoryCleaner;
 import com.yomahub.liteflow.spring.ComponentScanner;
@@ -17,6 +17,5 @@ public class BaseTest {
        ExecutorHelper.loadInstance().clearExecutorServiceMap();
        SpiFactoryCleaner.clean();
        LiteflowConfigGetter.clean();
-        IdGeneratorHelper.getInstance().clear();
    }
 }
--- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/BaseTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/BaseTest.java
@@ -1,7 +1,7 @@
 package com.yomahub.liteflow.test;

 import com.yomahub.liteflow.flow.FlowBus;
-import com.yomahub.liteflow.flow.id.IdGeneratorHelper;
+import com.yomahub.liteflow.flow.id.IdGeneratorHolder;
 import com.yomahub.liteflow.property.LiteflowConfigGetter;
 import com.yomahub.liteflow.spi.holder.SpiFactoryCleaner;
 import com.yomahub.liteflow.spring.ComponentScanner;
@@ -17,6 +17,5 @@ public class BaseTest {
        ExecutorHelper.loadInstance().clearExecutorServiceMap();
        SpiFactoryCleaner.clean();
        LiteflowConfigGetter.clean();
-        IdGeneratorHelper.getInstance().clear();
    }
 }
--- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/BaseTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/BaseTest.java
@@ -1,7 +1,7 @@
 package com.yomahub.liteflow.test;

 import com.yomahub.liteflow.flow.FlowBus;
-import com.yomahub.liteflow.flow.id.IdGeneratorHelper;
+import com.yomahub.liteflow.flow.id.IdGeneratorHolder;
 import com.yomahub.liteflow.property.LiteflowConfigGetter;
 import com.yomahub.liteflow.spi.holder.SpiFactoryCleaner;
 import com.yomahub.liteflow.spring.ComponentScanner;
@@ -17,6 +17,5 @@ public class BaseTest {
        ExecutorHelper.loadInstance().clearExecutorServiceMap();
        SpiFactoryCleaner.clean();
        LiteflowConfigGetter.clean();
-        IdGeneratorHelper.getInstance().clear();
    }
 }
--- a/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/BaseTest.java
+++ b/liteflow-testcase-old/liteflow-testcase-declare-springboot/src/test/java/com/yomahub/liteflow/test/BaseTest.java
@@ -1,7 +1,7 @@
 package com.yomahub.liteflow.test;

 import com.yomahub.liteflow.flow.FlowBus;
-import com.yomahub.liteflow.flow.id.IdGeneratorHelper;
+import com.yomahub.liteflow.flow.id.IdGeneratorHolder;
 import com.yomahub.liteflow.property.LiteflowConfigGetter;
 import com.yomahub.liteflow.spi.holder.SpiFactoryCleaner;
 import com.yomahub.liteflow.spring.ComponentScanner;
@@ -17,7 +17,6 @@ public class BaseTest {
        ExecutorHelper.loadInstance().clearExecutorServiceMap();
        SpiFactoryCleaner.clean();
        LiteflowConfigGetter.clean();
-        IdGeneratorHelper.getInstance().clear();
    }

 }
--- a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/BaseTest.java
+++ b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/BaseTest.java
@@ -2,7 +2,7 @@ package com.yomahub.liteflow.test;

 import com.yomahub.liteflow.core.FlowExecutorHolder;
 import com.yomahub.liteflow.flow.FlowBus;
-import com.yomahub.liteflow.flow.id.IdGeneratorHelper;
+import com.yomahub.liteflow.flow.id.IdGeneratorHolder;
 import com.yomahub.liteflow.property.LiteflowConfigGetter;
 import com.yomahub.liteflow.spi.holder.SpiFactoryCleaner;
 import com.yomahub.liteflow.thread.ExecutorHelper;
@@ -17,6 +17,5 @@ public class BaseTest {
        SpiFactoryCleaner.clean();
        LiteflowConfigGetter.clean();
        FlowExecutorHolder.clean();
-        IdGeneratorHelper.getInstance().clear();
    }
 }
--- a/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/requestId/LiteflowRequestIdSpringbootTest.java
+++ b/liteflow-testcase-old/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/requestId/LiteflowRequestIdSpringbootTest.java
@@ -3,7 +3,6 @@ package com.yomahub.liteflow.test.requestId;
 import com.yomahub.liteflow.core.FlowExecutor;
 import com.yomahub.liteflow.core.FlowExecutorHolder;
 import com.yomahub.liteflow.flow.LiteflowResponse;
-import com.yomahub.liteflow.flow.id.IdGeneratorHelper;
 import com.yomahub.liteflow.property.LiteflowConfig;
 import com.yomahub.liteflow.test.BaseTest;
 import org.junit.Assert;
--- a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/BaseTest.java
+++ b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/BaseTest.java
@@ -1,7 +1,7 @@
 package com.yomahub.liteflow.test;

 import com.yomahub.liteflow.flow.FlowBus;
-import com.yomahub.liteflow.flow.id.IdGeneratorHelper;
+import com.yomahub.liteflow.flow.id.IdGeneratorHolder;
 import com.yomahub.liteflow.property.LiteflowConfigGetter;
 import com.yomahub.liteflow.spi.holder.SpiFactoryCleaner;
 import com.yomahub.liteflow.spring.ComponentScanner;
@@ -17,6 +17,5 @@ public class BaseTest {
        ExecutorHelper.loadInstance().clearExecutorServiceMap();
        SpiFactoryCleaner.clean();
        LiteflowConfigGetter.clean();
-        IdGeneratorHelper.getInstance().clear();
    }
 }
--- a/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/requestId/LiteflowRequestIdSpringbootTest.java
+++ b/liteflow-testcase-old/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/requestId/LiteflowRequestIdSpringbootTest.java
@@ -2,10 +2,8 @@ package com.yomahub.liteflow.test.requestId;

 import com.yomahub.liteflow.core.FlowExecutor;
 import com.yomahub.liteflow.flow.LiteflowResponse;
-import com.yomahub.liteflow.flow.id.IdGeneratorHelper;
 import com.yomahub.liteflow.test.BaseTest;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
--- a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/BaseTest.java
+++ b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/BaseTest.java
@@ -1,7 +1,7 @@
 package com.yomahub.liteflow.test;

 import com.yomahub.liteflow.flow.FlowBus;
-import com.yomahub.liteflow.flow.id.IdGeneratorHelper;
+import com.yomahub.liteflow.flow.id.IdGeneratorHolder;
 import com.yomahub.liteflow.property.LiteflowConfigGetter;
 import com.yomahub.liteflow.spi.holder.SpiFactoryCleaner;
 import com.yomahub.liteflow.spring.ComponentScanner;
@@ -17,6 +17,5 @@ public class BaseTest {
        ExecutorHelper.loadInstance().clearExecutorServiceMap();
        SpiFactoryCleaner.clean();
        LiteflowConfigGetter.clean();
-        IdGeneratorHelper.getInstance().clear();
    }
 }
--- a/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/requestId/LiteflowRequestIdSpringbootTest.java
+++ b/liteflow-testcase-old/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/requestId/LiteflowRequestIdSpringbootTest.java
@@ -2,10 +2,8 @@ package com.yomahub.liteflow.test.requestId;

 import com.yomahub.liteflow.core.FlowExecutor;
 import com.yomahub.liteflow.flow.LiteflowResponse;
-import com.yomahub.liteflow.flow.id.IdGeneratorHelper;
 import com.yomahub.liteflow.test.BaseTest;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.context.annotation.ComponentScan;