From 100cdd5cf18f12859940db9284c38f17829a0473 Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Fri, 2 Feb 2024 14:00:30 +0100
Subject: [PATCH] refactored due to comments

---
 .../AbstractTbRuleEngineSubmitStrategy.java          | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractTbRuleEngineSubmitStrategy.java b/application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractTbRuleEngineSubmitStrategy.java
index 6f9a4c49c6..bfec9f747f 100644
--- a/application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractTbRuleEngineSubmitStrategy.java
+++ b/application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractTbRuleEngineSubmitStrategy.java
@@ -52,14 +52,12 @@ public abstract class AbstractTbRuleEngineSubmitStrategy implements TbRuleEngine
         List<IdMsgPair<TransportProtos.ToRuleEngineMsg>> newOrderedMsgList = new ArrayList<>(reprocessMap.size());
         for (IdMsgPair<TransportProtos.ToRuleEngineMsg> pair : orderedMsgList) {
             if (reprocessMap.containsKey(pair.uuid)) {
-                var oldValue = pair.getMsg().getValue();
-                if (StringUtils.isNotEmpty(oldValue.getFailureMessage())) {
-                    var newValue = TransportProtos.ToRuleEngineMsg.newBuilder()
-                            .setTenantIdMSB(oldValue.getTenantIdMSB())
-                            .setTenantIdLSB(oldValue.getTenantIdLSB())
-                            .setTbMsg(oldValue.getTbMsg())
+                if (StringUtils.isNotEmpty(pair.getMsg().getValue().getFailureMessage())) {
+                    var toRuleEngineMsg = TransportProtos.ToRuleEngineMsg.newBuilder(pair.getMsg().getValue())
+                            .clearFailureMessage()
+                            .clearRelationTypes()
                             .build();
-                    var newMsg = new TbProtoQueueMsg<>(pair.getMsg().getKey(), newValue, pair.getMsg().getHeaders());
+                    var newMsg = new TbProtoQueueMsg<>(pair.getMsg().getKey(), toRuleEngineMsg, pair.getMsg().getHeaders());
                     newOrderedMsgList.add(new IdMsgPair<>(pair.getUuid(), newMsg));
                 } else {
                     newOrderedMsgList.add(pair);