From abe127c3faeb92152ee8aac5c7b37a65ca07b7eb Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Thu, 19 May 2022 01:18:13 +0200
Subject: [PATCH] fixed checkpoint node

---
 .../thingsboard/server/controller/QueueController.java |  1 +
 .../thingsboard/rule/engine/flow/TbCheckpointNode.java | 10 +++++++---
 .../engine/flow/TbCheckpointNodeConfiguration.java     |  2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/controller/QueueController.java b/application/src/main/java/org/thingsboard/server/controller/QueueController.java
index 3b7b407b47..9b83aa43fb 100644
--- a/application/src/main/java/org/thingsboard/server/controller/QueueController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/QueueController.java
@@ -107,6 +107,7 @@ public class QueueController extends BaseController {
         checkParameter("queueId", queueIdStr);
         try {
             QueueId queueId = new QueueId(UUID.fromString(queueIdStr));
+            checkQueueId(queueId, Operation.READ);
             return checkNotNull(queueService.findQueueById(getTenantId(), queueId));
         } catch (
                 Exception e) {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbCheckpointNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbCheckpointNode.java
index 470a774b90..ff69212c67 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbCheckpointNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbCheckpointNode.java
@@ -23,9 +23,12 @@ import org.thingsboard.rule.engine.api.TbNodeConfiguration;
 import org.thingsboard.rule.engine.api.TbNodeException;
 import org.thingsboard.rule.engine.api.TbRelationTypes;
 import org.thingsboard.rule.engine.api.util.TbNodeUtils;
+import org.thingsboard.server.common.data.id.QueueId;
 import org.thingsboard.server.common.data.plugin.ComponentType;
 import org.thingsboard.server.common.msg.TbMsg;
 
+import java.util.UUID;
+
 @Slf4j
 @RuleNode(
         type = ComponentType.FLOW,
@@ -38,16 +41,17 @@ import org.thingsboard.server.common.msg.TbMsg;
 )
 public class TbCheckpointNode implements TbNode {
 
-    private TbCheckpointNodeConfiguration config;
+    private QueueId queueId;
 
     @Override
     public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException {
-        this.config = TbNodeUtils.convert(configuration, TbCheckpointNodeConfiguration.class);
+        TbCheckpointNodeConfiguration config = TbNodeUtils.convert(configuration, TbCheckpointNodeConfiguration.class);
+        this.queueId = new QueueId(UUID.fromString(config.getQueueId()));
     }
 
     @Override
     public void onMsg(TbContext ctx, TbMsg msg) {
-        ctx.enqueueForTellNext(msg, config.getQueueId(), TbRelationTypes.SUCCESS, () -> ctx.ack(msg), error -> ctx.tellFailure(msg, error));
+        ctx.enqueueForTellNext(msg, queueId, TbRelationTypes.SUCCESS, () -> ctx.ack(msg), error -> ctx.tellFailure(msg, error));
     }
 
     @Override
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbCheckpointNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbCheckpointNodeConfiguration.java
index 0546732874..42bd6342c9 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbCheckpointNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbCheckpointNodeConfiguration.java
@@ -22,7 +22,7 @@ import org.thingsboard.server.common.data.id.QueueId;
 @Data
 public class TbCheckpointNodeConfiguration implements NodeConfiguration<TbCheckpointNodeConfiguration> {
 
-    private QueueId queueId;
+    private String queueId;
 
     @Override
     public TbCheckpointNodeConfiguration defaultConfiguration() {