diff --git a/application/src/test/java/org/thingsboard/server/service/script/TbelInvokeDocsIoTest.java b/application/src/test/java/org/thingsboard/server/service/script/TbelInvokeDocsIoTest.java index 4aeb0d8c95..a7affe6dff 100644 --- a/application/src/test/java/org/thingsboard/server/service/script/TbelInvokeDocsIoTest.java +++ b/application/src/test/java/org/thingsboard/server/service/script/TbelInvokeDocsIoTest.java @@ -785,8 +785,8 @@ class TbelInvokeDocsIoTest extends AbstractTbelInvokeTest { {"list": ["B", "A", "C", "A"]} """; decoderStr = """ - var set1 = createSetTb(msg.list); // create new Set from createSetTb() with list, no sort, size = 3 ("A" - duplicate) - var set2 = createSetTb(); // create new Set from createSetTb(), Empty + var set1 = toSet(msg.list); // create new Set from toSet() with list, no sort, size = 3 ("A" - duplicate) + var set2 = newSet(); // create new Set from newSet(), Empty return {set1: set1, set2: set2 } @@ -806,7 +806,7 @@ class TbelInvokeDocsIoTest extends AbstractTbelInvokeTest { {"list": ["A", "B", "C"]} """; decoderStr = """ - var set2 = createSetTb(msg.list); // create new from list, size = 3 + var set2 = toSet(msg.list); // create new from list, size = 3 var set2_0 = set2.toArray()[0]; // return "A", value with index = 0 from Set var set2Size = set2.size(); // return size = 3 var smthForeach = ""; @@ -851,16 +851,16 @@ class TbelInvokeDocsIoTest extends AbstractTbelInvokeTest { """; decoderStr = """ // add - var setAdd = createSetTb(["thigsboard", 4, 67]); // create new, size = 3 + var setAdd = toSet(["thigsboard", 4, 67]); // create new, size = 3 var setAdd1_value = setAdd.clone(); // clone setAdd, size = 3 var setAdd2_result = setAdd.add(35); // add value = 35, result = true var setAdd2_value = setAdd.clone(); // clone setAdd (fixing the result add = 35), size = 4 - var setAddList1 = createSetTb(msg.list); // create new from list without duplicate value ("B" and "C" - only one), size = 5 + var setAddList1 = toSet(msg.list); // create new from list without duplicate value ("B" and "C" - only one), size = 5 var setAdd3_result = setAdd.addAll(setAddList1); // add all without duplicate values, result = true var setAdd3_value = setAdd.clone(); // clone setAdd (with addAll), size = 9 var setAdd4_result = setAdd.add(35); // add duplicate value = 35, result = false var setAdd4_value = setAdd.clone(); // clone setAdd (after add duplicate value = 35), size = 9 - var setAddList2 = createSetTb(msg.list); // create new from list without duplicate value ("B" and "C" - only one), start: size = 5, finish: size = 7 + var setAddList2 = toSet(msg.list); // create new from list without duplicate value ("B" and "C" - only one), start: size = 5, finish: size = 7 var setAdd5_result1 = setAddList2.add(72); // add is not duplicate value = 72, result = true var setAdd5_result2 = setAddList2.add(72); // add duplicate value = 72, result = false var setAdd5_result3 = setAddList2.add("hello25"); // add is not duplicate value = "hello25", result = true @@ -948,8 +948,8 @@ class TbelInvokeDocsIoTest extends AbstractTbelInvokeTest { {"list": ["C", "B", "A", 34567, "B", "C", "hello", 34]} """; decoderStr = """ - var set1 = createSetTb(msg.list); // create new from method createSetTb(List list) no sort, size = 6 ("A" and "C" is duplicated) - var set2 = createSetTb(msg.list); // create new from method createSetTb(List list) no sort, size = 6 ("A" and "C" is duplicated) + var set1 = toSet(msg.list); // create new from method toSet(List list) no sort, size = 6 ("A" and "C" is duplicated) + var set2 = toSet(msg.list); // create new from method toSet(List list) no sort, size = 6 ("A" and "C" is duplicated) var set1_asc = set1.clone(); // clone set1, size = 6 var set1_desc = set1.clone(); // clone set1, size = 6 set1.sort(); // sort set1 -> asc @@ -990,7 +990,7 @@ class TbelInvokeDocsIoTest extends AbstractTbelInvokeTest { {"list": ["C", "B", "A", 34567, "B", "C", "hello", 34]} """; decoderStr = """ - var set1 = createSetTb(msg.list); // create new from method createSetTb(List list) no sort, size = 6 ("A" and "C" is duplicated) + var set1 = toSet(msg.list); // create new from method toSet(List list) no sort, size = 6 ("A" and "C" is duplicated) var result1 = set1.contains("A"); // return true var result2 = set1.contains("H"); // return false return { @@ -1013,7 +1013,7 @@ class TbelInvokeDocsIoTest extends AbstractTbelInvokeTest { {"list": ["C", "B", "A", 34567, "B", "C", "hello", 34]} """; decoderStr = """ - var set1 = createSetTb(msg.list); // create new from method createSetTb(List list) no sort, size = 6 ("A" and "C" is duplicated) + var set1 = toSet(msg.list); // create new from method toSet(List list) no sort, size = 6 ("A" and "C" is duplicated) var tolist = set1.toList(); // create new List from Set, size = 6 return { "list": msg.list, @@ -2687,7 +2687,7 @@ class TbelInvokeDocsIoTest extends AbstractTbelInvokeTest { {"list": ["C", "B", "A", 34567, "B", "C", "hello", 34]} """; decoderStr = """ - return isSet(createSetTb(msg.list)); // return true + return isSet(toSet(msg.list)); // return true """; Object actual = invokeScript(evalScript(decoderStr), msgStr); assertInstanceOf(Boolean.class, actual); diff --git a/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbUtils.java b/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbUtils.java index e48d236dba..072a17835d 100644 --- a/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbUtils.java +++ b/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbUtils.java @@ -388,9 +388,9 @@ public class TbUtils { Object.class))); parserConfig.addImport("isArray", new MethodStub(TbUtils.class.getMethod("isArray", Object.class))); - parserConfig.addImport("createSetTb", new MethodStub(TbUtils.class.getMethod("createSetTb", + parserConfig.addImport("newSet", new MethodStub(TbUtils.class.getMethod("newSet", ExecutionContext.class))); - parserConfig.addImport("createSetTb", new MethodStub(TbUtils.class.getMethod("createSetTb", + parserConfig.addImport("toSet", new MethodStub(TbUtils.class.getMethod("toSet", ExecutionContext.class, List.class))); parserConfig.addImport("isSet", new MethodStub(TbUtils.class.getMethod("isSet", Object.class))); @@ -1489,11 +1489,11 @@ public class TbUtils { return obj != null && obj.getClass().isArray(); } - public static Set createSetTb(ExecutionContext ctx) { + public static Set newSet(ExecutionContext ctx) { return new ExecutionLinkedHashSet<>(ctx); } - public static Set createSetTb(ExecutionContext ctx, List list) { + public static Set toSet(ExecutionContext ctx, List list) { Set newSet = new LinkedHashSet<>(list); return new ExecutionLinkedHashSet<>(newSet, ctx); } diff --git a/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbUtilsTest.java b/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbUtilsTest.java index b7a3f4c07d..4dcbd2d69c 100644 --- a/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbUtilsTest.java +++ b/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbUtilsTest.java @@ -1213,7 +1213,7 @@ public class TbUtilsTest { } @Test public void setTest() throws ExecutionException, InterruptedException { - Set actual = TbUtils.createSetTb(ctx); + Set actual = TbUtils.newSet(ctx); Set expected = toSet(new byte[]{(byte) 0xDD, (byte) 0xCC, (byte) 0xCC}); actual.add((byte) 0xDD); actual.add((byte) 0xCC); @@ -1223,7 +1223,7 @@ public class TbUtilsTest { actual.addAll(list); assertEquals(4, actual.size()); assertTrue(actual.containsAll(expected)); - actual = TbUtils.createSetTb(ctx, list); + actual = TbUtils.toSet(ctx, list); expected = toSet(new byte[]{(byte) 0xDD, (byte) 0xCC, (byte) 0xDA}); actual.add((byte) 0xDA); actual.remove((byte) 0xBB); @@ -1232,10 +1232,10 @@ public class TbUtilsTest { assertEquals(actual.size(), 3); actual.clear(); assertTrue(actual.isEmpty()); - actual = TbUtils.createSetTb(ctx, list); - Set actualClone = TbUtils.createSetTb(ctx, list); - Set actualClone_asc = TbUtils.createSetTb(ctx, list); - Set actualClone_desc = TbUtils.createSetTb(ctx, list); + actual = TbUtils.toSet(ctx, list); + Set actualClone = TbUtils.toSet(ctx, list); + Set actualClone_asc = TbUtils.toSet(ctx, list); + Set actualClone_desc = TbUtils.toSet(ctx, list); ((ExecutionLinkedHashSet)actualClone).sort(); ((ExecutionLinkedHashSet)actualClone_asc).sort(true); ((ExecutionLinkedHashSet)actualClone_desc).sort(false);