From baf17c6488090a9aea8527be1c03fafc7e90968d Mon Sep 17 00:00:00 2001
From: Yuriy Lytvynchuk <yuriy.litv@gmail.com>
Date: Wed, 21 Sep 2022 16:57:22 +0300
Subject: [PATCH] code review

---
 .../thingsboard/server/common/data/EntityFieldsData.java  | 7 +++++++
 .../metadata/TbGetOriginatorFieldsConfiguration.java      | 4 ++--
 .../rule/engine/metadata/TbGetOriginatorFieldsNode.java   | 8 ++++----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/EntityFieldsData.java b/common/data/src/main/java/org/thingsboard/server/common/data/EntityFieldsData.java
index c3cd2b12b4..04c526b6fe 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/EntityFieldsData.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/EntityFieldsData.java
@@ -50,6 +50,10 @@ public class EntityFieldsData {
     }
 
     public String getFieldValue(String field) {
+        return getFieldValue(field, false);
+    }
+
+    public String getFieldValue(String field, boolean ignoreNullStrings) {
         String[] fieldsTree = field.split("\\.");
         JsonNode current = fieldsData;
         for (String key : fieldsTree) {
@@ -61,6 +65,9 @@ public class EntityFieldsData {
             }
         }
         if (current != null) {
+            if(current.isNull() && ignoreNullStrings){
+                return null;
+            }
             if (current.isValueNode()) {
                 return current.asText();
             } else {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsConfiguration.java
index 0648b81588..b0e9bf39e5 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsConfiguration.java
@@ -25,7 +25,7 @@ import java.util.Map;
 public class TbGetOriginatorFieldsConfiguration implements NodeConfiguration<TbGetOriginatorFieldsConfiguration> {
 
     private Map<String, String> fieldsMapping;
-    private boolean ignoreStringNull;
+    private boolean ignoreNullStrings;
 
     @Override
     public TbGetOriginatorFieldsConfiguration defaultConfiguration() {
@@ -34,7 +34,7 @@ public class TbGetOriginatorFieldsConfiguration implements NodeConfiguration<TbG
         fieldsMapping.put("name", "originatorName");
         fieldsMapping.put("type", "originatorType");
         configuration.setFieldsMapping(fieldsMapping);
-        configuration.setIgnoreStringNull(false);
+        configuration.setIgnoreNullStrings(false);
         return configuration;
     }
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNode.java
index 8c3c349b83..4832158783 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNode.java
@@ -46,12 +46,12 @@ import static org.thingsboard.common.util.DonAsynchron.withCallback;
 public class TbGetOriginatorFieldsNode implements TbNode {
 
     private TbGetOriginatorFieldsConfiguration config;
-    private boolean ignoreStringNull;
+    private boolean ignoreNullStrings;
 
     @Override
     public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException {
         config = TbNodeUtils.convert(configuration, TbGetOriginatorFieldsConfiguration.class);
-        ignoreStringNull = config.isIgnoreStringNull();
+        ignoreNullStrings = config.isIgnoreNullStrings();
     }
 
     @Override
@@ -71,8 +71,8 @@ public class TbGetOriginatorFieldsNode implements TbNode {
             return Futures.transform(EntitiesFieldsAsyncLoader.findAsync(ctx, entityId),
                     data -> {
                         config.getFieldsMapping().forEach((field, metaKey) -> {
-                            String val = data.getFieldValue(field);
-                            if (val != null && (!val.equals("null") || !ignoreStringNull)) {
+                            String val = data.getFieldValue(field, ignoreNullStrings);
+                            if (val != null) {
                                 msg.getMetaData().putValue(metaKey, val);
                             }
                         });