Merge pull request #15078 from thingsboard/fix/tbel-script-execution-stability

Fixed TBEL script execution failures on repeated runs

application/src/test/java/org/thingsboard/server/service/script/TbelInvokeDocsIoTest.java

@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.service.script;
 
+import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.script.api.tbel.TbDate;
@@ -779,7 +780,7 @@ class TbelInvokeDocsIoTest extends AbstractTbelInvokeTest {
         assertEquals(expected.toString(), actual.toString());
     }
 
-     @Test
+    @Test
     public void setsCreateNewSetFromCreateSetTbMethod_Test() throws ExecutionException, InterruptedException {
         msgStr = """
                 {"list": ["B", "A", "C", "A"]}
@@ -800,7 +801,7 @@ class TbelInvokeDocsIoTest extends AbstractTbelInvokeTest {
         assertEquals(expected.toString(), actual.toString());
     }
 
-     @Test
+    @Test
     public void setsForeachForLoop_Test() throws ExecutionException, InterruptedException {
         msgStr = """
                 {"list": ["A", "B", "C"]}
@@ -975,13 +976,13 @@ class TbelInvokeDocsIoTest extends AbstractTbelInvokeTest {
         ArrayList<Object> listSortDesc = new ArrayList<>(List.of("hello", "C", "B", "A", 34567, 34));
         Set<Object> expectedDesc = new LinkedHashSet<>(listSortDesc);
         Object actual = invokeScript(evalScript(decoderStr), msgStr);
-        assertEquals(expectedAsc.toString(), ((LinkedHashMap<?, ?>)actual).get("set1").toString());
+        assertEquals(expectedAsc.toString(), ((LinkedHashMap<?, ?>) actual).get("set1").toString());
-        assertEquals(expectedAsc.toString(), ((LinkedHashMap<?, ?>)actual).get("set1_asc").toString());
+        assertEquals(expectedAsc.toString(), ((LinkedHashMap<?, ?>) actual).get("set1_asc").toString());
-        assertEquals(expectedDesc.toString(), ((LinkedHashMap<?, ?>)actual).get("set1_desc").toString());
+        assertEquals(expectedDesc.toString(), ((LinkedHashMap<?, ?>) actual).get("set1_desc").toString());
-        assertEquals(expected.toString(), ((LinkedHashMap<?, ?>)actual).get("set2").toString());
+        assertEquals(expected.toString(), ((LinkedHashMap<?, ?>) actual).get("set2").toString());
-        assertEquals(expectedAsc.toString(), ((LinkedHashMap<?, ?>)actual).get("set3").toString());
+        assertEquals(expectedAsc.toString(), ((LinkedHashMap<?, ?>) actual).get("set3").toString());
-        assertEquals(expectedAsc.toString(), ((LinkedHashMap<?, ?>)actual).get("set3_asc").toString());
+        assertEquals(expectedAsc.toString(), ((LinkedHashMap<?, ?>) actual).get("set3_asc").toString());
-        assertEquals(expectedDesc.toString(), ((LinkedHashMap<?, ?>)actual).get("set3_desc").toString());
+        assertEquals(expectedDesc.toString(), ((LinkedHashMap<?, ?>) actual).get("set3_desc").toString());
     }
 
     @Test
@@ -1002,9 +1003,9 @@ class TbelInvokeDocsIoTest extends AbstractTbelInvokeTest {
         List<Object> listOrigin = new ArrayList<>(List.of("C", "B", "A", 34567, "B", "C", "hello", 34));
         Set<Object> expectedSet = new LinkedHashSet<>(listOrigin);
         Object actual = invokeScript(evalScript(decoderStr), msgStr);
-        assertEquals(expectedSet.toString(), ((LinkedHashMap<?, ?>)actual).get("set1").toString());
+        assertEquals(expectedSet.toString(), ((LinkedHashMap<?, ?>) actual).get("set1").toString());
-        assertEquals(true, ((LinkedHashMap<?, ?>)actual).get("result1"));
+        assertEquals(true, ((LinkedHashMap<?, ?>) actual).get("result1"));
-        assertEquals(false, ((LinkedHashMap<?, ?>)actual).get("result2"));
+        assertEquals(false, ((LinkedHashMap<?, ?>) actual).get("result2"));
     }
 
     @Test
@@ -1025,9 +1026,9 @@ class TbelInvokeDocsIoTest extends AbstractTbelInvokeTest {
         Set<Object> expectedSet = new LinkedHashSet<>(listOrigin);
         List<Object> expectedToList = new ArrayList<>(expectedSet);
         Object actual = invokeScript(evalScript(decoderStr), msgStr);
-        assertEquals(listOrigin.toString(), ((LinkedHashMap<?, ?>)actual).get("list").toString());
+        assertEquals(listOrigin.toString(), ((LinkedHashMap<?, ?>) actual).get("list").toString());
-        assertEquals(expectedSet.toString(), ((LinkedHashMap<?, ?>)actual).get("set1").toString());
+        assertEquals(expectedSet.toString(), ((LinkedHashMap<?, ?>) actual).get("set1").toString());
-        assertEquals(expectedToList.toString(), ((LinkedHashMap<?, ?>)actual).get("tolist").toString());
+        assertEquals(expectedToList.toString(), ((LinkedHashMap<?, ?>) actual).get("tolist").toString());
     }
 
     @Test
@@ -1713,7 +1714,7 @@ class TbelInvokeDocsIoTest extends AbstractTbelInvokeTest {
         assertEquals(expected, actual);
     }
 
-    @Test
+    @RepeatedTest(value = 3, name = "{displayName} {currentRepetition}/{totalRepetitions}")
     public void parseBytes_Test() throws ExecutionException, InterruptedException {
         byte[] bytesExecutionArrayList = new byte[]{(byte) 0xAA, (byte) 0xBB, (byte) 0xCC, (byte) 0xDD};
         msgStr = "{}";
@@ -2821,5 +2822,6 @@ class TbelInvokeDocsIoTest extends AbstractTbelInvokeTest {
         }
         return list;
     }
+
 }
 

pom.xml

@@ -65,7 +65,7 @@
         <zookeeper.version>3.9.3</zookeeper.version>
         <protobuf.version>3.25.5</protobuf.version> <!-- A Major v4 does not support by the pubsub yet-->
         <grpc.version>1.76.0</grpc.version>
-        <tbel.version>1.2.8</tbel.version>
+        <tbel.version>1.2.9</tbel.version>
         <lombok.version>1.18.38</lombok.version>
         <paho.client.version>1.2.5</paho.client.version>
         <paho.mqttv5.client.version>1.2.5</paho.mqttv5.client.version>
@@ -837,6 +837,7 @@
                             <exclude>**/test/resources/lwm2m/**</exclude>
                             <exclude>**/resources/lwm2m/models/**</exclude>
                             <exclude>src/main/data/resources/**</exclude>
+                            <exclude>.claude/**</exclude>
                         </excludes>
                         <mapping>
                             <proto>JAVADOC_STYLE</proto>