From b6cbe0ca77201ebf78add35631d2f0ff264d6886 Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Tue, 24 May 2022 12:02:43 +0200
Subject: [PATCH] added additional info to queue configutation

---
 .../org/thingsboard/server/common/data/queue/Queue.java     | 1 +
 .../tenant/profile/TenantProfileQueueConfiguration.java     | 2 ++
 .../server/dao/service/validator/QueueValidator.java        | 6 +++---
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/queue/Queue.java b/common/data/src/main/java/org/thingsboard/server/common/data/queue/Queue.java
index f65609beae..b4d65706a2 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/queue/Queue.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/queue/Queue.java
@@ -52,6 +52,7 @@ public class Queue extends SearchTextBasedWithAdditionalInfo<QueueId> implements
         this.packProcessingTimeout = queueConfiguration.getPackProcessingTimeout();
         this.submitStrategy = queueConfiguration.getSubmitStrategy();
         this.processingStrategy = queueConfiguration.getProcessingStrategy();
+        setAdditionalInfo(queueConfiguration.getAdditionalInfo());
     }
 
     @Override
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/TenantProfileQueueConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/TenantProfileQueueConfiguration.java
index 8d3389af3a..300aab3096 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/TenantProfileQueueConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/TenantProfileQueueConfiguration.java
@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.common.data.tenant.profile;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
 import org.thingsboard.server.common.data.queue.ProcessingStrategy;
 import org.thingsboard.server.common.data.queue.SubmitStrategy;
@@ -29,4 +30,5 @@ public class TenantProfileQueueConfiguration {
     private long packProcessingTimeout;
     private SubmitStrategy submitStrategy;
     private ProcessingStrategy processingStrategy;
+    private JsonNode additionalInfo;
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/validator/QueueValidator.java b/dao/src/main/java/org/thingsboard/server/dao/service/validator/QueueValidator.java
index 8257a6e659..c8ce639d40 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/service/validator/QueueValidator.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/service/validator/QueueValidator.java
@@ -40,12 +40,12 @@ public class QueueValidator extends DataValidator<Queue> {
 
     @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()));
         }
+        if (queueDao.findQueueByTenantIdAndTopic(tenantId, queue.getTopic()) != null) {
+            throw new DataValidationException(String.format("Queue with topic: %s already exists!", queue.getTopic()));
+        }
     }
 
     @Override