From fbd039384a49b814b44cb1ca7349511c65820469 Mon Sep 17 00:00:00 2001
From: Yuriy Lytvynchuk <yuriy.litv@gmail.com>
Date: Fri, 26 Aug 2022 11:44:28 +0300
Subject: [PATCH] refactor code

---
 .../engine/transform/TbDeleteKeysNode.java    | 52 +++++++++++--------
 .../TbDeleteKeysNodeConfiguration.java        |  4 --
 .../transform/TbDeleteKeysNodeTest.java       |  4 +-
 3 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNode.java
index e3d2be336a..d52728d8dc 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNode.java
@@ -32,7 +32,7 @@ import org.thingsboard.server.common.msg.TbMsgMetaData;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
+import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.regex.Pattern;
 
@@ -51,49 +51,58 @@ import java.util.regex.Pattern;
 public class TbDeleteKeysNode implements TbNode {
 
     TbDeleteKeysNodeConfiguration config;
+    List<Pattern> patternKeys = new ArrayList<>();
+    boolean fromMetadata;
 
     @Override
     public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException {
         this.config = TbNodeUtils.convert(configuration, TbDeleteKeysNodeConfiguration.class);
+        this.fromMetadata = config.isFromMetadata();
+        config.getKeys().forEach(key -> {
+            this.patternKeys.add(Pattern.compile(key));
+        });
     }
 
     @Override
     public void onMsg(TbContext ctx, TbMsg msg) throws ExecutionException, InterruptedException, TbNodeException {
-        Set<String> keys = config.getKeys();
         TbMsgMetaData metaData = msg.getMetaData();
         String msgData = msg.getData();
-        if (config.isFromMetadata()) {
+        List<String> keysToDelete = new ArrayList<>();
+        if (fromMetadata) {
             Map<String, String> metaDataMap = metaData.getData();
-            List<String> keysToDelete = new ArrayList<>();
-            keys.forEach(key -> {
-                Pattern pattern = Pattern.compile(key);
-                metaDataMap.forEach((keyMetaData, valueMetaData) -> {
-                    if (pattern.matcher(keyMetaData).matches()) {
-                        keysToDelete.add(keyMetaData);
-                    }
-                });
+            metaDataMap.forEach((keyMetaData, valueMetaData) -> {
+                if (checkKey(keyMetaData)) {
+                    keysToDelete.add(keyMetaData);
+                }
             });
             keysToDelete.forEach(key -> metaDataMap.remove(key));
             metaData = new TbMsgMetaData(metaDataMap);
         } else {
             JsonNode dataNode = JacksonUtil.toJsonNode(msgData);
             if (dataNode.isObject()) {
-                List<String> keysToDelete = new ArrayList<>();
                 ObjectNode msgDataObject = (ObjectNode) dataNode;
-                keys.forEach(key -> {
-                    Pattern pattern = Pattern.compile(key);
-                    msgDataObject.fields().forEachRemaining(entry -> {
-                        String keyData = entry.getKey();
-                        if (pattern.matcher(keyData).matches()) {
-                            keysToDelete.add(keyData);
-                        }
-                    });
+                dataNode.fields().forEachRemaining(entry -> {
+                    String keyData = entry.getKey();
+                    if (checkKey(keyData)) {
+                        keysToDelete.add(keyData);
+                    }
                 });
                 msgDataObject.remove(keysToDelete);
                 msgData = JacksonUtil.toString(msgDataObject);
             }
         }
-        ctx.tellSuccess(TbMsg.transformMsg(msg, msg.getType(), msg.getOriginator(), metaData, msgData));
+        if (keysToDelete.isEmpty()) {
+            ctx.tellSuccess(msg);
+        } else {
+            ctx.tellSuccess(TbMsg.transformMsg(msg, msg.getType(), msg.getOriginator(), metaData, msgData));
+        }
+    }
+
+    boolean checkKey(String key) {
+        Optional<Pattern> currentPattern = patternKeys.stream()
+                .filter(pattern -> pattern.matcher(key).matches())
+                .findFirst();
+        return currentPattern.isPresent();
     }
 
     @Override
@@ -101,4 +110,3 @@ public class TbDeleteKeysNode implements TbNode {
 
     }
 }
-
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNodeConfiguration.java
index 36c5eda7de..5666aaffca 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNodeConfiguration.java
@@ -19,7 +19,6 @@ import lombok.Data;
 import org.thingsboard.rule.engine.api.NodeConfiguration;
 
 import java.util.Collections;
-import java.util.List;
 import java.util.Set;
 
 @Data
@@ -37,6 +36,3 @@ public class TbDeleteKeysNodeConfiguration implements NodeConfiguration<TbDelete
     }
 
 }
-
-
-
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNodeTest.java
index 5ccf97c4c3..b6c40b8992 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNodeTest.java
@@ -75,6 +75,7 @@ public class TbDeleteKeysNodeTest {
     @Test
     void givenDefaultConfig_whenInit_thenOK() {
         assertThat(node.config).isEqualTo(config);
+        assertThat(node.patternKeys.size()).isEqualTo(config.getKeys().size());
     }
 
     @Test
@@ -150,4 +151,5 @@ public class TbDeleteKeysNodeTest {
         );
         return TbMsg.newMsg("POST_ATTRIBUTES_REQUEST", entityId, new TbMsgMetaData(mdMap), data, callback);
     }
-}
\ No newline at end of file
+
+}