diff --git a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/SQLXmlELParser.java b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/SQLXmlELParser.java
index 6f218de4a..98fa7f640 100644
--- a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/SQLXmlELParser.java
+++ b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/SQLXmlELParser.java
@@ -68,7 +68,7 @@ public class SQLXmlELParser extends ClassXmlFlowELParser {
try{
JDBCHelper jdbcHelper = JDBCHelper.getInstance();
String content = jdbcHelper.getContent();
- if(sqlParserVO.getIfPolling()) {
+ if(sqlParserVO.getPollingEnabled()) {
FlowInitHook.addHook(() -> {
jdbcHelper.listenSQL();
return true;
diff --git a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/util/JDBCHelper.java b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/util/JDBCHelper.java
index 5be349ed7..8eb6dc4b8 100644
--- a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/util/JDBCHelper.java
+++ b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/util/JDBCHelper.java
@@ -76,7 +76,7 @@ public class JDBCHelper {
}
INSTANCE.setSqlParserVO(sqlParserVO);
//创建定时任务线程池
- if (sqlParserVO.getIfPolling() && ObjectUtil.isNull(getPollExecutor())) {
+ if (sqlParserVO.getPollingEnabled() && ObjectUtil.isNull(getPollExecutor())) {
ThreadFactory namedThreadFactory = new NamedThreadFactory("SQL-Polling-", false);
ScheduledThreadPoolExecutor threadPoolExecutor = new ScheduledThreadPoolExecutor(
CORE_POOL_SIZE,
@@ -137,7 +137,7 @@ public class JDBCHelper {
result.add(StrUtil.format(CHAIN_XML_PATTERN, XmlUtil.escape(chainName), elData));
//如果需要轮询 计算该chainData的SHA值
- if(sqlParserVO.getIfPolling()){
+ if(sqlParserVO.getPollingEnabled()){
String chainSHA = DigestUtil.sha1Hex(elData);
chainSHAMap.put(chainName, chainSHA);
}
@@ -167,13 +167,13 @@ public class JDBCHelper {
public void listenSQL() {
//添加轮询chain的定时任务
ChainPollingTask chainTask = new ChainPollingTask(sqlParserVO, chainSHAMap);
- pollExecutor.scheduleAtFixedRate(chainTask, sqlParserVO.getPollingStartTime().longValue(),
- sqlParserVO.getPollingInterval().longValue(), TimeUnit.SECONDS);
+ pollExecutor.scheduleAtFixedRate(chainTask, sqlParserVO.getPollingStartSeconds().longValue(),
+ sqlParserVO.getPollingIntervalSeconds().longValue(), TimeUnit.SECONDS);
if (hasScriptData()) {
//添加轮询script的定时任务
ScriptPollingTask scriptTask = new ScriptPollingTask(sqlParserVO, scriptSHAMap);
- pollExecutor.scheduleAtFixedRate(scriptTask, sqlParserVO.getPollingStartTime().longValue(),
- sqlParserVO.getPollingInterval().longValue(), TimeUnit.SECONDS);
+ pollExecutor.scheduleAtFixedRate(scriptTask, sqlParserVO.getPollingStartSeconds().longValue(),
+ sqlParserVO.getPollingIntervalSeconds().longValue(), TimeUnit.SECONDS);
}
}
@@ -232,7 +232,7 @@ public class JDBCHelper {
result.add(StrUtil.format(NODE_ITEM_XML_PATTERN, XmlUtil.escape(id), XmlUtil.escape(name), type, data));
//如果需要轮询 计算该scriptData的SHA值
- if(sqlParserVO.getIfPolling()){
+ if(sqlParserVO.getPollingEnabled()){
String scriptKey = StrUtil.join(":", id, type, name);
String scriptSHA = DigestUtil.sha1Hex(data);
scriptSHAMap.put(scriptKey, scriptSHA);
@@ -306,7 +306,7 @@ public class JDBCHelper {
type, language, data));
//如果需要轮询 计算该scriptData的SHA值
- if(sqlParserVO.getIfPolling()){
+ if(sqlParserVO.getPollingEnabled()){
String scriptKey = StrUtil.join(":", id, type, name, language);
String scriptSHA = DigestUtil.sha1Hex(data);
scriptSHAMap.put(scriptKey, scriptSHA);
diff --git a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/vo/SQLParserVO.java b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/vo/SQLParserVO.java
index e1479025e..2e7bf0cd0 100644
--- a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/vo/SQLParserVO.java
+++ b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/vo/SQLParserVO.java
@@ -91,13 +91,13 @@ public class SQLParserVO {
private String scriptLanguageField;
/*轮询机制是否开启 默认不开启*/
- private Boolean ifPolling = false;
+ private Boolean pollingEnabled = false;
/*轮询时间间隔(s) 默认120s*/
- private Integer pollingInterval = 120;
+ private Integer pollingIntervalSeconds = 120;
/*规则配置后首次轮询的起始时间 默认为60s*/
- private Integer pollingStartTime = 60;
+ private Integer pollingStartSeconds = 60;
public String getUrl() {
return url;
@@ -234,27 +234,27 @@ public class SQLParserVO {
return StrUtil.isBlank(url) && StrUtil.isBlank(username) && StrUtil.isBlank(password) && StrUtil.isBlank(driverClassName);
}
- public Boolean getIfPolling() {
- return ifPolling;
+ public Boolean getPollingEnabled() {
+ return pollingEnabled;
}
- public void setIfPolling(Boolean ifPolling) {
- this.ifPolling = ifPolling;
+ public void setPollingEnabled(Boolean pollingEnabled) {
+ this.pollingEnabled = pollingEnabled;
}
- public Integer getPollingInterval() {
- return pollingInterval;
+ public Integer getPollingIntervalSeconds() {
+ return pollingIntervalSeconds;
}
- public void setPollingInterval(Integer pollingInterval) {
- this.pollingInterval = pollingInterval;
+ public void setPollingIntervalSeconds(Integer pollingIntervalSeconds) {
+ this.pollingIntervalSeconds = pollingIntervalSeconds;
}
- public Integer getPollingStartTime() {
- return pollingStartTime;
+ public Integer getPollingStartSeconds() {
+ return pollingStartSeconds;
}
- public void setPollingStartTime(Integer pollingStartTime) {
- this.pollingStartTime = pollingStartTime;
+ public void setPollingStartSeconds(Integer pollingStartSeconds) {
+ this.pollingStartSeconds = pollingStartSeconds;
}
}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-polling/.gitignore b/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-polling/.gitignore
deleted file mode 100644
index 549e00a2a..000000000
--- a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-polling/.gitignore
+++ /dev/null
@@ -1,33 +0,0 @@
-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
diff --git a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-polling/pom.xml b/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-polling/pom.xml
deleted file mode 100644
index 334c00ab4..000000000
--- a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-polling/pom.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
Title: liteflow
- *Description: 轻量级的组件式流程框架
- * - * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2020/4/1 - */ -package com.yomahub.liteflow.test.sql.cmp; - -import com.yomahub.liteflow.core.NodeComponent; -import org.springframework.stereotype.Component; - -@Component("a") -public class ACmp extends NodeComponent { - - @Override - public void process() { - System.out.println("ACmp executed!"); - } - -} \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-polling/src/test/java/com/yomahub/liteflow/test/sql/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-polling/src/test/java/com/yomahub/liteflow/test/sql/cmp/BCmp.java deleted file mode 100644 index 9601ee2cf..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-polling/src/test/java/com/yomahub/liteflow/test/sql/cmp/BCmp.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - *Title: liteflow
- *Description: 轻量级的组件式流程框架
- * - * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2020/4/1 - */ -package com.yomahub.liteflow.test.sql.cmp; - -import com.yomahub.liteflow.core.NodeComponent; -import org.springframework.stereotype.Component; - -@Component("b") -public class BCmp extends NodeComponent { - - @Override - public void process() { - System.out.println("BCmp executed!"); - } - -} diff --git a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-polling/src/test/java/com/yomahub/liteflow/test/sql/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-polling/src/test/java/com/yomahub/liteflow/test/sql/cmp/CCmp.java deleted file mode 100644 index 2274a153e..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-polling/src/test/java/com/yomahub/liteflow/test/sql/cmp/CCmp.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - *Title: liteflow
- *Description: 轻量级的组件式流程框架
- * - * @author Bryan.Zhang - * @email weenyc31@163.com - * @Date 2020/4/1 - */ -package com.yomahub.liteflow.test.sql.cmp; - -import com.yomahub.liteflow.core.NodeComponent; -import org.springframework.stereotype.Component; - -@Component("c") -public class CCmp extends NodeComponent { - - @Override - public void process() { - System.out.println("CCmp executed!"); - } - -} \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-polling/src/test/resources/sql/data.sql b/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-polling/src/test/resources/sql/data.sql deleted file mode 100644 index 5900dfa0a..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot-polling/src/test/resources/sql/data.sql +++ /dev/null @@ -1,14 +0,0 @@ -DELETE FROM EL_TABLE; - -INSERT INTO EL_TABLE (APPLICATION_NAME,CHAIN_NAME,EL_DATA) values ('demo','chain1','THEN(a, b, c);'); -INSERT INTO EL_TABLE (APPLICATION_NAME,CHAIN_NAME,EL_DATA) values ('demo','chain2','IF(x1, THEN(a, b));'); -INSERT INTO EL_TABLE (APPLICATION_NAME,CHAIN_NAME,EL_DATA) values ('demo','chain3','IF(x0, THEN(a, b));'); -INSERT INTO EL_TABLE (APPLICATION_NAME,CHAIN_NAME,EL_DATA) values ('demo','