(shenyu) branch master updated: fix: handle null or blank TTL configuration in ClickHouseLogCollectClient and add test case (#6919)

[liuhongyu]

This is an automated email from the ASF dual-hosted git repository.

Aias00 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git


The following commit(s) were added to refs/heads/master by this push:
     new 5cfd91e94d fix: handle null or blank TTL configuration in 
ClickHouseLogCollectClient and add test case (#6919)
5cfd91e94d is described below

commit 5cfd91e94d2fc304bfd045dbba7f5f5457770983
Author: Limbo <yyk...@qq.com>
AuthorDate: Mon Aug 17 13:52:32 2026 +0800

    fix: handle null or blank TTL configuration in ClickHouseLogCollectClient 
and add test case (#6919)
    
    Co-authored-by: aias00 <liuhon...@apache.org>
---
 .../clickhouse/client/ClickHouseLogCollectClient.java      |  3 ++-
 .../clickhouse/client/ClickHouseLogCollectClientTest.java  | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git 
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/main/java/org/apache/shenyu/plugin/logging/clickhouse/client/ClickHouseLogCollectClient.java
 
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/main/java/org/apache/shenyu/plugin/logging/clickhouse/client/ClickHouseLogCollectClient.java
index cb6e3538db..7b6d0e3e51 100644
--- 
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/main/java/org/apache/shenyu/plugin/logging/clickhouse/client/ClickHouseLogCollectClient.java
+++ 
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/main/java/org/apache/shenyu/plugin/logging/clickhouse/client/ClickHouseLogCollectClient.java
@@ -29,6 +29,7 @@ import com.clickhouse.client.data.ClickHouseLongValue;
 import com.clickhouse.client.data.ClickHouseOffsetDateTimeValue;
 import com.clickhouse.client.data.ClickHouseStringValue;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shenyu.common.utils.DateUtils;
 import 
org.apache.shenyu.plugin.logging.clickhouse.config.ClickHouseLogCollectConfig;
 import 
org.apache.shenyu.plugin.logging.clickhouse.constant.ClickHouseLoggingConstant;
@@ -125,7 +126,7 @@ public class ClickHouseLogCollectClient extends 
AbstractLogConsumeClient<ClickHo
     public void initClient0(@NonNull final 
ClickHouseLogCollectConfig.ClickHouseLogConfig config) {
         final String username = config.getUsername();
         final String password = config.getPassword();
-        final String ttl = config.getTtl().isEmpty() ? "30" : config.getTtl();
+        final String ttl = StringUtils.defaultIfBlank(config.getTtl(), "30");
         database = config.getDatabase();
         endpoint = ClickHouseNode.builder()
             .host(config.getHost())
diff --git 
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/test/java/org/apache/shenyu/plugin/logging/clickhouse/client/ClickHouseLogCollectClientTest.java
 
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/test/java/org/apache/shenyu/plugin/logging/clickhouse/client/ClickHouseLogCollectClientTest.java
index ba2a013e57..8d6079d126 100644
--- 
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/test/java/org/apache/shenyu/plugin/logging/clickhouse/client/ClickHouseLogCollectClientTest.java
+++ 
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/test/java/org/apache/shenyu/plugin/logging/clickhouse/client/ClickHouseLogCollectClientTest.java
@@ -86,6 +86,20 @@ public class ClickHouseLogCollectClientTest {
         Assertions.assertEquals(msg, "false");
     }
 
+    @Test
+    public void testInitClientWithoutTtl() {
+        
pluginData.setConfig("{\"host\":\"127.0.0.1\",\"port\":\"1\",\"database\":\"shenyu-gateway\","
+                + 
"\"username\":\"foo\",\"password\":\"bar\",\"engine\":\"MergeTree\",\"clusterName\":\"cluster\"}");
+        ClickHouseLogCollectConfig.ClickHouseLogConfig config = 
GsonUtils.getInstance()
+                .fromJson(pluginData.getConfig(), 
ClickHouseLogCollectConfig.ClickHouseLogConfig.class);
+        Assertions.assertNull(config.getTtl());
+        try {
+            Assertions.assertDoesNotThrow(() -> 
clickHouseLogCollectClient.initClient0(config));
+        } finally {
+            clickHouseLogCollectClient.close0();
+        }
+    }
+
     @After
     public void clean() {
         clickHouseLogCollectClient.close();