Fixed Time page link query for SQL database.

application/src/main/java/org/thingsboard/server/actors/service/DefaultActorService.java

@@ -130,11 +130,9 @@ public class DefaultActorService implements ActorService {
 
     @Override
     public void process(SessionAwareMsg msg) {
-        if (msg instanceof SessionAwareMsg) {
         log.debug("Processing session aware msg: {}", msg);
         sessionManagerActor.tell(msg, ActorRef.noSender());
     }
-    }
 
     @Override
     public void process(PluginWebsocketMsg<?> msg) {

dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java

@@ -102,7 +102,7 @@ public class JpaBaseEventDao extends JpaAbstractSearchTimeDao<EventEntity, Event
 
     @Override
     public List<Event> findEvents(UUID tenantId, EntityId entityId, String eventType, TimePageLink pageLink) {
-        Specification<EventEntity> timeSearchSpec = JpaAbstractSearchTimeDao.<EventEntity>getTimeSearchPageSpec(pageLink, "id");
+        Specification<EventEntity> timeSearchSpec = JpaAbstractSearchTimeDao.getTimeSearchPageSpec(pageLink, "id");
         Specification<EventEntity> fieldsSpec = getEntityFieldsSpec(tenantId, entityId, eventType);
         Sort.Direction sortDirection = pageLink.isAscOrder() ? Sort.Direction.ASC : Sort.Direction.DESC;
         Pageable pageable = new PageRequest(0, pageLink.getLimit(), sortDirection, ID_PROPERTY);
@@ -129,10 +129,8 @@ public class JpaBaseEventDao extends JpaAbstractSearchTimeDao<EventEntity, Event
     }
 
     private Specification<EventEntity> getEntityFieldsSpec(UUID tenantId, EntityId entityId, String eventType) {
-        return new Specification<EventEntity>() {
+        return (root, criteriaQuery, criteriaBuilder) -> {
-            @Override
+            List<Predicate> predicates = new ArrayList<>();
-            public Predicate toPredicate(Root<EventEntity> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
-                List<Predicate> predicates = new ArrayList<Predicate>();
             if (tenantId != null) {
                 Predicate tenantIdPredicate = criteriaBuilder.equal(root.get("tenantId"), UUIDConverter.fromTimeUUID(tenantId));
                 predicates.add(tenantIdPredicate);
@@ -148,7 +146,6 @@ public class JpaBaseEventDao extends JpaAbstractSearchTimeDao<EventEntity, Event
                 predicates.add(eventTypePredicate);
             }
             return criteriaBuilder.and(predicates.toArray(new Predicate[]{}));
-            }
         };
     }
 }

dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java

@@ -160,22 +160,16 @@ public class JpaRelationDao extends JpaAbstractDaoListeningExecutorService imple
 
     @Override
     public ListenableFuture<List<EntityRelation>> findRelations(EntityId from, String relationType, RelationTypeGroup typeGroup, EntityType childType, TimePageLink pageLink) {
-        Specification<RelationEntity> timeSearchSpec = JpaAbstractSearchTimeDao.<RelationEntity>getTimeSearchPageSpec(pageLink, "toId");
+        Specification<RelationEntity> timeSearchSpec = JpaAbstractSearchTimeDao.getTimeSearchPageSpec(pageLink, "toId");
         Specification<RelationEntity> fieldsSpec = getEntityFieldsSpec(from, relationType, typeGroup, childType);
-        Pageable pageable = new PageRequest(0, pageLink.getLimit(),
+        Sort.Direction sortDirection = pageLink.isAscOrder() ? Sort.Direction.ASC : Sort.Direction.DESC;
-                new Sort(
+        Pageable pageable = new PageRequest(0, pageLink.getLimit(), sortDirection, "toId");
-                        new Order(ASC, "relationTypeGroup"),
-                        new Order(ASC, "relationType"),
-                        new Order(ASC, "toType"))
-        );
         return service.submit(() ->
                 DaoUtil.convertDataList(relationRepository.findAll(where(timeSearchSpec).and(fieldsSpec), pageable).getContent()));
     }
 
     private Specification<RelationEntity> getEntityFieldsSpec(EntityId from, String relationType, RelationTypeGroup typeGroup, EntityType childType) {
-        return new Specification<RelationEntity>() {
+        return (root, criteriaQuery, criteriaBuilder) -> {
-            @Override
-            public Predicate toPredicate(Root<RelationEntity> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
             List<Predicate> predicates = new ArrayList<>();
             if (from != null) {
                 Predicate fromIdPredicate = criteriaBuilder.equal(root.get("fromId"),  UUIDConverter.fromTimeUUID(from.getId()));
@@ -196,7 +190,6 @@ public class JpaRelationDao extends JpaAbstractDaoListeningExecutorService imple
                 predicates.add(childTypePredicate);
             }
             return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
-            }
         };
     }
 }