created Queue validator
This commit is contained in:
YevhenBondarenko
parent
dc3c2cfec2
commit
3382ac4807
@ -71,9 +71,6 @@ public class DeviceProfileServiceImpl extends AbstractEntityService implements D
|
||||
@Autowired
|
||||
private CacheManager cacheManager;
|
||||
|
||||
@Autowired(required = false)
|
||||
private QueueService queueService;
|
||||
|
||||
@Autowired
|
||||
private DataValidator<DeviceProfile> deviceProfileValidator;
|
||||
|
||||
|
||||
@ -17,7 +17,6 @@ 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;
|
||||
@ -26,10 +25,7 @@ import org.thingsboard.server.common.data.id.QueueId;
|
||||
import org.thingsboard.server.common.data.id.TenantId;
|
||||
import org.thingsboard.server.common.data.page.PageData;
|
||||
import org.thingsboard.server.common.data.page.PageLink;
|
||||
import org.thingsboard.server.common.data.queue.ProcessingStrategy;
|
||||
import org.thingsboard.server.common.data.queue.Queue;
|
||||
import org.thingsboard.server.common.data.queue.SubmitStrategy;
|
||||
import org.thingsboard.server.common.data.queue.SubmitStrategyType;
|
||||
import org.thingsboard.server.dao.entity.AbstractEntityService;
|
||||
import org.thingsboard.server.dao.exception.DataValidationException;
|
||||
import org.thingsboard.server.dao.service.DataValidator;
|
||||
@ -50,6 +46,9 @@ public class BaseQueueService extends AbstractEntityService implements QueueServ
|
||||
@Autowired
|
||||
private TbTenantProfileCache tenantProfileCache;
|
||||
|
||||
@Autowired
|
||||
private DataValidator<Queue> queueValidator;
|
||||
|
||||
// @Autowired
|
||||
// private QueueStatsService queueStatsService;
|
||||
|
||||
@ -118,91 +117,6 @@ public class BaseQueueService extends AbstractEntityService implements QueueServ
|
||||
tenantQueuesRemover.removeEntities(tenantId, tenantId);
|
||||
}
|
||||
|
||||
private DataValidator<Queue> queueValidator =
|
||||
new DataValidator<>() {
|
||||
|
||||
@Override
|
||||
protected void validateCreate(TenantId tenantId, Queue queue) {
|
||||
if (queueDao.findQueueByTenantIdAndTopic(tenantId, queue.getTopic()) != null) {
|
||||
throw new DataValidationException(String.format("Queue with topic: %s already exists!", queue.getTopic()));
|
||||
}
|
||||
if (queueDao.findQueueByTenantIdAndName(tenantId, queue.getName()) != null) {
|
||||
throw new DataValidationException(String.format("Queue with name: %s already exists!", queue.getName()));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void validateUpdate(TenantId tenantId, Queue queue) {
|
||||
Queue foundQueue = queueDao.findById(tenantId, queue.getUuidId());
|
||||
if (queueDao.findById(tenantId, queue.getUuidId()) == null) {
|
||||
throw new DataValidationException(String.format("Queue with id: %s does not exists!", queue.getId()));
|
||||
}
|
||||
if (!foundQueue.getName().equals(queue.getName())) {
|
||||
throw new DataValidationException("Queue name can't be changed!");
|
||||
}
|
||||
if (!foundQueue.getTopic().equals(queue.getTopic())) {
|
||||
throw new DataValidationException("Queue topic can't be changed!");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void validateDataImpl(TenantId tenantId, Queue queue) {
|
||||
if (!tenantId.equals(TenantId.SYS_TENANT_ID)) {
|
||||
TenantProfile tenantProfile = tenantProfileCache.get(tenantId);
|
||||
|
||||
if (!tenantProfile.isIsolatedTbRuleEngine()) {
|
||||
throw new DataValidationException("Tenant should be isolated!");
|
||||
}
|
||||
}
|
||||
|
||||
if (StringUtils.isEmpty(queue.getName())) {
|
||||
throw new DataValidationException("Queue name should be specified!");
|
||||
}
|
||||
if (StringUtils.isBlank(queue.getTopic())) {
|
||||
throw new DataValidationException("Queue topic should be non empty and without spaces!");
|
||||
}
|
||||
if (queue.getPollInterval() < 1) {
|
||||
throw new DataValidationException("Queue poll interval should be more then 0!");
|
||||
}
|
||||
if (queue.getPartitions() < 1) {
|
||||
throw new DataValidationException("Queue partitions should be more then 0!");
|
||||
}
|
||||
if (queue.getPackProcessingTimeout() < 1) {
|
||||
throw new DataValidationException("Queue pack processing timeout should be more then 0!");
|
||||
}
|
||||
|
||||
SubmitStrategy submitStrategy = queue.getSubmitStrategy();
|
||||
if (submitStrategy == null) {
|
||||
throw new DataValidationException("Queue submit strategy can't be null!");
|
||||
}
|
||||
if (submitStrategy.getType() == null) {
|
||||
throw new DataValidationException("Queue submit strategy type can't be null!");
|
||||
}
|
||||
if (submitStrategy.getType() == SubmitStrategyType.BATCH && submitStrategy.getBatchSize() < 1) {
|
||||
throw new DataValidationException("Queue submit strategy batch size should be more then 0!");
|
||||
}
|
||||
ProcessingStrategy processingStrategy = queue.getProcessingStrategy();
|
||||
if (processingStrategy == null) {
|
||||
throw new DataValidationException("Queue processing strategy can't be null!");
|
||||
}
|
||||
if (processingStrategy.getType() == null) {
|
||||
throw new DataValidationException("Queue processing strategy type can't be null!");
|
||||
}
|
||||
if (processingStrategy.getRetries() < 0) {
|
||||
throw new DataValidationException("Queue processing strategy retries can't be less then 0!");
|
||||
}
|
||||
if (processingStrategy.getFailurePercentage() < 0 || processingStrategy.getFailurePercentage() > 100) {
|
||||
throw new DataValidationException("Queue processing strategy failure percentage should be in a range from 0 to 100!");
|
||||
}
|
||||
if (processingStrategy.getPauseBetweenRetries() < 0) {
|
||||
throw new DataValidationException("Queue processing strategy pause between retries can't be less then 0!");
|
||||
}
|
||||
if (processingStrategy.getMaxPauseBetweenRetries() < processingStrategy.getPauseBetweenRetries()) {
|
||||
throw new DataValidationException("Queue processing strategy MAX pause between retries can't be less then pause between retries!");
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
private PaginatedRemover<TenantId, Queue> tenantQueuesRemover =
|
||||
new PaginatedRemover<>() {
|
||||
|
||||
|
||||
@ -0,0 +1,121 @@
|
||||
/**
|
||||
* 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.dao.service.validator;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.thingsboard.server.common.data.TenantProfile;
|
||||
import org.thingsboard.server.common.data.id.TenantId;
|
||||
import org.thingsboard.server.common.data.queue.ProcessingStrategy;
|
||||
import org.thingsboard.server.common.data.queue.Queue;
|
||||
import org.thingsboard.server.common.data.queue.SubmitStrategy;
|
||||
import org.thingsboard.server.common.data.queue.SubmitStrategyType;
|
||||
import org.thingsboard.server.dao.exception.DataValidationException;
|
||||
import org.thingsboard.server.dao.queue.QueueDao;
|
||||
import org.thingsboard.server.dao.service.DataValidator;
|
||||
import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
|
||||
|
||||
@Component
|
||||
public class QueueValidator extends DataValidator<Queue> {
|
||||
|
||||
@Autowired
|
||||
private QueueDao queueDao;
|
||||
|
||||
@Autowired
|
||||
private TbTenantProfileCache tenantProfileCache;
|
||||
|
||||
@Override
|
||||
protected void validateCreate(TenantId tenantId, Queue queue) {
|
||||
if (queueDao.findQueueByTenantIdAndTopic(tenantId, queue.getTopic()) != null) {
|
||||
throw new DataValidationException(String.format("Queue with topic: %s already exists!", queue.getTopic()));
|
||||
}
|
||||
if (queueDao.findQueueByTenantIdAndName(tenantId, queue.getName()) != null) {
|
||||
throw new DataValidationException(String.format("Queue with name: %s already exists!", queue.getName()));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void validateUpdate(TenantId tenantId, Queue queue) {
|
||||
Queue foundQueue = queueDao.findById(tenantId, queue.getUuidId());
|
||||
if (queueDao.findById(tenantId, queue.getUuidId()) == null) {
|
||||
throw new DataValidationException(String.format("Queue with id: %s does not exists!", queue.getId()));
|
||||
}
|
||||
if (!foundQueue.getName().equals(queue.getName())) {
|
||||
throw new DataValidationException("Queue name can't be changed!");
|
||||
}
|
||||
if (!foundQueue.getTopic().equals(queue.getTopic())) {
|
||||
throw new DataValidationException("Queue topic can't be changed!");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void validateDataImpl(TenantId tenantId, Queue queue) {
|
||||
if (!tenantId.equals(TenantId.SYS_TENANT_ID)) {
|
||||
TenantProfile tenantProfile = tenantProfileCache.get(tenantId);
|
||||
|
||||
if (!tenantProfile.isIsolatedTbRuleEngine()) {
|
||||
throw new DataValidationException("Tenant should be isolated!");
|
||||
}
|
||||
}
|
||||
|
||||
if (StringUtils.isEmpty(queue.getName())) {
|
||||
throw new DataValidationException("Queue name should be specified!");
|
||||
}
|
||||
if (StringUtils.isBlank(queue.getTopic())) {
|
||||
throw new DataValidationException("Queue topic should be non empty and without spaces!");
|
||||
}
|
||||
if (queue.getPollInterval() < 1) {
|
||||
throw new DataValidationException("Queue poll interval should be more then 0!");
|
||||
}
|
||||
if (queue.getPartitions() < 1) {
|
||||
throw new DataValidationException("Queue partitions should be more then 0!");
|
||||
}
|
||||
if (queue.getPackProcessingTimeout() < 1) {
|
||||
throw new DataValidationException("Queue pack processing timeout should be more then 0!");
|
||||
}
|
||||
|
||||
SubmitStrategy submitStrategy = queue.getSubmitStrategy();
|
||||
if (submitStrategy == null) {
|
||||
throw new DataValidationException("Queue submit strategy can't be null!");
|
||||
}
|
||||
if (submitStrategy.getType() == null) {
|
||||
throw new DataValidationException("Queue submit strategy type can't be null!");
|
||||
}
|
||||
if (submitStrategy.getType() == SubmitStrategyType.BATCH && submitStrategy.getBatchSize() < 1) {
|
||||
throw new DataValidationException("Queue submit strategy batch size should be more then 0!");
|
||||
}
|
||||
ProcessingStrategy processingStrategy = queue.getProcessingStrategy();
|
||||
if (processingStrategy == null) {
|
||||
throw new DataValidationException("Queue processing strategy can't be null!");
|
||||
}
|
||||
if (processingStrategy.getType() == null) {
|
||||
throw new DataValidationException("Queue processing strategy type can't be null!");
|
||||
}
|
||||
if (processingStrategy.getRetries() < 0) {
|
||||
throw new DataValidationException("Queue processing strategy retries can't be less then 0!");
|
||||
}
|
||||
if (processingStrategy.getFailurePercentage() < 0 || processingStrategy.getFailurePercentage() > 100) {
|
||||
throw new DataValidationException("Queue processing strategy failure percentage should be in a range from 0 to 100!");
|
||||
}
|
||||
if (processingStrategy.getPauseBetweenRetries() < 0) {
|
||||
throw new DataValidationException("Queue processing strategy pause between retries can't be less then 0!");
|
||||
}
|
||||
if (processingStrategy.getMaxPauseBetweenRetries() < processingStrategy.getPauseBetweenRetries()) {
|
||||
throw new DataValidationException("Queue processing strategy MAX pause between retries can't be less then pause between retries!");
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user