From 4b7e49a8f40ee1babef8b7beabfb4d37a25b9182 Mon Sep 17 00:00:00 2001 From: Andrii Landiak Date: Fri, 29 Nov 2024 15:21:00 +0200 Subject: [PATCH] Improvement to buildTopicName for KafkaEdgeTopicsCleanUpService --- .../server/service/ttl/KafkaEdgeTopicsCleanUpService.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/ttl/KafkaEdgeTopicsCleanUpService.java b/application/src/main/java/org/thingsboard/server/service/ttl/KafkaEdgeTopicsCleanUpService.java index 1601310de8..6a3a0271da 100644 --- a/application/src/main/java/org/thingsboard/server/service/ttl/KafkaEdgeTopicsCleanUpService.java +++ b/application/src/main/java/org/thingsboard/server/service/ttl/KafkaEdgeTopicsCleanUpService.java @@ -64,9 +64,6 @@ public class KafkaEdgeTopicsCleanUpService extends AbstractCleanUpService { private final TbKafkaSettings kafkaSettings; private final TbKafkaTopicConfigs kafkaTopicConfigs; - @Value("${queue.prefix:}") - private String prefix; - @Value("${sql.ttl.edge_events.edge_events_ttl:2628000}") private long ttlSeconds; @@ -95,7 +92,7 @@ public class KafkaEdgeTopicsCleanUpService extends AbstractCleanUpService { return; } - String edgeTopicPrefix = prefix.isBlank() ? EDGE_EVENT_TOPIC_NAME : prefix + "." + EDGE_EVENT_TOPIC_NAME; + String edgeTopicPrefix = topicService.buildTopicName(EDGE_EVENT_TOPIC_NAME); List matchingTopics = topics.stream().filter(topic -> topic.startsWith(edgeTopicPrefix)).toList(); if (matchingTopics.isEmpty()) { log.info("No matching topics found with prefix [{}]. Skipping cleanup.", edgeTopicPrefix);