added TbServiceQueue asset validation and upgrade improvements

application/src/main/data/upgrade/3.4.1/schema_update_before.sql

@@ -37,9 +37,10 @@ CREATE OR REPLACE PROCEDURE update_asset_profiles()
     LANGUAGE plpgsql AS
 $$
 BEGIN
-UPDATE asset as a SET asset_profile_id = p.id
+    UPDATE asset a SET asset_profile_id = COALESCE(
-    FROM
+            (SELECT id from asset_profile p WHERE p.tenant_id = a.tenant_id AND a.type = p.name),
-           (SELECT id, tenant_id, name from asset_profile) as p
+            (SELECT id from asset_profile p WHERE p.tenant_id = a.tenant_id AND p.name = 'default')
-WHERE a.asset_profile_id IS NULL AND p.tenant_id = a.tenant_id AND a.type = p.name;
+        )
+    WHERE a.asset_profile_id IS NULL;
 END;
 $$;

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

@@ -38,7 +38,6 @@ import org.thingsboard.server.common.data.asset.Asset;
 import org.thingsboard.server.common.data.asset.AssetInfo;
 import org.thingsboard.server.common.data.asset.AssetSearchQuery;
 import org.thingsboard.server.common.data.edge.Edge;
-import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.AssetId;
 import org.thingsboard.server.common.data.id.AssetProfileId;
@@ -86,7 +85,6 @@ import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHO
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH;
 import static org.thingsboard.server.controller.ControllerConstants.UUID_WIKI_LINK;
 import static org.thingsboard.server.controller.EdgeController.EDGE_ID;
-import static org.thingsboard.server.dao.asset.BaseAssetService.TB_SERVICE_QUEUE;
 
 @RestController
 @TbCoreComponent
@@ -148,9 +146,6 @@ public class AssetController extends BaseController {
     @RequestMapping(value = "/asset", method = RequestMethod.POST)
     @ResponseBody
     public Asset saveAsset(@ApiParam(value = "A JSON value representing the asset.") @RequestBody Asset asset) throws Exception {
-        if (TB_SERVICE_QUEUE.equals(asset.getType())) {
-            throw new ThingsboardException("Unable to save asset with type " + TB_SERVICE_QUEUE, ThingsboardErrorCode.BAD_REQUEST_PARAMS);
-        }
         asset.setTenantId(getTenantId());
         checkEntity(asset.getId(), asset, Resource.ASSET);
         return tbAssetService.save(asset, getCurrentUser());

application/src/main/java/org/thingsboard/server/service/entitiy/asset/DefaultTbAssetService.java

@@ -22,8 +22,10 @@ import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.asset.Asset;
+import org.thingsboard.server.common.data.asset.AssetProfile;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.edge.Edge;
+import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.AssetId;
 import org.thingsboard.server.common.data.id.CustomerId;
@@ -31,20 +33,32 @@ import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.asset.AssetService;
 import org.thingsboard.server.service.entitiy.AbstractTbEntityService;
+import org.thingsboard.server.service.profile.TbAssetProfileCache;
 
 import java.util.List;
 
+import static org.thingsboard.server.dao.asset.BaseAssetService.TB_SERVICE_QUEUE;
+
 @Service
 @AllArgsConstructor
 public class DefaultTbAssetService extends AbstractTbEntityService implements TbAssetService {
 
     private final AssetService assetService;
+    private final TbAssetProfileCache assetProfileCache;
 
     @Override
     public Asset save(Asset asset, User user) throws Exception {
         ActionType actionType = asset.getId() == null ? ActionType.ADDED : ActionType.UPDATED;
         TenantId tenantId = asset.getTenantId();
         try {
+            if (TB_SERVICE_QUEUE.equals(asset.getType())) {
+                throw new ThingsboardException("Unable to save asset with type " + TB_SERVICE_QUEUE, ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+            } else if (asset.getAssetProfileId() != null) {
+                AssetProfile assetProfile = assetProfileCache.get(tenantId, asset.getAssetProfileId());
+                if (assetProfile != null && TB_SERVICE_QUEUE.equals(assetProfile.getName())) {
+                    throw new ThingsboardException("Unable to save asset with profile " + TB_SERVICE_QUEUE, ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+                }
+            }
             Asset savedAsset = checkNotNull(assetService.saveAsset(asset));
             autoCommit(user, savedAsset.getId());
             notificationEntityService.notifyCreateOrUpdateEntity(tenantId, savedAsset.getId(), savedAsset,

application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java

@@ -39,7 +39,7 @@ import org.thingsboard.server.dao.asset.AssetProfileService;
 import org.thingsboard.server.dao.dashboard.DashboardService;
 import org.thingsboard.server.dao.device.DeviceProfileService;
 import org.thingsboard.server.dao.device.DeviceService;
-import org.thingsboard.server.dao.model.sql.TbPair;
+import org.thingsboard.server.common.data.util.TbPair;
 import org.thingsboard.server.dao.queue.QueueService;
 import org.thingsboard.server.dao.sql.tenant.TenantRepository;
 import org.thingsboard.server.dao.tenant.TenantService;
@@ -59,9 +59,7 @@ import java.sql.SQLSyntaxErrorException;
 import java.sql.SQLWarning;
 import java.sql.Statement;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
@@ -629,11 +627,11 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
                         conn.createStatement().execute("DELETE FROM asset a WHERE NOT exists(SELECT id FROM tenant WHERE id = a.tenant_id);");
 
                         log.info("Creating default asset profiles...");
-                        List<ListenableFuture<?>> futures = new ArrayList<>();
 
                         PageLink pageLink = new PageLink(1000);
                         PageData<TenantId> tenantIds;
                         do {
+                            List<ListenableFuture<?>> futures = new ArrayList<>();
                             tenantIds = tenantService.findTenantsIds(pageLink);
                             for (TenantId tenantId : tenantIds.getData()) {
                                 futures.add(dbUpgradeExecutor.submit(() -> {
@@ -642,13 +640,14 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
                                     } catch (Exception e) {}
                                 }));
                             }
+                            Futures.allAsList(futures).get();
                             pageLink = pageLink.nextPageLink();
                         } while (tenantIds.hasNext());
 
                         pageLink = new PageLink(1000);
                         PageData<TbPair<UUID, String>> pairs;
-                        Set<UUID> tenants = new HashSet<>();
                         do {
+                            List<ListenableFuture<?>> futures = new ArrayList<>();
                             pairs = assetDao.getAllAssetTypes(pageLink);
                             for (TbPair<UUID, String> pair : pairs.getData()) {
                                 TenantId tenantId = new TenantId(pair.getFirst());
@@ -661,17 +660,13 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
                                     }));
                                 }
                             }
+                            Futures.allAsList(futures).get();
                             pageLink = pageLink.nextPageLink();
                         } while (pairs.hasNext());
 
-                        Futures.allAsList(futures).get();
-
                         log.info("Updating asset profiles...");
                         conn.createStatement().execute("call update_asset_profiles()");
 
-                        conn.createStatement().execute("UPDATE asset a SET asset_profile_id = " +
-                                "(SELECT id FROM asset_profile ap WHERE ap.tenant_id = a.tenant_id AND name='default') WHERE a.asset_profile_id IS NULL;");
-
                         schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.4.1", "schema_update_after.sql");
                         loadSql(schemaUpdateFile, conn);
 

dao/src/main/java/org/thingsboard/server/dao/model/sql/TbPair.java → common/data/src/main/java/org/thingsboard/server/common/data/util/TbPair.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.dao.model.sql;
+package org.thingsboard.server.common.data.util;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

dao/src/main/java/org/thingsboard/server/dao/asset/AssetDao.java

@@ -26,7 +26,7 @@ import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.dao.Dao;
 import org.thingsboard.server.dao.ExportableEntityDao;
 import org.thingsboard.server.dao.TenantEntityDao;
-import org.thingsboard.server.dao.model.sql.TbPair;
+import org.thingsboard.server.common.data.util.TbPair;
 
 import java.util.List;
 import java.util.Optional;

dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java

@@ -23,7 +23,7 @@ import org.springframework.data.repository.query.Param;
 import org.thingsboard.server.dao.ExportableEntityRepository;
 import org.thingsboard.server.dao.model.sql.AssetEntity;
 import org.thingsboard.server.dao.model.sql.AssetInfoEntity;
-import org.thingsboard.server.dao.model.sql.TbPair;
+import org.thingsboard.server.common.data.util.TbPair;
 
 import java.util.List;
 import java.util.UUID;
@@ -197,7 +197,7 @@ public interface AssetRepository extends JpaRepository<AssetEntity, UUID>, Expor
     @Query("SELECT externalId FROM AssetEntity WHERE id = :id")
     UUID getExternalIdById(@Param("id") UUID id);
 
-    @Query(value = "SELECT DISTINCT new org.thingsboard.server.dao.model.sql.TbPair(a.tenantId , a.type) FROM  AssetEntity a")
+    @Query(value = "SELECT DISTINCT new org.thingsboard.server.common.data.util.TbPair(a.tenantId , a.type) FROM  AssetEntity a")
     Page<TbPair<UUID, String>> getAllAssetTypes(Pageable pageable);
 
 }

dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java

@@ -33,7 +33,7 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.asset.AssetDao;
 import org.thingsboard.server.dao.model.sql.AssetEntity;
 import org.thingsboard.server.dao.model.sql.AssetInfoEntity;
-import org.thingsboard.server.dao.model.sql.TbPair;
+import org.thingsboard.server.common.data.util.TbPair;
 import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
 import org.thingsboard.server.dao.util.SqlDao;