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

Merge with master

Browse Source
This commit is contained in:
Andrii Shvaika 2023-08-17 14:36:15 +03:00
parent 80f80496df
commit 54ef3aaafa
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/src/test/java/org/thingsboard/server/service/sync/ie/ExportImportServiceSqlTest.java
View File

@ -71,6 +71,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -363,10 +364,10 @@ public class ExportImportServiceSqlTest extends BaseExportImportServiceTest {
"var msgType = \"POST_TELEMETRY_REQUEST\";\n" + "var msgType = \"POST_TELEMETRY_REQUEST\";\n" +
"var someUuid = \"" + someUuid + "\";\n" + "var someUuid = \"" + someUuid + "\";\n" +
"return { msg: msg, metadata: metadata, msgType: msgType };"); "return { msg: msg, metadata: metadata, msgType: msgType };");
generatorNode.setConfiguration(mapper.valueToTree(generatorNodeConfig)); generatorNode.setConfiguration(JacksonUtil.valueToTree(generatorNodeConfig));
nodes.add(generatorNode); nodes.add(generatorNode);
metaData.setNodes(nodes); metaData.setNodes(nodes);
ruleChainService.saveRuleChainMetaData(tenantId1, metaData); ruleChainService.saveRuleChainMetaData(tenantId1, metaData, Function.identity());
EntityExportData<RuleChain> ruleChainExportData = exportEntity(tenantAdmin1, ruleChain.getId()); EntityExportData<RuleChain> ruleChainExportData = exportEntity(tenantAdmin1, ruleChain.getId());
EntityExportData<Customer> customerExportData = exportEntity(tenantAdmin1, customer.getId()); EntityExportData<Customer> customerExportData = exportEntity(tenantAdmin1, customer.getId());