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

add Exception

Browse Source
This commit is contained in:
Yuriy Lytvynchuk 2022-09-21 12:27:47 +03:00
parent a383efdb4a
commit 370c43affb
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java
View File

@ -93,11 +93,11 @@ public class TbChangeOriginatorNode extends TbAbstractTransformNode {
case ENTITY_SOURCE: case ENTITY_SOURCE:
EntityType entityType = EntityType.valueOf(config.getEntityType()); EntityType entityType = EntityType.valueOf(config.getEntityType());
String entityName = TbNodeUtils.processPattern(config.getEntityNamePattern(), msg); String entityName = TbNodeUtils.processPattern(config.getEntityNamePattern(), msg);
try {
EntityId targetEntity = EntitiesByNameAndTypeLoader.findEntityId(ctx, entityType, entityName); EntityId targetEntity = EntitiesByNameAndTypeLoader.findEntityId(ctx, entityType, entityName);
if (targetEntity != null) {
return Futures.immediateFuture(targetEntity); return Futures.immediateFuture(targetEntity);
} else { } catch (IllegalStateException e) {
return Futures.immediateFailedFuture(new IllegalStateException("Failed to found " + entityType.name() + " entity by name: '" + entityName + "'!")); return Futures.immediateFailedFuture(e);
} }
default: default:
return Futures.immediateFailedFuture(new IllegalStateException("Unexpected originator source " + config.getOriginatorSource())); return Futures.immediateFailedFuture(new IllegalStateException("Unexpected originator source " + config.getOriginatorSource()));

5
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesByNameAndTypeLoader.java
View File

@ -83,6 +83,11 @@ public class EntitiesByNameAndTypeLoader {
targetEntity = user.getId(); targetEntity = user.getId();
} }
break; 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; return targetEntity;
} }