refactor code

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()));
         }

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);

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesEntitySourceAsyncLoader.java → 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 + "'!"));
         }
     }