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

added queue constraint processing

Browse Source
This commit is contained in:
YevhenBondarenko 2022-05-06 21:18:48 +02:00
parent 2839878b9e
commit 7dcb572dfd
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueService.java
View File

@ -18,6 +18,7 @@ package org.thingsboard.server.dao.queue;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.exception.ConstraintViolationException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.thingsboard.server.common.data.TenantProfile;
@ -62,7 +63,16 @@ public class BaseQueueService extends AbstractEntityService implements QueueServ
@Override
public void deleteQueue(TenantId tenantId, QueueId queueId) {
log.trace("Executing deleteQueue, queueId: [{}]", queueId);
queueDao.removeById(tenantId, queueId.getId());
try {
queueDao.removeById(tenantId, queueId.getId());
} catch (Exception t) {
ConstraintViolationException e = extractConstraintViolationException(t).orElse(null);
if (e != null && e.getConstraintName() != null && e.getConstraintName().equalsIgnoreCase("fk_default_queue_device_profile")) {
throw new DataValidationException("The queue referenced by the device profiles cannot be deleted!");
} else {
throw t;
}
}
}
@Override