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

Remove unnecessary isSupportedOriginator for TbPushNode in order not to support 2 places of possible types: there is check after fetching during processing edge events from db

Browse Source
This commit is contained in:
Andrii Landiak 2024-01-04 14:50:15 +02:00
parent c43a265868
commit 05f5961fac
1 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/AbstractTbMsgPushNode.java
View File

@ -66,16 +66,10 @@ public abstract class AbstractTbMsgPushNode<T extends BaseTbMsgPushNodeConfigura
ctx.ack(msg); ctx.ack(msg);
return; return;
} }
if (isSupportedOriginator(msg.getOriginator().getEntityType())) { if (isSupportedMsgType(msg)) {
if (isSupportedMsgType(msg)) { processMsg(ctx, msg);
processMsg(ctx, msg);
} else {
String errMsg = String.format("Unsupported msg type %s", msg.getType());
log.debug(errMsg);
ctx.tellFailure(msg, new RuntimeException(errMsg));
}
} else { } else {
String errMsg = String.format("Unsupported originator type %s", msg.getOriginator().getEntityType()); String errMsg = String.format("Unsupported msg type %s", msg.getType());
log.debug(errMsg); log.debug(errMsg);
ctx.tellFailure(msg, new RuntimeException(errMsg)); ctx.tellFailure(msg, new RuntimeException(errMsg));
} }
@ -183,20 +177,4 @@ public abstract class AbstractTbMsgPushNode<T extends BaseTbMsgPushNodeConfigura
return msg.isTypeOneOf(POST_TELEMETRY_REQUEST, POST_ATTRIBUTES_REQUEST, ATTRIBUTES_UPDATED, return msg.isTypeOneOf(POST_TELEMETRY_REQUEST, POST_ATTRIBUTES_REQUEST, ATTRIBUTES_UPDATED,
ATTRIBUTES_DELETED, TIMESERIES_UPDATED, ALARM, CONNECT_EVENT, DISCONNECT_EVENT, ACTIVITY_EVENT, INACTIVITY_EVENT); ATTRIBUTES_DELETED, TIMESERIES_UPDATED, ALARM, CONNECT_EVENT, DISCONNECT_EVENT, ACTIVITY_EVENT, INACTIVITY_EVENT);
} }
protected boolean isSupportedOriginator(EntityType entityType) {
switch (entityType) {
case DEVICE:
case ASSET:
case ENTITY_VIEW:
case DASHBOARD:
case TENANT:
case CUSTOMER:
case USER:
case EDGE:
return true;
default:
return false;
}
}
} }