added TbTenantProfileService

application/src/main/java/org/thingsboard/server/controller/QueueController.java

@@ -34,6 +34,7 @@ import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.queue.Queue;
 import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.queue.util.TbCoreComponent;
+import org.thingsboard.server.service.entity.queue.TbQueueService;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
 
@@ -52,6 +53,8 @@ import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHO
 @RequiredArgsConstructor
 public class QueueController extends BaseController {
 
+    private final TbQueueService tbQueueService;
+
     @ApiOperation(value = "Get queue names (getTenantQueuesByServiceType)",
             notes = "Returns a set of unique queue names based on service type. " + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
@@ -126,7 +129,7 @@ public class QueueController extends BaseController {
             switch (type) {
                 case TB_RULE_ENGINE:
                     queue.setTenantId(getTenantId());
-                    Queue savedQueue = queueService.saveQueue(queue);
+                    Queue savedQueue = tbQueueService.saveQueue(queue);
                     checkNotNull(savedQueue);
                     return savedQueue;
                 default:
@@ -145,7 +148,7 @@ public class QueueController extends BaseController {
         try {
             QueueId queueId = new QueueId(toUUID(queueIdStr));
             checkQueueId(queueId, Operation.DELETE);
-            queueService.deleteQueue(getTenantId(), queueId);
+            tbQueueService.deleteQueue(getTenantId(), queueId);
         } catch (Exception e) {
             throw handleException(e);
         }

application/src/main/java/org/thingsboard/server/controller/TenantProfileController.java

@@ -17,6 +17,7 @@ package org.thingsboard.server.controller;
 
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -37,6 +38,7 @@ import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.queue.util.TbCoreComponent;
+import org.thingsboard.server.service.entity.tenant_profile.TbTenantProfileService;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
 
@@ -59,10 +61,13 @@ import static org.thingsboard.server.controller.ControllerConstants.UUID_WIKI_LI
 @TbCoreComponent
 @RequestMapping("/api")
 @Slf4j
+@RequiredArgsConstructor
 public class TenantProfileController extends BaseController {
 
     private static final String TENANT_PROFILE_INFO_DESCRIPTION = "Tenant Profile Info is a lightweight object that contains only id and name of the profile. ";
 
+    private final TbTenantProfileService tbTenantProfileService;
+
     @ApiOperation(value = "Get Tenant Profile (getTenantProfileById)",
             notes = "Fetch the Tenant Profile object based on the provided Tenant Profile Id. " + SYSTEM_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN')")
@@ -171,14 +176,16 @@ public class TenantProfileController extends BaseController {
             @RequestBody TenantProfile tenantProfile) throws ThingsboardException {
         try {
             boolean newTenantProfile = tenantProfile.getId() == null;
+            TenantProfile oldProfile;
             if (newTenantProfile) {
                 accessControlService
                         .checkPermission(getCurrentUser(), Resource.TENANT_PROFILE, Operation.CREATE);
+                oldProfile = null;
             } else {
-                checkEntityId(tenantProfile.getId(), Operation.WRITE);
+                oldProfile = checkTenantProfileId(tenantProfile.getId(), Operation.WRITE);
             }
 
-            tenantProfile = checkNotNull(tenantProfileService.saveTenantProfile(getTenantId(), tenantProfile));
+            tenantProfile = checkNotNull(tbTenantProfileService.saveTenantProfile(getTenantId(), tenantProfile, oldProfile));
             tenantProfileCache.put(tenantProfile);
             tbClusterService.onTenantProfileChange(tenantProfile, null);
             tbClusterService.broadcastEntityStateChangeEvent(TenantId.SYS_TENANT_ID, tenantProfile.getId(),

application/src/main/java/org/thingsboard/server/service/entity/queue/DefaultTbQueueService.java

@@ -19,15 +19,23 @@ import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.id.QueueId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.queue.Queue;
+import org.thingsboard.server.common.data.tenant.profile.TenantProfileQueueConfiguration;
 import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
 import org.thingsboard.server.dao.queue.QueueService;
 import org.thingsboard.server.queue.TbQueueAdmin;
 import org.thingsboard.server.queue.TbQueueClusterService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 @Slf4j
 @Service
 @TbCoreComponent
@@ -141,4 +149,73 @@ public class DefaultTbQueueService implements TbQueueService {
         Thread.sleep(3000);
     }
 
+    @Override
+    public void updateQueuesByTenants(List<TenantId> tenantIds, TenantProfile newTenantProfile, TenantProfile oldTenantProfile) {
+
+        boolean oldIsolated = oldTenantProfile != null && oldTenantProfile.isIsolatedTbRuleEngine();
+        boolean newIsolated = newTenantProfile.isIsolatedTbRuleEngine();
+
+        if (!oldIsolated && !newIsolated) {
+            return;
+        }
+
+        if (newTenantProfile.equals(oldTenantProfile)) {
+            return;
+        }
+
+        Map<String, TenantProfileQueueConfiguration> oldQueues;
+        Map<String, TenantProfileQueueConfiguration> newQueues;
+
+        if (oldIsolated) {
+            oldQueues = oldTenantProfile.getProfileData().getQueueConfiguration().stream()
+                    .collect(Collectors.toMap(TenantProfileQueueConfiguration::getName, q -> q));
+        } else {
+            oldQueues = Collections.emptyMap();
+        }
+
+        if (newIsolated) {
+            newQueues = newTenantProfile.getProfileData().getQueueConfiguration().stream()
+                    .collect(Collectors.toMap(TenantProfileQueueConfiguration::getName, q -> q));
+        } else {
+            newQueues = Collections.emptyMap();
+        }
+
+        List<String> toRemove = new ArrayList<>();
+        List<String> toCreate = new ArrayList<>();
+        List<String> toUpdate = new ArrayList<>();
+
+        for (String oldQueue : oldQueues.keySet()) {
+            if (!newQueues.containsKey(oldQueue)) {
+                toRemove.add(oldQueue);
+            }
+        }
+
+        for (String newQueue : newQueues.keySet()) {
+            if (oldQueues.containsKey(newQueue)) {
+                toUpdate.add(newQueue);
+            } else {
+                toCreate.add(newQueue);
+            }
+        }
+
+        tenantIds.forEach(tenantId -> {
+            toRemove.forEach(q -> deleteQueueByQueueName(tenantId, q));
+
+            toCreate.forEach(key -> saveQueue(new Queue(tenantId, newQueues.get(key))));
+
+            toUpdate.forEach(key -> {
+                Queue queueToUpdate = new Queue(tenantId, newQueues.get(key));
+                Queue foundQueue = queueService.findQueueByTenantIdAndName(tenantId, key);
+                queueToUpdate.setId(foundQueue.getId());
+                queueToUpdate.setCreatedTime(foundQueue.getCreatedTime());
+
+                if (queueToUpdate.equals(foundQueue)) {
+                    //Queue not changed
+                } else {
+                    saveQueue(queueToUpdate);
+                }
+            });
+        });
+    }
+
 }

application/src/main/java/org/thingsboard/server/service/entity/queue/TbQueueService.java

@@ -15,10 +15,13 @@
  */
 package org.thingsboard.server.service.entity.queue;
 
+import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.id.QueueId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.queue.Queue;
 
+import java.util.List;
+
 public interface TbQueueService {
 
     Queue saveQueue(Queue queue);
@@ -26,4 +29,6 @@ public interface TbQueueService {
     void deleteQueue(TenantId tenantId, QueueId queueId);
 
     void deleteQueueByQueueName(TenantId tenantId, String queueName);
+
+    void updateQueuesByTenants(List<TenantId> tenantIds, TenantProfile newTenantProfile, TenantProfile oldTenantProfile);
 }

application/src/main/java/org/thingsboard/server/service/entity/tenant/DefaultTbTenantService.java

@@ -21,20 +21,13 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.queue.Queue;
-import org.thingsboard.server.common.data.tenant.profile.TenantProfileQueueConfiguration;
-import org.thingsboard.server.dao.queue.QueueService;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
 import org.thingsboard.server.dao.tenant.TenantProfileService;
 import org.thingsboard.server.dao.tenant.TenantService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entity.queue.TbQueueService;
 
-import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -44,7 +37,6 @@ public class DefaultTbTenantService implements TbTenantService {
 
     private final TenantService tenantService;
     private final TbQueueService tbQueueService;
-    private final QueueService queueService;
     private final TenantProfileService tenantProfileService;
     private final TbTenantProfileCache tenantProfileCache;
 
@@ -52,84 +44,14 @@ public class DefaultTbTenantService implements TbTenantService {
     public Tenant saveTenant(Tenant tenant) {
         boolean updated = tenant.getId() != null;
         Tenant oldTenant = updated ? tenantService.findTenantById(tenant.getId()) : null;
-        List<Queue> queues;
-        if (updated) {
-
-        }
 
         Tenant savedTenant = tenantService.saveTenant(tenant);
         tenantProfileCache.evict(tenant.getId());
-        updateQueuesForTenant(oldTenant, savedTenant);
-        return savedTenant;
-    }
 
-    public void updateQueuesForTenant(Tenant oldTenant, Tenant newTenant) {
         TenantProfile oldTenantProfile = oldTenant != null ? tenantProfileService.findTenantProfileById(TenantId.SYS_TENANT_ID, oldTenant.getTenantProfileId()) : null;
-        TenantProfile newTenantProfile = tenantProfileService.findTenantProfileById(TenantId.SYS_TENANT_ID, newTenant.getTenantProfileId());
+        TenantProfile newTenantProfile = tenantProfileService.findTenantProfileById(TenantId.SYS_TENANT_ID, savedTenant.getTenantProfileId());
-
+        tbQueueService.updateQueuesByTenants(Collections.singletonList(savedTenant.getTenantId()), newTenantProfile, oldTenantProfile);
-        TenantId tenantId = newTenant.getId();
+        return savedTenant;
-
-        boolean oldIsolated = oldTenantProfile != null && oldTenantProfile.isIsolatedTbRuleEngine();
-        boolean newIsolated = newTenantProfile.isIsolatedTbRuleEngine();
-
-        if (!oldIsolated && !newIsolated) {
-            return;
-        }
-
-        if (newTenantProfile.equals(oldTenantProfile)) {
-            return;
-        }
-
-        Map<String, TenantProfileQueueConfiguration> oldQueues;
-        Map<String, TenantProfileQueueConfiguration> newQueues;
-
-        if (oldIsolated) {
-            oldQueues = oldTenantProfile.getProfileData().getQueueConfiguration().stream()
-                    .collect(Collectors.toMap(TenantProfileQueueConfiguration::getName, q -> q));
-        } else {
-            oldQueues = Collections.emptyMap();
-        }
-
-        if (newIsolated) {
-            newQueues = newTenantProfile.getProfileData().getQueueConfiguration().stream()
-                    .collect(Collectors.toMap(TenantProfileQueueConfiguration::getName, q -> q));
-        } else {
-            newQueues = Collections.emptyMap();
-        }
-
-        List<String> toRemove = new ArrayList<>();
-        List<String> toCreate = new ArrayList<>();
-        List<String> toUpdate = new ArrayList<>();
-
-        for (String oldQueue : oldQueues.keySet()) {
-            if (!newQueues.containsKey(oldQueue)) {
-                toRemove.add(oldQueue);
-            }
-        }
-
-        for (String newQueue : newQueues.keySet()) {
-            if (oldQueues.containsKey(newQueue)) {
-                toUpdate.add(newQueue);
-            } else {
-                toCreate.add(newQueue);
-            }
-        }
-
-        toRemove.forEach(q -> tbQueueService.deleteQueueByQueueName(tenantId, q));
-
-        toCreate.forEach(key -> tbQueueService.saveQueue(new Queue(tenantId, newQueues.get(key))));
-
-        toUpdate.forEach(key -> {
-            Queue queueToUpdate = new Queue(tenantId, newQueues.get(key));
-            Queue foundQueue = queueService.findQueueByTenantIdAndName(tenantId, key);
-            queueToUpdate.setId(foundQueue.getId());
-            queueToUpdate.setCreatedTime(foundQueue.getCreatedTime());
-
-            if (queueToUpdate.equals(foundQueue)) {
-                //Queue not changed
-            } else {
-                tbQueueService.saveQueue(queueToUpdate);
-            }
-        });
     }
+
 }

application/src/main/java/org/thingsboard/server/service/entity/tenant_profile/DefaultTbTenantProfileService.java

@@ -0,0 +1,50 @@
+/**
+ * Copyright © 2016-2022 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.entity.tenant_profile;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.TenantProfile;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.dao.tenant.TenantProfileService;
+import org.thingsboard.server.dao.tenant.TenantService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
+import org.thingsboard.server.service.entity.queue.TbQueueService;
+
+import java.util.List;
+
+@Slf4j
+@Service
+@TbCoreComponent
+@AllArgsConstructor
+public class DefaultTbTenantProfileService implements TbTenantProfileService {
+    private final TbQueueService queueService;
+    private final TenantProfileService tenantProfileService;
+    private final TenantService tenantService;
+
+    @Override
+    public TenantProfile saveTenantProfile(TenantId tenantId, TenantProfile tenantProfile, TenantProfile oldTenantProfile) {
+        TenantProfile savedTenantProfile = tenantProfileService.saveTenantProfile(tenantId, tenantProfile);
+
+        if (oldTenantProfile != null && savedTenantProfile.isIsolatedTbRuleEngine()) {
+            List<TenantId> tenantIds = tenantService.findTenantIdsByTenantProfileId(savedTenantProfile.getId());
+            queueService.updateQueuesByTenants(tenantIds, savedTenantProfile, oldTenantProfile);
+        }
+
+        return savedTenantProfile;
+    }
+}

application/src/main/java/org/thingsboard/server/service/entity/tenant_profile/TbTenantProfileService.java

@@ -0,0 +1,23 @@
+/**
+ * Copyright © 2016-2022 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.entity.tenant_profile;
+
+import org.thingsboard.server.common.data.TenantProfile;
+import org.thingsboard.server.common.data.id.TenantId;
+
+public interface TbTenantProfileService {
+    TenantProfile saveTenantProfile(TenantId tenantId, TenantProfile tenantProfile, TenantProfile oldTenantProfile);
+}

common/dao-api/src/main/java/org/thingsboard/server/dao/tenant/TenantService.java

@@ -19,9 +19,12 @@ import com.google.common.util.concurrent.ListenableFuture;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.TenantInfo;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.TenantProfileId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 
+import java.util.List;
+
 public interface TenantService {
 
     Tenant findTenantById(TenantId tenantId);
@@ -38,5 +41,7 @@ public interface TenantService {
 
     PageData<TenantInfo> findTenantInfos(PageLink pageLink);
 
+    List<TenantId> findTenantIdsByTenantProfileId(TenantProfileId tenantProfileId);
+
     void deleteTenants();
 }

dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.TenantInfo;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.TenantProfileId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.dao.DaoUtil;
@@ -29,8 +30,10 @@ import org.thingsboard.server.dao.model.sql.TenantInfoEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
 import org.thingsboard.server.dao.tenant.TenantDao;
 
+import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 
 /**
@@ -80,4 +83,10 @@ public class JpaTenantDao extends JpaAbstractSearchTextDao<TenantEntity, Tenant>
         return DaoUtil.pageToPageData(tenantRepository.findTenantsIds(DaoUtil.toPageable(pageLink))).mapData(TenantId::fromUUID);
     }
 
+    @Override
+    public List<TenantId> findTenantIdsByTenantProfileId(TenantProfileId tenantProfileId) {
+        return tenantRepository.findTenantIdsByTenantProfileId(tenantProfileId.getId()).stream()
+                .map(TenantId::fromUUID)
+                .collect(Collectors.toList());
+    }
 }

dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java

@@ -23,6 +23,7 @@ import org.springframework.data.repository.query.Param;
 import org.thingsboard.server.dao.model.sql.TenantEntity;
 import org.thingsboard.server.dao.model.sql.TenantInfoEntity;
 
+import java.util.List;
 import java.util.UUID;
 
 /**
@@ -54,4 +55,7 @@ public interface TenantRepository extends PagingAndSortingRepository<TenantEntit
     @Query("SELECT t.id FROM TenantEntity t")
     Page<UUID> findTenantsIds(Pageable pageable);
 
+    @Query("SELECT t.id FROM TenantEntity t where t.tenantProfileId = :tenantProfileId")
+    List<UUID> findTenantIdsByTenantProfileId(@Param("tenantProfileId") UUID tenantProfileId);
+
 }

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

@@ -18,10 +18,12 @@ package org.thingsboard.server.dao.tenant;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.TenantInfo;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.TenantProfileId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.dao.Dao;
 
+import java.util.List;
 import java.util.UUID;
 
 public interface TenantDao extends Dao<Tenant> {
@@ -49,4 +51,5 @@ public interface TenantDao extends Dao<Tenant> {
 
     PageData<TenantId> findTenantsIds(PageLink pageLink);
 
+    List<TenantId> findTenantIdsByTenantProfileId(TenantProfileId tenantProfileId);
 }

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

@@ -20,12 +20,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.TenantInfo;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.TenantProfileId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.dao.asset.AssetService;
@@ -48,6 +48,8 @@ import org.thingsboard.server.dao.usagerecord.ApiUsageStateService;
 import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.dao.widget.WidgetsBundleService;
 
+import java.util.List;
+
 import static org.thingsboard.server.dao.service.Validator.validateId;
 
 @Service
@@ -183,6 +185,12 @@ public class TenantServiceImpl extends AbstractEntityService implements TenantSe
         return tenantDao.findTenantInfosByRegion(TenantId.SYS_TENANT_ID, DEFAULT_TENANT_REGION, pageLink);
     }
 
+    @Override
+    public List<TenantId> findTenantIdsByTenantProfileId(TenantProfileId tenantProfileId) {
+        log.trace("Executing findTenantsByTenantProfileId [{}]", tenantProfileId);
+        return tenantDao.findTenantIdsByTenantProfileId(tenantProfileId);
+    }
+
     @Override
     public void deleteTenants() {
         log.trace("Executing deleteTenants");