refactoring rule nodes after review

application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java

@@ -217,9 +217,9 @@ public class DefaultDataUpdateService implements DataUpdateService {
                 break;
             case "3.4.4":
                 log.info("Updating data from version 3.4.4 to 3.5.0 ...");
-                log.info("Started enrichment rule nodes update ...");
+                log.info("Starting enrichment rule nodes update ...");
                 updateEnrichmentRuleNodes();
-                log.info("Finished enrichment rule nodes update ...");
+                log.info("Finished enrichment rule nodes update!");
                 break;
             default:
                 throw new RuntimeException("Unable to update data, unsupported fromVersion: " + fromVersion);
@@ -247,12 +247,12 @@ public class DefaultDataUpdateService implements DataUpdateService {
                 for (var ruleNode : ruleNodes) {
                     var configuration = ruleNode.getConfiguration();
                     if (configuration == null) {
-                        log.error("Unable to update [{}] rule node with ID [{}]! Node configuration is null! Skipping this node!",
+                        log.error("Failed to update rule node: [{}] with id: [{}] Node configuration is null! Skipping this node!",
                                 ruleNodeType, ruleNode.getId());
                         continue;
                     }
                     if (!configuration.isObject()) {
-                        log.error("Unable to update [{}] rule node with ID [{}]! Node configuration is not an object! Skipping this node!",
+                        log.error("Failed to update rule node: [{}] with id: [{}] Node configuration is not an object! Skipping this node!",
                                 ruleNodeType, ruleNode.getId());
                         continue;
                     }
@@ -265,8 +265,10 @@ public class DefaultDataUpdateService implements DataUpdateService {
                         } else if ("false".equals(fetchToMetadata)) {
                             fetchTo = FetchTo.DATA;
                         } else {
-                            log.error("[fetchToMetadata] property has unexpected value: {}! Expected true or false! Skipping this node ID[{}]!",
+                            log.error("Failed to updated rule node: [{}] with id: [{}] " +
-                                    fetchToMetadata, ruleNode.getId());
+                                    "Reason: fetchToMetadata property has unexpected value: {} Allowed values: true or false!",
+                                    ruleNodeType, ruleNode.getId(), fetchToMetadata);
+                            continue;
                         }
                         configObjectNode.remove("fetchToMetadata");
                     }
@@ -277,8 +279,10 @@ public class DefaultDataUpdateService implements DataUpdateService {
                         } else if ("false".equals(fetchToData)) {
                             fetchTo = FetchTo.METADATA;
                         } else {
-                            log.error("[fetchToData] property has unexpected value: {}! Expected true or false! Skipping this node ID[{}]!",
+                            log.error("Failed to updated rule node: [{}] with id: [{}] " +
-                                    fetchToData, ruleNode.getId());
+                                    "Reason: fetchToData property has unexpected value: {} Allowed values: true or false!",
+                                    ruleNodeType, ruleNode.getId(), fetchToData);
+                            continue;
                         }
                         configObjectNode.remove("fetchToData");
                     }
@@ -289,16 +293,28 @@ public class DefaultDataUpdateService implements DataUpdateService {
                         } else if ("false".equals(addToMetadata)) {
                             fetchTo = FetchTo.DATA;
                         } else {
-                            log.error("[addToMetadata] property has unexpected value: {}! Skipping  Expected true or false! Skipping this node ID[{}]!",
+                            log.error("Failed to updated rule node: [{}] with id: [{}] " +
-                                    addToMetadata, ruleNode.getId());
+                                    "Reason: addToMetadata property has unexpected value: {} Allowed values: true or false!",
+                                    ruleNodeType, ruleNode.getId(), addToMetadata);
+                            continue;
                         }
                         configObjectNode.remove("addToMetadata");
                     }
-                    configObjectNode.put("fetchTo", fetchTo.toString());
+                    configObjectNode.put("fetchTo", fetchTo.name());
                     ruleNode.setConfiguration(configObjectNode);
-                    ruleChainIdToTenantId.computeIfAbsent(ruleNode.getRuleChainId(),
+                    RuleChainId ruleChainId = ruleNode.getRuleChainId();
-                            ruleChainId -> ruleChainService.findRuleChainById(TenantId.SYS_TENANT_ID, ruleNode.getRuleChainId()).getTenantId());
+                    TenantId tenantId = ruleChainIdToTenantId.computeIfAbsent(ruleChainId,
-                    ruleChainService.saveRuleNode(ruleChainIdToTenantId.get(ruleNode.getRuleChainId()), ruleNode);
+                            id -> {
+                                RuleChain ruleChain = ruleChainService.findRuleChainById(TenantId.SYS_TENANT_ID, id);
+                                if (ruleChain == null) {
+                                    log.error("Failed to find rule chain by id: [{}], ruleNodeId: [{}]", ruleChainId, ruleNode.getId());
+                                    return null;
+                                }
+                                return ruleChain.getTenantId();
+                            });
+                    if (tenantId != null) {
+                        ruleChainService.saveRuleNode(tenantId, ruleNode);
+                    }
                 }
             });
         } catch (Exception e) {

rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NodeConfiguration.java

@@ -16,5 +16,7 @@
 package org.thingsboard.rule.engine.api;
 
 public interface NodeConfiguration<T extends NodeConfiguration> {
+
     T defaultConfiguration();
+
 }

rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbNode.java

@@ -24,6 +24,7 @@ import java.util.concurrent.ExecutionException;
  * Created by ashvayka on 19.01.18.
  */
 public interface TbNode {
+
     void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException;
 
     void onMsg(TbContext ctx, TbMsg msg) throws ExecutionException, InterruptedException, TbNodeException;
@@ -33,4 +34,5 @@ public interface TbNode {
 
     default void onPartitionChangeMsg(TbContext ctx, PartitionChangeMsg msg) {
     }
+
 }

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractFetchToNodeConfiguration.java

@@ -19,5 +19,7 @@ import lombok.Data;
 
 @Data
 public abstract class TbAbstractFetchToNodeConfiguration {
+
     private FetchTo fetchTo;
+
 }

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetAttributesNode.java

@@ -19,7 +19,9 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.BooleanUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.api.TbNodeConfiguration;
@@ -31,14 +33,13 @@ import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
 import org.thingsboard.server.common.data.kv.JsonDataEntry;
 import org.thingsboard.server.common.data.kv.KvEntry;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
+import org.thingsboard.server.common.data.util.TbPair;
 import org.thingsboard.server.common.msg.TbMsg;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
 import java.util.Objects;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
@@ -48,6 +49,7 @@ import static org.thingsboard.server.common.data.DataConstants.LATEST_TS;
 import static org.thingsboard.server.common.data.DataConstants.SERVER_SCOPE;
 import static org.thingsboard.server.common.data.DataConstants.SHARED_SCOPE;
 
+@Slf4j
 public abstract class TbAbstractGetAttributesNode<C extends TbGetAttributesNodeConfiguration, T extends EntityId> extends TbAbstractNodeWithFetchTo<C> {
     private static final String VALUE = "value";
     private static final String TS = "ts";
@@ -58,98 +60,81 @@ public abstract class TbAbstractGetAttributesNode<C extends TbGetAttributesNodeC
     public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException {
         super.init(ctx, configuration);
         getLatestValueWithTs = config.isGetLatestValueWithTs();
-        isTellFailureIfAbsent = config.isTellFailureIfAbsent();
+        isTellFailureIfAbsent = BooleanUtils.toBooleanDefaultIfNull(config.isTellFailureIfAbsent(), true);
     }
 
     @Override
     public void onMsg(TbContext ctx, TbMsg msg) throws TbNodeException {
-        try {
+        ctx.checkTenantEntity(msg.getOriginator());
-            withCallback(
+        var msgDataAsObjectNode = FetchTo.DATA.equals(fetchTo) ? getMsgDataAsObjectNode(msg) : null;
-                    findEntityIdAsync(ctx, msg),
+        withCallback(
-                    entityId -> safePutAttributes(ctx, msg, entityId),
+                findEntityIdAsync(ctx, msg),
-                    t -> ctx.tellFailure(msg, t), ctx.getDbCallbackExecutor());
+                entityId -> safePutAttributes(ctx, msg, msgDataAsObjectNode, entityId),
-        } catch (Throwable th) {
+                t -> ctx.tellFailure(msg, t), ctx.getDbCallbackExecutor());
-            ctx.tellFailure(msg, th);
-        }
     }
 
     protected abstract ListenableFuture<T> findEntityIdAsync(TbContext ctx, TbMsg msg);
 
-    private void safePutAttributes(TbContext ctx, TbMsg msg, T entityId) {
+    private void safePutAttributes(TbContext ctx, TbMsg msg, ObjectNode msgDataNode, T entityId) {
-        if (entityId == null || entityId.isNullUid()) {
+        Set<TbPair<String, List<String>>> failuresPairSet = ConcurrentHashMap.newKeySet();
-            ctx.tellFailure(msg, new NoSuchElementException("Did not find entity! Msg ID: " + msg.getId()));
+        var getKvEntryPairFutures = Futures.allAsList(
-            return;
+                getLatestTelemetry(ctx, entityId, TbNodeUtils.processPatterns(config.getLatestTsKeyNames(), msg), failuresPairSet),
-        }
+                getAttrAsync(ctx, entityId, CLIENT_SCOPE, TbNodeUtils.processPatterns(config.getClientAttributeNames(), msg), failuresPairSet),
-        ObjectNode msgDataNode;
+                getAttrAsync(ctx, entityId, SHARED_SCOPE, TbNodeUtils.processPatterns(config.getSharedAttributeNames(), msg), failuresPairSet),
-        if (FetchTo.DATA.equals(fetchTo)) {
+                getAttrAsync(ctx, entityId, SERVER_SCOPE, TbNodeUtils.processPatterns(config.getServerAttributeNames(), msg), failuresPairSet)
-            msgDataNode = getMsgDataAsObjectNode(msg);
-        } else {
-            msgDataNode = null;
-        }
-        var failuresMap = new ConcurrentHashMap<String, List<String>>();
-        ListenableFuture<List<Map<String, ? extends List<? extends KvEntry>>>> allFutures = Futures.allAsList(
-                getLatestTelemetry(ctx, entityId, TbNodeUtils.processPatterns(config.getLatestTsKeyNames(), msg), failuresMap),
-                getAttrAsync(ctx, entityId, CLIENT_SCOPE, TbNodeUtils.processPatterns(config.getClientAttributeNames(), msg), failuresMap),
-                getAttrAsync(ctx, entityId, SHARED_SCOPE, TbNodeUtils.processPatterns(config.getSharedAttributeNames(), msg), failuresMap),
-                getAttrAsync(ctx, entityId, SERVER_SCOPE, TbNodeUtils.processPatterns(config.getServerAttributeNames(), msg), failuresMap)
         );
-        withCallback(allFutures, futuresList -> {
+        withCallback(getKvEntryPairFutures, futuresList -> {
             var msgMetaData = msg.getMetaData().copy();
-            futuresList.stream().filter(Objects::nonNull).forEach(kvEntriesMap -> {
+            futuresList.stream().filter(Objects::nonNull).forEach(kvEntriesPair -> {
-                kvEntriesMap.forEach((keyScope, kvEntryList) -> {
+                var keyScope = kvEntriesPair.getFirst();
-                    var prefix = getPrefix(keyScope);
+                var kvEntryList = kvEntriesPair.getSecond();
-                    kvEntryList.forEach(kvEntry -> {
+                var prefix = getPrefix(keyScope);
-                        var key = prefix + kvEntry.getKey();
+                kvEntryList.forEach(kvEntry -> {
-                        if (FetchTo.DATA.equals(fetchTo)) {
+                    String targetKey = prefix + kvEntry.getKey();
-                            JacksonUtil.addKvEntry(msgDataNode, kvEntry, key);
+                    enrichMessage(msgDataNode, msgMetaData, kvEntry, targetKey);
-                        } else if (FetchTo.METADATA.equals(fetchTo)) {
-                            msgMetaData.putValue(key, kvEntry.getValueAsString());
-                        }
-                    });
                 });
             });
-
+            TbMsg outMsg = transformMessage(msg, msgDataNode, msgMetaData);
-            TbMsg outMsg = null;
+            if (failuresPairSet.isEmpty()) {
-            if (FetchTo.DATA.equals(fetchTo)) {
-                outMsg = TbMsg.transformMsgData(msg, JacksonUtil.toString(msgDataNode));
-            } else if (FetchTo.METADATA.equals(fetchTo)) {
-                outMsg = TbMsg.transformMsg(msg, msgMetaData);
-            }
-
-            if (failuresMap.isEmpty()) {
                 ctx.tellSuccess(outMsg);
             } else {
-                ctx.tellFailure(outMsg, reportFailures(failuresMap));
+                ctx.tellFailure(outMsg, reportFailures(failuresPairSet));
             }
         }, t -> ctx.tellFailure(msg, t), ctx.getDbCallbackExecutor());
     }
 
-    private ListenableFuture<Map<String, List<AttributeKvEntry>>> getAttrAsync(TbContext ctx, EntityId entityId, String scope, List<String> keys, ConcurrentHashMap<String, List<String>> failuresMap) {
+    private ListenableFuture<TbPair<String, List<AttributeKvEntry>>> getAttrAsync(
+            TbContext ctx,
+            EntityId entityId,
+            String scope,
+            List<String> keys,
+            Set<TbPair<String, List<String>>> failuresPairSet
+    ) {
         if (CollectionUtils.isEmpty(keys)) {
             return Futures.immediateFuture(null);
         }
         var attributeKvEntryListFuture = ctx.getAttributesService().find(ctx.getTenantId(), entityId, scope, keys);
         return Futures.transform(attributeKvEntryListFuture, attributeKvEntryList -> {
             if (isTellFailureIfAbsent && attributeKvEntryList.size() != keys.size()) {
-                getNotExistingKeys(attributeKvEntryList, keys).forEach(key -> computeFailuresMap(scope, failuresMap, key));
+                List<String> nonExistentKeys = getNonExistentKeys(attributeKvEntryList, keys);
+                failuresPairSet.add(new TbPair<>(scope, nonExistentKeys));
             }
-            var mapAttributeKvEntry = new HashMap<String, List<AttributeKvEntry>>();
+            return new TbPair<>(scope, attributeKvEntryList);
-            mapAttributeKvEntry.put(scope, attributeKvEntryList);
-            return mapAttributeKvEntry;
         }, MoreExecutors.directExecutor());
     }
 
-    private ListenableFuture<Map<String, List<TsKvEntry>>> getLatestTelemetry(TbContext ctx, EntityId entityId, List<String> keys, ConcurrentHashMap<String, List<String>> failuresMap) {
+    private ListenableFuture<TbPair<String, List<TsKvEntry>>> getLatestTelemetry(TbContext ctx, EntityId entityId, List<String> keys, Set<TbPair<String, List<String>>> failuresPairSet) {
         if (CollectionUtils.isEmpty(keys)) {
             return Futures.immediateFuture(null);
         }
         ListenableFuture<List<TsKvEntry>> latestTelemetryFutures = ctx.getTimeseriesService().findLatest(ctx.getTenantId(), entityId, keys);
         return Futures.transform(latestTelemetryFutures, tsKvEntries -> {
             var listTsKvEntry = new ArrayList<TsKvEntry>();
+            var nonExistentKeys = new ArrayList<String>();
             tsKvEntries.forEach(tsKvEntry -> {
                 if (tsKvEntry.getValue() == null) {
                     if (isTellFailureIfAbsent) {
-                        computeFailuresMap(LATEST_TS, failuresMap, tsKvEntry.getKey());
+                        nonExistentKeys.add(tsKvEntry.getKey());
                     }
                 } else if (getLatestValueWithTs) {
                     listTsKvEntry.add(getValueWithTs(tsKvEntry));
@@ -157,9 +142,10 @@ public abstract class TbAbstractGetAttributesNode<C extends TbGetAttributesNodeC
                     listTsKvEntry.add(new BasicTsKvEntry(tsKvEntry.getTs(), tsKvEntry));
                 }
             });
-            var mapTsKvEntry = new HashMap<String, List<TsKvEntry>>();
+            if (isTellFailureIfAbsent && !nonExistentKeys.isEmpty()) {
-            mapTsKvEntry.put(LATEST_TS, listTsKvEntry);
+                failuresPairSet.add(new TbPair<>(LATEST_TS, nonExistentKeys));
-            return mapTsKvEntry;
+            }
+            return new TbPair<>(LATEST_TS, listTsKvEntry);
         }, MoreExecutors.directExecutor());
     }
 
@@ -187,31 +173,19 @@ public abstract class TbAbstractGetAttributesNode<C extends TbGetAttributesNodeC
         return prefix;
     }
 
-    private List<String> getNotExistingKeys(List<AttributeKvEntry> existingAttributesKvEntry, List<String> allKeys) {
+    private List<String> getNonExistentKeys(List<AttributeKvEntry> existingAttributesKvEntry, List<String> allKeys) {
         List<String> existingKeys = existingAttributesKvEntry.stream().map(KvEntry::getKey).collect(Collectors.toList());
         return allKeys.stream().filter(key -> !existingKeys.contains(key)).collect(Collectors.toList());
     }
 
-    private void computeFailuresMap(String scope, ConcurrentHashMap<String, List<String>> failuresMap, String key) {
+    private RuntimeException reportFailures(Set<TbPair<String, List<String>>> failuresPairSet) {
-        List<String> failures = failuresMap.computeIfAbsent(scope, k -> new ArrayList<>());
-        failures.add(key);
-    }
-
-    private RuntimeException reportFailures(ConcurrentHashMap<String, List<String>> failuresMap) {
         var errorMessage = new StringBuilder("The following attribute/telemetry keys is not present in the DB: ").append("\n");
-        if (failuresMap.containsKey(CLIENT_SCOPE)) {
+        failuresPairSet.forEach(failurePair -> {
-            errorMessage.append("\t").append("[" + CLIENT_SCOPE + "]:").append(failuresMap.get(CLIENT_SCOPE).toString()).append("\n");
+            String scope = failurePair.getFirst();
-        }
+            List<String> nonExistentKeys = failurePair.getSecond();
-        if (failuresMap.containsKey(SERVER_SCOPE)) {
+            errorMessage.append("\t").append("[").append(scope).append("]:").append(nonExistentKeys.toString()).append("\n");
-            errorMessage.append("\t").append("[" + SERVER_SCOPE + "]:").append(failuresMap.get(SERVER_SCOPE).toString()).append("\n");
+        });
-        }
+        failuresPairSet.clear();
-        if (failuresMap.containsKey(SHARED_SCOPE)) {
-            errorMessage.append("\t").append("[" + SHARED_SCOPE + "]:").append(failuresMap.get(SHARED_SCOPE).toString()).append("\n");
-        }
-        if (failuresMap.containsKey(LATEST_TS)) {
-            errorMessage.append("\t").append("[" + LATEST_TS + "]:").append(failuresMap.get(LATEST_TS).toString()).append("\n");
-        }
-        failuresMap.clear();
         return new RuntimeException(errorMessage.toString());
     }
 }

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetEntityAttrNode.java

@@ -20,8 +20,8 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import lombok.extern.slf4j.Slf4j;
-import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.TbContext;
+import org.thingsboard.rule.engine.api.TbNodeException;
 import org.thingsboard.rule.engine.api.util.TbNodeUtils;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.kv.KvEntry;
@@ -30,7 +30,6 @@ import org.thingsboard.server.common.msg.TbMsg;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.NoSuchElementException;
 import java.util.stream.Collectors;
 
 import static org.thingsboard.common.util.DonAsynchron.withCallback;
@@ -38,35 +37,31 @@ import static org.thingsboard.server.common.data.DataConstants.SERVER_SCOPE;
 
 @Slf4j
 public abstract class TbAbstractGetEntityAttrNode<T extends EntityId> extends TbAbstractNodeWithFetchTo<TbGetEntityAttrNodeConfiguration> {
+
     @Override
     public void onMsg(TbContext ctx, TbMsg msg) {
-        ObjectNode msgDataAsJsonNode;
-        if (FetchTo.DATA.equals(fetchTo)) {
-            msgDataAsJsonNode = getMsgDataAsObjectNode(msg);
-        } else {
-            msgDataAsJsonNode = null;
-        }
         ctx.checkTenantEntity(msg.getOriginator());
+        var msgDataAsObjectNode = FetchTo.DATA.equals(fetchTo) ? getMsgDataAsObjectNode(msg) : null;
         withCallback(findEntityAsync(ctx, msg.getOriginator()),
-                entityId -> safeGetAttributes(ctx, msg, entityId, msgDataAsJsonNode),
+                entityId -> safeGetAttributes(ctx, msg, entityId, msgDataAsObjectNode),
                 t -> ctx.tellFailure(msg, t), ctx.getDbCallbackExecutor());
     }
 
     protected abstract ListenableFuture<T> findEntityAsync(TbContext ctx, EntityId originator);
 
-    private void safeGetAttributes(TbContext ctx, TbMsg msg, T entityId, ObjectNode msgDataAsJsonNode) {
+    protected void checkIfMappingIsNotEmptyOrThrow(TbGetEntityAttrNodeConfiguration config) throws TbNodeException {
-        if (entityId == null || entityId.isNullUid()) {
+        if (config.getAttrMapping().isEmpty()) {
-            ctx.tellFailure(msg, new NoSuchElementException("Did not find entity! Msg ID: " + msg.getId()));
+            throw new TbNodeException("At least one attribute mapping should be specified!");
-            return;
         }
+    }
 
-        Map<String, String> mappingsMap = new HashMap<>();
+    private void safeGetAttributes(TbContext ctx, TbMsg msg, T entityId, ObjectNode msgDataAsJsonNode) {
+        var mappingsMap = new HashMap<String, String>();
         config.getAttrMapping().forEach((key, value) -> {
             String patternProcessedSourceKey = TbNodeUtils.processPattern(key, msg);
             String patternProcessedTargetKey = TbNodeUtils.processPattern(value, msg);
             mappingsMap.put(patternProcessedSourceKey, patternProcessedTargetKey);
         });
-
         var sourceKeys = List.copyOf(mappingsMap.keySet());
         withCallback(config.isTelemetry() ? getLatestTelemetryAsync(ctx, entityId, sourceKeys) : getAttributesAsync(ctx, entityId, sourceKeys),
                 data -> putDataAndTell(ctx, msg, data, mappingsMap, msgDataAsJsonNode),
@@ -91,20 +86,13 @@ public abstract class TbAbstractGetEntityAttrNode<T extends EntityId> extends Tb
                 MoreExecutors.directExecutor());
     }
 
-    private void putDataAndTell(TbContext ctx, TbMsg msg, List<? extends KvEntry> data, Map<String, String> map, ObjectNode msgDataAsJsonNode) {
+    private void putDataAndTell(TbContext ctx, TbMsg msg, List<? extends KvEntry> data, Map<String, String> map, ObjectNode msgData) {
+        var msgMetaData = msg.getMetaData().copy();
         for (KvEntry entry : data) {
             String targetKey = map.get(entry.getKey());
-            String value = entry.getValueAsString();
+            enrichMessage(msgData, msgMetaData, entry, targetKey);
-            if (FetchTo.DATA.equals(fetchTo)) {
-                msgDataAsJsonNode.put(targetKey, value);
-            } else if (FetchTo.METADATA.equals(fetchTo)) {
-                msg.getMetaData().putValue(targetKey, value);
-            }
-        }
-        if (FetchTo.DATA.equals(fetchTo)) {
-            ctx.tellSuccess(TbMsg.transformMsgData(msg, JacksonUtil.toString(msgDataAsJsonNode)));
-        } else if (FetchTo.METADATA.equals(fetchTo)) {
-            ctx.tellSuccess(msg);
         }
+        ctx.tellSuccess(transformMessage(msg, msgData, msgMetaData));
     }
+
 }

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetEntityDetailsNode.java

@@ -15,159 +15,131 @@
  */
 package org.thingsboard.rule.engine.metadata;
 
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.gson.reflect.TypeToken;
-import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.rule.engine.api.TbContext;
-import org.thingsboard.rule.engine.util.EntityDetails;
+import org.thingsboard.rule.engine.api.TbNodeException;
 import org.thingsboard.server.common.data.ContactBased;
+import org.thingsboard.server.common.data.id.UUIDBased;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 
-import java.lang.reflect.Type;
-import java.util.Map;
-
 import static org.thingsboard.common.util.DonAsynchron.withCallback;
 
 @Slf4j
-public abstract class TbAbstractGetEntityDetailsNode<C extends TbAbstractGetEntityDetailsNodeConfiguration> extends TbAbstractNodeWithFetchTo<C> {
+public abstract class TbAbstractGetEntityDetailsNode<C extends TbAbstractGetEntityDetailsNodeConfiguration, I extends UUIDBased> extends TbAbstractNodeWithFetchTo<C> {
-    private static final Gson gson = new Gson();
-    private static final Type TYPE = new TypeToken<Map<String, String>>() {
-    }.getType();
 
     @Override
     public void onMsg(TbContext ctx, TbMsg msg) {
-        withCallback(getDetails(ctx, msg),
+        ctx.checkTenantEntity(msg.getOriginator());
+        var msgDataAsObjectNode = FetchTo.DATA.equals(fetchTo) ? getMsgDataAsObjectNode(msg) : null;
+        withCallback(getDetails(ctx, msg, msgDataAsObjectNode),
                 ctx::tellSuccess,
                 t -> ctx.tellFailure(msg, t), ctx.getDbCallbackExecutor());
     }
 
-    protected abstract ListenableFuture<TbMsg> getDetails(TbContext ctx, TbMsg msg);
+    protected abstract String getPrefix();
 
-    protected abstract ListenableFuture<ContactBased> getContactBasedListenableFuture(TbContext ctx, TbMsg msg);
+    protected abstract ListenableFuture<? extends ContactBased<I>> getContactBasedFuture(TbContext ctx, TbMsg msg);
 
-    protected MessageData getDataAsJson(TbMsg msg) {
+    protected void checkIfDetailsListIsNotEmptyOrThrow(C configuration) throws TbNodeException {
-        if (fetchTo == FetchTo.METADATA) {
+        if (configuration.getDetailsList().isEmpty()) {
-            return new MessageData(gson.toJsonTree(msg.getMetaData().getData(), TYPE), DataSource.METADATA);
+            throw new TbNodeException("No entity details selected!");
-        } else if (fetchTo == FetchTo.DATA) {
-            var msgDataJsonElement = JsonParser.parseString(msg.getData());
-            if (!msgDataJsonElement.isJsonObject()) {
-                throw new IllegalArgumentException("Message body is not an object!");
-            }
-            return new MessageData(msgDataJsonElement, DataSource.DATA);
-        } else {
-            throw new IllegalArgumentException("Unsupported fetchTo value!");
         }
     }
 
-    protected ListenableFuture<TbMsg> getTbMsgListenableFuture(TbContext ctx, TbMsg msg, MessageData messageData, String prefix) {
+    private ListenableFuture<TbMsg> getDetails(TbContext ctx, TbMsg msg, ObjectNode messageData) {
-        if (config.getDetailsList().isEmpty()) {
+        ListenableFuture<? extends ContactBased<I>> contactBasedFuture = getContactBasedFuture(ctx, msg);
-            return Futures.immediateFuture(msg);
+        return Futures.transformAsync(contactBasedFuture, contactBased -> {
-        } else {
-            ListenableFuture<ContactBased> contactBasedListenableFuture = getContactBasedListenableFuture(ctx, msg);
-            ListenableFuture<JsonElement> resultObject = addContactProperties(messageData.getData(), contactBasedListenableFuture, prefix);
-            return transformMsg(ctx, msg, resultObject, messageData);
-        }
-    }
-
-    private ListenableFuture<TbMsg> transformMsg(TbContext ctx, TbMsg msg, ListenableFuture<JsonElement> propertiesFuture, MessageData messageData) {
-        return Futures.transformAsync(propertiesFuture, jsonElement -> {
-            if (jsonElement == null) {
-                return Futures.immediateFuture(null);
-            } else if (messageData.getDataSource().equals(DataSource.METADATA)) {
-                Map<String, String> metadataMap = gson.fromJson(jsonElement.toString(), TYPE);
-                return Futures.immediateFuture(ctx.transformMsg(msg, msg.getType(), msg.getOriginator(), new TbMsgMetaData(metadataMap), msg.getData()));
-            } else {
-                return Futures.immediateFuture(ctx.transformMsg(msg, msg.getType(), msg.getOriginator(), msg.getMetaData(), gson.toJson(jsonElement)));
-            }
-        }, MoreExecutors.directExecutor());
-    }
-
-    private ListenableFuture<JsonElement> addContactProperties(JsonElement data, ListenableFuture<ContactBased> entityFuture, String prefix) {
-        return Futures.transformAsync(entityFuture, contactBased -> {
             if (contactBased == null) {
-                return Futures.immediateFuture(null);
+                return Futures.immediateFuture(msg);
-            } else {
-                JsonElement jsonElement = null;
-                for (EntityDetails entityDetails : this.config.getDetailsList()) {
-                    jsonElement = setProperties(contactBased, data, entityDetails, prefix);
-                }
-                return Futures.immediateFuture(jsonElement);
             }
+            var msgMetaData = msg.getMetaData().copy();
+            setProperties(contactBased, messageData, msgMetaData);
+            return Futures.immediateFuture(transformMessage(msg, messageData, msgMetaData));
         }, MoreExecutors.directExecutor());
     }
 
-    private JsonElement setProperties(ContactBased entity, JsonElement data, EntityDetails entityDetails, String prefix) {
+    private void setProperties(ContactBased<I> contactBased, ObjectNode messageData, TbMsgMetaData msgMetaData) {
-        JsonObject dataAsObject = data.getAsJsonObject();
+        String prefix = getPrefix();
-        switch (entityDetails) {
+        String property;
-            case ID:
+        String value;
-                dataAsObject.addProperty(prefix + "id", entity.getId().toString());
+        for (var entityDetails : config.getDetailsList()) {
-                break;
+            switch (entityDetails) {
-            case TITLE:
+                case ID:
-                dataAsObject.addProperty(prefix + "title", entity.getName());
+                    property = prefix + "id";
-                break;
+                    value = contactBased.getId().getId().toString();
-            case ADDRESS:
+                    setDetail(property, value, messageData, msgMetaData);
-                if (entity.getAddress() != null) {
+                    break;
-                    dataAsObject.addProperty(prefix + "address", entity.getAddress());
+                case TITLE:
-                }
+                    property = prefix + "title";
-                break;
+                    value = contactBased.getName();
-            case ADDRESS2:
+                    setDetail(property, value, messageData, msgMetaData);
-                if (entity.getAddress2() != null) {
+                    break;
-                    dataAsObject.addProperty(prefix + "address2", entity.getAddress2());
+                case ADDRESS:
-                }
+                    property = prefix + "address";
-                break;
+                    value = contactBased.getAddress();
-            case CITY:
+                    setDetail(property, value, messageData, msgMetaData);
-                if (entity.getCity() != null) dataAsObject.addProperty(prefix + "city", entity.getCity());
+                    break;
-                break;
+                case ADDRESS2:
-            case COUNTRY:
+                    property = prefix + "address2";
-                if (entity.getCountry() != null)
+                    value = contactBased.getAddress2();
-                    dataAsObject.addProperty(prefix + "country", entity.getCountry());
+                    setDetail(property, value, messageData, msgMetaData);
-                break;
+                    break;
-            case STATE:
+                case CITY:
-                if (entity.getState() != null) {
+                    property = prefix + "city";
-                    dataAsObject.addProperty(prefix + "state", entity.getState());
+                    value = contactBased.getCity();
-                }
+                    setDetail(property, value, messageData, msgMetaData);
-                break;
+                    break;
-            case EMAIL:
+                case COUNTRY:
-                if (entity.getEmail() != null) {
+                    property = prefix + "country";
-                    dataAsObject.addProperty(prefix + "email", entity.getEmail());
+                    value = contactBased.getCountry();
-                }
+                    setDetail(property, value, messageData, msgMetaData);
-                break;
+                    break;
-            case PHONE:
+                case STATE:
-                if (entity.getPhone() != null) {
+                    property = prefix + "state";
-                    dataAsObject.addProperty(prefix + "phone", entity.getPhone());
+                    value = contactBased.getState();
-                }
+                    setDetail(property, value, messageData, msgMetaData);
-                break;
+                    break;
-            case ZIP:
+                case EMAIL:
-                if (entity.getZip() != null) {
+                    property = prefix + "email";
-                    dataAsObject.addProperty(prefix + "zip", entity.getZip());
+                    value = contactBased.getEmail();
-                }
+                    setDetail(property, value, messageData, msgMetaData);
-                break;
+                    break;
-            case ADDITIONAL_INFO:
+                case PHONE:
-                if (entity.getAdditionalInfo().hasNonNull("description")) {
+                    property = prefix + "phone";
-                    dataAsObject.addProperty(prefix + "additionalInfo", entity.getAdditionalInfo().get("description").asText());
+                    value = contactBased.getPhone();
-                }
+                    setDetail(property, value, messageData, msgMetaData);
-                break;
+                    break;
+                case ZIP:
+                    property = prefix + "zip";
+                    value = contactBased.getZip();
+                    setDetail(property, value, messageData, msgMetaData);
+                    break;
+                case ADDITIONAL_INFO:
+                    if (contactBased.getAdditionalInfo().hasNonNull("description")) {
+                        property = prefix + "additionalInfo";
+                        value = contactBased.getAdditionalInfo().get("description").asText();
+                        setDetail(property, value, messageData, msgMetaData);
+                    }
+                    break;
+            }
         }
-        return dataAsObject;
     }
 
-    @Data
+    private void setDetail(String property, String value, ObjectNode messageData, TbMsgMetaData msgMetaData) {
-    @AllArgsConstructor
+        if (value == null) {
-    private static class MessageData {
+            return;
-        private JsonElement data;
+        }
-        private DataSource dataSource;
+        if (FetchTo.METADATA.equals(fetchTo)) {
+            msgMetaData.putValue(property, value);
+        }
+        if (FetchTo.DATA.equals(fetchTo)) {
+            messageData.put(property, value);
+        }
     }
 
-    private enum DataSource {
-        DATA, METADATA
-    }
 }

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetEntityDetailsNodeConfiguration.java

@@ -24,5 +24,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 public abstract class TbAbstractGetEntityDetailsNodeConfiguration extends TbAbstractFetchToNodeConfiguration {
+
     private List<EntityDetails> detailsList;
+
 }

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractNodeWithFetchTo.java

@@ -17,14 +17,24 @@ package org.thingsboard.rule.engine.metadata;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.util.concurrent.AsyncFunction;
+import com.google.common.util.concurrent.Futures;
+import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.api.TbNode;
 import org.thingsboard.rule.engine.api.TbNodeConfiguration;
 import org.thingsboard.rule.engine.api.TbNodeException;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.kv.KvEntry;
 import org.thingsboard.server.common.msg.TbMsg;
+import org.thingsboard.server.common.msg.TbMsgMetaData;
 
+import java.util.NoSuchElementException;
+
+@Slf4j
 public abstract class TbAbstractNodeWithFetchTo<C extends TbAbstractFetchToNodeConfiguration> implements TbNode {
+
     protected C config;
     protected FetchTo fetchTo;
 
@@ -32,7 +42,7 @@ public abstract class TbAbstractNodeWithFetchTo<C extends TbAbstractFetchToNodeC
     public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException {
         config = loadNodeConfiguration(configuration);
         if (config.getFetchTo() == null) {
-            throw new TbNodeException("FetchTo cannot be NULL!");
+            throw new TbNodeException("FetchTo cannot be null!");
         } else {
             fetchTo = config.getFetchTo();
         }
@@ -40,11 +50,41 @@ public abstract class TbAbstractNodeWithFetchTo<C extends TbAbstractFetchToNodeC
 
     protected abstract C loadNodeConfiguration(TbNodeConfiguration configuration) throws TbNodeException;
 
+    protected <I extends EntityId> AsyncFunction<I, I> checkIfEntityIsPresentOrThrow(String message) {
+        return id -> {
+            if (id == null || id.isNullUid()) {
+                return Futures.immediateFailedFuture(new NoSuchElementException(message));
+            }
+            return Futures.immediateFuture(id);
+        };
+    }
+
     protected ObjectNode getMsgDataAsObjectNode(TbMsg msg) {
         JsonNode msgDataNode = JacksonUtil.toJsonNode(msg.getData());
-        if (!msgDataNode.isObject()) {
+        if (msgDataNode == null || !msgDataNode.isObject()) {
             throw new IllegalArgumentException("Message body is not an object!");
         }
         return (ObjectNode) msgDataNode;
     }
+
+    protected void enrichMessage(ObjectNode msgData, TbMsgMetaData metaData, KvEntry kvEntry, String targetKey) {
+        if (FetchTo.DATA.equals(fetchTo)) {
+            JacksonUtil.addKvEntry(msgData, kvEntry, targetKey);
+        } else if (FetchTo.METADATA.equals(fetchTo)) {
+            metaData.putValue(targetKey, kvEntry.getValueAsString());
+        }
+    }
+
+    protected TbMsg transformMessage(TbMsg msg, ObjectNode msgDataNode, TbMsgMetaData msgMetaData) {
+        switch (fetchTo) {
+            case DATA:
+                return TbMsg.transformMsgData(msg, JacksonUtil.toString(msgDataNode));
+            case METADATA:
+                return TbMsg.transformMsg(msg, msgMetaData);
+            default:
+                log.debug("Unexpected FetchTo value: {}. Allowed values: {}", fetchTo, FetchTo.values());
+                return msg;
+        }
+    }
+
 }

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNode.java

@@ -15,6 +15,7 @@
  */
 package org.thingsboard.rule.engine.metadata;
 
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.RuleNode;
@@ -43,6 +44,7 @@ import java.util.concurrent.ExecutionException;
         uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbEnrichmentNodeFetchDeviceCredentialsConfig")
 public class TbFetchDeviceCredentialsNode extends TbAbstractNodeWithFetchTo<TbFetchDeviceCredentialsNodeConfiguration> {
+
     private static final String CREDENTIALS = "credentials";
     private static final String CREDENTIALS_TYPE = "credentialsType";
 
@@ -55,6 +57,7 @@ public class TbFetchDeviceCredentialsNode extends TbAbstractNodeWithFetchTo<TbFe
     public void onMsg(TbContext ctx, TbMsg msg) throws ExecutionException, InterruptedException, TbNodeException {
         var originator = msg.getOriginator();
         ctx.checkTenantEntity(originator);
+        var msgDataAsObjectNode = FetchTo.DATA.equals(fetchTo) ? getMsgDataAsObjectNode(msg) : null;
         if (!EntityType.DEVICE.equals(originator.getEntityType())) {
             ctx.tellFailure(msg, new RuntimeException("Unsupported originator type: " + originator.getEntityType() + "!"));
             return;
@@ -66,26 +69,22 @@ public class TbFetchDeviceCredentialsNode extends TbAbstractNodeWithFetchTo<TbFe
             ctx.tellFailure(msg, new RuntimeException("Failed to get Device Credentials for device: " + deviceId + "!"));
             return;
         }
-
-        TbMsg transformedMsg = null;
         var credentialsType = deviceCredentials.getCredentialsType();
         var credentialsInfo = ctx.getDeviceCredentialsService().toCredentialsInfo(deviceCredentials);
-
+        var metaData = msg.getMetaData().copy();
         if (FetchTo.METADATA.equals(fetchTo)) {
-            var metaData = msg.getMetaData();
             metaData.putValue(CREDENTIALS_TYPE, credentialsType.name());
             if (credentialsType.equals(DeviceCredentialsType.ACCESS_TOKEN) || credentialsType.equals(DeviceCredentialsType.X509_CERTIFICATE)) {
                 metaData.putValue(CREDENTIALS, credentialsInfo.asText());
             } else {
                 metaData.putValue(CREDENTIALS, JacksonUtil.toString(credentialsInfo));
             }
-            transformedMsg = TbMsg.transformMsg(msg, msg.getType(), originator, metaData, msg.getData());
         } else if (FetchTo.DATA.equals(fetchTo)) {
-            var data = getMsgDataAsObjectNode(msg);
+            msgDataAsObjectNode.put(CREDENTIALS_TYPE, credentialsType.name());
-            data.put(CREDENTIALS_TYPE, credentialsType.name());
+            msgDataAsObjectNode.set(CREDENTIALS, credentialsInfo);
-            data.set(CREDENTIALS, credentialsInfo);
-            transformedMsg = TbMsg.transformMsg(msg, msg.getType(), originator, msg.getMetaData(), JacksonUtil.toString(data));
         }
+        TbMsg transformedMsg = transformMessage(msg, msgDataAsObjectNode, metaData);
         ctx.tellSuccess(transformedMsg);
     }
+
 }

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java

@@ -49,7 +49,6 @@ public class TbGetAttributesNode extends TbAbstractGetAttributesNode<TbGetAttrib
 
     @Override
     protected ListenableFuture<EntityId> findEntityIdAsync(TbContext ctx, TbMsg msg) {
-        ctx.checkTenantEntity(msg.getOriginator());
         return Futures.immediateFuture(msg.getOriginator());
     }
 }

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeConfiguration.java

@@ -28,6 +28,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class TbGetAttributesNodeConfiguration extends TbAbstractFetchToNodeConfiguration implements NodeConfiguration<TbGetAttributesNodeConfiguration> {
+
     private List<String> clientAttributeNames;
     private List<String> sharedAttributeNames;
     private List<String> serverAttributeNames;
@@ -49,4 +50,5 @@ public class TbGetAttributesNodeConfiguration extends TbAbstractFetchToNodeConfi
         configuration.setFetchTo(FetchTo.METADATA);
         return configuration;
     }
+
 }

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java

@@ -15,6 +15,7 @@
  */
 package org.thingsboard.rule.engine.metadata;
 
+import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import org.thingsboard.rule.engine.api.RuleNode;
 import org.thingsboard.rule.engine.api.TbContext;
@@ -30,22 +31,30 @@ import org.thingsboard.server.common.data.plugin.ComponentType;
         type = ComponentType.ENRICHMENT,
         name = "customer attributes",
         configClazz = TbGetEntityAttrNodeConfiguration.class,
-        nodeDescription = "Add Originators Customer Attributes or Latest Telemetry into Message Metadata/Data",
+        nodeDescription = "Add Originators Customer Attributes or Latest Telemetry into Message or Metadata",
-        nodeDetails = "Enrich the Message Metadata/Data with the corresponding customer's latest attributes or telemetry value. " +
+        nodeDetails = "Enrich the Message or Metadata with the corresponding customer's latest attributes or telemetry value. " +
                 "The customer is selected based on the originator of the message: device, asset, etc. " +
                 "</br>" +
                 "Useful when you store some parameters on the customer level and would like to use them for message processing.",
         uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbEnrichmentNodeCustomerAttributesConfig")
 public class TbGetCustomerAttributeNode extends TbAbstractGetEntityAttrNode<CustomerId> {
+
+    private static final String CUSTOMER_NOT_FOUND_MESSAGE = "Failed to find customer for entity with id %s and type %s";
+
     @Override
-    protected ListenableFuture<CustomerId> findEntityAsync(TbContext ctx, EntityId originator) {
+    protected TbGetEntityAttrNodeConfiguration loadNodeConfiguration(TbNodeConfiguration configuration) throws TbNodeException {
-        ctx.checkTenantEntity(originator);
+        var config = TbNodeUtils.convert(configuration, TbGetEntityAttrNodeConfiguration.class);
-        return EntitiesCustomerIdAsyncLoader.findEntityIdAsync(ctx, originator);
+        checkIfMappingIsNotEmptyOrThrow(config);
+        return config;
     }
 
     @Override
-    protected TbGetEntityAttrNodeConfiguration loadNodeConfiguration(TbNodeConfiguration configuration) throws TbNodeException {
+    protected ListenableFuture<CustomerId> findEntityAsync(TbContext ctx, EntityId originator) {
-        return TbNodeUtils.convert(configuration, TbGetEntityAttrNodeConfiguration.class);
+        return Futures.transformAsync(EntitiesCustomerIdAsyncLoader.findEntityIdAsync(ctx, originator),
+                checkIfEntityIsPresentOrThrow(String.format(CUSTOMER_NOT_FOUND_MESSAGE, originator.getId(), originator.getEntityType().getNormalName())),
+                ctx.getDbCallbackExecutor()
+        );
     }
+
 }

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNode.java

@@ -29,6 +29,7 @@ import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.HasCustomerId;
 import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.id.AssetId;
+import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.EntityId;
@@ -37,6 +38,8 @@ import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.plugin.ComponentType;
 import org.thingsboard.server.common.msg.TbMsg;
 
+import java.util.NoSuchElementException;
+
 @Slf4j
 @RuleNode(type = ComponentType.ENRICHMENT,
         name = "customer details",
@@ -47,28 +50,24 @@ import org.thingsboard.server.common.msg.TbMsg;
                 "If the originator of the message is not assigned to Customer, or originator type is not supported - Message will be forwarded to <b>Failure</b> chain, otherwise, <b>Success</b> chain will be used.",
         uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbEnrichmentNodeEntityDetailsConfig")
-public class TbGetCustomerDetailsNode extends TbAbstractGetEntityDetailsNode<TbGetCustomerDetailsNodeConfiguration> {
+public class TbGetCustomerDetailsNode extends TbAbstractGetEntityDetailsNode<TbGetCustomerDetailsNodeConfiguration, CustomerId> {
+
     private static final String CUSTOMER_PREFIX = "customer_";
 
     @Override
     protected TbGetCustomerDetailsNodeConfiguration loadNodeConfiguration(TbNodeConfiguration configuration) throws TbNodeException {
-        return TbNodeUtils.convert(configuration, TbGetCustomerDetailsNodeConfiguration.class);
+        var config = TbNodeUtils.convert(configuration, TbGetCustomerDetailsNodeConfiguration.class);
+        checkIfDetailsListIsNotEmptyOrThrow(config);
+        return config;
     }
 
     @Override
-    protected ListenableFuture<TbMsg> getDetails(TbContext ctx, TbMsg msg) {
+    protected String getPrefix() {
-        ctx.checkTenantEntity(msg.getOriginator());
+        return CUSTOMER_PREFIX;
-        return getTbMsgListenableFuture(ctx, msg, getDataAsJson(msg), CUSTOMER_PREFIX);
     }
 
     @Override
-    protected ListenableFuture<ContactBased> getContactBasedListenableFuture(TbContext ctx, TbMsg msg) {
+    protected ListenableFuture<? extends ContactBased<CustomerId>> getContactBasedFuture(TbContext ctx, TbMsg msg) {
-        return Futures.transformAsync(getCustomer(ctx, msg), customer ->
-                        customer == null ? Futures.immediateFuture(null) : Futures.immediateFuture(customer),
-                MoreExecutors.directExecutor());
-    }
-
-    private ListenableFuture<Customer> getCustomer(TbContext ctx, TbMsg msg) {
         switch (msg.getOriginator().getEntityType()) {
             case DEVICE:
                 return Futures.transformAsync(ctx.getDeviceService().findDeviceByIdAsync(ctx.getTenantId(), new DeviceId(msg.getOriginator().getId())),
@@ -86,7 +85,7 @@ public class TbGetCustomerDetailsNode extends TbAbstractGetEntityDetailsNode<TbG
                 return Futures.transformAsync(ctx.getEdgeService().findEdgeByIdAsync(ctx.getTenantId(), new EdgeId(msg.getOriginator().getId())),
                         edge -> getCustomerFuture(ctx, edge, msg.getOriginator()), MoreExecutors.directExecutor());
             default:
-                throw new RuntimeException("Entity with entityType '" + msg.getOriginator().getEntityType() + "' is not supported.");
+                return Futures.immediateFailedFuture(new NoSuchElementException("Entity with entityType '" + msg.getOriginator().getEntityType() + "' is not supported."));
         }
     }
 
@@ -96,7 +95,7 @@ public class TbGetCustomerDetailsNode extends TbAbstractGetEntityDetailsNode<TbG
         } else {
             if (hasCustomerId.getCustomerId().isNullUid()) {
                 if (hasCustomerId instanceof HasName) {
-                    HasName hasName = (HasName) hasCustomerId;
+                    var hasName = (HasName) hasCustomerId;
                     throw new RuntimeException(originator.getEntityType().getNormalName() + " with name '" + hasName.getName() + "' is not assigned to Customer.");
                 }
                 throw new RuntimeException(originator.getEntityType().getNormalName() + " with id '" + originator + "' is not assigned to Customer.");

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeConfiguration.java

@@ -24,11 +24,13 @@ import java.util.Collections;
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class TbGetCustomerDetailsNodeConfiguration extends TbAbstractGetEntityDetailsNodeConfiguration implements NodeConfiguration<TbGetCustomerDetailsNodeConfiguration> {
+
     @Override
     public TbGetCustomerDetailsNodeConfiguration defaultConfiguration() {
         var configuration = new TbGetCustomerDetailsNodeConfiguration();
         configuration.setDetailsList(Collections.emptyList());
-        configuration.setFetchTo(FetchTo.METADATA);
+        configuration.setFetchTo(FetchTo.DATA);
         return configuration;
     }
+
 }

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNode.java

@@ -15,6 +15,7 @@
  */
 package org.thingsboard.rule.engine.metadata;
 
+import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.rule.engine.api.RuleNode;
@@ -39,6 +40,9 @@ import org.thingsboard.server.common.msg.TbMsg;
         uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbEnrichmentNodeDeviceAttributesConfig")
 public class TbGetDeviceAttrNode extends TbAbstractGetAttributesNode<TbGetDeviceAttrNodeConfiguration, DeviceId> {
+
+    private static final String RELATED_DEVICE_NOT_FOUND_MESSAGE = "Failed to find related device to message originator using relation query specified in the configuration!";
+
     @Override
     protected TbGetDeviceAttrNodeConfiguration loadNodeConfiguration(TbNodeConfiguration configuration) throws TbNodeException {
         return TbNodeUtils.convert(configuration, TbGetDeviceAttrNodeConfiguration.class);
@@ -46,7 +50,10 @@ public class TbGetDeviceAttrNode extends TbAbstractGetAttributesNode<TbGetDevice
 
     @Override
     protected ListenableFuture<DeviceId> findEntityIdAsync(TbContext ctx, TbMsg msg) {
-        ctx.checkTenantEntity(msg.getOriginator());
+        return Futures.transformAsync(
-        return EntitiesRelatedDeviceIdAsyncLoader.findDeviceAsync(ctx, msg.getOriginator(), config.getDeviceRelationsQuery());
+                EntitiesRelatedDeviceIdAsyncLoader.findDeviceAsync(ctx, msg.getOriginator(), config.getDeviceRelationsQuery()),
+                checkIfEntityIsPresentOrThrow(RELATED_DEVICE_NOT_FOUND_MESSAGE),
+                ctx.getDbCallbackExecutor());
     }
+
 }

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeConfiguration.java

@@ -26,6 +26,7 @@ import java.util.Collections;
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class TbGetDeviceAttrNodeConfiguration extends TbGetAttributesNodeConfiguration {
+
     private DeviceRelationsQuery deviceRelationsQuery;
 
     @Override
@@ -49,4 +50,5 @@ public class TbGetDeviceAttrNodeConfiguration extends TbGetAttributesNodeConfigu
 
         return configuration;
     }
+
 }

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetEntityAttrNodeConfiguration.java

@@ -25,17 +25,19 @@ import java.util.Map;
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class TbGetEntityAttrNodeConfiguration extends TbAbstractFetchToNodeConfiguration implements NodeConfiguration<TbGetEntityAttrNodeConfiguration> {
+
     private Map<String, String> attrMapping;
-    private boolean isTelemetry = false;
+    private boolean isTelemetry;
 
     @Override
     public TbGetEntityAttrNodeConfiguration defaultConfiguration() {
         var configuration = new TbGetEntityAttrNodeConfiguration();
         var attrMapping = new HashMap<String, String>();
-        attrMapping.putIfAbsent("serialNumber", "sn");
+        attrMapping.putIfAbsent("alarmThreshold", "threshold");
         configuration.setAttrMapping(attrMapping);
         configuration.setTelemetry(false);
         configuration.setFetchTo(FetchTo.METADATA);
         return configuration;
     }
+
 }

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsConfiguration.java

@@ -25,6 +25,7 @@ import java.util.Map;
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class TbGetOriginatorFieldsConfiguration extends TbAbstractFetchToNodeConfiguration implements NodeConfiguration<TbGetOriginatorFieldsConfiguration> {
+
     private Map<String, String> fieldsMapping;
     private boolean ignoreNullStrings;
 
@@ -39,4 +40,5 @@ public class TbGetOriginatorFieldsConfiguration extends TbAbstractFetchToNodeCon
         configuration.setFetchTo(FetchTo.METADATA);
         return configuration;
     }
+
 }

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNode.java

@@ -15,11 +15,9 @@
  */
 package org.thingsboard.rule.engine.metadata;
 
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
-import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.RuleNode;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.api.TbNodeConfiguration;
@@ -29,8 +27,8 @@ import org.thingsboard.rule.engine.util.EntitiesFieldsAsyncLoader;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.plugin.ComponentType;
 import org.thingsboard.server.common.msg.TbMsg;
+import org.thingsboard.server.common.msg.TbMsgMetaData;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -48,60 +46,53 @@ import static org.thingsboard.common.util.DonAsynchron.withCallback;
         uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbEnrichmentNodeOriginatorFieldsConfig")
 public class TbGetOriginatorFieldsNode extends TbAbstractNodeWithFetchTo<TbGetOriginatorFieldsConfiguration> {
+
     @Override
     protected TbGetOriginatorFieldsConfiguration loadNodeConfiguration(TbNodeConfiguration configuration) throws TbNodeException {
-        return TbNodeUtils.convert(configuration, TbGetOriginatorFieldsConfiguration.class);
+        var getOriginatorFieldsConfiguration = TbNodeUtils.convert(configuration, TbGetOriginatorFieldsConfiguration.class);
+        if (config.getFieldsMapping().isEmpty()) {
+            throw new TbNodeException("At least one field mapping should be specified!");
+        }
+        return getOriginatorFieldsConfiguration;
     }
 
     @Override
     public void onMsg(TbContext ctx, TbMsg msg) {
-        ObjectNode msgDataAsJsonNode;
-        if (FetchTo.DATA.equals(fetchTo)) {
-            msgDataAsJsonNode = getMsgDataAsObjectNode(msg);
-        } else {
-            msgDataAsJsonNode = null;
-        }
         ctx.checkTenantEntity(msg.getOriginator());
+        var msgDataAsObjectNode = FetchTo.DATA.equals(fetchTo) ? getMsgDataAsObjectNode(msg) : null;
         withCallback(collectMappedEntityFieldsAsync(ctx, msg.getOriginator()),
                 targetKeysToSourceValuesMap -> {
+                    TbMsgMetaData msgMetaData = msg.getMetaData().copy();
                     for (var entry : targetKeysToSourceValuesMap.entrySet()) {
                         var targetKeyName = entry.getKey();
                         var sourceFieldValue = entry.getValue();
                         if (FetchTo.DATA.equals(fetchTo)) {
-                            msgDataAsJsonNode.put(targetKeyName, sourceFieldValue);
+                            msgDataAsObjectNode.put(targetKeyName, sourceFieldValue);
                         } else if (FetchTo.METADATA.equals(fetchTo)) {
-                            msg.getMetaData().putValue(targetKeyName, sourceFieldValue);
+                            msgMetaData.putValue(targetKeyName, sourceFieldValue);
                         }
                     }
-
+                    TbMsg outMsg = transformMessage(msg, msgDataAsObjectNode, msgMetaData);
-                    if (FetchTo.DATA.equals(fetchTo)) {
+                    ctx.tellSuccess(outMsg);
-                        ctx.tellSuccess(TbMsg.transformMsgData(msg, JacksonUtil.toString(msgDataAsJsonNode)));
-                    } else if (FetchTo.METADATA.equals(fetchTo)) {
-                        ctx.tellSuccess(msg);
-                    }
                 },
                 t -> ctx.tellFailure(msg, t),
                 MoreExecutors.directExecutor());
     }
 
     private ListenableFuture<Map<String, String>> collectMappedEntityFieldsAsync(TbContext ctx, EntityId entityId) {
-        if (config.getFieldsMapping().isEmpty()) {
+        return Futures.transform(EntitiesFieldsAsyncLoader.findAsync(ctx, entityId),
-            return Futures.immediateFuture(Collections.emptyMap());
+                fieldsData -> {
-        } else {
+                    var targetKeysToSourceValuesMap = new HashMap<String, String>();
-            return Futures.transform(EntitiesFieldsAsyncLoader.findAsync(ctx, entityId),
+                    for (var mappingEntry : config.getFieldsMapping().entrySet()) {
-                    fieldsData -> {
+                        var sourceFieldName = mappingEntry.getKey();
-                        var targetKeysToSourceValuesMap = new HashMap<String, String>();
+                        var targetKeyName = mappingEntry.getValue();
-                        for (var mappingEntry : config.getFieldsMapping().entrySet()) {
+                        var sourceFieldValue = fieldsData.getFieldValue(sourceFieldName, config.isIgnoreNullStrings());
-                            var sourceFieldName = mappingEntry.getKey();
+                        if (sourceFieldValue != null) {
-                            var targetKeyName = mappingEntry.getValue();
+                            targetKeysToSourceValuesMap.put(targetKeyName, sourceFieldValue);
-                            var sourceFieldValue = fieldsData.getFieldValue(sourceFieldName, config.isIgnoreNullStrings());
-                            if (sourceFieldValue != null) {
-                                targetKeysToSourceValuesMap.put(targetKeyName, sourceFieldValue);
-                            }
                         }
-                        return targetKeysToSourceValuesMap;
+                    }
-                    }, ctx.getDbCallbackExecutor()
+                    return targetKeysToSourceValuesMap;
-            );
+                }, ctx.getDbCallbackExecutor()
-        }
+        );
     }
 }

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttrNodeConfiguration.java

@@ -28,6 +28,7 @@ import java.util.HashMap;
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class TbGetRelatedAttrNodeConfiguration extends TbGetEntityAttrNodeConfiguration {
+
     private RelationsQuery relationsQuery;
 
     @Override
@@ -37,14 +38,16 @@ public class TbGetRelatedAttrNodeConfiguration extends TbGetEntityAttrNodeConfig
         attrMapping.putIfAbsent("serialNumber", "sn");
         configuration.setAttrMapping(attrMapping);
         configuration.setTelemetry(false);
+        configuration.setFetchTo(FetchTo.METADATA);
 
         var relationsQuery = new RelationsQuery();
+        var relationEntityTypeFilter = new RelationEntityTypeFilter(EntityRelation.CONTAINS_TYPE, Collections.emptyList());
         relationsQuery.setDirection(EntitySearchDirection.FROM);
         relationsQuery.setMaxLevel(1);
-        var relationEntityTypeFilter = new RelationEntityTypeFilter(EntityRelation.CONTAINS_TYPE, Collections.emptyList());
         relationsQuery.setFilters(Collections.singletonList(relationEntityTypeFilter));
         configuration.setRelationsQuery(relationsQuery);
 
         return configuration;
     }
+
 }

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNode.java

@@ -15,6 +15,7 @@
  */
 package org.thingsboard.rule.engine.metadata;
 
+import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import org.thingsboard.rule.engine.api.RuleNode;
 import org.thingsboard.rule.engine.api.TbContext;
@@ -39,15 +40,23 @@ import org.thingsboard.server.common.data.plugin.ComponentType;
         uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbEnrichmentNodeRelatedAttributesConfig")
 public class TbGetRelatedAttributeNode extends TbAbstractGetEntityAttrNode<EntityId> {
+
+    private static final String RELATED_ENTITY_NOT_FOUND_MESSAGE = "Failed to find related entity to message originator using relation query specified in the configuration!";
+
     @Override
     public TbGetRelatedAttrNodeConfiguration loadNodeConfiguration(TbNodeConfiguration configuration) throws TbNodeException {
-        return TbNodeUtils.convert(configuration, TbGetRelatedAttrNodeConfiguration.class);
+        var config = TbNodeUtils.convert(configuration, TbGetRelatedAttrNodeConfiguration.class);
+        checkIfMappingIsNotEmptyOrThrow(config);
+        return config;
     }
 
     @Override
     public ListenableFuture<EntityId> findEntityAsync(TbContext ctx, EntityId originator) {
-        ctx.checkTenantEntity(originator);
         var relatedAttrConfig = (TbGetRelatedAttrNodeConfiguration) config;
-        return EntitiesRelatedEntityIdAsyncLoader.findEntityAsync(ctx, originator, relatedAttrConfig.getRelationsQuery());
+        return Futures.transformAsync(
+                EntitiesRelatedEntityIdAsyncLoader.findEntityAsync(ctx, originator, relatedAttrConfig.getRelationsQuery()),
+                checkIfEntityIsPresentOrThrow(RELATED_ENTITY_NOT_FOUND_MESSAGE),
+                ctx.getDbCallbackExecutor());
     }
+
 }

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java

@@ -40,14 +40,17 @@ import org.thingsboard.server.common.data.plugin.ComponentType;
         uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbEnrichmentNodeTenantAttributesConfig")
 public class TbGetTenantAttributeNode extends TbAbstractGetEntityAttrNode<TenantId> {
+
     @Override
-    public ListenableFuture<TenantId> findEntityAsync(TbContext ctx, EntityId originator) {
+    public TbGetEntityAttrNodeConfiguration loadNodeConfiguration(TbNodeConfiguration configuration) throws TbNodeException {
-        ctx.checkTenantEntity(originator);
+        var config = TbNodeUtils.convert(configuration, TbGetEntityAttrNodeConfiguration.class);
-        return Futures.immediateFuture(ctx.getTenantId());
+        checkIfMappingIsNotEmptyOrThrow(config);
+        return config;
     }
 
     @Override
-    public TbGetEntityAttrNodeConfiguration loadNodeConfiguration(TbNodeConfiguration configuration) throws TbNodeException {
+    public ListenableFuture<TenantId> findEntityAsync(TbContext ctx, EntityId originator) {
-        return TbNodeUtils.convert(configuration, TbGetEntityAttrNodeConfiguration.class);
+        return Futures.immediateFuture(ctx.getTenantId());
     }
+
 }

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNode.java

@@ -15,9 +15,7 @@
  */
 package org.thingsboard.rule.engine.metadata;
 
-import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.MoreExecutors;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.rule.engine.api.RuleNode;
 import org.thingsboard.rule.engine.api.TbContext;
@@ -25,6 +23,7 @@ import org.thingsboard.rule.engine.api.TbNodeConfiguration;
 import org.thingsboard.rule.engine.api.TbNodeException;
 import org.thingsboard.rule.engine.api.util.TbNodeUtils;
 import org.thingsboard.server.common.data.ContactBased;
+import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.plugin.ComponentType;
 import org.thingsboard.server.common.msg.TbMsg;
 
@@ -38,25 +37,25 @@ import org.thingsboard.server.common.msg.TbMsg;
                 "If the originator of the message is not assigned to Tenant, or originator type is not supported - Message will be forwarded to <b>Failure</b> chain, otherwise, <b>Success</b> chain will be used.",
         uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbEnrichmentNodeEntityDetailsConfig")
-public class TbGetTenantDetailsNode extends TbAbstractGetEntityDetailsNode<TbGetTenantDetailsNodeConfiguration> {
+public class TbGetTenantDetailsNode extends TbAbstractGetEntityDetailsNode<TbGetTenantDetailsNodeConfiguration, TenantId> {
+
     private static final String TENANT_PREFIX = "tenant_";
 
     @Override
     protected TbGetTenantDetailsNodeConfiguration loadNodeConfiguration(TbNodeConfiguration configuration) throws TbNodeException {
-        return TbNodeUtils.convert(configuration, TbGetTenantDetailsNodeConfiguration.class);
+        var config = TbNodeUtils.convert(configuration, TbGetTenantDetailsNodeConfiguration.class);
+        checkIfDetailsListIsNotEmptyOrThrow(config);
+        return config;
     }
 
     @Override
-    protected ListenableFuture<TbMsg> getDetails(TbContext ctx, TbMsg msg) {
+    protected String getPrefix() {
-        ctx.checkTenantEntity(msg.getOriginator());
+        return TENANT_PREFIX;
-        return getTbMsgListenableFuture(ctx, msg, getDataAsJson(msg), TENANT_PREFIX);
     }
 
     @Override
-    protected ListenableFuture<ContactBased> getContactBasedListenableFuture(TbContext ctx, TbMsg msg) {
+    protected ListenableFuture<? extends ContactBased<TenantId>> getContactBasedFuture(TbContext ctx, TbMsg msg) {
-        ctx.checkTenantEntity(msg.getOriginator());
+        return ctx.getTenantService().findTenantByIdAsync(ctx.getTenantId(), ctx.getTenantId());
-        return Futures.transformAsync(ctx.getTenantService().findTenantByIdAsync(ctx.getTenantId(), ctx.getTenantId()), tenant ->
-                        tenant == null ? Futures.immediateFuture(null) : Futures.immediateFuture(tenant),
-                MoreExecutors.directExecutor());
     }
+
 }

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeConfiguration.java

@@ -24,11 +24,13 @@ import java.util.Collections;
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class TbGetTenantDetailsNodeConfiguration extends TbAbstractGetEntityDetailsNodeConfiguration implements NodeConfiguration<TbGetTenantDetailsNodeConfiguration> {
+
     @Override
     public TbGetTenantDetailsNodeConfiguration defaultConfiguration() {
         TbGetTenantDetailsNodeConfiguration configuration = new TbGetTenantDetailsNodeConfiguration();
         configuration.setDetailsList(Collections.emptyList());
-        configuration.setFetchTo(FetchTo.METADATA);
+        configuration.setFetchTo(FetchTo.DATA);
         return configuration;
     }
+
 }

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbAbstractTransformNode.java

@@ -36,12 +36,13 @@ import static org.thingsboard.common.util.DonAsynchron.withCallback;
  * Created by ashvayka on 19.01.18.
  */
 @Slf4j
-public abstract class TbAbstractTransformNode implements TbNode {
+public abstract class TbAbstractTransformNode<C> implements TbNode {
-    private TbTransformNodeConfiguration config;
+
+    protected C config;
 
     @Override
-    public void init(TbContext context, TbNodeConfiguration configuration) throws TbNodeException {
+    public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException {
-        this.config = TbNodeUtils.convert(configuration, TbTransformNodeConfiguration.class);
+        config = loadNodeConfiguration(ctx, configuration);
     }
 
     @Override
@@ -52,18 +53,12 @@ public abstract class TbAbstractTransformNode implements TbNode {
                 MoreExecutors.directExecutor());
     }
 
+    protected abstract C loadNodeConfiguration(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException;
+
     protected void transformFailure(TbContext ctx, TbMsg msg, Throwable t) {
         ctx.tellFailure(msg, t);
     }
 
-    protected void transformSuccess(TbContext ctx, TbMsg msg, TbMsg m) {
-        if (m != null) {
-            ctx.tellSuccess(m);
-        } else {
-            ctx.tellFailure(msg, new RuntimeException("Message is null!"));
-        }
-    }
-
     protected void transformSuccess(TbContext ctx, TbMsg msg, List<TbMsg> msgs) {
         if (msgs != null && !msgs.isEmpty()) {
             if (msgs.size() == 1) {
@@ -89,7 +84,4 @@ public abstract class TbAbstractTransformNode implements TbNode {
 
     protected abstract ListenableFuture<List<TbMsg>> transform(TbContext ctx, TbMsg msg);
 
-    public void setConfig(TbTransformNodeConfiguration config) {
-        this.config = config;
-    }
 }

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

@@ -37,6 +37,7 @@ import org.thingsboard.server.common.msg.TbMsg;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.NoSuchElementException;
 
 @Slf4j
 @RuleNode(
@@ -51,31 +52,36 @@ import java.util.List;
         configDirective = "tbTransformationNodeChangeOriginatorConfig",
         icon = "find_replace"
 )
-public class TbChangeOriginatorNode extends TbAbstractTransformNode {
+public class TbChangeOriginatorNode extends TbAbstractTransformNode<TbChangeOriginatorNodeConfiguration> {
 
-    protected static final String CUSTOMER_SOURCE = "CUSTOMER";
+    private static final String CUSTOMER_SOURCE = "CUSTOMER";
-    protected static final String TENANT_SOURCE = "TENANT";
+    private static final String TENANT_SOURCE = "TENANT";
-    protected static final String RELATED_SOURCE = "RELATED";
+    private static final String RELATED_SOURCE = "RELATED";
-    protected static final String ALARM_ORIGINATOR_SOURCE = "ALARM_ORIGINATOR";
+    private static final String ALARM_ORIGINATOR_SOURCE = "ALARM_ORIGINATOR";
-    protected static final String ENTITY_SOURCE = "ENTITY";
+    private static final String ENTITY_SOURCE = "ENTITY";
-
-    private TbChangeOriginatorNodeConfiguration config;
 
     @Override
-    public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException {
+    protected TbChangeOriginatorNodeConfiguration loadNodeConfiguration(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException {
-        this.config = TbNodeUtils.convert(configuration, TbChangeOriginatorNodeConfiguration.class);
+        var config = TbNodeUtils.convert(configuration, TbChangeOriginatorNodeConfiguration.class);
         validateConfig(config);
-        setConfig(config);
+        return config;
     }
 
     @Override
     protected ListenableFuture<List<TbMsg>> transform(TbContext ctx, TbMsg msg) {
-        ListenableFuture<? extends EntityId> newOriginator = getNewOriginator(ctx, msg);
+        ListenableFuture<? extends EntityId> newOriginatorFuture = getNewOriginator(ctx, msg);
-        return Futures.transform(newOriginator, n -> {
+        return Futures.transformAsync(newOriginatorFuture, newOriginator -> {
-            if (n == null || n.isNullUid()) {
+            if (newOriginator == null || newOriginator.isNullUid()) {
-                return null;
+                return Futures.immediateFailedFuture(new NoSuchElementException("Failed to find new originator!"));
             }
-            return Collections.singletonList((ctx.transformMsg(msg, msg.getType(), n, msg.getMetaData(), msg.getData())));
+            return Futures.immediateFuture(
+                    Collections.singletonList(
+                            ctx.transformMsg(
+                                    msg,
+                                    msg.getType(),
+                                    newOriginator,
+                                    msg.getMetaData(),
+                                    msg.getData())));
         }, ctx.getDbCallbackExecutor());
     }
 
@@ -129,7 +135,6 @@ public class TbChangeOriginatorNode extends TbAbstractTransformNode {
             }
             EntitiesByNameAndTypeLoader.checkEntityType(EntityType.valueOf(conf.getEntityType()));
         }
-
     }
 
 }

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeConfiguration.java

@@ -25,7 +25,9 @@ import org.thingsboard.server.common.data.relation.RelationEntityTypeFilter;
 import java.util.Collections;
 
 @Data
-public class TbChangeOriginatorNodeConfiguration extends TbTransformNodeConfiguration implements NodeConfiguration {
+public class TbChangeOriginatorNodeConfiguration implements NodeConfiguration<TbChangeOriginatorNodeConfiguration> {
+
+    private static final String CUSTOMER_SOURCE = "CUSTOMER";
 
     private String originatorSource;
 
@@ -36,7 +38,7 @@ public class TbChangeOriginatorNodeConfiguration extends TbTransformNodeConfigur
     @Override
     public TbChangeOriginatorNodeConfiguration defaultConfiguration() {
         TbChangeOriginatorNodeConfiguration configuration = new TbChangeOriginatorNodeConfiguration();
-        configuration.setOriginatorSource(TbChangeOriginatorNode.CUSTOMER_SOURCE);
+        configuration.setOriginatorSource(CUSTOMER_SOURCE);
 
         RelationsQuery relationsQuery = new RelationsQuery();
         relationsQuery.setDirection(EntitySearchDirection.FROM);

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNode.java

@@ -43,17 +43,16 @@ import java.util.List;
         uiResources = {"static/rulenode/rulenode-core-config.js"},
         configDirective = "tbTransformationNodeScriptConfig"
 )
-public class TbTransformMsgNode extends TbAbstractTransformNode {
+public class TbTransformMsgNode extends TbAbstractTransformNode<TbTransformMsgNodeConfiguration> {
 
-    private TbTransformMsgNodeConfiguration config;
     private ScriptEngine scriptEngine;
 
     @Override
-    public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException {
+    protected TbTransformMsgNodeConfiguration loadNodeConfiguration(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException {
-        this.config = TbNodeUtils.convert(configuration, TbTransformMsgNodeConfiguration.class);
+        var config = TbNodeUtils.convert(configuration, TbTransformMsgNodeConfiguration.class);
         scriptEngine = ctx.createScriptEngine(config.getScriptLang(),
                 ScriptLanguage.TBEL.equals(config.getScriptLang()) ? config.getTbelScript() : config.getJsScript());
-        setConfig(config);
+        return config;
     }
 
     @Override
@@ -62,12 +61,6 @@ public class TbTransformMsgNode extends TbAbstractTransformNode {
         return scriptEngine.executeUpdateAsync(msg);
     }
 
-    @Override
-    protected void transformSuccess(TbContext ctx, TbMsg msg, TbMsg m) {
-        ctx.logJsEvalResponse();
-        super.transformSuccess(ctx, msg, m);
-    }
-
     @Override
     protected void transformFailure(TbContext ctx, TbMsg msg, Throwable t) {
         ctx.logJsEvalFailure();

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeConfiguration.java

@@ -20,7 +20,7 @@ import org.thingsboard.rule.engine.api.NodeConfiguration;
 import org.thingsboard.server.common.data.script.ScriptLanguage;
 
 @Data
-public class TbTransformMsgNodeConfiguration extends TbTransformNodeConfiguration implements NodeConfiguration {
+public class TbTransformMsgNodeConfiguration implements NodeConfiguration<TbTransformMsgNodeConfiguration> {
 
     private ScriptLanguage scriptLang;
     private String jsScript;

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbTransformNodeConfiguration.java

@@ -1,23 +0,0 @@
-/**
- * Copyright © 2016-2023 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.rule.engine.transform;
-
-import lombok.Data;
-
-@Data
-public class TbTransformNodeConfiguration {
-
-}

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesCustomerIdAsyncLoader.java

@@ -29,9 +29,7 @@ import org.thingsboard.server.common.data.id.UserId;
 
 public class EntitiesCustomerIdAsyncLoader {
 
-
     public static ListenableFuture<CustomerId> findEntityIdAsync(TbContext ctx, EntityId original) {
-
         switch (original.getEntityType()) {
             case CUSTOMER:
                 return Futures.immediateFuture((CustomerId) original);

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesFieldsAsyncLoader.java

@@ -17,8 +17,6 @@ package org.thingsboard.rule.engine.util;
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.MoreExecutors;
-import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.api.TbNodeException;
 import org.thingsboard.server.common.data.BaseData;
@@ -34,36 +32,37 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UUIDBased;
 import org.thingsboard.server.common.data.id.UserId;
 
+import java.util.NoSuchElementException;
 import java.util.function.Function;
 
-@Slf4j
 public class EntitiesFieldsAsyncLoader {
+
     public static ListenableFuture<EntityFieldsData> findAsync(TbContext ctx, EntityId originatorId) {
         switch (originatorId.getEntityType()) {
             case TENANT:
                 return toEntityFieldsDataAsync(ctx.getTenantService().findTenantByIdAsync(ctx.getTenantId(), (TenantId) originatorId),
-                        EntityFieldsData::new);
+                        EntityFieldsData::new, ctx);
             case CUSTOMER:
                 return toEntityFieldsDataAsync(ctx.getCustomerService().findCustomerByIdAsync(ctx.getTenantId(), (CustomerId) originatorId),
-                        EntityFieldsData::new);
+                        EntityFieldsData::new, ctx);
             case USER:
                 return toEntityFieldsDataAsync(ctx.getUserService().findUserByIdAsync(ctx.getTenantId(), (UserId) originatorId),
-                        EntityFieldsData::new);
+                        EntityFieldsData::new, ctx);
             case ASSET:
                 return toEntityFieldsDataAsync(ctx.getAssetService().findAssetByIdAsync(ctx.getTenantId(), (AssetId) originatorId),
-                        EntityFieldsData::new);
+                        EntityFieldsData::new, ctx);
             case DEVICE:
                 return toEntityFieldsDataAsync(ctx.getDeviceService().findDeviceByIdAsync(ctx.getTenantId(), (DeviceId) originatorId),
-                        EntityFieldsData::new);
+                        EntityFieldsData::new, ctx);
             case ALARM:
                 return toEntityFieldsDataAsync(ctx.getAlarmService().findAlarmByIdAsync(ctx.getTenantId(), (AlarmId) originatorId),
-                        EntityFieldsData::new);
+                        EntityFieldsData::new, ctx);
             case RULE_CHAIN:
                 return toEntityFieldsDataAsync(ctx.getRuleChainService().findRuleChainByIdAsync(ctx.getTenantId(), (RuleChainId) originatorId),
-                        EntityFieldsData::new);
+                        EntityFieldsData::new, ctx);
             case ENTITY_VIEW:
                 return toEntityFieldsDataAsync(ctx.getEntityViewService().findEntityViewByIdAsync(ctx.getTenantId(), (EntityViewId) originatorId),
-                        EntityFieldsData::new);
+                        EntityFieldsData::new, ctx);
             default:
                 return Futures.immediateFailedFuture(new TbNodeException("Unexpected originator EntityType: " + originatorId.getEntityType()));
         }
@@ -71,10 +70,12 @@ public class EntitiesFieldsAsyncLoader {
 
     private static <T extends BaseData<? extends UUIDBased>> ListenableFuture<EntityFieldsData> toEntityFieldsDataAsync(
             ListenableFuture<T> future,
-            Function<T, EntityFieldsData> converter
+            Function<T, EntityFieldsData> converter,
+            TbContext ctx
     ) {
         return Futures.transformAsync(future, in -> in != null ?
                 Futures.immediateFuture(converter.apply(in))
-                : Futures.immediateFailedFuture(new TbNodeException("Entity not found!")), MoreExecutors.directExecutor());
+                : Futures.immediateFailedFuture(new NoSuchElementException("Entity not found!")), ctx.getDbCallbackExecutor());
     }
+
 }

rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java

@@ -53,6 +53,8 @@ import static org.thingsboard.rule.engine.api.TbRelationTypes.FAILURE;
 @RunWith(MockitoJUnitRunner.class)
 public class TbChangeOriginatorNodeTest {
 
+    private static final String CUSTOMER_SOURCE = "CUSTOMER";
+
     private TbChangeOriginatorNode node;
 
     @Mock
@@ -158,7 +160,7 @@ public class TbChangeOriginatorNodeTest {
 
     public void init() throws TbNodeException {
         TbChangeOriginatorNodeConfiguration config = new TbChangeOriginatorNodeConfiguration();
-        config.setOriginatorSource(TbChangeOriginatorNode.CUSTOMER_SOURCE);
+        config.setOriginatorSource(CUSTOMER_SOURCE);
         ObjectMapper mapper = new ObjectMapper();
         TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(mapper.valueToTree(config));