Code review changes

application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/GeneralEdgeEventFetcher.java

@@ -21,6 +21,7 @@ import org.thingsboard.server.common.data.edge.EdgeEvent;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.common.data.page.SortOrder;
 import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.dao.edge.EdgeEventService;
 
@@ -32,7 +33,13 @@ public class GeneralEdgeEventFetcher implements EdgeEventFetcher {
 
     @Override
     public PageLink getPageLink(int pageSize) {
-        return new TimePageLink(pageSize, 0, null, null, queueStartTs, null);
+        return new TimePageLink(
+                pageSize,
+                0,
+                null,
+                new SortOrder("createdTime", SortOrder.Direction.ASC),
+                queueStartTs,
+                null);
     }
 
     @Override

application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbEntityDataSubscriptionService.java

@@ -95,7 +95,6 @@ public class DefaultTbEntityDataSubscriptionService implements TbEntityDataSubsc
     private final Map<String, Map<Integer, TbAbstractSubCtx>> subscriptionsBySessionId = new ConcurrentHashMap<>();
 
     @Autowired
-    @Lazy
     private WebSocketService wsService;
 
     @Autowired