From 370c43affbfb5c4e9dbf93af0940625c9e743e44 Mon Sep 17 00:00:00 2001 From: Yuriy Lytvynchuk Date: Wed, 21 Sep 2022 12:27:47 +0300 Subject: [PATCH] add Exception --- .../rule/engine/transform/TbChangeOriginatorNode.java | 8 ++++---- .../rule/engine/util/EntitiesByNameAndTypeLoader.java | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) 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 b47988e0f3..60ce154a29 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 @@ -93,11 +93,11 @@ public class TbChangeOriginatorNode extends TbAbstractTransformNode { case ENTITY_SOURCE: EntityType entityType = EntityType.valueOf(config.getEntityType()); String entityName = TbNodeUtils.processPattern(config.getEntityNamePattern(), msg); - EntityId targetEntity = EntitiesByNameAndTypeLoader.findEntityId(ctx, entityType, entityName); - if (targetEntity != null) { + try { + EntityId targetEntity = EntitiesByNameAndTypeLoader.findEntityId(ctx, entityType, entityName); return Futures.immediateFuture(targetEntity); - } else { - return Futures.immediateFailedFuture(new IllegalStateException("Failed to found " + entityType.name() + " entity by name: '" + entityName + "'!")); + } catch (IllegalStateException e) { + return Futures.immediateFailedFuture(e); } default: return Futures.immediateFailedFuture(new IllegalStateException("Unexpected originator source " + config.getOriginatorSource())); diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesByNameAndTypeLoader.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesByNameAndTypeLoader.java index 14cc95299a..566ef37924 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesByNameAndTypeLoader.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesByNameAndTypeLoader.java @@ -83,6 +83,11 @@ public class EntitiesByNameAndTypeLoader { targetEntity = user.getId(); } break; + default: + throw new IllegalStateException("Unexpected entity type " + entityType.name()); + } + if (targetEntity == null) { + throw new IllegalStateException("Failed to found " + entityType.name() + " entity by name: '" + entityName + "'!"); } return targetEntity; }