From 8bb51824dd033dfbaad53a7d30cd6522443fb6c7 Mon Sep 17 00:00:00 2001
From: Yuriy Lytvynchuk <yuriy.litv@gmail.com>
Date: Tue, 13 Sep 2022 12:09:33 +0300
Subject: [PATCH] refactor code

---
 .../rule/engine/transform/TbChangeOriginatorNode.java         | 4 ++--
 .../engine/transform/TbChangeOriginatorNodeConfiguration.java | 1 -
 ...AsyncLoader.java => EntitiesByNameAndTypeAsyncLoader.java} | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)
 rename rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/{EntitiesEntitySourceAsyncLoader.java => EntitiesByNameAndTypeAsyncLoader.java} (96%)

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 d3c2f179a4..62cae3c835 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
@@ -26,7 +26,7 @@ import org.thingsboard.rule.engine.api.TbNodeException;
 import org.thingsboard.rule.engine.api.util.TbNodeUtils;
 import org.thingsboard.rule.engine.util.EntitiesAlarmOriginatorIdAsyncLoader;
 import org.thingsboard.rule.engine.util.EntitiesCustomerIdAsyncLoader;
-import org.thingsboard.rule.engine.util.EntitiesEntitySourceAsyncLoader;
+import org.thingsboard.rule.engine.util.EntitiesByNameAndTypeAsyncLoader;
 import org.thingsboard.rule.engine.util.EntitiesRelatedEntityIdAsyncLoader;
 import org.thingsboard.rule.engine.util.EntitiesTenantIdAsyncLoader;
 import org.thingsboard.server.common.data.EntityType;
@@ -93,7 +93,7 @@ public class TbChangeOriginatorNode extends TbAbstractTransformNode {
             case ENTITY_SOURCE:
                 EntityType entityType = EntityType.valueOf(config.getEntityType());
                 String entityName = TbNodeUtils.processPattern(config.getEntityNamePattern(), msg);
-                return EntitiesEntitySourceAsyncLoader.findEntityIdAsync(ctx, entityType, entityName);
+                return EntitiesByNameAndTypeAsyncLoader.findEntityIdAsync(ctx, entityType, entityName);
             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/transform/TbChangeOriginatorNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeConfiguration.java
index 43a805b203..0184575e96 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeConfiguration.java
@@ -37,7 +37,6 @@ public class TbChangeOriginatorNodeConfiguration extends TbTransformNodeConfigur
     public TbChangeOriginatorNodeConfiguration defaultConfiguration() {
         TbChangeOriginatorNodeConfiguration configuration = new TbChangeOriginatorNodeConfiguration();
         configuration.setOriginatorSource(TbChangeOriginatorNode.CUSTOMER_SOURCE);
-        configuration.setEntityNamePattern("");
 
         RelationsQuery relationsQuery = new RelationsQuery();
         relationsQuery.setDirection(EntitySearchDirection.FROM);
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesEntitySourceAsyncLoader.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesByNameAndTypeAsyncLoader.java
similarity index 96%
rename from rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesEntitySourceAsyncLoader.java
rename to rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesByNameAndTypeAsyncLoader.java
index e9092cf292..fb1352aee2 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesEntitySourceAsyncLoader.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesByNameAndTypeAsyncLoader.java
@@ -32,7 +32,7 @@ import org.thingsboard.server.common.data.page.PageLink;
 
 import java.util.Optional;
 
-public class EntitiesEntitySourceAsyncLoader {
+public class EntitiesByNameAndTypeAsyncLoader {
 
     public static ListenableFuture<? extends EntityId> findEntityIdAsync(TbContext ctx, EntityType entityType, String entityName) {
         EntityId targetEntity = null;
@@ -92,7 +92,7 @@ public class EntitiesEntitySourceAsyncLoader {
         if (targetEntity != null) {
             return Futures.immediateFuture(targetEntity);
         } else {
-            return Futures.immediateFailedFuture(new IllegalStateException("Entity '" + entityType.name() + "' not found by name '" + entityName + "'!"));
+            return Futures.immediateFailedFuture(new IllegalStateException("Failed to found entity " + entityType.name() + " by name '" + entityName + "'!"));
         }
     }