From 978861e56c1557e78f3e61ae026a9f01691db717 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Mon, 18 Apr 2022 11:35:07 +0300
Subject: [PATCH] Minor refactoring. Added missing timeseries_updated message
 type

---
 .../rule/engine/edge/AbstractTbMsgPushNode.java          | 5 +++--
 .../rule/engine/edge/TbMsgPushToCloudNode.java           | 2 +-
 .../rule/engine/edge/TbMsgPushToEdgeNode.java            | 9 +++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

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 7ba94779d1..f8865bd4fd 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
@@ -111,7 +111,7 @@ public abstract class AbstractTbMsgPushNode<T extends BaseTbMsgPushNodeConfigura
         }
     }
 
-    abstract S buildEvent(TenantId tenantId, EdgeEventActionType edgeEventAction, UUID entityId, U edgeEventType, JsonNode entityBody);
+    abstract S buildEvent(TenantId tenantId, EdgeEventActionType eventAction, UUID entityId, U eventType, JsonNode entityBody);
 
     abstract U getEventTypeByEntityType(EntityType entityType);
 
@@ -139,7 +139,8 @@ public abstract class AbstractTbMsgPushNode<T extends BaseTbMsgPushNodeConfigura
 
     protected EdgeEventActionType getEdgeEventActionTypeByMsgType(String msgType) {
         EdgeEventActionType actionType;
-        if (SessionMsgType.POST_TELEMETRY_REQUEST.name().equals(msgType)) {
+        if (SessionMsgType.POST_TELEMETRY_REQUEST.name().equals(msgType)
+                || DataConstants.TIMESERIES_UPDATED.equals(msgType)) {
             actionType = EdgeEventActionType.TIMESERIES_UPDATED;
         } else if (DataConstants.ATTRIBUTES_UPDATED.equals(msgType)) {
             actionType = EdgeEventActionType.ATTRIBUTES_UPDATED;
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToCloudNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToCloudNode.java
index e8524484a3..c7bf3bed0e 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToCloudNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToCloudNode.java
@@ -64,7 +64,7 @@ public class TbMsgPushToCloudNode extends AbstractTbMsgPushNode<TbMsgPushToCloud
     // Implementation of this node is done on the Edge
 
     @Override
-    Object buildEvent(TenantId tenantId, EdgeEventActionType edgeEventAction, UUID entityId, Object edgeEventType, JsonNode entityBody) {
+    Object buildEvent(TenantId tenantId, EdgeEventActionType eventAction, UUID entityId, Object eventType, JsonNode entityBody) {
         return null;
     }
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java
index 15843d3f56..4b08c7a0b4 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java
@@ -74,13 +74,13 @@ public class TbMsgPushToEdgeNode extends AbstractTbMsgPushNode<TbMsgPushToEdgeNo
     static final int DEFAULT_PAGE_SIZE = 100;
 
     @Override
-    EdgeEvent buildEvent(TenantId tenantId, EdgeEventActionType edgeEventAction, UUID entityId,
-                         EdgeEventType edgeEventType, JsonNode entityBody) {
+    EdgeEvent buildEvent(TenantId tenantId, EdgeEventActionType eventAction, UUID entityId,
+                         EdgeEventType eventType, JsonNode entityBody) {
         EdgeEvent edgeEvent = new EdgeEvent();
         edgeEvent.setTenantId(tenantId);
-        edgeEvent.setAction(edgeEventAction);
+        edgeEvent.setAction(eventAction);
         edgeEvent.setEntityId(entityId);
-        edgeEvent.setType(edgeEventType);
+        edgeEvent.setType(eventType);
         edgeEvent.setBody(entityBody);
         return edgeEvent;
     }
@@ -105,6 +105,7 @@ public class TbMsgPushToEdgeNode extends AbstractTbMsgPushNode<TbMsgPushToEdgeNo
         return TbMsgPushToEdgeNodeConfiguration.class;
     }
 
+    @Override
     protected void processMsg(TbContext ctx, TbMsg msg) {
         if (EntityType.EDGE.equals(msg.getOriginator().getEntityType())) {
             EdgeEvent edgeEvent = buildEvent(msg, ctx);