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

added additional info to queue configutation

Browse Source
This commit is contained in:
YevhenBondarenko 2022-05-24 12:02:43 +02:00
parent ee8c9deda9
commit b6cbe0ca77
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/data/src/main/java/org/thingsboard/server/common/data/queue/Queue.java
View File

@ -52,6 +52,7 @@ public class Queue extends SearchTextBasedWithAdditionalInfo<QueueId> implements
this.packProcessingTimeout = queueConfiguration.getPackProcessingTimeout(); this.packProcessingTimeout = queueConfiguration.getPackProcessingTimeout();
this.submitStrategy = queueConfiguration.getSubmitStrategy(); this.submitStrategy = queueConfiguration.getSubmitStrategy();
this.processingStrategy = queueConfiguration.getProcessingStrategy(); this.processingStrategy = queueConfiguration.getProcessingStrategy();
setAdditionalInfo(queueConfiguration.getAdditionalInfo());
} }
@Override @Override

2
common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/TenantProfileQueueConfiguration.java
View File

@ -15,6 +15,7 @@
*/ */
package org.thingsboard.server.common.data.tenant.profile; package org.thingsboard.server.common.data.tenant.profile;
import com.fasterxml.jackson.databind.JsonNode;
import lombok.Data; import lombok.Data;
import org.thingsboard.server.common.data.queue.ProcessingStrategy; import org.thingsboard.server.common.data.queue.ProcessingStrategy;
import org.thingsboard.server.common.data.queue.SubmitStrategy; import org.thingsboard.server.common.data.queue.SubmitStrategy;
@ -29,4 +30,5 @@ public class TenantProfileQueueConfiguration {
private long packProcessingTimeout; private long packProcessingTimeout;
private SubmitStrategy submitStrategy; private SubmitStrategy submitStrategy;
private ProcessingStrategy processingStrategy; private ProcessingStrategy processingStrategy;
private JsonNode additionalInfo;
} }

6
dao/src/main/java/org/thingsboard/server/dao/service/validator/QueueValidator.java
View File

@ -40,12 +40,12 @@ public class QueueValidator extends DataValidator<Queue> {
@Override @Override
protected void validateCreate(TenantId tenantId, Queue queue) { 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) { if (queueDao.findQueueByTenantIdAndName(tenantId, queue.getName()) != null) {
throw new DataValidationException(String.format("Queue with name: %s already exists!", queue.getName())); throw new DataValidationException(String.format("Queue with name: %s already exists!", queue.getName()));
} }
if (queueDao.findQueueByTenantIdAndTopic(tenantId, queue.getTopic()) != null) {
throw new DataValidationException(String.format("Queue with topic: %s already exists!", queue.getTopic()));
}
} }
@Override @Override