From e17004ebb33dfd42fd004146fcf25fa182e2fb27 Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Wed, 28 May 2025 16:26:43 +0300
Subject: [PATCH] Fix circular references

---
 .../service/queue/DefaultTenantRoutingInfoService.java | 10 +++++-----
 .../server/dao/service/validator/QueueValidator.java   |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTenantRoutingInfoService.java b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTenantRoutingInfoService.java
index 381d49a8ec..2d9b737f25 100644
--- a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTenantRoutingInfoService.java
+++ b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTenantRoutingInfoService.java
@@ -16,7 +16,9 @@
 package org.thingsboard.server.service.queue;
 
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.exception.TenantNotFoundException;
@@ -30,11 +32,9 @@ import org.thingsboard.server.queue.discovery.TenantRoutingInfoService;
 @ConditionalOnExpression("'${service.type:null}'=='monolith' || '${service.type:null}'=='tb-core' || '${service.type:null}'=='tb-rule-engine'")
 public class DefaultTenantRoutingInfoService implements TenantRoutingInfoService {
 
-    private final TbTenantProfileCache tenantProfileCache;
-
-    public DefaultTenantRoutingInfoService(TbTenantProfileCache tenantProfileCache) {
-        this.tenantProfileCache = tenantProfileCache;
-    }
+    @Lazy
+    @Autowired
+    private TbTenantProfileCache tenantProfileCache;
 
     @Override
     public TenantRoutingInfo getRoutingInfo(TenantId tenantId) {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/validator/QueueValidator.java b/dao/src/main/java/org/thingsboard/server/dao/service/validator/QueueValidator.java
index 6216b5a222..2aa750ef99 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/service/validator/QueueValidator.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/service/validator/QueueValidator.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.dao.service.validator;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -34,6 +35,7 @@ public class QueueValidator extends DataValidator<Queue> {
     @Autowired
     private QueueDao queueDao;
 
+    @Lazy
     @Autowired
     private TbTenantProfileCache tenantProfileCache;