From 236538079f250254991f0907ce1776f445a2d0df Mon Sep 17 00:00:00 2001 From: "everywhere.z" Date: Sat, 22 Feb 2025 00:54:46 +0800 Subject: [PATCH] =?UTF-8?q?ELBus=E4=B8=AD=E7=9A=84commonNode=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E6=94=B9=E6=88=90element?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yomahub/liteflow/builder/el/ELBus.java | 2 +- .../liteflow/test/builder/MaxWaitSecondBuilderTest.java | 4 ++-- .../yomahub/liteflow/test/builder/RetryBuilderTest.java | 8 ++++---- .../yomahub/liteflow/test/builder/ThenELBuilderTest.java | 2 +- .../yomahub/liteflow/test/config/LiteflowConfigTest1.java | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/ELBus.java b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/ELBus.java index 374d445a2..6514996cc 100644 --- a/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/ELBus.java +++ b/liteflow-el-builder/src/main/java/com/yomahub/liteflow/builder/el/ELBus.java @@ -126,7 +126,7 @@ public class ELBus { * @param nodeId 节点id * @return {@link CommonNodeELWrapper} */ - public static CommonNodeELWrapper commonNode(String nodeId){ + public static CommonNodeELWrapper element(String nodeId){ return new CommonNodeELWrapper(nodeId); } diff --git a/liteflow-testcase-el/liteflow-testcase-el-builder/src/test/java/com/yomahub/liteflow/test/builder/MaxWaitSecondBuilderTest.java b/liteflow-testcase-el/liteflow-testcase-el-builder/src/test/java/com/yomahub/liteflow/test/builder/MaxWaitSecondBuilderTest.java index bb48c2db1..b3ea51823 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-builder/src/test/java/com/yomahub/liteflow/test/builder/MaxWaitSecondBuilderTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-builder/src/test/java/com/yomahub/liteflow/test/builder/MaxWaitSecondBuilderTest.java @@ -14,8 +14,8 @@ public class MaxWaitSecondBuilderTest extends BaseTest { // node层面 @Test public void testMaxWaitSecond1(){ - CommonNodeELWrapper nodeA = ELBus.commonNode("a").maxWaitSeconds(4); - CommonNodeELWrapper nodeB = ELBus.commonNode("b").maxWaitSeconds(4); + CommonNodeELWrapper nodeA = ELBus.element("a").maxWaitSeconds(4); + CommonNodeELWrapper nodeB = ELBus.element("b").maxWaitSeconds(4); WhenELWrapper whenELWrapper = ELBus.when(nodeA, nodeB); Assertions.assertEquals("WHEN(a.maxWaitSeconds(4),b.maxWaitSeconds(4));", whenELWrapper.toEL()); } diff --git a/liteflow-testcase-el/liteflow-testcase-el-builder/src/test/java/com/yomahub/liteflow/test/builder/RetryBuilderTest.java b/liteflow-testcase-el/liteflow-testcase-el-builder/src/test/java/com/yomahub/liteflow/test/builder/RetryBuilderTest.java index 21ce4187e..2635745d3 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-builder/src/test/java/com/yomahub/liteflow/test/builder/RetryBuilderTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-builder/src/test/java/com/yomahub/liteflow/test/builder/RetryBuilderTest.java @@ -16,8 +16,8 @@ public class RetryBuilderTest extends BaseTest { // node上进行retry @Test public void testRetry1(){ - CommonNodeELWrapper nodeA = ELBus.commonNode("a").retry(2); - CommonNodeELWrapper nodeB = ELBus.commonNode("b").retry(3); + CommonNodeELWrapper nodeA = ELBus.element("a").retry(2); + CommonNodeELWrapper nodeB = ELBus.element("b").retry(3); WhenELWrapper whenELWrapper = ELBus.when(nodeA, nodeB); Assertions.assertEquals("WHEN(a.retry(2),b.retry(3));", whenELWrapper.toEL()); } @@ -25,8 +25,8 @@ public class RetryBuilderTest extends BaseTest { // node上进行retry，带exception @Test public void testRetry2(){ - CommonNodeELWrapper nodeA = ELBus.commonNode("a").retry(2, "java.lang.NullPointerException"); - CommonNodeELWrapper nodeB = ELBus.commonNode("b").retry(3, "java.lang.NullPointerException", "java.lang.ArrayIndexOutOfBoundsException"); + CommonNodeELWrapper nodeA = ELBus.element("a").retry(2, "java.lang.NullPointerException"); + CommonNodeELWrapper nodeB = ELBus.element("b").retry(3, "java.lang.NullPointerException", "java.lang.ArrayIndexOutOfBoundsException"); WhenELWrapper whenELWrapper = ELBus.when(nodeA, nodeB); Assertions.assertEquals("WHEN(a.retry(2,\"java.lang.NullPointerException\"),b.retry(3,\"java.lang.NullPointerException\",\"java.lang.ArrayIndexOutOfBoundsException\"));", whenELWrapper.toEL()); diff --git a/liteflow-testcase-el/liteflow-testcase-el-builder/src/test/java/com/yomahub/liteflow/test/builder/ThenELBuilderTest.java b/liteflow-testcase-el/liteflow-testcase-el-builder/src/test/java/com/yomahub/liteflow/test/builder/ThenELBuilderTest.java index ca1c6bced..a0658f2f7 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-builder/src/test/java/com/yomahub/liteflow/test/builder/ThenELBuilderTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-builder/src/test/java/com/yomahub/liteflow/test/builder/ThenELBuilderTest.java @@ -28,7 +28,7 @@ public class ThenELBuilderTest extends BaseTest { name2Value.put("name", "zhangsan"); name2Value.put("age", 18); String expected = "nodeData = '{\"name\":\"zhangsan\",\"age\":18}';\nTHEN(\n\ta.tag(\"tagA\").data(nodeData).maxWaitSeconds(10).retry(2),\n\tnode(\"b\")\n);"; - String actualEl = ELBus.then(ELBus.commonNode("a").data("nodeData", name2Value).tag("tagA").maxWaitSeconds(10).retry(2), ELBus.node("b")).toEL(true); + String actualEl = ELBus.then(ELBus.element("a").data("nodeData", name2Value).tag("tagA").maxWaitSeconds(10).retry(2), ELBus.node("b")).toEL(true); System.out.println(actualEl); Assertions.assertEquals(expected, actualEl); } diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/config/LiteflowConfigTest1.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/config/LiteflowConfigTest1.java index 2b2b2a48d..1c0e977b3 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/config/LiteflowConfigTest1.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/config/LiteflowConfigTest1.java @@ -42,7 +42,7 @@ public class LiteflowConfigTest1 extends BaseTest { Assertions.assertEquals(300000L, config.getDelay().longValue()); Assertions.assertEquals(300000L, config.getPeriod().longValue()); Assertions.assertFalse(config.getEnableLog()); - Assertions.assertEquals(16, config.getGlobalThreadPoolSize().longValue()); + Assertions.assertEquals(64, config.getGlobalThreadPoolSize().longValue()); Assertions.assertEquals(512, config.getGlobalThreadPoolQueueSize().longValue()); Assertions.assertEquals(ParseModeEnum.PARSE_ALL_ON_START, config.getParseMode()); }