dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,321 Commits 106 Branches 71 Tags
Commit Graph

1692 Commits

Author SHA1 Message Date
Viacheslav Klimov
2d845c7840 Merge remote-tracking branch 'origin/master' into fields-validation 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
#	common/data/src/main/java/org/thingsboard/server/common/data/Customer.java
#	common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfile.java
#	common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java
#	common/data/src/main/java/org/thingsboard/server/common/data/OtaPackageInfo.java
#	common/data/src/main/java/org/thingsboard/server/common/data/TbResource.java
#	common/data/src/main/java/org/thingsboard/server/common/data/TbResourceInfo.java
#	common/data/src/main/java/org/thingsboard/server/common/data/TenantProfile.java
#	common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java
#	common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java
#	common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityRelation.java
#	common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java
#	common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java
#	common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetsBundle.java
 2021-11-04 12:43:54 +02:00
van-vanich
a9b3f409f3
Merge branch 'thingsboard:master' into command_in 2021-11-04 12:31:49 +02:00
nickAS21
82704d54d0 lwm2m - profile (Base64 validate) 2021-11-04 07:58:58 +02:00
nickAS21
bad6653a50 lwm2m - update lwm2mController by base64 and createte BootstrpServerCredentials by Profile (Base64 validate) 2021-11-03 23:28:28 +02:00
Andrew Shvayka
447dcdcad5
Merge pull request #4878 from smatvienko-tb/feature/sql-query-timeout 
Timeout for all SQL queries to survive enormous heavy query
 2021-11-03 16:45:30 +02:00
Viacheslav Klimov
8d28a28b08 Implement entities search within all tenants 2021-11-01 20:04:35 +02:00
Volodymyr Babak
ba9ad04a90 Validate tenant profile usage - can not use isolated profiles in monolith setup 2021-10-28 17:07:32 +03:00
Sergey Matvienko
25c669f420 dao test dependency: removed duplicated spring-boot-starter-test 2021-10-28 14:26:22 +03:00
nickAS21
883d58c155 Lwm2m validate PSK 2021-10-27 17:46:46 +03:00
Swoq
81f2d122a1 precise reference to id 2021-10-27 09:54:53 +03:00
Swoq
b36f851349 Fix default ordering in Entity Query Repository 2021-10-27 09:54:53 +03:00
Andrii Shvaika
f015a3a45c Merge with master 2021-10-26 19:54:00 +03:00
Sergey Matvienko
7f1f298774 cassandra buffered rate executor: separate beans for read and write operations 2021-10-21 19:07:53 +03:00
Andrii Shvaika
4ae4c7c381 Merge with master 2021-10-19 16:42:44 +03:00
Andrew Shvayka
dda6138393
Merge pull request #5328 from ViacheslavKlimov/bulk-import-improvements 
Concurrent bulk import processing
 2021-10-19 15:47:17 +03:00
Andrew Shvayka
96d20b073b
Merge pull request #5351 from ViacheslavKlimov/fix/rule-chains-import 
Rule chains import refactoring
 2021-10-19 15:44:45 +03:00
Sergey Matvienko
6246753b92 test: refactored to clear InMemoryStorage (queues) on before and after each test, delete tenant profiles after each test run, psql specific indexes added 2021-10-18 16:10:26 +03:00
Viacheslav Klimov
1f94ff9732 Swagger docs for OAuth2Controller and OAuth2ConfigTemplateController 2021-10-18 10:58:58 +03:00
Sergey Matvienko
d52c64ef03 CustomSqlUnit removed from test suites. dependency added for testcontainers for application test scope. 2021-10-15 19:48:49 +03:00
Volodymyr Babak
d7c09b9f67 Added Api swagger desc for assing*ToEdge and unassing*FromEdge 2021-10-15 16:15:43 +03:00
Sergey Matvienko
f165a1a810 dao sql tests: run on postgresql with in-memory disk using testcontainers jdbc (jdbc:tc:postgresql:12.8) 2021-10-15 16:13:48 +03:00
Sergey Matvienko
caddc4d4d7 getMaxLevel has refactored to simplify the code 2021-10-15 16:12:43 +03:00
Sergey Matvienko
2c743f647c SQL_RELATIONS_MAX_LEVEL parameter added 2021-10-15 16:12:43 +03:00
Sergey Matvienko
c3ea719b94 Merge branch 'master' into feature/sql-query-timeout 2021-10-15 15:34:13 +03:00
Andrii Shvaika
c26d7d1662 Merge branch 'feature/swagger-event-filter' of https://github.com/dmytro-landiak/thingsboard into feature/swagger 2021-10-15 12:52:13 +03:00
Dima Landiak
0670652897 event filters description 2021-10-14 18:11:03 +03:00
Volodymyr Babak
318dc28279 Merge remote-tracking branch 'upstream/feature/swagger' into feature/swagger-edge-controller 2021-10-14 12:22:10 +03:00
Viacheslav Klimov
2d4ac40e25 Refactor searchTenantIdRecursive for rule chains import 2021-10-13 16:51:49 +03:00
Sergey Matvienko
319d47eaad fixed CE license headers 2021-10-12 18:48:28 +03:00
Sergey Matvienko
2d08573fee relation query test: maxLevel and fetchLastLevelOnly cases added 2021-10-12 18:43:38 +03:00
Sergey Matvienko
8b6a9be476 fixed re.lvl with r_int.lvl 2021-10-12 18:41:32 +03:00
Sergey Matvienko
f4cfd92aaa tests dao: marked base classes as abstract, exclude subfolders for sql test on in pom 2021-10-12 18:40:20 +03:00
Sergey Matvienko
2d2aa50520 tests: added psql exclude in application pom. dao pom copied the same rules as fo rapplication 2021-10-12 18:36:07 +03:00
Sergey Matvienko
7585239339 tests: cleanup after dubug 2021-10-12 18:35:26 +03:00
Sergey Matvienko
076b1943fb sql dao test: init ODBC connection to Postgres DB with custom PostgreSqlInitializer (class rule replacement, PostgreSQL dao tests able to run as standalone) 2021-10-12 18:35:17 +03:00
Sergey Matvienko
adb9a8d150 dao tests: PostgreSqlDaoServiceTestSuite added using org.testcontainers 2021-10-12 18:33:48 +03:00
Sergey Matvienko
1adaef31f5 license header CE fixed for DefaultEntityQueryRepositoryTest 2021-10-12 18:28:44 +03:00
Sergey Matvienko
edd96624ae relation query: group by added to the initial pert of recursive query 2021-10-12 18:27:15 +03:00
Sergey Matvienko
f2f3468077 test relations: print all relations added as sql procedure to reproduce exact data in the PostgreSQL 2021-10-12 18:26:16 +03:00
Sergey Matvienko
d65b02df19 test: count entities by query adjusted due to the loop relations in hierarchy 2021-10-12 18:21:57 +03:00
Sergey Matvienko
e4f8c7e878 relational query: Limit the max level to break the infinite loop when circles appear in relation graph 2021-10-12 18:20:33 +03:00
Sergey Matvienko
99476c78c9 relational query failed test when createHorizontalRingRelations added and freeze when createLoopRelations (due to infinite recursion with no level limit) 2021-10-12 18:13:17 +03:00
Sergey Matvienko
9ceb6f0d4d relational query: stable test run with ManyCustomRelationsBetweenTwoNodes, but without Loop Relations 2021-10-12 18:13:14 +03:00
Sergey Matvienko
891024f620 relation-query-improvement, failed relation were disabled temporary and will be enabled on next commits 2021-10-12 18:10:38 +03:00
Sergey Matvienko
a5d446914c tests: relation query - added test cases with many edges between two nodes, horizontal ring (loop) on the same level, loop Tenant-Asset-Device-Tenant. This commit will fail 4 hierarchy tests. Reformat code 2021-10-12 18:04:45 +03:00
Sergey Matvienko
2dc1f18a2d HsqlEventCleanupRepository: sql query timeout 1 hour 2021-10-12 14:27:02 +03:00
Sergey Matvienko
d7c530378b PsqlEventCleanupRepository.java: sql query timeout 1 hour 2021-10-12 14:25:24 +03:00
Sergey Matvienko
305409a0dc JpaBaseEdgeEventDao: sql query timeout 1 hour 2021-10-12 14:24:50 +03:00
Sergey Matvienko
87b3de09ad Merge branch 'master' into feature/sql-query-timeout 
# Conflicts:
#	dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaEdgeDao.java
#	dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java
 2021-10-12 14:19:10 +03:00
Volodymyr Babak
427e7ac094 Added swagger API for edge event controller. Added search text usage for edge event type. Code cleanup 2021-10-12 12:58:25 +03:00