3310 Commits

Author SHA1 Message Date
Andrii Shvaika
a88b1ef349 Merge hotfix/3.6.3 to master 2024-04-04 12:56:17 +03:00
Andrii Shvaika
d5cdd2b13d Merge branch 'master' of github.com:thingsboard/thingsboard 2024-04-04 12:46:10 +03:00
Oleksandra Matviienko
e00b14bf84 validateId refactoring
Signed-off-by: Oleksandra Matviienko <al.zzzeebra@gmail.com>
2024-04-03 21:11:05 +02:00
Andrii Shvaika
bd2cf904e4 Merge branch 'improve-entity-data-query' of github.com:AndriiLandiak/thingsboard 2024-04-03 17:01:32 +03:00
Sergey Matvienko
6ca90a80b2 Deprecated old methods in Validator in favour the fastest ones 2024-04-03 15:30:36 +02:00
Sergey Matvienko
93adbd116c Validator: some old method usage replaced with a new ones with functions 2024-04-03 15:28:28 +02:00
Sergey Matvienko
f82d6b9db5 ValidatorTest fixed imports 2024-04-03 14:44:36 +02:00
Oleksandra Matviienko
1e83e458f6 Changes in validateIds method. Validate method for id,ids added. Minor changes in code formatting.
Signed-off-by: Oleksandra Matviienko <al.zzzeebra@gmail.com>
2024-04-03 14:03:41 +02:00
Oleksandra Matviienko
c785c8acfd Minor changes of validation methods and code formatting.
Signed-off-by: Oleksandra Matviienko <al.zzzeebra@gmail.com>
2024-04-03 14:03:41 +02:00
Oleksandra Matviienko
a993f2133a Changes according to comments
Signed-off-by: Oleksandra Matviienko <al.zzzeebra@gmail.com>
2024-04-03 14:03:41 +02:00
Oleksandra Matviienko
816f6e35c5 Changed the usage of validate methods in Validator from methods with an errorMessage to methods with functions.
Signed-off-by: Oleksandra Matviienko <al.zzzeebra@gmail.com>
2024-04-03 14:03:41 +02:00
Oleksandra Matviienko
4eeb0b2883 UPD. Refactoring and changes according to comments.
Signed-off-by: Oleksandra Matviienko <al.zzzeebra@gmail.com>
2024-04-03 14:03:41 +02:00
Oleksandra Matviienko
c2b53479fb UPD. Refactoring and changes according to comments.
Signed-off-by: Oleksandra Matviienko <al.zzzeebra@gmail.com>
2024-04-03 14:03:41 +02:00
Oleksandra Matviienko
85e80a56ae Tests for Validator are added.
Signed-off-by: Oleksandra Matviienko <al.zzzeebra@gmail.com>
2024-04-03 14:03:41 +02:00
Oleksandra Matviienko
5e39af738b In Validator a Function provided to build an error message only if necessary.
Signed-off-by: Oleksandra Matviienko <al.zzzeebra@gmail.com>
2024-04-03 14:03:41 +02:00
Andrew Shvayka
b276d5e3da
Merge pull request #10145 from dashevchenko/queueStatsEntity
Entity for queue statistics
2024-04-02 12:19:33 +03:00
Andrew Shvayka
1e62ed98fa
Merge pull request #10453 from dashevchenko/sortProblemFix
Added default sorting by id for PageLink
2024-04-01 18:57:07 +03:00
Andrii Landiak
fe5b4606eb Improvement: do not use 2 queries for single_entity 2024-04-01 16:51:31 +03:00
Andrii Landiak
87e564f8c0 Use stringUtils to check if search text is not null and is not empty 2024-04-01 16:39:44 +03:00
Andrii Landiak
596d0f1135 Improvement optimization is not perfroming while text search is not null 2024-04-01 15:46:01 +03:00
Andrii Landiak
2888ac5db9 Improve EntityDataQuery using 2 query: filter and sort to find entityIds and using entityIds as List to map with telemetry and entity fields 2024-04-01 12:32:32 +03:00
ViacheslavKlimov
9d1f751f3a Fix race condition on tenant creation; refactoring 2024-03-29 15:20:56 +02:00
IrynaMatveieva
841729bca3 removed unnecessary object creation 2024-03-29 10:51:20 +02:00
dashevchenko
6c911637ae merged with master 2024-03-27 19:04:34 +02:00
Volodymyr Babak
cb9236ff78
Merge pull request #10239 from AndriiLandiak/feature/edge-oauth-support
Edge - OAuth2 support
2024-03-27 14:52:01 +02:00
dashevchenko
1f1a9c5a25 updated asset/device delete methods to delete only alarms originated by entity 2024-03-27 13:06:03 +02:00
dashevchenko
3c0e0be9bc Merge remote-tracking branch 'upstream/master' into ownerName 2024-03-27 12:35:33 +02:00
dashevchenko
a00c0a3d7f Merge remote-tracking branch 'upstream/master' into sortProblemFix 2024-03-27 12:17:53 +02:00
dashevchenko
dae4f313e2 merged with master 2024-03-26 19:09:21 +02:00
Igor Kulikov
02df0728dc Merge branch 'master' into feature/swagger3.1 2024-03-26 12:25:51 +02:00
Igor Kulikov
8a890a4512 Fix compilation error 2024-03-25 12:45:28 +02:00
ViacheslavKlimov
8a58fd49b5 Fix import in DefaultEntityServiceRegistry 2024-03-25 11:28:59 +02:00
ViacheslavKlimov
03cb21b79a Merge branch 'hotfix/3.6.3' into master-with-hotfix
# Conflicts:
#	common/util/src/main/java/org/thingsboard/common/util/SslUtil.java
2024-03-25 09:56:57 +02:00
IrynaMatveieva
e29a470856 used assertj instead of junit 2024-03-22 14:33:03 +02:00
ViacheslavKlimov
ed44db6d25 Add delivery_method column to notification; persist mobile notifications 2024-03-22 14:20:51 +02:00
Iryna Matveieva
f4ca0c8c90
Merge branch 'master' into improve-script-node 2024-03-22 12:37:25 +02:00
IrynaMatveieva
e879f63376 fixed error message for problem with external id 2024-03-22 10:50:21 +02:00
ViacheslavKlimov
a529abeced Fix attributes removal by entity id 2024-03-21 12:43:34 +02:00
ViacheslavKlimov
be3e78044c Merge remote-tracking branch 'origin/master' into feature/housekeeper 2024-03-21 11:52:07 +02:00
Andrii Landiak
37d5405dc5 Merge remote-tracking branch 'upstream/master' into feature/edge-oauth-support 2024-03-21 11:17:16 +02:00
dashevchenko
ab638cfa19 add defaultSorting by default 2024-03-20 18:53:26 +02:00
dashevchenko
56c65f249d added selection mapping for entity property filters 2024-03-20 15:12:57 +02:00
ViacheslavKlimov
4ed952a9d6 Merge branch 'master' into develop/3.7 2024-03-19 15:44:23 +02:00
IrynaMatveieva
8767b6d845 changed method of generating event in tests 2024-03-19 13:32:59 +02:00
Viacheslav Klimov
e3a940c575
Merge pull request #10385 from YevhenBondarenko/fix/entity-service-registry
fixed NPE related to the entity service registry initialization
2024-03-18 18:08:32 +02:00
ViacheslavKlimov
b3b27210b0 Merge branch 'master' into hotfix/3.6.3 2024-03-18 18:06:14 +02:00
ViacheslavKlimov
1ed95b24a6 Clean up api usage state data on deletion 2024-03-18 18:02:06 +02:00
Viacheslav Klimov
baa15fd095
Merge pull request #10039 from smatvienko-tb/feature/delete-rpc-native-query
Refactoring / delete rpc native query
2024-03-18 13:15:25 +02:00
Andrii Landiak
f4733a44b4 Fix existingNotificationTypes for Edge 2024-03-18 12:47:32 +02:00
ViacheslavKlimov
dfb40ecbe0 Skipped entity types list for cleaning up related data 2024-03-18 12:35:29 +02:00