dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tbel: reName createSetTb to newSet and to toSet

Browse Source
This commit is contained in:
nickAS21 2025-07-16 17:31:59 +03:00
parent 3d5d84eb1a
commit 5f6cc76d11
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -785,8 +785,8 @@ class TbelInvokeDocsIoTest extends AbstractTbelInvokeTest {
{"list": ["B", "A", "C", "A"]} {"list": ["B", "A", "C", "A"]}
"""; """;
decoderStr = """ decoderStr = """
var set1 = createSetTb(msg.list); // create new Set from createSetTb() with list, no sort, size = 3 ("A" - duplicate) var set1 = toSet(msg.list); // create new Set from toSet() with list, no sort, size = 3 ("A" - duplicate)
var set2 = createSetTb(); // create new Set from createSetTb(), Empty var set2 = newSet(); // create new Set from newSet(), Empty
return {set1: set1, return {set1: set1,
set2: set2 set2: set2
} }
@ -806,7 +806,7 @@ class TbelInvokeDocsIoTest extends AbstractTbelInvokeTest {
{"list": ["A", "B", "C"]} {"list": ["A", "B", "C"]}
"""; """;
decoderStr = """ 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 set2_0 = set2.toArray()[0]; // return "A", value with index = 0 from Set
var set2Size = set2.size(); // return size = 3 var set2Size = set2.size(); // return size = 3
var smthForeach = ""; var smthForeach = "";
@ -851,16 +851,16 @@ class TbelInvokeDocsIoTest extends AbstractTbelInvokeTest {
"""; """;
decoderStr = """ decoderStr = """
// add // 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 setAdd1_value = setAdd.clone(); // clone setAdd, size = 3
var setAdd2_result = setAdd.add(35); // add value = 35, result = true 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 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_result = setAdd.addAll(setAddList1); // add all without duplicate values, result = true
var setAdd3_value = setAdd.clone(); // clone setAdd (with addAll), size = 9 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_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 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_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_result2 = setAddList2.add(72); // add duplicate value = 72, result = false
var setAdd5_result3 = setAddList2.add("hello25"); // add is not duplicate value = "hello25", result = true 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]} {"list": ["C", "B", "A", 34567, "B", "C", "hello", 34]}
"""; """;
decoderStr = """ 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 set2 = createSetTb(msg.list); // create new from method createSetTb(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_asc = set1.clone(); // clone set1, size = 6
var set1_desc = set1.clone(); // clone set1, size = 6 var set1_desc = set1.clone(); // clone set1, size = 6
set1.sort(); // sort set1 -> asc set1.sort(); // sort set1 -> asc
@ -990,7 +990,7 @@ class TbelInvokeDocsIoTest extends AbstractTbelInvokeTest {
{"list": ["C", "B", "A", 34567, "B", "C", "hello", 34]} {"list": ["C", "B", "A", 34567, "B", "C", "hello", 34]}
"""; """;
decoderStr = """ 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 result1 = set1.contains("A"); // return true
var result2 = set1.contains("H"); // return false var result2 = set1.contains("H"); // return false
return { return {
@ -1013,7 +1013,7 @@ class TbelInvokeDocsIoTest extends AbstractTbelInvokeTest {
{"list": ["C", "B", "A", 34567, "B", "C", "hello", 34]} {"list": ["C", "B", "A", 34567, "B", "C", "hello", 34]}
"""; """;
decoderStr = """ 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 var tolist = set1.toList(); // create new List from Set, size = 6
return { return {
"list": msg.list, "list": msg.list,
@ -2687,7 +2687,7 @@ class TbelInvokeDocsIoTest extends AbstractTbelInvokeTest {
{"list": ["C", "B", "A", 34567, "B", "C", "hello", 34]} {"list": ["C", "B", "A", 34567, "B", "C", "hello", 34]}
"""; """;
decoderStr = """ decoderStr = """
return isSet(createSetTb(msg.list)); // return true return isSet(toSet(msg.list)); // return true
"""; """;
Object actual = invokeScript(evalScript(decoderStr), msgStr); Object actual = invokeScript(evalScript(decoderStr), msgStr);
assertInstanceOf(Boolean.class, actual); assertInstanceOf(Boolean.class, actual);

8
common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbUtils.java
View File

@ -388,9 +388,9 @@ public class TbUtils {
Object.class))); Object.class)));
parserConfig.addImport("isArray", new MethodStub(TbUtils.class.getMethod("isArray", parserConfig.addImport("isArray", new MethodStub(TbUtils.class.getMethod("isArray",
Object.class))); Object.class)));
parserConfig.addImport("createSetTb", new MethodStub(TbUtils.class.getMethod("createSetTb", parserConfig.addImport("newSet", new MethodStub(TbUtils.class.getMethod("newSet",
ExecutionContext.class))); ExecutionContext.class)));
parserConfig.addImport("createSetTb", new MethodStub(TbUtils.class.getMethod("createSetTb", parserConfig.addImport("toSet", new MethodStub(TbUtils.class.getMethod("toSet",
ExecutionContext.class, List.class))); ExecutionContext.class, List.class)));
parserConfig.addImport("isSet", new MethodStub(TbUtils.class.getMethod("isSet", parserConfig.addImport("isSet", new MethodStub(TbUtils.class.getMethod("isSet",
Object.class))); Object.class)));
@ -1489,11 +1489,11 @@ public class TbUtils {
return obj != null && obj.getClass().isArray(); return obj != null && obj.getClass().isArray();
} }
public static <E> Set<E> createSetTb(ExecutionContext ctx) { public static <E> Set<E> newSet(ExecutionContext ctx) {
return new ExecutionLinkedHashSet<>(ctx); return new ExecutionLinkedHashSet<>(ctx);
} }
public static <E> Set<E> createSetTb(ExecutionContext ctx, List<E> list) { public static <E> Set<E> toSet(ExecutionContext ctx, List<E> list) {
Set<E> newSet = new LinkedHashSet<>(list); Set<E> newSet = new LinkedHashSet<>(list);
return new ExecutionLinkedHashSet<>(newSet, ctx); return new ExecutionLinkedHashSet<>(newSet, ctx);
} }

12
common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbUtilsTest.java
View File

@ -1213,7 +1213,7 @@ public class TbUtilsTest {
} }
@Test @Test
public void setTest() throws ExecutionException, InterruptedException { 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}); Set expected = toSet(new byte[]{(byte) 0xDD, (byte) 0xCC, (byte) 0xCC});
actual.add((byte) 0xDD); actual.add((byte) 0xDD);
actual.add((byte) 0xCC); actual.add((byte) 0xCC);
@ -1223,7 +1223,7 @@ public class TbUtilsTest {
actual.addAll(list); actual.addAll(list);
assertEquals(4, actual.size()); assertEquals(4, actual.size());
assertTrue(actual.containsAll(expected)); assertTrue(actual.containsAll(expected));
actual = TbUtils.createSetTb(ctx, list); actual = TbUtils.toSet(ctx, list);
expected = toSet(new byte[]{(byte) 0xDD, (byte) 0xCC, (byte) 0xDA}); expected = toSet(new byte[]{(byte) 0xDD, (byte) 0xCC, (byte) 0xDA});
actual.add((byte) 0xDA); actual.add((byte) 0xDA);
actual.remove((byte) 0xBB); actual.remove((byte) 0xBB);
@ -1232,10 +1232,10 @@ public class TbUtilsTest {
assertEquals(actual.size(), 3); assertEquals(actual.size(), 3);
actual.clear(); actual.clear();
assertTrue(actual.isEmpty()); assertTrue(actual.isEmpty());
actual = TbUtils.createSetTb(ctx, list); actual = TbUtils.toSet(ctx, list);
Set actualClone = TbUtils.createSetTb(ctx, list); Set actualClone = TbUtils.toSet(ctx, list);
Set actualClone_asc = TbUtils.createSetTb(ctx, list); Set actualClone_asc = TbUtils.toSet(ctx, list);
Set actualClone_desc = TbUtils.createSetTb(ctx, list); Set actualClone_desc = TbUtils.toSet(ctx, list);
((ExecutionLinkedHashSet<?>)actualClone).sort(); ((ExecutionLinkedHashSet<?>)actualClone).sort();
((ExecutionLinkedHashSet<?>)actualClone_asc).sort(true); ((ExecutionLinkedHashSet<?>)actualClone_asc).sort(true);
((ExecutionLinkedHashSet<?>)actualClone_desc).sort(false); ((ExecutionLinkedHashSet<?>)actualClone_desc).sort(false);