diff --git a/liteflow-rule-plugin/liteflow-rule-apollo/src/main/java/com/yomahub/liteflow/parser/apollo/ApolloXmlELParser.java b/liteflow-rule-plugin/liteflow-rule-apollo/src/main/java/com/yomahub/liteflow/parser/apollo/ApolloXmlELParser.java index b0a443c9f..631ca19c0 100644 --- a/liteflow-rule-plugin/liteflow-rule-apollo/src/main/java/com/yomahub/liteflow/parser/apollo/ApolloXmlELParser.java +++ b/liteflow-rule-plugin/liteflow-rule-apollo/src/main/java/com/yomahub/liteflow/parser/apollo/ApolloXmlELParser.java @@ -48,7 +48,7 @@ public class ApolloXmlELParser extends ClassXmlFlowELParser { apolloParseHelper = new ApolloParseHelper(apolloParserConfigVO); } catch (Exception e) { - throw new ApolloException(e.getMessage()); + throw new ApolloException(e); } } @@ -65,7 +65,7 @@ public class ApolloXmlELParser extends ClassXmlFlowELParser { } catch (Exception e) { - throw new ApolloException(e.getMessage()); + throw new ApolloException(e); } } diff --git a/liteflow-rule-plugin/liteflow-rule-apollo/src/main/java/com/yomahub/liteflow/parser/apollo/exception/ApolloException.java b/liteflow-rule-plugin/liteflow-rule-apollo/src/main/java/com/yomahub/liteflow/parser/apollo/exception/ApolloException.java index d11333ce4..4efef6563 100644 --- a/liteflow-rule-plugin/liteflow-rule-apollo/src/main/java/com/yomahub/liteflow/parser/apollo/exception/ApolloException.java +++ b/liteflow-rule-plugin/liteflow-rule-apollo/src/main/java/com/yomahub/liteflow/parser/apollo/exception/ApolloException.java @@ -13,6 +13,11 @@ public class ApolloException extends RuntimeException { this.message = message; } + public ApolloException(Throwable cause) { + super(cause); + this.message = cause.getMessage(); + } + @Override public String getMessage() { return message; diff --git a/liteflow-rule-plugin/liteflow-rule-etcd/src/main/java/com/yomahub/liteflow/parser/etcd/EtcdXmlELParser.java b/liteflow-rule-plugin/liteflow-rule-etcd/src/main/java/com/yomahub/liteflow/parser/etcd/EtcdXmlELParser.java index 4e074a67e..9536689b6 100644 --- a/liteflow-rule-plugin/liteflow-rule-etcd/src/main/java/com/yomahub/liteflow/parser/etcd/EtcdXmlELParser.java +++ b/liteflow-rule-plugin/liteflow-rule-etcd/src/main/java/com/yomahub/liteflow/parser/etcd/EtcdXmlELParser.java @@ -14,7 +14,6 @@ import com.yomahub.liteflow.property.LiteflowConfigGetter; import com.yomahub.liteflow.util.JsonUtil; import java.util.Objects; -import java.util.function.BooleanSupplier; /** * Etcd解析器实现,只支持EL形式的XML,不支持其他的形式 @@ -53,7 +52,7 @@ public class EtcdXmlELParser extends ClassXmlFlowELParser { etcdParserHelper = new EtcdParserHelper(etcdParserVO); } catch (Exception e) { - throw new EtcdException(e.getMessage()); + throw new EtcdException(e); } } @@ -71,7 +70,7 @@ public class EtcdXmlELParser extends ClassXmlFlowELParser { return content; } catch (Exception e) { - throw new EtcdException(e.getMessage()); + throw new EtcdException(e); } } diff --git a/liteflow-rule-plugin/liteflow-rule-etcd/src/main/java/com/yomahub/liteflow/parser/etcd/exception/EtcdException.java b/liteflow-rule-plugin/liteflow-rule-etcd/src/main/java/com/yomahub/liteflow/parser/etcd/exception/EtcdException.java index 40a51b645..a2f4b44da 100644 --- a/liteflow-rule-plugin/liteflow-rule-etcd/src/main/java/com/yomahub/liteflow/parser/etcd/exception/EtcdException.java +++ b/liteflow-rule-plugin/liteflow-rule-etcd/src/main/java/com/yomahub/liteflow/parser/etcd/exception/EtcdException.java @@ -9,22 +9,29 @@ package com.yomahub.liteflow.parser.etcd.exception; */ public class EtcdException extends RuntimeException { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - /** 异常信息 */ - private String message; + /** + * 异常信息 + */ + private String message; - public EtcdException(String message) { - this.message = message; - } + public EtcdException(String message) { + this.message = message; + } - @Override - public String getMessage() { - return message; - } + public EtcdException(Throwable cause) { + super(cause); + this.message = cause.getMessage(); + } - public void setMessage(String message) { - this.message = message; - } + @Override + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } } diff --git a/liteflow-rule-plugin/liteflow-rule-etcd/src/main/java/com/yomahub/liteflow/parser/etcd/util/EtcdParserHelper.java b/liteflow-rule-plugin/liteflow-rule-etcd/src/main/java/com/yomahub/liteflow/parser/etcd/util/EtcdParserHelper.java index 684e1bf26..c9256cf4b 100644 --- a/liteflow-rule-plugin/liteflow-rule-etcd/src/main/java/com/yomahub/liteflow/parser/etcd/util/EtcdParserHelper.java +++ b/liteflow-rule-plugin/liteflow-rule-etcd/src/main/java/com/yomahub/liteflow/parser/etcd/util/EtcdParserHelper.java @@ -64,7 +64,7 @@ public class EtcdParserHelper { this.client = new EtcdClient(clientBuilder.build()); } } catch (Exception e) { - throw new EtcdException(e.getMessage()); + throw new EtcdException(e); } } @@ -114,7 +114,7 @@ public class EtcdParserHelper { return StrUtil.format(XML_PATTERN, scriptAllContent, chainAllContent); } catch (Exception e) { - throw new EtcdException(e.getMessage()); + throw new EtcdException(e); } } diff --git a/liteflow-rule-plugin/liteflow-rule-nacos/src/main/java/com/yomahub/liteflow/parser/nacos/NacosXmlELParser.java b/liteflow-rule-plugin/liteflow-rule-nacos/src/main/java/com/yomahub/liteflow/parser/nacos/NacosXmlELParser.java index 92b9a2af5..a31d31fd0 100644 --- a/liteflow-rule-plugin/liteflow-rule-nacos/src/main/java/com/yomahub/liteflow/parser/nacos/NacosXmlELParser.java +++ b/liteflow-rule-plugin/liteflow-rule-nacos/src/main/java/com/yomahub/liteflow/parser/nacos/NacosXmlELParser.java @@ -69,7 +69,7 @@ public class NacosXmlELParser extends ClassXmlFlowELParser { helper = new NacosParserHelper(nacosParserVO); } catch (Exception e) { - throw new NacosException(e.getMessage()); + throw new NacosException(e); } } @@ -90,7 +90,7 @@ public class NacosXmlELParser extends ClassXmlFlowELParser { return content; } catch (Exception e) { - throw new NacosException(e.getMessage()); + throw new NacosException(e); } } diff --git a/liteflow-rule-plugin/liteflow-rule-nacos/src/main/java/com/yomahub/liteflow/parser/nacos/exception/NacosException.java b/liteflow-rule-plugin/liteflow-rule-nacos/src/main/java/com/yomahub/liteflow/parser/nacos/exception/NacosException.java index f256fb52f..febc76452 100644 --- a/liteflow-rule-plugin/liteflow-rule-nacos/src/main/java/com/yomahub/liteflow/parser/nacos/exception/NacosException.java +++ b/liteflow-rule-plugin/liteflow-rule-nacos/src/main/java/com/yomahub/liteflow/parser/nacos/exception/NacosException.java @@ -12,6 +12,11 @@ public class NacosException extends RuntimeException { this.message = message; } + public NacosException(Throwable cause) { + super(cause); + this.message = cause.getMessage(); + } + @Override public String getMessage() { return message; diff --git a/liteflow-rule-plugin/liteflow-rule-nacos/src/main/java/com/yomahub/liteflow/parser/nacos/util/NacosParserHelper.java b/liteflow-rule-plugin/liteflow-rule-nacos/src/main/java/com/yomahub/liteflow/parser/nacos/util/NacosParserHelper.java index 31934e750..b33180533 100644 --- a/liteflow-rule-plugin/liteflow-rule-nacos/src/main/java/com/yomahub/liteflow/parser/nacos/util/NacosParserHelper.java +++ b/liteflow-rule-plugin/liteflow-rule-nacos/src/main/java/com/yomahub/liteflow/parser/nacos/util/NacosParserHelper.java @@ -44,7 +44,7 @@ public class NacosParserHelper { } } catch (Exception e) { - throw new NacosException(e.getMessage()); + throw new NacosException(e); } } @@ -76,7 +76,7 @@ public class NacosParserHelper { return configService.getConfig(nacosParserVO.getDataId(), nacosParserVO.getGroup(), 3000L); } catch (Exception e) { - throw new NacosException(e.getMessage()); + throw new NacosException(e); } } @@ -109,7 +109,7 @@ public class NacosParserHelper { }); } catch (Exception ex) { - throw new NacosException(ex.getMessage()); + throw new NacosException(ex); } } diff --git a/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/RedisXmlELParser.java b/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/RedisXmlELParser.java index 1de16453d..48a3a9c88 100644 --- a/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/RedisXmlELParser.java +++ b/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/RedisXmlELParser.java @@ -1,7 +1,5 @@ package com.yomahub.liteflow.parser.redis; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.text.StrFormatter; @@ -11,10 +9,10 @@ import com.yomahub.liteflow.core.FlowInitHook; import com.yomahub.liteflow.parser.el.ClassXmlFlowELParser; import com.yomahub.liteflow.parser.redis.exception.RedisException; import com.yomahub.liteflow.parser.redis.mode.RedisMode; -import com.yomahub.liteflow.parser.redis.mode.polling.RedisParserPollingMode; -import com.yomahub.liteflow.parser.redis.mode.subscribe.RedisParserSubscribeMode; import com.yomahub.liteflow.parser.redis.mode.RedisParserHelper; import com.yomahub.liteflow.parser.redis.mode.RedisParserMode; +import com.yomahub.liteflow.parser.redis.mode.polling.RedisParserPollingMode; +import com.yomahub.liteflow.parser.redis.mode.subscribe.RedisParserSubscribeMode; import com.yomahub.liteflow.parser.redis.vo.RedisParserVO; import com.yomahub.liteflow.property.LiteflowConfig; import com.yomahub.liteflow.property.LiteflowConfigGetter; @@ -78,7 +76,7 @@ public class RedisXmlELParser extends ClassXmlFlowELParser { throw redisException; } catch (Exception e) { - throw new RedisException(e.getMessage()); + throw new RedisException(e); } } @@ -94,7 +92,7 @@ public class RedisXmlELParser extends ClassXmlFlowELParser { } catch (Exception e) { - throw new RedisException(e.getMessage()); + throw new RedisException(e); } } diff --git a/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/exception/RedisException.java b/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/exception/RedisException.java index 1b6ee435f..14f8fd9a0 100644 --- a/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/exception/RedisException.java +++ b/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/exception/RedisException.java @@ -16,6 +16,11 @@ public class RedisException extends RuntimeException{ this.message = message; } + public RedisException(Throwable cause) { + super(cause); + this.message = cause.getMessage(); + } + @Override public String getMessage() { return message; diff --git a/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/mode/polling/RedisParserPollingMode.java b/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/mode/polling/RedisParserPollingMode.java index 0063acf75..cafaa67fb 100644 --- a/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/mode/polling/RedisParserPollingMode.java +++ b/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/mode/polling/RedisParserPollingMode.java @@ -114,7 +114,7 @@ public class RedisParserPollingMode implements RedisParserHelper { } } catch (Exception e) { - throw new RedisException(e.getMessage()); + throw new RedisException(e); } } @@ -175,7 +175,7 @@ public class RedisParserPollingMode implements RedisParserHelper { return StrUtil.format(XML_PATTERN, scriptAllContent, chainAllContent); } catch (Exception e) { - throw new RedisException(e.getMessage()); + throw new RedisException(e); } } diff --git a/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/mode/subscribe/RedisParserSubscribeMode.java b/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/mode/subscribe/RedisParserSubscribeMode.java index 0e490b240..cb4e50c5d 100644 --- a/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/mode/subscribe/RedisParserSubscribeMode.java +++ b/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/mode/subscribe/RedisParserSubscribeMode.java @@ -2,12 +2,8 @@ package com.yomahub.liteflow.parser.redis.mode.subscribe; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Pair; -import cn.hutool.core.util.BooleanUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.yomahub.liteflow.builder.LiteFlowNodeBuilder; -import com.yomahub.liteflow.builder.el.LiteFlowChainELBuilder; -import com.yomahub.liteflow.enums.NodeTypeEnum; import com.yomahub.liteflow.flow.FlowBus; import com.yomahub.liteflow.parser.helper.NodeConvertHelper; import com.yomahub.liteflow.parser.redis.exception.RedisException; @@ -78,7 +74,7 @@ public class RedisParserSubscribeMode implements RedisParserHelper { } } } catch (Exception e) { - throw new RedisException(e.getMessage()); + throw new RedisException(e); } } @@ -126,7 +122,7 @@ public class RedisParserSubscribeMode implements RedisParserHelper { return StrUtil.format(XML_PATTERN, scriptAllContent, chainAllContent); } catch (Exception e) { - throw new RedisException(e.getMessage()); + throw new RedisException(e); } } 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 4a08df95c..a758fd606 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 @@ -64,7 +64,7 @@ public class SQLXmlELParser extends ClassXmlFlowELParser { } catch (ELSQLException elsqlException) { throw elsqlException; } catch (Exception ex) { - throw new ELSQLException(ex.getMessage()); + throw new ELSQLException(ex); } } @@ -82,7 +82,7 @@ public class SQLXmlELParser extends ClassXmlFlowELParser { } return content; } catch (Exception ex) { - throw new ELSQLException(ex.getMessage()); + throw new ELSQLException(ex); } } diff --git a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/exception/ELSQLException.java b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/exception/ELSQLException.java index 875f6d6d3..439822944 100644 --- a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/exception/ELSQLException.java +++ b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/exception/ELSQLException.java @@ -19,6 +19,11 @@ public class ELSQLException extends RuntimeException { this.message = message; } + public ELSQLException(Throwable cause) { + super(cause); + this.message = cause.getMessage(); + } + @Override public String getMessage() { return message; diff --git a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/read/AbstractSqlRead.java b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/read/AbstractSqlRead.java index 5d611f4e0..599815897 100644 --- a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/read/AbstractSqlRead.java +++ b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/read/AbstractSqlRead.java @@ -66,7 +66,7 @@ public abstract class AbstractSqlRead implements SqlRead { result.add(parse(rs)); } } catch (Exception e) { - throw new ELSQLException(e.getMessage()); + throw new ELSQLException(e); } finally { // 关闭连接 LiteFlowJdbcUtil.close(conn, stmt, rs); 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 714644a3f..b80497f3a 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 @@ -71,7 +71,7 @@ public class JDBCHelper { setPollExecutor(threadPoolExecutor); } } catch (ClassNotFoundException e) { - throw new ELSQLException(e.getMessage()); + throw new ELSQLException(e); } } diff --git a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/util/LiteFlowJdbcUtil.java b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/util/LiteFlowJdbcUtil.java index e4b33e0bf..30d760d9a 100644 --- a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/util/LiteFlowJdbcUtil.java +++ b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/util/LiteFlowJdbcUtil.java @@ -55,7 +55,7 @@ public class LiteFlowJdbcUtil { } } catch (Exception e) { - throw new ELSQLException(e.getMessage()); + throw new ELSQLException(e); } return connection; @@ -95,7 +95,7 @@ public class LiteFlowJdbcUtil { try { rs.close(); } catch (SQLException e) { - throw new ELSQLException(e.getMessage()); + throw new ELSQLException(e); } } // 关闭 statement @@ -103,7 +103,7 @@ public class LiteFlowJdbcUtil { try { stmt.close(); } catch (SQLException e) { - throw new ELSQLException(e.getMessage()); + throw new ELSQLException(e); } } // 关闭连接 @@ -111,7 +111,7 @@ public class LiteFlowJdbcUtil { try { conn.close(); } catch (SQLException e) { - throw new ELSQLException(e.getMessage()); + throw new ELSQLException(e); } } } diff --git a/liteflow-rule-plugin/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/ZkXmlELParser.java b/liteflow-rule-plugin/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/ZkXmlELParser.java index 7c9ed0b4b..25df9999c 100644 --- a/liteflow-rule-plugin/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/ZkXmlELParser.java +++ b/liteflow-rule-plugin/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/ZkXmlELParser.java @@ -52,7 +52,7 @@ public class ZkXmlELParser extends ClassXmlFlowELParser { zkParserHelper = new ZkParserHelper(zkParserVO); } catch (Exception e) { - throw new ZkException(e.getMessage()); + throw new ZkException(e); } } @@ -69,7 +69,7 @@ public class ZkXmlELParser extends ClassXmlFlowELParser { return content; } catch (Exception e) { - throw new ZkException(e.getMessage()); + throw new ZkException(e); } } diff --git a/liteflow-rule-plugin/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/exception/ZkException.java b/liteflow-rule-plugin/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/exception/ZkException.java index 70ac5b83c..c06ddb5f5 100644 --- a/liteflow-rule-plugin/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/exception/ZkException.java +++ b/liteflow-rule-plugin/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/exception/ZkException.java @@ -12,6 +12,11 @@ public class ZkException extends RuntimeException { this.message = message; } + public ZkException(Throwable cause) { + super(cause); + this.message = cause.getMessage(); + } + @Override public String getMessage() { return message; diff --git a/liteflow-rule-plugin/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/util/ZkParserHelper.java b/liteflow-rule-plugin/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/util/ZkParserHelper.java index 2f78d734e..e17060bfb 100644 --- a/liteflow-rule-plugin/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/util/ZkParserHelper.java +++ b/liteflow-rule-plugin/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/util/ZkParserHelper.java @@ -48,7 +48,7 @@ public class ZkParserHelper { this.client = client; } catch (Exception e) { - throw new ZkException(e.getMessage()); + throw new ZkException(e); } } @@ -98,7 +98,7 @@ public class ZkParserHelper { return StrUtil.format(XML_PATTERN, scriptAllContent, chainAllContent); } catch (Exception e) { - throw new ZkException(e.getMessage()); + throw new ZkException(e); } }