From f0f2d1f29f033d5bd2c77896fb11cf98f60dbf0b Mon Sep 17 00:00:00 2001
From: Andrii Shvaika <ashvayka@thingsboard.io>
Date: Thu, 27 Feb 2025 18:31:35 +0200
Subject: [PATCH] Avoid start of Kafka State Service for Cores

---
 .../service/cf/ctx/state/KafkaCalculatedFieldStateService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/KafkaCalculatedFieldStateService.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/KafkaCalculatedFieldStateService.java
index edb47dd7fa..e81fa4d1dc 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/KafkaCalculatedFieldStateService.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/KafkaCalculatedFieldStateService.java
@@ -49,7 +49,7 @@ import static org.thingsboard.server.queue.common.AbstractTbQueueTemplate.*;
 @Service
 @RequiredArgsConstructor
 @Slf4j
-@ConditionalOnExpression("'${queue.type:null}'=='kafka'")
+@ConditionalOnExpression("('${service.type:null}'=='monolith' || '${service.type:null}'=='tb-rule-engine') && '${queue.type:null}'=='kafka'")
 public class KafkaCalculatedFieldStateService extends AbstractCalculatedFieldStateService {
 
     private final TbRuleEngineQueueFactory queueFactory;