refactor code

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/math/TbMathNode.java

@@ -223,7 +223,7 @@ public class TbMathNode implements TbNode {
             tmpMsg = addToBody(msg, mathResultDef, msgBodyOpt, result);
         }
         if (mathResultDef.isAddToMetadata()) {
-            tmpMsg = addToMeta(msg, mathResultDef, result);
+            tmpMsg = addToMeta(tmpMsg, mathResultDef, result);
         }
         return tmpMsg;
     }

rule-engine/rule-engine-components/src/test/java/math/TbMathArgumentValueTest.java

@@ -42,7 +42,7 @@ public class TbMathArgumentValueTest {
     public void test_fromMessageBody_then_emptyBody() {
         TbMathArgument tbMathArgument = new TbMathArgument(TbMathArgumentType.MESSAGE_BODY, "TestKey");
         Throwable thrown = assertThrows(RuntimeException.class, () -> {
-            TbMathArgumentValue result = TbMathArgumentValue.fromMessageBody(tbMathArgument, Optional.ofNullable(null));
+            TbMathArgumentValue result = TbMathArgumentValue.fromMessageBody(tbMathArgument, Optional.empty());
         });
         Assert.assertNotNull(thrown.getMessage());
     }
@@ -50,9 +50,7 @@ public class TbMathArgumentValueTest {
     @Test
     public void test_fromMessageBody_then_noKey() {
         TbMathArgument tbMathArgument = new TbMathArgument(TbMathArgumentType.MESSAGE_BODY, "TestKey");
-        Throwable thrown = assertThrows(RuntimeException.class, () -> {
-            TbMathArgumentValue result = TbMathArgumentValue.fromMessageBody(tbMathArgument, Optional.ofNullable(JacksonUtil.newObjectNode()));
-        });
+        Throwable thrown = assertThrows(RuntimeException.class, () -> TbMathArgumentValue.fromMessageBody(tbMathArgument, Optional.ofNullable(JacksonUtil.newObjectNode())));
         Assert.assertNotNull(thrown.getMessage());
     }
 
@@ -63,16 +61,12 @@ public class TbMathArgumentValueTest {
         msgData.putNull("TestKey");
 
         //null value
-        Throwable thrown = assertThrows(RuntimeException.class, () -> {
-            TbMathArgumentValue result = TbMathArgumentValue.fromMessageBody(tbMathArgument, Optional.ofNullable(msgData));
-        });
+        Throwable thrown = assertThrows(RuntimeException.class, () -> TbMathArgumentValue.fromMessageBody(tbMathArgument, Optional.of(msgData)));
         Assert.assertNotNull(thrown.getMessage());
 
         //empty value
         msgData.put("TestKey", "");
-        thrown = assertThrows(RuntimeException.class, () -> {
-            TbMathArgumentValue result = TbMathArgumentValue.fromMessageBody(tbMathArgument, Optional.ofNullable(msgData));
-        });
+        thrown = assertThrows(RuntimeException.class, () -> TbMathArgumentValue.fromMessageBody(tbMathArgument, Optional.of(msgData)));
         Assert.assertNotNull(thrown.getMessage());
     }
 
@@ -83,34 +77,26 @@ public class TbMathArgumentValueTest {
         msgData.put("TestKey", "Test");
 
         //string value
-        Throwable thrown = assertThrows(RuntimeException.class, () -> {
-            TbMathArgumentValue result = TbMathArgumentValue.fromMessageBody(tbMathArgument, Optional.ofNullable(msgData));
-        });
+        Throwable thrown = assertThrows(RuntimeException.class, () -> TbMathArgumentValue.fromMessageBody(tbMathArgument, Optional.of(msgData)));
         Assert.assertNotNull(thrown.getMessage());
 
         //object value
-        msgData.put("TestKey", JacksonUtil.newObjectNode());
-        thrown = assertThrows(RuntimeException.class, () -> {
-            TbMathArgumentValue result = TbMathArgumentValue.fromMessageBody(tbMathArgument, Optional.ofNullable(msgData));
-        });
+        msgData.set("TestKey", JacksonUtil.newObjectNode());
+        thrown = assertThrows(RuntimeException.class, () -> TbMathArgumentValue.fromMessageBody(tbMathArgument, Optional.of(msgData)));
         Assert.assertNotNull(thrown.getMessage());
     }
 
     @Test
     public void test_fromMessageMetadata_then_noKey() {
         TbMathArgument tbMathArgument = new TbMathArgument(TbMathArgumentType.MESSAGE_BODY, "TestKey");
-        Throwable thrown = assertThrows(RuntimeException.class, () -> {
-            TbMathArgumentValue result = TbMathArgumentValue.fromMessageMetadata(tbMathArgument, new TbMsgMetaData());
-        });
+        Throwable thrown = assertThrows(RuntimeException.class, () -> TbMathArgumentValue.fromMessageMetadata(tbMathArgument, new TbMsgMetaData()));
         Assert.assertNotNull(thrown.getMessage());
     }
 
     @Test
     public void test_fromMessageMetadata_then_valueEmpty() {
         TbMathArgument tbMathArgument = new TbMathArgument(TbMathArgumentType.MESSAGE_BODY, "TestKey");
-        Throwable thrown = assertThrows(RuntimeException.class, () -> {
-            TbMathArgumentValue result = TbMathArgumentValue.fromMessageMetadata(tbMathArgument, null);
-        });
+        Throwable thrown = assertThrows(RuntimeException.class, () -> TbMathArgumentValue.fromMessageMetadata(tbMathArgument, null));
         Assert.assertNotNull(thrown.getMessage());
     }
 
@@ -125,9 +111,7 @@ public class TbMathArgumentValueTest {
     @Test
     public void test_fromString_then_failure() {
         var value = "Test";
-        Throwable thrown = assertThrows(RuntimeException.class, () -> {
-            TbMathArgumentValue result = TbMathArgumentValue.fromString(value);
-        });
+        Throwable thrown = assertThrows(RuntimeException.class, () -> TbMathArgumentValue.fromString(value));
         Assert.assertNotNull(thrown.getMessage());
     }
 }

rule-engine/rule-engine-components/src/test/java/math/TbMathNodeTest.java

@@ -424,6 +424,36 @@ public class TbMathNodeTest {
         Assert.assertEquals(2.236, resultJson.get("result").asDouble(), 0.0);
     }
 
+    @Test
+    public void test_sqrt_5_to_timeseries_and_metadata_and_data() {
+        var node = initNode(TbRuleNodeMathFunctionType.SQRT,
+                new TbMathResult(TbMathArgumentType.TIME_SERIES, "result", 3, true, true, DataConstants.SERVER_SCOPE),
+                new TbMathArgument(TbMathArgumentType.MESSAGE_BODY, "a")
+        );
+
+        TbMsg msg = TbMsg.newMsg("TEST", originator, new TbMsgMetaData(), JacksonUtil.newObjectNode().put("a", 5).toString());
+        Mockito.when(telemetryService.saveAndNotify(any(), any(), any(TsKvEntry.class)))
+                .thenReturn(Futures.immediateFuture(null));
+
+        node.onMsg(ctx, msg);
+
+        ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+        verify(ctx, Mockito.timeout(5000)).tellSuccess(msgCaptor.capture());
+        Mockito.verify(telemetryService, times(1)).saveAndNotify(any(), any(), any(TsKvEntry.class));
+
+        TbMsg resultMsg = msgCaptor.getValue();
+        Assert.assertNotNull(resultMsg);
+        Assert.assertNotNull(resultMsg.getData());
+        var resultMetadata = resultMsg.getMetaData().getValue("result");
+        var resultData = JacksonUtil.toJsonNode(resultMsg.getData());
+
+        Assert.assertTrue(resultData.has("result"));
+        Assert.assertEquals(2.236, resultData.get("result").asDouble(), 0.0);
+
+        Assert.assertNotNull(resultMetadata);
+        Assert.assertEquals("2.236", resultMetadata);
+    }
+
     @Test
     public void test_sqrt_5_default_value() {
         TbMathArgument tbMathArgument = new TbMathArgument(TbMathArgumentType.MESSAGE_BODY, "TestKey");