From 13130ff25770b5af1c546d8ac232e79dfed28219 Mon Sep 17 00:00:00 2001
From: Yuriy Lytvynchuk <yuriy.litv@gmail.com>
Date: Mon, 12 Sep 2022 17:05:58 +0300
Subject: [PATCH] add ignoreStringNull

---
 .../engine/metadata/TbGetOriginatorFieldsConfiguration.java   | 2 ++
 .../rule/engine/metadata/TbGetOriginatorFieldsNode.java       | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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 be8e356b59..0648b81588 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,6 +25,7 @@ import java.util.Map;
 public class TbGetOriginatorFieldsConfiguration implements NodeConfiguration<TbGetOriginatorFieldsConfiguration> {
 
     private Map<String, String> fieldsMapping;
+    private boolean ignoreStringNull;
 
     @Override
     public TbGetOriginatorFieldsConfiguration defaultConfiguration() {
@@ -33,6 +34,7 @@ public class TbGetOriginatorFieldsConfiguration implements NodeConfiguration<TbG
         fieldsMapping.put("name", "originatorName");
         fieldsMapping.put("type", "originatorType");
         configuration.setFieldsMapping(fieldsMapping);
+        configuration.setIgnoreStringNull(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 b21d35aa71..8c3c349b83 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,10 +46,12 @@ import static org.thingsboard.common.util.DonAsynchron.withCallback;
 public class TbGetOriginatorFieldsNode implements TbNode {
 
     private TbGetOriginatorFieldsConfiguration config;
+    private boolean ignoreStringNull;
 
     @Override
     public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException {
         config = TbNodeUtils.convert(configuration, TbGetOriginatorFieldsConfiguration.class);
+        ignoreStringNull = config.isIgnoreStringNull();
     }
 
     @Override
@@ -70,7 +72,7 @@ public class TbGetOriginatorFieldsNode implements TbNode {
                     data -> {
                         config.getFieldsMapping().forEach((field, metaKey) -> {
                             String val = data.getFieldValue(field);
-                            if (val != null && !val.equals("null")) {
+                            if (val != null && (!val.equals("null") || !ignoreStringNull)) {
                                 msg.getMetaData().putValue(metaKey, val);
                             }
                         });