dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

validateId refactoring

Browse Source 
Signed-off-by: Oleksandra Matviienko <al.zzzeebra@gmail.com>
This commit is contained in:
Oleksandra Matviienko 2024-04-03 21:11:05 +02:00
parent 6ca90a80b2
commit e00b14bf84
12 changed files with 86 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/src/main/java/org/thingsboard/server/controller/BaseController.java
View File

@ -506,7 +506,7 @@ public abstract class BaseController {
TenantProfile checkTenantProfileId(TenantProfileId tenantProfileId, Operation operation) throws ThingsboardException { TenantProfile checkTenantProfileId(TenantProfileId tenantProfileId, Operation operation) throws ThingsboardException {
try { try {
validateId(tenantProfileId, "Incorrect tenantProfileId " + tenantProfileId); validateId(tenantProfileId, id -> "Incorrect tenantProfileId " + id);
TenantProfile tenantProfile = tenantProfileService.findTenantProfileById(getTenantId(), tenantProfileId); TenantProfile tenantProfile = tenantProfileService.findTenantProfileById(getTenantId(), tenantProfileId);
checkNotNull(tenantProfile, "Tenant profile with id [" + tenantProfileId + "] is not found"); checkNotNull(tenantProfile, "Tenant profile with id [" + tenantProfileId + "] is not found");
accessControlService.checkPermission(getCurrentUser(), Resource.TENANT_PROFILE, operation); accessControlService.checkPermission(getCurrentUser(), Resource.TENANT_PROFILE, operation);
@ -668,7 +668,7 @@ public abstract class BaseController {
AlarmComment checkAlarmCommentId(AlarmCommentId alarmCommentId, AlarmId alarmId) throws ThingsboardException { AlarmComment checkAlarmCommentId(AlarmCommentId alarmCommentId, AlarmId alarmId) throws ThingsboardException {
try { try {
validateId(alarmCommentId, "Incorrect alarmCommentId " + alarmCommentId); validateId(alarmCommentId, id -> "Incorrect alarmCommentId " + id);
AlarmComment alarmComment = alarmCommentService.findAlarmCommentByIdAsync(getCurrentUser().getTenantId(), alarmCommentId).get(); AlarmComment alarmComment = alarmCommentService.findAlarmCommentByIdAsync(getCurrentUser().getTenantId(), alarmCommentId).get();
checkNotNull(alarmComment, "Alarm comment with id [" + alarmCommentId + "] is not found"); checkNotNull(alarmComment, "Alarm comment with id [" + alarmCommentId + "] is not found");
if (!alarmId.equals(alarmComment.getAlarmId())) { if (!alarmId.equals(alarmComment.getAlarmId())) {
@ -736,7 +736,7 @@ public abstract class BaseController {
} }
protected RuleNode checkRuleNode(RuleNodeId ruleNodeId, Operation operation) throws ThingsboardException { protected RuleNode checkRuleNode(RuleNodeId ruleNodeId, Operation operation) throws ThingsboardException {
validateId(ruleNodeId, "Incorrect ruleNodeId " + ruleNodeId); validateId(ruleNodeId, id -> "Incorrect ruleNodeId " + id);
RuleNode ruleNode = ruleChainService.findRuleNodeById(getTenantId(), ruleNodeId); RuleNode ruleNode = ruleChainService.findRuleNodeById(getTenantId(), ruleNodeId);
checkNotNull(ruleNode, "Rule node with id [" + ruleNodeId + "] is not found"); checkNotNull(ruleNode, "Rule node with id [" + ruleNodeId + "] is not found");
checkRuleChain(ruleNode.getRuleChainId(), operation); checkRuleChain(ruleNode.getRuleChainId(), operation);

4
dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmCommentService.java
View File

@ -82,14 +82,14 @@ public class BaseAlarmCommentService extends AbstractEntityService implements Al
@Override @Override
public ListenableFuture<AlarmComment> findAlarmCommentByIdAsync(TenantId tenantId, AlarmCommentId alarmCommentId) { public ListenableFuture<AlarmComment> findAlarmCommentByIdAsync(TenantId tenantId, AlarmCommentId alarmCommentId) {
log.trace("Executing findAlarmCommentByIdAsync by alarmCommentId [{}]", alarmCommentId); log.trace("Executing findAlarmCommentByIdAsync by alarmCommentId [{}]", alarmCommentId);
validateId(alarmCommentId, "Incorrect alarmCommentId " + alarmCommentId); validateId(alarmCommentId, id -> "Incorrect alarmCommentId " + id);
return alarmCommentDao.findAlarmCommentByIdAsync(tenantId, alarmCommentId.getId()); return alarmCommentDao.findAlarmCommentByIdAsync(tenantId, alarmCommentId.getId());
} }
@Override @Override
public AlarmComment findAlarmCommentById(TenantId tenantId, AlarmCommentId alarmCommentId) { public AlarmComment findAlarmCommentById(TenantId tenantId, AlarmCommentId alarmCommentId) {
log.trace("Executing findAlarmCommentByIdAsync by alarmCommentId [{}]", alarmCommentId); log.trace("Executing findAlarmCommentByIdAsync by alarmCommentId [{}]", alarmCommentId);
validateId(alarmCommentId, "Incorrect alarmCommentId " + alarmCommentId); validateId(alarmCommentId, id -> "Incorrect alarmCommentId " + id);
return alarmCommentDao.findById(tenantId, alarmCommentId.getId()); return alarmCommentDao.findById(tenantId, alarmCommentId.getId());
} }

14
dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
View File

@ -169,7 +169,7 @@ public class BaseAlarmService extends AbstractCachedEntityService<TenantId, Page
@Override @Override
public PageData<AlarmData> findAlarmDataByQueryForEntities(TenantId tenantId, public PageData<AlarmData> findAlarmDataByQueryForEntities(TenantId tenantId,
AlarmDataQuery query, Collection<EntityId> orderedEntityIds) { AlarmDataQuery query, Collection<EntityId> orderedEntityIds) {
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validateEntityDataPageLink(query.getPageLink()); validateEntityDataPageLink(query.getPageLink());
return alarmDao.findAlarmDataByQueryForEntities(tenantId, query, orderedEntityIds); return alarmDao.findAlarmDataByQueryForEntities(tenantId, query, orderedEntityIds);
} }
@ -261,21 +261,21 @@ public class BaseAlarmService extends AbstractCachedEntityService<TenantId, Page
@Override @Override
public Alarm findAlarmById(TenantId tenantId, AlarmId alarmId) { public Alarm findAlarmById(TenantId tenantId, AlarmId alarmId) {
log.trace("Executing findAlarmById [{}]", alarmId); log.trace("Executing findAlarmById [{}]", alarmId);
validateId(alarmId, "Incorrect alarmId " + alarmId); validateId(alarmId, id -> "Incorrect alarmId " + id);
return alarmDao.findAlarmById(tenantId, alarmId.getId()); return alarmDao.findAlarmById(tenantId, alarmId.getId());
} }
@Override @Override
public ListenableFuture<Alarm> findAlarmByIdAsync(TenantId tenantId, AlarmId alarmId) { public ListenableFuture<Alarm> findAlarmByIdAsync(TenantId tenantId, AlarmId alarmId) {
log.trace("Executing findAlarmByIdAsync [{}]", alarmId); log.trace("Executing findAlarmByIdAsync [{}]", alarmId);
validateId(alarmId, "Incorrect alarmId " + alarmId); validateId(alarmId, id -> "Incorrect alarmId " + id);
return alarmDao.findAlarmByIdAsync(tenantId, alarmId.getId()); return alarmDao.findAlarmByIdAsync(tenantId, alarmId.getId());
} }
@Override @Override
public AlarmInfo findAlarmInfoById(TenantId tenantId, AlarmId alarmId) { public AlarmInfo findAlarmInfoById(TenantId tenantId, AlarmId alarmId) {
log.trace("Executing findAlarmInfoByIdAsync [{}]", alarmId); log.trace("Executing findAlarmInfoByIdAsync [{}]", alarmId);
validateId(alarmId, "Incorrect alarmId " + alarmId); validateId(alarmId, id -> "Incorrect alarmId " + id);
return alarmDao.findAlarmInfoById(tenantId, alarmId.getId()); return alarmDao.findAlarmInfoById(tenantId, alarmId.getId());
} }
@ -302,7 +302,7 @@ public class BaseAlarmService extends AbstractCachedEntityService<TenantId, Page
@Override @Override
public PageData<AlarmId> findAlarmIdsByAssigneeId(TenantId tenantId, UserId userId, PageLink pageLink) { public PageData<AlarmId> findAlarmIdsByAssigneeId(TenantId tenantId, UserId userId, PageLink pageLink) {
log.trace("[{}] Executing findAlarmIdsByAssigneeId [{}]", tenantId, userId); log.trace("[{}] Executing findAlarmIdsByAssigneeId [{}]", tenantId, userId);
validateId(userId, "Incorrect userId " + userId); validateId(userId, id -> "Incorrect userId " + id);
return alarmDao.findAlarmIdsByAssigneeId(tenantId, userId.getId(), pageLink); return alarmDao.findAlarmIdsByAssigneeId(tenantId, userId.getId(), pageLink);
} }
@ -336,14 +336,14 @@ public class BaseAlarmService extends AbstractCachedEntityService<TenantId, Page
@Override @Override
public long countAlarmsByQuery(TenantId tenantId, CustomerId customerId, AlarmCountQuery query) { public long countAlarmsByQuery(TenantId tenantId, CustomerId customerId, AlarmCountQuery query) {
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
return alarmDao.countAlarmsByQuery(tenantId, customerId, query); return alarmDao.countAlarmsByQuery(tenantId, customerId, query);
} }
@Override @Override
public PageData<EntitySubtype> findAlarmTypesByTenantId(TenantId tenantId, PageLink pageLink) { public PageData<EntitySubtype> findAlarmTypesByTenantId(TenantId tenantId, PageLink pageLink) {
log.trace("Executing findAlarmTypesByTenantId, tenantId [{}]", tenantId); log.trace("Executing findAlarmTypesByTenantId, tenantId [{}]", tenantId);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
if (DEFAULT_ALARM_TYPES_PAGE_LINK.equals(pageLink)) { if (DEFAULT_ALARM_TYPES_PAGE_LINK.equals(pageLink)) {
return cache.getAndPutInTransaction(tenantId, () -> return cache.getAndPutInTransaction(tenantId, () ->
alarmDao.findTenantAlarmTypes(tenantId.getId(), pageLink), false); alarmDao.findTenantAlarmTypes(tenantId.getId(), pageLink), false);

66
dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java
View File

@ -102,28 +102,28 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
@Override @Override
public AssetInfo findAssetInfoById(TenantId tenantId, AssetId assetId) { public AssetInfo findAssetInfoById(TenantId tenantId, AssetId assetId) {
log.trace("Executing findAssetInfoById [{}]", assetId); log.trace("Executing findAssetInfoById [{}]", assetId);
validateId(assetId, INCORRECT_ASSET_ID + assetId); validateId(assetId, id -> INCORRECT_ASSET_ID + id);
return assetDao.findAssetInfoById(tenantId, assetId.getId()); return assetDao.findAssetInfoById(tenantId, assetId.getId());
} }
@Override @Override
public Asset findAssetById(TenantId tenantId, AssetId assetId) { public Asset findAssetById(TenantId tenantId, AssetId assetId) {
log.trace("Executing findAssetById [{}]", assetId); log.trace("Executing findAssetById [{}]", assetId);
validateId(assetId, INCORRECT_ASSET_ID + assetId); validateId(assetId, id -> INCORRECT_ASSET_ID + id);
return assetDao.findById(tenantId, assetId.getId()); return assetDao.findById(tenantId, assetId.getId());
} }
@Override @Override
public ListenableFuture<Asset> findAssetByIdAsync(TenantId tenantId, AssetId assetId) { public ListenableFuture<Asset> findAssetByIdAsync(TenantId tenantId, AssetId assetId) {
log.trace("Executing findAssetById [{}]", assetId); log.trace("Executing findAssetById [{}]", assetId);
validateId(assetId, INCORRECT_ASSET_ID + assetId); validateId(assetId, id -> INCORRECT_ASSET_ID + id);
return assetDao.findByIdAsync(tenantId, assetId.getId()); return assetDao.findByIdAsync(tenantId, assetId.getId());
} }
@Override @Override
public Asset findAssetByTenantIdAndName(TenantId tenantId, String name) { public Asset findAssetByTenantIdAndName(TenantId tenantId, String name) {
log.trace("Executing findAssetByTenantIdAndName [{}][{}]", tenantId, name); log.trace("Executing findAssetByTenantIdAndName [{}][{}]", tenantId, name);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
return cache.getAndPutInTransaction(new AssetCacheKey(tenantId, name), return cache.getAndPutInTransaction(new AssetCacheKey(tenantId, name),
() -> assetDao.findAssetsByTenantIdAndName(tenantId.getId(), name) () -> assetDao.findAssetsByTenantIdAndName(tenantId.getId(), name)
.orElse(null), true); .orElse(null), true);
@ -198,7 +198,7 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
@Override @Override
@Transactional @Transactional
public void deleteAsset(TenantId tenantId, AssetId assetId) { public void deleteAsset(TenantId tenantId, AssetId assetId) {
validateId(assetId, INCORRECT_ASSET_ID + assetId); validateId(assetId, id -> INCORRECT_ASSET_ID + id);
if (entityViewService.existsByTenantIdAndEntityId(tenantId, assetId)) { if (entityViewService.existsByTenantIdAndEntityId(tenantId, assetId)) {
throw new DataValidationException("Can't delete asset that has entity views!"); throw new DataValidationException("Can't delete asset that has entity views!");
} }
@ -222,7 +222,7 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
@Override @Override
public PageData<Asset> findAssetsByTenantId(TenantId tenantId, PageLink pageLink) { public PageData<Asset> findAssetsByTenantId(TenantId tenantId, PageLink pageLink) {
log.trace("Executing findAssetsByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink); log.trace("Executing findAssetsByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validatePageLink(pageLink); validatePageLink(pageLink);
return assetDao.findAssetsByTenantId(tenantId.getId(), pageLink); return assetDao.findAssetsByTenantId(tenantId.getId(), pageLink);
} }
@ -230,7 +230,7 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
@Override @Override
public PageData<AssetInfo> findAssetInfosByTenantId(TenantId tenantId, PageLink pageLink) { public PageData<AssetInfo> findAssetInfosByTenantId(TenantId tenantId, PageLink pageLink) {
log.trace("Executing findAssetInfosByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink); log.trace("Executing findAssetInfosByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validatePageLink(pageLink); validatePageLink(pageLink);
return assetDao.findAssetInfosByTenantId(tenantId.getId(), pageLink); return assetDao.findAssetInfosByTenantId(tenantId.getId(), pageLink);
} }
@ -238,7 +238,7 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
@Override @Override
public PageData<Asset> findAssetsByTenantIdAndType(TenantId tenantId, String type, PageLink pageLink) { public PageData<Asset> findAssetsByTenantIdAndType(TenantId tenantId, String type, PageLink pageLink) {
log.trace("Executing findAssetsByTenantIdAndType, tenantId [{}], type [{}], pageLink [{}]", tenantId, type, pageLink); log.trace("Executing findAssetsByTenantIdAndType, tenantId [{}], type [{}], pageLink [{}]", tenantId, type, pageLink);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validateString(type, t -> "Incorrect type " + t); validateString(type, t -> "Incorrect type " + t);
validatePageLink(pageLink); validatePageLink(pageLink);
return assetDao.findAssetsByTenantIdAndType(tenantId.getId(), type, pageLink); return assetDao.findAssetsByTenantIdAndType(tenantId.getId(), type, pageLink);
@ -247,7 +247,7 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
@Override @Override
public PageData<AssetInfo> findAssetInfosByTenantIdAndType(TenantId tenantId, String type, PageLink pageLink) { public PageData<AssetInfo> findAssetInfosByTenantIdAndType(TenantId tenantId, String type, PageLink pageLink) {
log.trace("Executing findAssetInfosByTenantIdAndType, tenantId [{}], type [{}], pageLink [{}]", tenantId, type, pageLink); log.trace("Executing findAssetInfosByTenantIdAndType, tenantId [{}], type [{}], pageLink [{}]", tenantId, type, pageLink);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validateString(type, t -> "Incorrect type " + t); validateString(type, t -> "Incorrect type " + t);
validatePageLink(pageLink); validatePageLink(pageLink);
return assetDao.findAssetInfosByTenantIdAndType(tenantId.getId(), type, pageLink); return assetDao.findAssetInfosByTenantIdAndType(tenantId.getId(), type, pageLink);
@ -256,8 +256,8 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
@Override @Override
public PageData<AssetInfo> findAssetInfosByTenantIdAndAssetProfileId(TenantId tenantId, AssetProfileId assetProfileId, PageLink pageLink) { public PageData<AssetInfo> findAssetInfosByTenantIdAndAssetProfileId(TenantId tenantId, AssetProfileId assetProfileId, PageLink pageLink) {
log.trace("Executing findAssetInfosByTenantIdAndAssetProfileId, tenantId [{}], assetProfileId [{}], pageLink [{}]", tenantId, assetProfileId, pageLink); log.trace("Executing findAssetInfosByTenantIdAndAssetProfileId, tenantId [{}], assetProfileId [{}], pageLink [{}]", tenantId, assetProfileId, pageLink);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validateId(assetProfileId, INCORRECT_ASSET_PROFILE_ID + assetProfileId); validateId(assetProfileId, id -> INCORRECT_ASSET_PROFILE_ID + id);
validatePageLink(pageLink); validatePageLink(pageLink);
return assetDao.findAssetInfosByTenantIdAndAssetProfileId(tenantId.getId(), assetProfileId.getId(), pageLink); return assetDao.findAssetInfosByTenantIdAndAssetProfileId(tenantId.getId(), assetProfileId.getId(), pageLink);
} }
@ -265,7 +265,7 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
@Override @Override
public ListenableFuture<List<Asset>> findAssetsByTenantIdAndIdsAsync(TenantId tenantId, List<AssetId> assetIds) { public ListenableFuture<List<Asset>> findAssetsByTenantIdAndIdsAsync(TenantId tenantId, List<AssetId> assetIds) {
log.trace("Executing findAssetsByTenantIdAndIdsAsync, tenantId [{}], assetIds [{}]", tenantId, assetIds); log.trace("Executing findAssetsByTenantIdAndIdsAsync, tenantId [{}], assetIds [{}]", tenantId, assetIds);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validateIds(assetIds, ids -> "Incorrect assetIds " + ids); validateIds(assetIds, ids -> "Incorrect assetIds " + ids);
return assetDao.findAssetsByTenantIdAndIdsAsync(tenantId.getId(), toUUIDs(assetIds)); return assetDao.findAssetsByTenantIdAndIdsAsync(tenantId.getId(), toUUIDs(assetIds));
} }
@ -273,15 +273,15 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
@Override @Override
public void deleteAssetsByTenantId(TenantId tenantId) { public void deleteAssetsByTenantId(TenantId tenantId) {
log.trace("Executing deleteAssetsByTenantId, tenantId [{}]", tenantId); log.trace("Executing deleteAssetsByTenantId, tenantId [{}]", tenantId);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
tenantAssetsRemover.removeEntities(tenantId, tenantId); tenantAssetsRemover.removeEntities(tenantId, tenantId);
} }
@Override @Override
public PageData<Asset> findAssetsByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId, PageLink pageLink) { public PageData<Asset> findAssetsByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId, PageLink pageLink) {
log.trace("Executing findAssetsByTenantIdAndCustomerId, tenantId [{}], customerId [{}], pageLink [{}]", tenantId, customerId, pageLink); log.trace("Executing findAssetsByTenantIdAndCustomerId, tenantId [{}], customerId [{}], pageLink [{}]", tenantId, customerId, pageLink);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validateId(customerId, INCORRECT_CUSTOMER_ID + customerId); validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
validatePageLink(pageLink); validatePageLink(pageLink);
return assetDao.findAssetsByTenantIdAndCustomerId(tenantId.getId(), customerId.getId(), pageLink); return assetDao.findAssetsByTenantIdAndCustomerId(tenantId.getId(), customerId.getId(), pageLink);
} }
@ -289,8 +289,8 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
@Override @Override
public PageData<AssetInfo> findAssetInfosByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId, PageLink pageLink) { public PageData<AssetInfo> findAssetInfosByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId, PageLink pageLink) {
log.trace("Executing findAssetInfosByTenantIdAndCustomerId, tenantId [{}], customerId [{}], pageLink [{}]", tenantId, customerId, pageLink); log.trace("Executing findAssetInfosByTenantIdAndCustomerId, tenantId [{}], customerId [{}], pageLink [{}]", tenantId, customerId, pageLink);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validateId(customerId, INCORRECT_CUSTOMER_ID + customerId); validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
validatePageLink(pageLink); validatePageLink(pageLink);
return assetDao.findAssetInfosByTenantIdAndCustomerId(tenantId.getId(), customerId.getId(), pageLink); return assetDao.findAssetInfosByTenantIdAndCustomerId(tenantId.getId(), customerId.getId(), pageLink);
} }
@ -298,8 +298,8 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
@Override @Override
public PageData<Asset> findAssetsByTenantIdAndCustomerIdAndType(TenantId tenantId, CustomerId customerId, String type, PageLink pageLink) { public PageData<Asset> findAssetsByTenantIdAndCustomerIdAndType(TenantId tenantId, CustomerId customerId, String type, PageLink pageLink) {
log.trace("Executing findAssetsByTenantIdAndCustomerIdAndType, tenantId [{}], customerId [{}], type [{}], pageLink [{}]", tenantId, customerId, type, pageLink); log.trace("Executing findAssetsByTenantIdAndCustomerIdAndType, tenantId [{}], customerId [{}], type [{}], pageLink [{}]", tenantId, customerId, type, pageLink);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validateId(customerId, INCORRECT_CUSTOMER_ID + customerId); validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
validateString(type, t -> "Incorrect type " + t); validateString(type, t -> "Incorrect type " + t);
validatePageLink(pageLink); validatePageLink(pageLink);
return assetDao.findAssetsByTenantIdAndCustomerIdAndType(tenantId.getId(), customerId.getId(), type, pageLink); return assetDao.findAssetsByTenantIdAndCustomerIdAndType(tenantId.getId(), customerId.getId(), type, pageLink);
@ -308,8 +308,8 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
@Override @Override
public PageData<AssetInfo> findAssetInfosByTenantIdAndCustomerIdAndType(TenantId tenantId, CustomerId customerId, String type, PageLink pageLink) { public PageData<AssetInfo> findAssetInfosByTenantIdAndCustomerIdAndType(TenantId tenantId, CustomerId customerId, String type, PageLink pageLink) {
log.trace("Executing findAssetInfosByTenantIdAndCustomerIdAndType, tenantId [{}], customerId [{}], type [{}], pageLink [{}]", tenantId, customerId, type, pageLink); log.trace("Executing findAssetInfosByTenantIdAndCustomerIdAndType, tenantId [{}], customerId [{}], type [{}], pageLink [{}]", tenantId, customerId, type, pageLink);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validateId(customerId, INCORRECT_CUSTOMER_ID + customerId); validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
validateString(type, t -> "Incorrect type " + t); validateString(type, t -> "Incorrect type " + t);
validatePageLink(pageLink); validatePageLink(pageLink);
return assetDao.findAssetInfosByTenantIdAndCustomerIdAndType(tenantId.getId(), customerId.getId(), type, pageLink); return assetDao.findAssetInfosByTenantIdAndCustomerIdAndType(tenantId.getId(), customerId.getId(), type, pageLink);
@ -318,9 +318,9 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
@Override @Override
public PageData<AssetInfo> findAssetInfosByTenantIdAndCustomerIdAndAssetProfileId(TenantId tenantId, CustomerId customerId, AssetProfileId assetProfileId, PageLink pageLink) { public PageData<AssetInfo> findAssetInfosByTenantIdAndCustomerIdAndAssetProfileId(TenantId tenantId, CustomerId customerId, AssetProfileId assetProfileId, PageLink pageLink) {
log.trace("Executing findAssetInfosByTenantIdAndCustomerIdAndAssetProfileId, tenantId [{}], customerId [{}], assetProfileId [{}], pageLink [{}]", tenantId, customerId, assetProfileId, pageLink); log.trace("Executing findAssetInfosByTenantIdAndCustomerIdAndAssetProfileId, tenantId [{}], customerId [{}], assetProfileId [{}], pageLink [{}]", tenantId, customerId, assetProfileId, pageLink);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validateId(customerId, INCORRECT_CUSTOMER_ID + customerId); validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
validateId(assetProfileId, INCORRECT_ASSET_PROFILE_ID + assetProfileId); validateId(assetProfileId, id -> INCORRECT_ASSET_PROFILE_ID + id);
validatePageLink(pageLink); validatePageLink(pageLink);
return assetDao.findAssetInfosByTenantIdAndCustomerIdAndAssetProfileId(tenantId.getId(), customerId.getId(), assetProfileId.getId(), pageLink); return assetDao.findAssetInfosByTenantIdAndCustomerIdAndAssetProfileId(tenantId.getId(), customerId.getId(), assetProfileId.getId(), pageLink);
} }
@ -328,8 +328,8 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
@Override @Override
public ListenableFuture<List<Asset>> findAssetsByTenantIdCustomerIdAndIdsAsync(TenantId tenantId, CustomerId customerId, List<AssetId> assetIds) { public ListenableFuture<List<Asset>> findAssetsByTenantIdCustomerIdAndIdsAsync(TenantId tenantId, CustomerId customerId, List<AssetId> assetIds) {
log.trace("Executing findAssetsByTenantIdAndCustomerIdAndIdsAsync, tenantId [{}], customerId [{}], assetIds [{}]", tenantId, customerId, assetIds); log.trace("Executing findAssetsByTenantIdAndCustomerIdAndIdsAsync, tenantId [{}], customerId [{}], assetIds [{}]", tenantId, customerId, assetIds);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validateId(customerId, INCORRECT_CUSTOMER_ID + customerId); validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
validateIds(assetIds, ids -> "Incorrect assetIds " + ids); validateIds(assetIds, ids -> "Incorrect assetIds " + ids);
return assetDao.findAssetsByTenantIdAndCustomerIdAndIdsAsync(tenantId.getId(), customerId.getId(), toUUIDs(assetIds)); return assetDao.findAssetsByTenantIdAndCustomerIdAndIdsAsync(tenantId.getId(), customerId.getId(), toUUIDs(assetIds));
} }
@ -337,8 +337,8 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
@Override @Override
public void unassignCustomerAssets(TenantId tenantId, CustomerId customerId) { public void unassignCustomerAssets(TenantId tenantId, CustomerId customerId) {
log.trace("Executing unassignCustomerAssets, tenantId [{}], customerId [{}]", tenantId, customerId); log.trace("Executing unassignCustomerAssets, tenantId [{}], customerId [{}]", tenantId, customerId);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validateId(customerId, INCORRECT_CUSTOMER_ID + customerId); validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
customerAssetsUnasigner.removeEntities(tenantId, customerId); customerAssetsUnasigner.removeEntities(tenantId, customerId);
} }
@ -370,7 +370,7 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
@Override @Override
public ListenableFuture<List<EntitySubtype>> findAssetTypesByTenantId(TenantId tenantId) { public ListenableFuture<List<EntitySubtype>> findAssetTypesByTenantId(TenantId tenantId) {
log.trace("Executing findAssetTypesByTenantId, tenantId [{}]", tenantId); log.trace("Executing findAssetTypesByTenantId, tenantId [{}]", tenantId);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
return assetDao.findTenantAssetTypesAsync(tenantId.getId()); return assetDao.findTenantAssetTypesAsync(tenantId.getId());
} }
@ -419,8 +419,8 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
@Override @Override
public PageData<Asset> findAssetsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, PageLink pageLink) { public PageData<Asset> findAssetsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, PageLink pageLink) {
log.trace("Executing findAssetsByTenantIdAndEdgeId, tenantId [{}], edgeId [{}], pageLink [{}]", tenantId, edgeId, pageLink); log.trace("Executing findAssetsByTenantIdAndEdgeId, tenantId [{}], edgeId [{}], pageLink [{}]", tenantId, edgeId, pageLink);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validateId(edgeId, INCORRECT_EDGE_ID + edgeId); validateId(edgeId, id -> INCORRECT_EDGE_ID + id);
validatePageLink(pageLink); validatePageLink(pageLink);
return assetDao.findAssetsByTenantIdAndEdgeId(tenantId.getId(), edgeId.getId(), pageLink); return assetDao.findAssetsByTenantIdAndEdgeId(tenantId.getId(), edgeId.getId(), pageLink);
} }
@ -428,8 +428,8 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
@Override @Override
public PageData<Asset> findAssetsByTenantIdAndEdgeIdAndType(TenantId tenantId, EdgeId edgeId, String type, PageLink pageLink) { public PageData<Asset> findAssetsByTenantIdAndEdgeIdAndType(TenantId tenantId, EdgeId edgeId, String type, PageLink pageLink) {
log.trace("Executing findAssetsByTenantIdAndEdgeIdAndType, tenantId [{}], edgeId [{}], type [{}] pageLink [{}]", tenantId, edgeId, type, pageLink); log.trace("Executing findAssetsByTenantIdAndEdgeIdAndType, tenantId [{}], edgeId [{}], type [{}] pageLink [{}]", tenantId, edgeId, type, pageLink);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validateId(edgeId, INCORRECT_EDGE_ID + edgeId); validateId(edgeId, id -> INCORRECT_EDGE_ID + id);
validateString(type, t -> "Incorrect type " + t); validateString(type, t -> "Incorrect type " + t);
validatePageLink(pageLink); validatePageLink(pageLink);
return assetDao.findAssetsByTenantIdAndEdgeIdAndType(tenantId.getId(), edgeId.getId(), type, pageLink); return assetDao.findAssetsByTenantIdAndEdgeIdAndType(tenantId.getId(), edgeId.getId(), type, pageLink);

8
dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java
View File

@ -67,8 +67,8 @@ public class BaseEntityService extends AbstractEntityService implements EntitySe
@Override @Override
public long countEntitiesByQuery(TenantId tenantId, CustomerId customerId, EntityCountQuery query) { public long countEntitiesByQuery(TenantId tenantId, CustomerId customerId, EntityCountQuery query) {
log.trace("Executing countEntitiesByQuery, tenantId [{}], customerId [{}], query [{}]", tenantId, customerId, query); log.trace("Executing countEntitiesByQuery, tenantId [{}], customerId [{}], query [{}]", tenantId, customerId, query);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validateId(customerId, INCORRECT_CUSTOMER_ID + customerId); validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
validateEntityCountQuery(query); validateEntityCountQuery(query);
return this.entityQueryDao.countEntitiesByQuery(tenantId, customerId, query); return this.entityQueryDao.countEntitiesByQuery(tenantId, customerId, query);
} }
@ -76,8 +76,8 @@ public class BaseEntityService extends AbstractEntityService implements EntitySe
@Override @Override
public PageData<EntityData> findEntityDataByQuery(TenantId tenantId, CustomerId customerId, EntityDataQuery query) { public PageData<EntityData> findEntityDataByQuery(TenantId tenantId, CustomerId customerId, EntityDataQuery query) {
log.trace("Executing findEntityDataByQuery, tenantId [{}], customerId [{}], query [{}]", tenantId, customerId, query); log.trace("Executing findEntityDataByQuery, tenantId [{}], customerId [{}], query [{}]", tenantId, customerId, query);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validateId(customerId, INCORRECT_CUSTOMER_ID + customerId); validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
validateEntityDataQuery(query); validateEntityDataQuery(query);
return this.entityQueryDao.findEntityDataByQuery(tenantId, customerId, query); return this.entityQueryDao.findEntityDataByQuery(tenantId, customerId, query);
} }

14
dao/src/main/java/org/thingsboard/server/dao/ota/BaseOtaPackageService.java
View File

@ -159,14 +159,14 @@ public class BaseOtaPackageService extends AbstractCachedEntityService<OtaPackag
@Override @Override
public OtaPackage findOtaPackageById(TenantId tenantId, OtaPackageId otaPackageId) { public OtaPackage findOtaPackageById(TenantId tenantId, OtaPackageId otaPackageId) {
log.trace("Executing findOtaPackageById [{}]", otaPackageId); log.trace("Executing findOtaPackageById [{}]", otaPackageId);
validateId(otaPackageId, INCORRECT_OTA_PACKAGE_ID + otaPackageId); validateId(otaPackageId, id -> INCORRECT_OTA_PACKAGE_ID + id);
return otaPackageDao.findById(tenantId, otaPackageId.getId()); return otaPackageDao.findById(tenantId, otaPackageId.getId());
} }
@Override @Override
public OtaPackageInfo findOtaPackageInfoById(TenantId tenantId, OtaPackageId otaPackageId) { public OtaPackageInfo findOtaPackageInfoById(TenantId tenantId, OtaPackageId otaPackageId) {
log.trace("Executing findOtaPackageInfoById [{}]", otaPackageId); log.trace("Executing findOtaPackageInfoById [{}]", otaPackageId);
validateId(otaPackageId, INCORRECT_OTA_PACKAGE_ID + otaPackageId); validateId(otaPackageId, id -> INCORRECT_OTA_PACKAGE_ID + id);
return cache.getAndPutInTransaction(new OtaPackageCacheKey(otaPackageId), return cache.getAndPutInTransaction(new OtaPackageCacheKey(otaPackageId),
() -> otaPackageInfoDao.findById(tenantId, otaPackageId.getId()), true); () -> otaPackageInfoDao.findById(tenantId, otaPackageId.getId()), true);
} }
@ -174,14 +174,14 @@ public class BaseOtaPackageService extends AbstractCachedEntityService<OtaPackag
@Override @Override
public ListenableFuture<OtaPackageInfo> findOtaPackageInfoByIdAsync(TenantId tenantId, OtaPackageId otaPackageId) { public ListenableFuture<OtaPackageInfo> findOtaPackageInfoByIdAsync(TenantId tenantId, OtaPackageId otaPackageId) {
log.trace("Executing findOtaPackageInfoByIdAsync [{}]", otaPackageId); log.trace("Executing findOtaPackageInfoByIdAsync [{}]", otaPackageId);
validateId(otaPackageId, INCORRECT_OTA_PACKAGE_ID + otaPackageId); validateId(otaPackageId, id -> INCORRECT_OTA_PACKAGE_ID + id);
return otaPackageInfoDao.findByIdAsync(tenantId, otaPackageId.getId()); return otaPackageInfoDao.findByIdAsync(tenantId, otaPackageId.getId());
} }
@Override @Override
public PageData<OtaPackageInfo> findTenantOtaPackagesByTenantId(TenantId tenantId, PageLink pageLink) { public PageData<OtaPackageInfo> findTenantOtaPackagesByTenantId(TenantId tenantId, PageLink pageLink) {
log.trace("Executing findTenantOtaPackagesByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink); log.trace("Executing findTenantOtaPackagesByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validatePageLink(pageLink); validatePageLink(pageLink);
return otaPackageInfoDao.findOtaPackageInfoByTenantId(tenantId, pageLink); return otaPackageInfoDao.findOtaPackageInfoByTenantId(tenantId, pageLink);
} }
@ -189,7 +189,7 @@ public class BaseOtaPackageService extends AbstractCachedEntityService<OtaPackag
@Override @Override
public PageData<OtaPackageInfo> findTenantOtaPackagesByTenantIdAndDeviceProfileIdAndTypeAndHasData(TenantId tenantId, DeviceProfileId deviceProfileId, OtaPackageType otaPackageType, PageLink pageLink) { public PageData<OtaPackageInfo> findTenantOtaPackagesByTenantIdAndDeviceProfileIdAndTypeAndHasData(TenantId tenantId, DeviceProfileId deviceProfileId, OtaPackageType otaPackageType, PageLink pageLink) {
log.trace("Executing findTenantOtaPackagesByTenantIdAndHasData, tenantId [{}], pageLink [{}]", tenantId, pageLink); log.trace("Executing findTenantOtaPackagesByTenantIdAndHasData, tenantId [{}], pageLink [{}]", tenantId, pageLink);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validatePageLink(pageLink); validatePageLink(pageLink);
return otaPackageInfoDao.findOtaPackageInfoByTenantIdAndDeviceProfileIdAndTypeAndHasData(tenantId, deviceProfileId, otaPackageType, pageLink); return otaPackageInfoDao.findOtaPackageInfoByTenantIdAndDeviceProfileIdAndTypeAndHasData(tenantId, deviceProfileId, otaPackageType, pageLink);
} }
@ -197,7 +197,7 @@ public class BaseOtaPackageService extends AbstractCachedEntityService<OtaPackag
@Override @Override
public void deleteOtaPackage(TenantId tenantId, OtaPackageId otaPackageId) { public void deleteOtaPackage(TenantId tenantId, OtaPackageId otaPackageId) {
log.trace("Executing deleteOtaPackage [{}]", otaPackageId); log.trace("Executing deleteOtaPackage [{}]", otaPackageId);
validateId(otaPackageId, INCORRECT_OTA_PACKAGE_ID + otaPackageId); validateId(otaPackageId, id -> INCORRECT_OTA_PACKAGE_ID + id);
try { try {
otaPackageDao.removeById(tenantId, otaPackageId.getId()); otaPackageDao.removeById(tenantId, otaPackageId.getId());
publishEvictEvent(new OtaPackageCacheEvictEvent(otaPackageId)); publishEvictEvent(new OtaPackageCacheEvictEvent(otaPackageId));
@ -226,7 +226,7 @@ public class BaseOtaPackageService extends AbstractCachedEntityService<OtaPackag
@Override @Override
public void deleteOtaPackagesByTenantId(TenantId tenantId) { public void deleteOtaPackagesByTenantId(TenantId tenantId) {
log.trace("Executing deleteOtaPackagesByTenantId, tenantId [{}]", tenantId); log.trace("Executing deleteOtaPackagesByTenantId, tenantId [{}]", tenantId);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
tenantOtaPackageRemover.removeEntities(tenantId, tenantId); tenantOtaPackageRemover.removeEntities(tenantId, tenantId);
} }

8
dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueStatsService.java
View File

@ -53,28 +53,28 @@ public class BaseQueueStatsService extends AbstractEntityService implements Queu
@Override @Override
public QueueStats findQueueStatsById(TenantId tenantId, QueueStatsId queueStatsId) { public QueueStats findQueueStatsById(TenantId tenantId, QueueStatsId queueStatsId) {
log.trace("Executing findQueueStatsById [{}]", queueStatsId); log.trace("Executing findQueueStatsById [{}]", queueStatsId);
validateId(queueStatsId, "Incorrect queueStatsId " + queueStatsId); validateId(queueStatsId, id -> "Incorrect queueStatsId " + id);
return queueStatsDao.findById(tenantId, queueStatsId.getId()); return queueStatsDao.findById(tenantId, queueStatsId.getId());
} }
@Override @Override
public QueueStats findByTenantIdAndNameAndServiceId(TenantId tenantId, String queueName, String serviceId) { public QueueStats findByTenantIdAndNameAndServiceId(TenantId tenantId, String queueName, String serviceId) {
log.trace("Executing findByTenantIdAndNameAndServiceId, tenantId: [{}], queueName: [{}], serviceId: [{}]", tenantId, queueName, serviceId); log.trace("Executing findByTenantIdAndNameAndServiceId, tenantId: [{}], queueName: [{}], serviceId: [{}]", tenantId, queueName, serviceId);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
return queueStatsDao.findByTenantIdQueueNameAndServiceId(tenantId, queueName, serviceId); return queueStatsDao.findByTenantIdQueueNameAndServiceId(tenantId, queueName, serviceId);
} }
@Override @Override
public List<QueueStats> findByTenantId(TenantId tenantId) { public List<QueueStats> findByTenantId(TenantId tenantId) {
log.trace("Executing findByTenantId, tenantId: [{}]", tenantId); log.trace("Executing findByTenantId, tenantId: [{}]", tenantId);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
return queueStatsDao.findByTenantId(tenantId); return queueStatsDao.findByTenantId(tenantId);
} }
@Override @Override
public void deleteByTenantId(TenantId tenantId) { public void deleteByTenantId(TenantId tenantId) {
log.trace("Executing deleteByTenantId, tenantId [{}]", tenantId); log.trace("Executing deleteByTenantId, tenantId [{}]", tenantId);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
queueStatsDao.deleteByTenantId(tenantId); queueStatsDao.deleteByTenantId(tenantId);
} }

2
dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java
View File

@ -513,7 +513,7 @@ public class BaseRelationService implements RelationService {
@Override @Override
public List<EntityRelation> findRuleNodeToRuleChainRelations(TenantId tenantId, RuleChainType ruleChainType, int limit) { public List<EntityRelation> findRuleNodeToRuleChainRelations(TenantId tenantId, RuleChainType ruleChainType, int limit) {
log.trace("Executing findRuleNodeToRuleChainRelations, tenantId [{}], ruleChainType {} and limit {}", tenantId, ruleChainType, limit); log.trace("Executing findRuleNodeToRuleChainRelations, tenantId [{}], ruleChainType {} and limit {}", tenantId, ruleChainType, limit);
validateId(tenantId, "Invalid tenant id: " + tenantId); validateId(tenantId, id -> "Invalid tenant id: " + id);
return relationDao.findRuleNodeToRuleChainRelations(ruleChainType, limit); return relationDao.findRuleNodeToRuleChainRelations(ruleChainType, limit);
} }

2
dao/src/main/java/org/thingsboard/server/dao/resource/BaseImageService.java
View File

@ -256,7 +256,7 @@ public class BaseImageService extends BaseResourceService implements ImageServic
var tenantId = imageInfo.getTenantId(); var tenantId = imageInfo.getTenantId();
var imageId = imageInfo.getId(); var imageId = imageInfo.getId();
log.trace("Executing deleteImage [{}] [{}]", tenantId, imageId); log.trace("Executing deleteImage [{}] [{}]", tenantId, imageId);
Validator.validateId(imageId, INCORRECT_RESOURCE_ID + imageId); Validator.validateId(imageId, id -> INCORRECT_RESOURCE_ID + id);
TbImageDeleteResult.TbImageDeleteResultBuilder result = TbImageDeleteResult.builder(); TbImageDeleteResult.TbImageDeleteResultBuilder result = TbImageDeleteResult.builder();
boolean success = true; boolean success = true;
if (!force) { if (!force) {

20
dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java
View File

@ -116,14 +116,14 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
@Override @Override
public TbResource findResourceById(TenantId tenantId, TbResourceId resourceId) { public TbResource findResourceById(TenantId tenantId, TbResourceId resourceId) {
log.trace("Executing findResourceById [{}] [{}]", tenantId, resourceId); log.trace("Executing findResourceById [{}] [{}]", tenantId, resourceId);
Validator.validateId(resourceId, INCORRECT_RESOURCE_ID + resourceId); Validator.validateId(resourceId, id -> INCORRECT_RESOURCE_ID + id);
return resourceDao.findById(tenantId, resourceId.getId()); return resourceDao.findById(tenantId, resourceId.getId());
} }
@Override @Override
public TbResourceInfo findResourceInfoById(TenantId tenantId, TbResourceId resourceId) { public TbResourceInfo findResourceInfoById(TenantId tenantId, TbResourceId resourceId) {
log.trace("Executing findResourceInfoById [{}] [{}]", tenantId, resourceId); log.trace("Executing findResourceInfoById [{}] [{}]", tenantId, resourceId);
Validator.validateId(resourceId, INCORRECT_RESOURCE_ID + resourceId); Validator.validateId(resourceId, id -> INCORRECT_RESOURCE_ID + id);
return cache.getAndPutInTransaction(new ResourceInfoCacheKey(tenantId, resourceId), return cache.getAndPutInTransaction(new ResourceInfoCacheKey(tenantId, resourceId),
() -> resourceInfoDao.findById(tenantId, resourceId.getId()), true); () -> resourceInfoDao.findById(tenantId, resourceId.getId()), true);
@ -138,7 +138,7 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
@Override @Override
public ListenableFuture<TbResourceInfo> findResourceInfoByIdAsync(TenantId tenantId, TbResourceId resourceId) { public ListenableFuture<TbResourceInfo> findResourceInfoByIdAsync(TenantId tenantId, TbResourceId resourceId) {
log.trace("Executing findResourceInfoById [{}] [{}]", tenantId, resourceId); log.trace("Executing findResourceInfoById [{}] [{}]", tenantId, resourceId);
Validator.validateId(resourceId, INCORRECT_RESOURCE_ID + resourceId); Validator.validateId(resourceId, id -> INCORRECT_RESOURCE_ID + id);
return resourceInfoDao.findByIdAsync(tenantId, resourceId.getId()); return resourceInfoDao.findByIdAsync(tenantId, resourceId.getId());
} }
@ -150,7 +150,7 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
@Override @Override
public void deleteResource(TenantId tenantId, TbResourceId resourceId, boolean force) { public void deleteResource(TenantId tenantId, TbResourceId resourceId, boolean force) {
log.trace("Executing deleteResource [{}] [{}]", tenantId, resourceId); log.trace("Executing deleteResource [{}] [{}]", tenantId, resourceId);
Validator.validateId(resourceId, INCORRECT_RESOURCE_ID + resourceId); Validator.validateId(resourceId, id -> INCORRECT_RESOURCE_ID + id);
if (!force) { if (!force) {
resourceValidator.validateDelete(tenantId, resourceId); resourceValidator.validateDelete(tenantId, resourceId);
} }
@ -163,7 +163,7 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
public PageData<TbResourceInfo> findAllTenantResourcesByTenantId(TbResourceInfoFilter filter, PageLink pageLink) { public PageData<TbResourceInfo> findAllTenantResourcesByTenantId(TbResourceInfoFilter filter, PageLink pageLink) {
TenantId tenantId = filter.getTenantId(); TenantId tenantId = filter.getTenantId();
log.trace("Executing findAllTenantResourcesByTenantId [{}]", tenantId); log.trace("Executing findAllTenantResourcesByTenantId [{}]", tenantId);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
return resourceInfoDao.findAllTenantResourcesByTenantId(filter, pageLink); return resourceInfoDao.findAllTenantResourcesByTenantId(filter, pageLink);
} }
@ -171,35 +171,35 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
public PageData<TbResourceInfo> findTenantResourcesByTenantId(TbResourceInfoFilter filter, PageLink pageLink) { public PageData<TbResourceInfo> findTenantResourcesByTenantId(TbResourceInfoFilter filter, PageLink pageLink) {
TenantId tenantId = filter.getTenantId(); TenantId tenantId = filter.getTenantId();
log.trace("Executing findTenantResourcesByTenantId [{}]", tenantId); log.trace("Executing findTenantResourcesByTenantId [{}]", tenantId);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
return resourceInfoDao.findTenantResourcesByTenantId(filter, pageLink); return resourceInfoDao.findTenantResourcesByTenantId(filter, pageLink);
} }
@Override @Override
public List<TbResource> findTenantResourcesByResourceTypeAndObjectIds(TenantId tenantId, ResourceType resourceType, String[] objectIds) { public List<TbResource> findTenantResourcesByResourceTypeAndObjectIds(TenantId tenantId, ResourceType resourceType, String[] objectIds) {
log.trace("Executing findTenantResourcesByResourceTypeAndObjectIds [{}][{}][{}]", tenantId, resourceType, objectIds); log.trace("Executing findTenantResourcesByResourceTypeAndObjectIds [{}][{}][{}]", tenantId, resourceType, objectIds);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
return resourceDao.findResourcesByTenantIdAndResourceType(tenantId, resourceType, objectIds, null); return resourceDao.findResourcesByTenantIdAndResourceType(tenantId, resourceType, objectIds, null);
} }
@Override @Override
public PageData<TbResource> findAllTenantResources(TenantId tenantId, PageLink pageLink) { public PageData<TbResource> findAllTenantResources(TenantId tenantId, PageLink pageLink) {
log.trace("Executing findAllTenantResources [{}][{}]", tenantId, pageLink); log.trace("Executing findAllTenantResources [{}][{}]", tenantId, pageLink);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
return resourceDao.findAllByTenantId(tenantId, pageLink); return resourceDao.findAllByTenantId(tenantId, pageLink);
} }
@Override @Override
public PageData<TbResource> findTenantResourcesByResourceTypeAndPageLink(TenantId tenantId, ResourceType resourceType, PageLink pageLink) { public PageData<TbResource> findTenantResourcesByResourceTypeAndPageLink(TenantId tenantId, ResourceType resourceType, PageLink pageLink) {
log.trace("Executing findTenantResourcesByResourceTypeAndPageLink [{}][{}][{}]", tenantId, resourceType, pageLink); log.trace("Executing findTenantResourcesByResourceTypeAndPageLink [{}][{}][{}]", tenantId, resourceType, pageLink);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
return resourceDao.findResourcesByTenantIdAndResourceType(tenantId, resourceType, pageLink); return resourceDao.findResourcesByTenantIdAndResourceType(tenantId, resourceType, pageLink);
} }
@Override @Override
public void deleteResourcesByTenantId(TenantId tenantId) { public void deleteResourcesByTenantId(TenantId tenantId) {
log.trace("Executing deleteResourcesByTenantId, tenantId [{}]", tenantId); log.trace("Executing deleteResourcesByTenantId, tenantId [{}]", tenantId);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
tenantResourcesRemover.removeEntities(tenantId, tenantId); tenantResourcesRemover.removeEntities(tenantId, tenantId);
} }

18
dao/src/main/java/org/thingsboard/server/dao/rpc/BaseRpcService.java
View File

@ -54,38 +54,38 @@ public class BaseRpcService implements RpcService {
@Override @Override
public void deleteRpc(TenantId tenantId, RpcId rpcId) { public void deleteRpc(TenantId tenantId, RpcId rpcId) {
log.trace("Executing deleteRpc, tenantId [{}], rpcId [{}]", tenantId, rpcId); log.trace("Executing deleteRpc, tenantId [{}], rpcId [{}]", tenantId, rpcId);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validateId(rpcId, INCORRECT_RPC_ID + rpcId); validateId(rpcId, id -> INCORRECT_RPC_ID + id);
rpcDao.removeById(tenantId, rpcId.getId()); rpcDao.removeById(tenantId, rpcId.getId());
} }
@Override @Override
public void deleteAllRpcByTenantId(TenantId tenantId) { public void deleteAllRpcByTenantId(TenantId tenantId) {
log.trace("Executing deleteAllRpcByTenantId, tenantId [{}]", tenantId); log.trace("Executing deleteAllRpcByTenantId, tenantId [{}]", tenantId);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
tenantRpcRemover.removeEntities(tenantId, tenantId); tenantRpcRemover.removeEntities(tenantId, tenantId);
} }
@Override @Override
public Rpc findById(TenantId tenantId, RpcId rpcId) { public Rpc findById(TenantId tenantId, RpcId rpcId) {
log.trace("Executing findById, tenantId [{}], rpcId [{}]", tenantId, rpcId); log.trace("Executing findById, tenantId [{}], rpcId [{}]", tenantId, rpcId);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validateId(rpcId, INCORRECT_RPC_ID + rpcId); validateId(rpcId, id -> INCORRECT_RPC_ID + id);
return rpcDao.findById(tenantId, rpcId.getId()); return rpcDao.findById(tenantId, rpcId.getId());
} }
@Override @Override
public ListenableFuture<Rpc> findRpcByIdAsync(TenantId tenantId, RpcId rpcId) { public ListenableFuture<Rpc> findRpcByIdAsync(TenantId tenantId, RpcId rpcId) {
log.trace("Executing findRpcByIdAsync, tenantId [{}], rpcId: [{}]", tenantId, rpcId); log.trace("Executing findRpcByIdAsync, tenantId [{}], rpcId: [{}]", tenantId, rpcId);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validateId(rpcId, INCORRECT_RPC_ID + rpcId); validateId(rpcId, id -> INCORRECT_RPC_ID + id);
return rpcDao.findByIdAsync(tenantId, rpcId.getId()); return rpcDao.findByIdAsync(tenantId, rpcId.getId());
} }
@Override @Override
public PageData<Rpc> findAllByDeviceIdAndStatus(TenantId tenantId, DeviceId deviceId, RpcStatus rpcStatus, PageLink pageLink) { public PageData<Rpc> findAllByDeviceIdAndStatus(TenantId tenantId, DeviceId deviceId, RpcStatus rpcStatus, PageLink pageLink) {
log.trace("Executing findAllByDeviceIdAndStatus, tenantId [{}], deviceId [{}], rpcStatus [{}], pageLink [{}]", tenantId, deviceId, rpcStatus, pageLink); log.trace("Executing findAllByDeviceIdAndStatus, tenantId [{}], deviceId [{}], rpcStatus [{}], pageLink [{}]", tenantId, deviceId, rpcStatus, pageLink);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validatePageLink(pageLink); validatePageLink(pageLink);
return rpcDao.findAllByDeviceIdAndStatus(tenantId, deviceId, rpcStatus, pageLink); return rpcDao.findAllByDeviceIdAndStatus(tenantId, deviceId, rpcStatus, pageLink);
} }
@ -93,7 +93,7 @@ public class BaseRpcService implements RpcService {
@Override @Override
public PageData<Rpc> findAllByDeviceId(TenantId tenantId, DeviceId deviceId, PageLink pageLink) { public PageData<Rpc> findAllByDeviceId(TenantId tenantId, DeviceId deviceId, PageLink pageLink) {
log.trace("Executing findAllByDeviceIdAndStatus, tenantId [{}], deviceId [{}], pageLink [{}]", tenantId, deviceId, pageLink); log.trace("Executing findAllByDeviceIdAndStatus, tenantId [{}], deviceId [{}], pageLink [{}]", tenantId, deviceId, pageLink);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validatePageLink(pageLink); validatePageLink(pageLink);
return rpcDao.findAllByDeviceId(tenantId, deviceId, pageLink); return rpcDao.findAllByDeviceId(tenantId, deviceId, pageLink);
} }

10
dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
View File

@ -645,8 +645,8 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
@Override @Override
public PageData<RuleChain> findRuleChainsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, PageLink pageLink) { public PageData<RuleChain> findRuleChainsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, PageLink pageLink) {
log.trace("Executing findRuleChainsByTenantIdAndEdgeId, tenantId [{}], edgeId [{}], pageLink [{}]", tenantId, edgeId, pageLink); log.trace("Executing findRuleChainsByTenantIdAndEdgeId, tenantId [{}], edgeId [{}], pageLink [{}]", tenantId, edgeId, pageLink);
Validator.validateId(tenantId, "Incorrect tenantId " + tenantId); Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
Validator.validateId(edgeId, "Incorrect edgeId " + edgeId); Validator.validateId(edgeId, id -> "Incorrect edgeId " + id);
Validator.validatePageLink(pageLink); Validator.validatePageLink(pageLink);
return ruleChainDao.findRuleChainsByTenantIdAndEdgeId(tenantId.getId(), edgeId.getId(), pageLink); return ruleChainDao.findRuleChainsByTenantIdAndEdgeId(tenantId.getId(), edgeId.getId(), pageLink);
} }
@ -705,14 +705,14 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
@Override @Override
public PageData<RuleChain> findAutoAssignToEdgeRuleChainsByTenantId(TenantId tenantId, PageLink pageLink) { public PageData<RuleChain> findAutoAssignToEdgeRuleChainsByTenantId(TenantId tenantId, PageLink pageLink) {
log.trace("Executing findAutoAssignToEdgeRuleChainsByTenantId, tenantId [{}], pageLink {}", tenantId, pageLink); log.trace("Executing findAutoAssignToEdgeRuleChainsByTenantId, tenantId [{}], pageLink {}", tenantId, pageLink);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
return ruleChainDao.findAutoAssignToEdgeRuleChainsByTenantId(tenantId.getId(), pageLink); return ruleChainDao.findAutoAssignToEdgeRuleChainsByTenantId(tenantId.getId(), pageLink);
} }
@Override @Override
public List<RuleNode> findRuleNodesByTenantIdAndType(TenantId tenantId, String type, String search) { public List<RuleNode> findRuleNodesByTenantIdAndType(TenantId tenantId, String type, String search) {
log.trace("Executing findRuleNodes, tenantId [{}], type {}, search {}", tenantId, type, search); log.trace("Executing findRuleNodes, tenantId [{}], type {}, search {}", tenantId, type, search);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validateString(type, "Incorrect type of the rule node"); validateString(type, "Incorrect type of the rule node");
validateString(search, "Incorrect search text"); validateString(search, "Incorrect search text");
return ruleNodeDao.findRuleNodesByTenantIdAndType(tenantId, type, search); return ruleNodeDao.findRuleNodesByTenantIdAndType(tenantId, type, search);
@ -721,7 +721,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
@Override @Override
public List<RuleNode> findRuleNodesByTenantIdAndType(TenantId tenantId, String type) { public List<RuleNode> findRuleNodesByTenantIdAndType(TenantId tenantId, String type) {
log.trace("Executing findRuleNodes, tenantId [{}], type {}", tenantId, type); log.trace("Executing findRuleNodes, tenantId [{}], type {}", tenantId, type);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
validateString(type, "Incorrect type of the rule node"); validateString(type, "Incorrect type of the rule node");
return ruleNodeDao.findRuleNodesByTenantIdAndType(tenantId, type, ""); return ruleNodeDao.findRuleNodesByTenantIdAndType(tenantId, type, "");
} }