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

refactored due to comments

Browse Source
This commit is contained in:
YevhenBondarenko 2024-02-02 14:00:30 +01:00
parent bf9c4af2aa
commit 100cdd5cf1
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractTbRuleEngineSubmitStrategy.java
View File

@ -52,14 +52,12 @@ public abstract class AbstractTbRuleEngineSubmitStrategy implements TbRuleEngine
List<IdMsgPair<TransportProtos.ToRuleEngineMsg>> newOrderedMsgList = new ArrayList<>(reprocessMap.size()); List<IdMsgPair<TransportProtos.ToRuleEngineMsg>> newOrderedMsgList = new ArrayList<>(reprocessMap.size());
for (IdMsgPair<TransportProtos.ToRuleEngineMsg> pair : orderedMsgList) { for (IdMsgPair<TransportProtos.ToRuleEngineMsg> pair : orderedMsgList) {
if (reprocessMap.containsKey(pair.uuid)) { if (reprocessMap.containsKey(pair.uuid)) {
var oldValue = pair.getMsg().getValue(); if (StringUtils.isNotEmpty(pair.getMsg().getValue().getFailureMessage())) {
if (StringUtils.isNotEmpty(oldValue.getFailureMessage())) { var toRuleEngineMsg = TransportProtos.ToRuleEngineMsg.newBuilder(pair.getMsg().getValue())
var newValue = TransportProtos.ToRuleEngineMsg.newBuilder() .clearFailureMessage()
.setTenantIdMSB(oldValue.getTenantIdMSB()) .clearRelationTypes()
.setTenantIdLSB(oldValue.getTenantIdLSB())
.setTbMsg(oldValue.getTbMsg())
.build(); .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)); newOrderedMsgList.add(new IdMsgPair<>(pair.getUuid(), newMsg));
} else { } else {
newOrderedMsgList.add(pair); newOrderedMsgList.add(pair);