PROD-2240 & added missing version to check relation presence node

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckRelationNode.java

@@ -49,6 +49,7 @@ import static org.thingsboard.common.util.DonAsynchron.withCallback;
         type = ComponentType.FILTER,
         name = "check relation presence",
         configClazz = TbCheckRelationNodeConfiguration.class,
+        version = 1,
         relationTypes = {TbNodeConnectionType.TRUE, TbNodeConnectionType.FALSE},
         nodeDescription = "Checks the presence of the relation between the originator of the message and other entities.",
         nodeDetails = "If 'check relation to specific entity' is selected, you should specify a related entity. " +

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

@@ -15,6 +15,7 @@
  */
 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.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -75,6 +76,20 @@ public abstract class TbAbstractGetAttributesNode<C extends TbGetAttributesNodeC
 
     protected abstract ListenableFuture<T> findEntityIdAsync(TbContext ctx, TbMsg msg);
 
+    protected TbPair<Boolean, JsonNode> upgradeRuleNodesWithOldPropertyToUseFetchTo(
+            JsonNode oldConfiguration,
+            String oldProperty,
+            String ifTrue,
+            String ifFalse
+    ) throws TbNodeException {
+        var newConfigObjectNode = (ObjectNode) oldConfiguration;
+        if (!newConfigObjectNode.has(oldProperty)) {
+            newConfigObjectNode.put(FETCH_TO_PROPERTY_NAME, FetchTo.METADATA.name());
+            return new TbPair<>(true, newConfigObjectNode);
+        }
+        return upgradeConfigurationToUseFetchTo(oldProperty, ifTrue, ifFalse, newConfigObjectNode);
+    }
+
     private void safePutAttributes(TbContext ctx, TbMsg msg, ObjectNode msgDataNode, T entityId) {
         Set<TbPair<String, List<String>>> failuresPairSet = ConcurrentHashMap.newKeySet();
         var getKvEntryPairFutures = Futures.allAsList(

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

@@ -96,21 +96,29 @@ public abstract class TbAbstractNodeWithFetchTo<C extends TbAbstractFetchToNodeC
             String ifTrue,
             String ifFalse
     ) throws TbNodeException {
-        var newConfigObjectNode = (ObjectNode) oldConfiguration;
-        if (!newConfigObjectNode.has(oldProperty)) {
+        var newConfig = (ObjectNode) oldConfiguration;
+        if (!newConfig.has(oldProperty)) {
             throw new TbNodeException("property to update: '" + oldProperty + "' doesn't exists in configuration!");
         }
-        var value = newConfigObjectNode.get(oldProperty).asText();
+        return upgradeConfigurationToUseFetchTo(oldProperty, ifTrue, ifFalse, newConfig);
+    }
+
+    protected TbPair<Boolean, JsonNode> upgradeConfigurationToUseFetchTo(
+            String oldProperty, String ifTrue,
+            String ifFalse, ObjectNode newConfig
+    ) throws TbNodeException {
+        var value = newConfig.get(oldProperty).asText();
         if ("true".equals(value)) {
-            newConfigObjectNode.remove(oldProperty);
-            newConfigObjectNode.put(FETCH_TO_PROPERTY_NAME, ifTrue);
-            return new TbPair<>(true, newConfigObjectNode);
+            newConfig.remove(oldProperty);
+            newConfig.put(FETCH_TO_PROPERTY_NAME, ifTrue);
+            return new TbPair<>(true, newConfig);
         } else if ("false".equals(value)) {
-            newConfigObjectNode.remove(oldProperty);
-            newConfigObjectNode.put(FETCH_TO_PROPERTY_NAME, ifFalse);
-            return new TbPair<>(true, newConfigObjectNode);
+            newConfig.remove(oldProperty);
+            newConfig.put(FETCH_TO_PROPERTY_NAME, ifFalse);
+            return new TbPair<>(true, newConfig);
         } else {
-            throw new TbNodeException("property to update: '" + oldProperty + "' has unexpected value: " + value + ". Allowed values: true or false!");
+            throw new TbNodeException("property to update: '" + oldProperty + "' has unexpected value: "
+                    + value + ". Allowed values: true or false!");
         }
     }
 

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

@@ -64,9 +64,7 @@ public class TbGetCustomerAttributeNode extends TbAbstractGetEntityDataNode<Cust
 
     @Override
     public TbPair<Boolean, JsonNode> upgrade(int fromVersion, JsonNode oldConfiguration) throws TbNodeException {
-        return fromVersion == 0 ?
-                upgradeToUseFetchToAndDataToFetch(oldConfiguration) :
-                new TbPair<>(false, oldConfiguration);
+        return fromVersion == 0 ? upgradeToUseFetchToAndDataToFetch(oldConfiguration) : new TbPair<>(false, oldConfiguration);
     }
 
 }

rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeTest.java

@@ -267,6 +267,22 @@ public class TbGetAttributesNodeTest {
         Assertions.assertEquals(defaultConfig, JacksonUtil.treeToValue(upgrade.getSecond(), defaultConfig.getClass()));
     }
 
+    @Test
+    public void givenOldConfigWithNoFetchToDataProperty_whenUpgrade_thenShouldReturnTrueResultWithNewConfig() throws Exception {
+        var defaultConfig = new TbGetAttributesNodeConfiguration().defaultConfiguration();
+        var node = new TbGetAttributesNode();
+        String oldConfig = "{\"clientAttributeNames\":[]," +
+                "\"sharedAttributeNames\":[]," +
+                "\"serverAttributeNames\":[]," +
+                "\"latestTsKeyNames\":[]," +
+                "\"tellFailureIfAbsent\":true," +
+                "\"getLatestValueWithTs\":false}";
+        JsonNode configJson = JacksonUtil.toJsonNode(oldConfig);
+        TbPair<Boolean, JsonNode> upgrade = node.upgrade(0, configJson);
+        Assertions.assertTrue(upgrade.getFirst());
+        Assertions.assertEquals(defaultConfig, JacksonUtil.treeToValue(upgrade.getSecond(), defaultConfig.getClass()));
+    }
+
     private TbMsg checkMsg(boolean checkSuccess) {
         var msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         if (checkSuccess) {

rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java

@@ -42,4 +42,22 @@ public class TbGetDeviceAttrNodeTest {
         Assertions.assertEquals(defaultConfig, JacksonUtil.treeToValue(upgrade.getSecond(), defaultConfig.getClass()));
     }
 
+    @Test
+    public void givenOldConfigWithNoFetchToDataProperty_whenUpgrade_thenShouldReturnTrueResultWithNewConfig() throws Exception {
+        var defaultConfig = new TbGetDeviceAttrNodeConfiguration().defaultConfiguration();
+        var node = new TbGetDeviceAttrNode();
+        String oldConfig = "{\"clientAttributeNames\":[]," +
+                "\"sharedAttributeNames\":[]," +
+                "\"serverAttributeNames\":[]," +
+                "\"latestTsKeyNames\":[]," +
+                "\"tellFailureIfAbsent\":true," +
+                "\"getLatestValueWithTs\":false," +
+                "\"deviceRelationsQuery\":{\"direction\":\"FROM\",\"maxLevel\":1,\"relationType\":\"Contains\",\"deviceTypes\":[\"default\"]," +
+                "\"fetchLastLevelOnly\":false}}";
+        JsonNode configJson = JacksonUtil.toJsonNode(oldConfig);
+        TbPair<Boolean, JsonNode> upgrade = node.upgrade(0, configJson);
+        Assertions.assertTrue(upgrade.getFirst());
+        Assertions.assertEquals(defaultConfig, JacksonUtil.treeToValue(upgrade.getSecond(), defaultConfig.getClass()));
+    }
+
 }