Use Autowired in TenantServiceImpl

dao/src/main/java/org/thingsboard/server/dao/service/validator/AssetProfileDataValidator.java

@@ -42,7 +42,6 @@ public class AssetProfileDataValidator extends DataValidator<AssetProfile> {
     @Lazy
     private AssetProfileService assetProfileService;
     @Autowired
-    @Lazy
     private TenantService tenantService;
     @Lazy
     @Autowired

dao/src/main/java/org/thingsboard/server/dao/service/validator/DashboardDataValidator.java

@@ -16,7 +16,6 @@
 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.Dashboard;
 import org.thingsboard.server.common.data.EntityType;
@@ -29,7 +28,6 @@ import org.thingsboard.server.dao.tenant.TenantService;
 public class DashboardDataValidator extends DataValidator<Dashboard> {
 
     @Autowired
-    @Lazy
     private TenantService tenantService;
 
     @Override

dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceDataValidator.java

@@ -16,7 +16,6 @@
 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.Customer;
 import org.thingsboard.server.common.data.Device;
@@ -40,7 +39,6 @@ public class DeviceDataValidator extends AbstractHasOtaPackageValidator<Device>
     private DeviceDao deviceDao;
 
     @Autowired
-    @Lazy
     private TenantService tenantService;
 
     @Autowired

dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java

@@ -86,7 +86,6 @@ public class DeviceProfileDataValidator extends AbstractHasOtaPackageValidator<D
     @Autowired
     private DeviceDao deviceDao;
     @Autowired
-    @Lazy
     private TenantService tenantService;
     @Lazy
     @Autowired

dao/src/main/java/org/thingsboard/server/dao/service/validator/ResourceDataValidator.java

@@ -49,7 +49,6 @@ public class ResourceDataValidator extends DataValidator<TbResource> {
     private WidgetTypeDao widgetTypeDao;
 
     @Autowired
-    @Lazy
     private TenantService tenantService;
 
     @Autowired

dao/src/main/java/org/thingsboard/server/dao/service/validator/RuleChainDataValidator.java

@@ -53,7 +53,6 @@ public class RuleChainDataValidator extends DataValidator<RuleChain> {
     private RuleChainService ruleChainService;
 
     @Autowired
-    @Lazy
     private TenantService tenantService;
 
     @Override

dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java

@@ -18,6 +18,8 @@ package org.thingsboard.server.dao.tenant;
 import com.google.common.util.concurrent.ListenableFuture;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.event.TransactionalEventListener;
@@ -38,9 +40,9 @@ import org.thingsboard.server.dao.entity.AbstractCachedEntityService;
 import org.thingsboard.server.dao.eventsourcing.DeleteEntityEvent;
 import org.thingsboard.server.dao.eventsourcing.SaveEntityEvent;
 import org.thingsboard.server.dao.notification.NotificationSettingsService;
-import org.thingsboard.server.dao.service.DataValidator;
 import org.thingsboard.server.dao.service.PaginatedRemover;
 import org.thingsboard.server.dao.service.Validator;
+import org.thingsboard.server.dao.service.validator.TenantDataValidator;
 import org.thingsboard.server.dao.settings.AdminSettingsService;
 import org.thingsboard.server.dao.usagerecord.ApiUsageStateService;
 import org.thingsboard.server.dao.user.UserService;
@@ -58,16 +60,28 @@ public class TenantServiceImpl extends AbstractCachedEntityService<TenantId, Ten
     private static final String DEFAULT_TENANT_REGION = "Global";
     public static final String INCORRECT_TENANT_ID = "Incorrect tenantId ";
 
-    private final TenantDao tenantDao;
+    @Autowired
-    private final TenantProfileService tenantProfileService;
+    private TenantDao tenantDao;
-    private final UserService userService;
+    @Autowired
-    private final AssetProfileService assetProfileService;
+    private TenantProfileService tenantProfileService;
-    private final DeviceProfileService deviceProfileService;
+    @Autowired
-    private final ApiUsageStateService apiUsageStateService;
+    @Lazy
-    private final AdminSettingsService adminSettingsService;
+    private UserService userService;
-    private final NotificationSettingsService notificationSettingsService;
+    @Autowired
-    private final DataValidator<Tenant> tenantValidator;
+    private AssetProfileService assetProfileService;
-    private final TbTransactionalCache<TenantId, Boolean> existsTenantCache;
+    @Autowired
+    private DeviceProfileService deviceProfileService;
+    @Lazy
+    @Autowired
+    private ApiUsageStateService apiUsageStateService;
+    @Autowired
+    private AdminSettingsService adminSettingsService;
+    @Autowired
+    private NotificationSettingsService notificationSettingsService;
+    @Autowired
+    private TenantDataValidator tenantValidator;
+    @Autowired
+    protected TbTransactionalCache<TenantId, Boolean> existsTenantCache;
 
     @TransactionalEventListener(classes = TenantEvictEvent.class)
     @Override

dao/src/main/java/org/thingsboard/server/dao/usagerecord/ApiUsageStateServiceImpl.java

@@ -59,7 +59,7 @@ public class ApiUsageStateServiceImpl extends AbstractEntityService implements A
     private final DataValidator<ApiUsageState> apiUsageStateValidator;
 
     public ApiUsageStateServiceImpl(ApiUsageStateDao apiUsageStateDao, TenantProfileDao tenantProfileDao,
-                                    @Lazy TenantService tenantService, @Lazy TimeseriesService tsService,
+                                    TenantService tenantService, @Lazy TimeseriesService tsService,
                                     DataValidator<ApiUsageState> apiUsageStateValidator) {
         this.apiUsageStateDao = apiUsageStateDao;
         this.tenantProfileDao = tenantProfileDao;