From ad3e4849989c95a4ecc187a8215a6fd74a37ef2f Mon Sep 17 00:00:00 2001
From: ShvaykaD <dshvaika@thingsboard.io>
Date: Fri, 19 Aug 2022 16:56:36 +0300
Subject: [PATCH 1/2] set default for destroy method in TbNode interface

---
 .../main/java/org/thingsboard/rule/engine/api/TbNode.java    | 2 +-
 .../rule/engine/action/TbAbstractCustomerActionNode.java     | 3 +++
 .../rule/engine/action/TbAbstractRelationActionNode.java     | 3 +++
 .../rule/engine/action/TbCopyAttributesToEntityViewNode.java | 3 ---
 .../org/thingsboard/rule/engine/action/TbMsgCountNode.java   | 3 ---
 .../thingsboard/rule/engine/edge/AbstractTbMsgPushNode.java  | 4 ----
 .../rule/engine/filter/TbCheckAlarmStatusNode.java           | 3 ---
 .../thingsboard/rule/engine/filter/TbCheckMessageNode.java   | 4 ----
 .../thingsboard/rule/engine/filter/TbCheckRelationNode.java  | 4 ----
 .../thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java  | 4 ----
 .../thingsboard/rule/engine/filter/TbMsgTypeSwitchNode.java  | 4 ----
 .../rule/engine/filter/TbOriginatorTypeFilterNode.java       | 4 ----
 .../rule/engine/filter/TbOriginatorTypeSwitchNode.java       | 4 ----
 .../java/org/thingsboard/rule/engine/flow/TbAckNode.java     | 3 ---
 .../org/thingsboard/rule/engine/flow/TbCheckpointNode.java   | 3 ---
 .../thingsboard/rule/engine/flow/TbRuleChainInputNode.java   | 3 ---
 .../thingsboard/rule/engine/flow/TbRuleChainOutputNode.java  | 3 ---
 .../thingsboard/rule/engine/geo/AbstractGeofencingNode.java  | 5 -----
 .../org/thingsboard/rule/engine/mail/TbMsgToEmailNode.java   | 4 ----
 .../org/thingsboard/rule/engine/mail/TbSendEmailNode.java    | 4 ----
 .../rule/engine/metadata/TbAbstractGetAttributesNode.java    | 4 ----
 .../rule/engine/metadata/TbAbstractGetEntityDetailsNode.java | 4 ----
 .../rule/engine/metadata/TbEntityGetAttrNode.java            | 5 -----
 .../rule/engine/metadata/TbGetOriginatorFieldsNode.java      | 4 ----
 .../thingsboard/rule/engine/metadata/TbGetTelemetryNode.java | 4 ----
 .../org/thingsboard/rule/engine/rpc/TbSendRPCReplyNode.java  | 4 ----
 .../rule/engine/telemetry/TbMsgAttributesNode.java           | 4 ----
 .../rule/engine/transaction/TbSynchronizationBeginNode.java  | 4 ----
 .../rule/engine/transaction/TbSynchronizationEndNode.java    | 3 ---
 .../rule/engine/transform/TbChangeOriginatorNode.java        | 4 ----
 30 files changed, 7 insertions(+), 103 deletions(-)

diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbNode.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbNode.java
index 8780833a5e..1516b6957c 100644
--- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbNode.java
+++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbNode.java
@@ -29,7 +29,7 @@ public interface TbNode {
 
     void onMsg(TbContext ctx, TbMsg msg) throws ExecutionException, InterruptedException, TbNodeException;
 
-    void destroy();
+    default void destroy() {}
 
     default void onPartitionChangeMsg(TbContext ctx, PartitionChangeMsg msg) {}
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractCustomerActionNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractCustomerActionNode.java
index 0cd637c01c..efff637e57 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractCustomerActionNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractCustomerActionNode.java
@@ -92,6 +92,9 @@ public abstract class TbAbstractCustomerActionNode<C extends TbAbstractCustomerA
 
     @Override
     public void destroy() {
+        if (customerIdCache != null) {
+            customerIdCache.invalidateAll();
+        }
     }
 
     @Data
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractRelationActionNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractRelationActionNode.java
index 82d80dd127..7a63a60479 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractRelationActionNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractRelationActionNode.java
@@ -88,6 +88,9 @@ public abstract class TbAbstractRelationActionNode<C extends TbAbstractRelationA
 
     @Override
     public void destroy() {
+        if (entityIdCache != null) {
+            entityIdCache.invalidateAll();
+        }
     }
 
     protected ListenableFuture<RelationContainer> processEntityRelationAction(TbContext ctx, TbMsg msg, String relationType) {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCopyAttributesToEntityViewNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCopyAttributesToEntityViewNode.java
index 73e03892c9..fd69303501 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCopyAttributesToEntityViewNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCopyAttributesToEntityViewNode.java
@@ -158,7 +158,4 @@ public class TbCopyAttributesToEntityViewNode implements TbNode {
         return CollectionsUtil.contains(keys, attrKey);
     }
 
-    @Override
-    public void destroy() {
-    }
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbMsgCountNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbMsgCountNode.java
index 22bed5b4e4..2d34972bfa 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbMsgCountNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbMsgCountNode.java
@@ -98,7 +98,4 @@ public class TbMsgCountNode implements TbNode {
         ctx.tellSelf(tickMsg, curDelay);
     }
 
-    @Override
-    public void destroy() {
-    }
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/AbstractTbMsgPushNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/AbstractTbMsgPushNode.java
index eb30a236af..28dc64c068 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/AbstractTbMsgPushNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/AbstractTbMsgPushNode.java
@@ -71,10 +71,6 @@ public abstract class AbstractTbMsgPushNode<T extends BaseTbMsgPushNodeConfigura
         }
     }
 
-    @Override
-    public void destroy() {
-    }
-
     protected S buildEvent(TbMsg msg, TbContext ctx) {
         String msgType = msg.getType();
         if (DataConstants.ALARM.equals(msgType)) {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNode.java
index 8ab7059e41..4c511ca720 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNode.java
@@ -93,7 +93,4 @@ public class TbCheckAlarmStatusNode implements TbNode {
         }
     }
 
-    @Override
-    public void destroy() {
-    }
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckMessageNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckMessageNode.java
index 590aae1e95..de0bd07461 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckMessageNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckMessageNode.java
@@ -68,10 +68,6 @@ public class TbCheckMessageNode implements TbNode {
         }
     }
 
-    @Override
-    public void destroy() {
-    }
-
     private boolean allKeysData(TbMsg msg) {
         if (!messageNamesList.isEmpty()) {
             Map<String, String> dataMap = dataToMap(msg);
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckRelationNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckRelationNode.java
index c4bc9641a4..4832a0af35 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckRelationNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckRelationNode.java
@@ -103,8 +103,4 @@ public class TbCheckRelationNode implements TbNode {
         }
     }
 
-    @Override
-    public void destroy() {
-
-    }
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java
index fd292be43e..aeddcd18d3 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java
@@ -52,8 +52,4 @@ public class TbMsgTypeFilterNode implements TbNode {
         ctx.tellNext(msg, config.getMessageTypes().contains(msg.getType()) ? "True" : "False");
     }
 
-    @Override
-    public void destroy() {
-
-    }
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeSwitchNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeSwitchNode.java
index 696212c9cb..62e44bb50e 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeSwitchNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeSwitchNode.java
@@ -117,8 +117,4 @@ public class TbMsgTypeSwitchNode implements TbNode {
         ctx.tellNext(msg, relationType);
     }
 
-    @Override
-    public void destroy() {
-
-    }
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeFilterNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeFilterNode.java
index 8b893c0396..10ccc77dc1 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeFilterNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeFilterNode.java
@@ -51,8 +51,4 @@ public class TbOriginatorTypeFilterNode implements TbNode {
         ctx.tellNext(msg, config.getOriginatorTypes().contains(originatorType) ? "True" : "False");
     }
 
-    @Override
-    public void destroy() {
-
-    }
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeSwitchNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeSwitchNode.java
index d44c555f8c..e5c06c3878 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeSwitchNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeSwitchNode.java
@@ -90,8 +90,4 @@ public class TbOriginatorTypeSwitchNode implements TbNode {
         ctx.tellNext(msg, relationType);
     }
 
-    @Override
-    public void destroy() {
-
-    }
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbAckNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbAckNode.java
index 801a31fbb6..64938092f6 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbAckNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbAckNode.java
@@ -51,7 +51,4 @@ public class TbAckNode implements TbNode {
         ctx.tellSuccess(msg);
     }
 
-    @Override
-    public void destroy() {
-    }
 }
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 3fa2b5d64e..ececf96303 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
@@ -54,7 +54,4 @@ public class TbCheckpointNode implements TbNode {
         ctx.enqueueForTellNext(msg, queueName, TbRelationTypes.SUCCESS, () -> ctx.ack(msg), error -> ctx.tellFailure(msg, error));
     }
 
-    @Override
-    public void destroy() {
-    }
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNode.java
index eb2e6bb249..fc4a1edfc9 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNode.java
@@ -63,7 +63,4 @@ public class TbRuleChainInputNode implements TbNode {
         ctx.input(msg, ruleChainId);
     }
 
-    @Override
-    public void destroy() {
-    }
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbRuleChainOutputNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbRuleChainOutputNode.java
index 5b014d8bc4..bc701dd56a 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbRuleChainOutputNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbRuleChainOutputNode.java
@@ -51,7 +51,4 @@ public class TbRuleChainOutputNode implements TbNode {
         ctx.output(msg, ctx.getSelf().getName());
     }
 
-    @Override
-    public void destroy() {
-    }
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/AbstractGeofencingNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/AbstractGeofencingNode.java
index 40bbd6f506..af35e88b81 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/AbstractGeofencingNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/AbstractGeofencingNode.java
@@ -148,9 +148,4 @@ public abstract class AbstractGeofencingNode<T extends TbGpsGeofencingFilterNode
         return value;
     }
 
-    @Override
-    public void destroy() {
-
-    }
-
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNode.java
index 28732c53e9..e04c9f606d 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNode.java
@@ -110,8 +110,4 @@ public class TbMsgToEmailNode implements TbNode {
         }
     }
 
-    @Override
-    public void destroy() {
-
-    }
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNode.java
index bf65dc1fc3..d362545247 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNode.java
@@ -107,10 +107,6 @@ public class TbSendEmailNode implements TbNode {
         }
     }
 
-    @Override
-    public void destroy() {
-    }
-
     private JavaMailSenderImpl createMailSender() {
         JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
         mailSender.setHost(this.config.getSmtpHost());
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetAttributesNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetAttributesNode.java
index 47d6af8e9c..b2c029589c 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetAttributesNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetAttributesNode.java
@@ -79,10 +79,6 @@ public abstract class TbAbstractGetAttributesNode<C extends TbGetAttributesNodeC
         }
     }
 
-    @Override
-    public void destroy() {
-    }
-
     protected abstract ListenableFuture<T> findEntityIdAsync(TbContext ctx, TbMsg msg);
 
     private void safePutAttributes(TbContext ctx, TbMsg msg, T entityId) {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetEntityDetailsNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetEntityDetailsNode.java
index 75d1869e6d..490a42a72c 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetEntityDetailsNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetEntityDetailsNode.java
@@ -63,10 +63,6 @@ public abstract class TbAbstractGetEntityDetailsNode<C extends TbAbstractGetEnti
                 t -> ctx.tellFailure(msg, t), ctx.getDbCallbackExecutor());
     }
 
-    @Override
-    public void destroy() {
-    }
-
     protected abstract C loadGetEntityDetailsNodeConfiguration(TbNodeConfiguration configuration) throws TbNodeException;
 
     protected abstract ListenableFuture<TbMsg> getDetails(TbContext ctx, TbMsg msg);
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java
index b1eaea0bbd..28fd920264 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java
@@ -100,11 +100,6 @@ public abstract class TbEntityGetAttrNode<T extends EntityId> implements TbNode
         ctx.tellSuccess(msg);
     }
 
-    @Override
-    public void destroy() {
-
-    }
-
     protected abstract ListenableFuture<T> findEntityAsync(TbContext ctx, EntityId originator);
 
     public void setConfig(TbGetEntityAttrNodeConfiguration config) {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNode.java
index f5d52c96ea..25579d81ed 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNode.java
@@ -80,8 +80,4 @@ public class TbGetOriginatorFieldsNode implements TbNode {
         }
     }
 
-    @Override
-    public void destroy() {
-
-    }
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNode.java
index 320502005b..71d0e18549 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNode.java
@@ -125,10 +125,6 @@ public class TbGetTelemetryNode implements TbNode {
         }
     }
 
-    @Override
-    public void destroy() {
-    }
-
     private List<ReadTsKvQuery> buildQueries(TbMsg msg, List<String> keys) {
         final Interval interval = getInterval(msg);
         final long aggIntervalStep = Aggregation.NONE.equals(aggregation) ? 1 :
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rpc/TbSendRPCReplyNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rpc/TbSendRPCReplyNode.java
index 36497df564..85acf4c5ea 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rpc/TbSendRPCReplyNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rpc/TbSendRPCReplyNode.java
@@ -70,8 +70,4 @@ public class TbSendRPCReplyNode implements TbNode {
         }
     }
 
-    @Override
-    public void destroy() {
-    }
-
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNode.java
index 56e1ca8577..ae569de2af 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNode.java
@@ -75,8 +75,4 @@ public class TbMsgAttributesNode implements TbNode {
         );
     }
 
-    @Override
-    public void destroy() {
-    }
-
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbSynchronizationBeginNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbSynchronizationBeginNode.java
index ad846b6a29..21f1a9d82f 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbSynchronizationBeginNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbSynchronizationBeginNode.java
@@ -49,8 +49,4 @@ public class TbSynchronizationBeginNode implements TbNode {
         ctx.tellSuccess(msg);
     }
 
-    @Override
-    public void destroy() {
-
-    }
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbSynchronizationEndNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbSynchronizationEndNode.java
index f346fcf497..5cb81399c6 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbSynchronizationEndNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbSynchronizationEndNode.java
@@ -48,7 +48,4 @@ public class TbSynchronizationEndNode implements TbNode {
         ctx.tellSuccess(msg);
     }
 
-    @Override
-    public void destroy() {
-    }
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java
index a59980849d..b48f666184 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java
@@ -108,8 +108,4 @@ public class TbChangeOriginatorNode extends TbAbstractTransformNode {
 
     }
 
-    @Override
-    public void destroy() {
-
-    }
 }

From ddd8f3c18b423e83727a41140e82f58c79ae2197 Mon Sep 17 00:00:00 2001
From: ShvaykaD <dshvaika@thingsboard.io>
Date: Fri, 19 Aug 2022 17:30:53 +0300
Subject: [PATCH 2/2] remove destroy method impl for TbSendRPCRequestNode

---
 .../org/thingsboard/rule/engine/rpc/TbSendRPCRequestNode.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rpc/TbSendRPCRequestNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rpc/TbSendRPCRequestNode.java
index 45b45e91f9..27e83a2614 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rpc/TbSendRPCRequestNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rpc/TbSendRPCRequestNode.java
@@ -127,10 +127,6 @@ public class TbSendRPCRequestNode implements TbNode {
         }
     }
 
-    @Override
-    public void destroy() {
-    }
-
     private String wrap(String name, String body) {
         JsonObject json = new JsonObject();
         json.addProperty(name, body);