From 97f01314f4b8c7deaf5b4f72fa6786f3eb0fd388 Mon Sep 17 00:00:00 2001
From: ShvaykaD <dshvaika@thingsboard.io>
Date: Tue, 24 Jan 2023 12:45:05 +0200
Subject: [PATCH] updated tests and default rule node configuration

---
 .../server/cache/rule/DefaultRuleNodeCache.java       |  1 -
 .../TbMsgDeduplicationNodeConfiguration.java          |  3 +++
 .../engine/action/TbMsgDeduplicationNodeTest.java     | 11 +++++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/rule/DefaultRuleNodeCache.java b/common/cache/src/main/java/org/thingsboard/server/cache/rule/DefaultRuleNodeCache.java
index cc76cf9688..9631df5e08 100644
--- a/common/cache/src/main/java/org/thingsboard/server/cache/rule/DefaultRuleNodeCache.java
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/rule/DefaultRuleNodeCache.java
@@ -28,7 +28,6 @@ import java.util.TreeSet;
 
 @Service
 @ConditionalOnProperty(prefix = "cache", value = "type", havingValue = "caffeine", matchIfMissing = true)
-@Slf4j
 public class DefaultRuleNodeCache implements RuleNodeCache {
 
     private final Map<String, Set<byte[]>> cache;
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/deduplication/TbMsgDeduplicationNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/deduplication/TbMsgDeduplicationNodeConfiguration.java
index afb9cc62b6..8f3fa6f371 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/deduplication/TbMsgDeduplicationNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/deduplication/TbMsgDeduplicationNodeConfiguration.java
@@ -21,6 +21,8 @@ import org.thingsboard.rule.engine.api.NodeConfiguration;
 @Data
 public class TbMsgDeduplicationNodeConfiguration implements NodeConfiguration<TbMsgDeduplicationNodeConfiguration> {
 
+    private static final String DEFAULT_QUEUE_NAME = "Main";
+
     private int interval;
     private DeduplicationId id;
     private DeduplicationStrategy strategy;
@@ -39,6 +41,7 @@ public class TbMsgDeduplicationNodeConfiguration implements NodeConfiguration<Tb
         configuration.setInterval(60);
         configuration.setId(DeduplicationId.ORIGINATOR);
         configuration.setStrategy(DeduplicationStrategy.FIRST);
+        configuration.setQueueName(DEFAULT_QUEUE_NAME);
         configuration.setMaxPendingMsgs(100);
         configuration.setMaxRetries(3);
         return configuration;
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbMsgDeduplicationNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbMsgDeduplicationNodeTest.java
index 2dc4054c50..299e9f896d 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbMsgDeduplicationNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbMsgDeduplicationNodeTest.java
@@ -17,6 +17,7 @@ package org.thingsboard.rule.engine.action;
 
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.protobuf.ByteString;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
@@ -54,6 +55,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
@@ -175,7 +177,7 @@ public class TbMsgDeduplicationNodeTest {
         verify(ctx, times(1)).tellFailure(eq(msgToReject), any());
         verify(node, times(msgCount + wantedNumberOfTellSelfInvocation + 1)).onMsg(eq(ctx), any());
         verify(ctx, times(1)).enqueueForTellNext(newMsgCaptor.capture(), eq(TbRelationTypes.SUCCESS), successCaptor.capture(), failureCaptor.capture());
-        Assertions.assertEquals(inputMsgs.get(0), newMsgCaptor.getValue());
+        Assertions.assertEquals(TbMsg.toByteString(inputMsgs.get(0)), TbMsg.toByteString(newMsgCaptor.getValue()));
     }
 
     @Test
@@ -214,7 +216,7 @@ public class TbMsgDeduplicationNodeTest {
         verify(ctx, times(1)).tellFailure(eq(msgToReject), any());
         verify(node, times(msgCount + wantedNumberOfTellSelfInvocation + 1)).onMsg(eq(ctx), any());
         verify(ctx, times(1)).enqueueForTellNext(newMsgCaptor.capture(), eq(TbRelationTypes.SUCCESS), successCaptor.capture(), failureCaptor.capture());
-        Assertions.assertEquals(msgWithLatestTs, newMsgCaptor.getValue());
+        Assertions.assertEquals(TbMsg.toByteString(msgWithLatestTs), TbMsg.toByteString(newMsgCaptor.getValue()));
     }
 
     @Test
@@ -351,8 +353,9 @@ public class TbMsgDeduplicationNodeTest {
 
         List<TbMsg> resultMsgs = newMsgCaptor.getAllValues();
         Assertions.assertEquals(2, resultMsgs.size());
-        Assertions.assertTrue(resultMsgs.contains(msgWithLatestTsInFirstPack));
-        Assertions.assertTrue(resultMsgs.contains(msgWithLatestTsInSecondPack));
+        List<ByteString> resultMsgsByteStrings = resultMsgs.stream().map(TbMsg::toByteString).collect(Collectors.toList());
+        Assertions.assertTrue(resultMsgsByteStrings.contains(TbMsg.toByteString(msgWithLatestTsInFirstPack)));
+        Assertions.assertTrue(resultMsgsByteStrings.contains(TbMsg.toByteString(msgWithLatestTsInSecondPack)));
     }
 
     private TbMsg getMsgWithLatestTs(List<TbMsg> firstMsgPack) {