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

tbel: refactoring

Browse Source
This commit is contained in:
nick 2025-07-11 16:39:03 +03:00
parent 3d3ac28a7f
commit baf68bbbfc
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -391,7 +391,7 @@ public class TbUtils {
parserConfig.addImport("createSetTb", new MethodStub(TbUtils.class.getMethod("createSetTb", parserConfig.addImport("createSetTb", new MethodStub(TbUtils.class.getMethod("createSetTb",
ExecutionContext.class))); ExecutionContext.class)));
parserConfig.addImport("createSetTb", new MethodStub(TbUtils.class.getMethod("createSetTb", parserConfig.addImport("createSetTb", new MethodStub(TbUtils.class.getMethod("createSetTb",
List.class, ExecutionContext.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)));
} }
@ -1493,7 +1493,7 @@ public class TbUtils {
return new ExecutionLinkedHashSet<>(ctx); return new ExecutionLinkedHashSet<>(ctx);
} }
public static <E> Set<E> createSetTb(List<E> list, ExecutionContext ctx) { public static <E> Set<E> createSetTb(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);
} }

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

@ -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(list, ctx); actual = TbUtils.createSetTb(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(list, ctx); actual = TbUtils.createSetTb(ctx, list);
Set actualClone = TbUtils.createSetTb(list, ctx); Set actualClone = TbUtils.createSetTb(ctx, list);
Set actualClone_asc = TbUtils.createSetTb(list, ctx); Set actualClone_asc = TbUtils.createSetTb(ctx, list);
Set actualClone_desc = TbUtils.createSetTb(list, ctx); Set actualClone_desc = TbUtils.createSetTb(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);