Merge remote-tracking branch 'upstream/develop/3.5' into alarm-details-redesign

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

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

application/src/test/java/org/thingsboard/server/controller/BaseHomePageApiTest.java

@@ -249,7 +249,7 @@ public abstract class BaseHomePageApiTest extends AbstractControllerTest {
         Assert.assertEquals(7, listData.get(0).getTimeseries().size());
 
         for (TsValue[] tsv : listData.get(0).getTimeseries().values()) {
-            Assert.assertTrue(tsv.length > 1);
+            Assert.assertTrue(tsv.length > 0);
         }
     }
 

application/src/test/java/org/thingsboard/server/service/notification/NotificationApiTest.java

@@ -20,6 +20,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.assertj.core.data.Offset;
 import org.java_websocket.client.WebSocketClient;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.rule.engine.api.NotificationCenter;
@@ -476,6 +477,7 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
     }
 
     @Test
+    @Ignore
     public void testNotificationsForALotOfUsers() throws Exception {
         int usersCount = 5000;
 
@@ -521,6 +523,7 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
     }
 
     @Test
+    @Ignore
     public void testSlackNotifications() throws Exception {
         NotificationSettings settings = new NotificationSettings();
         SlackNotificationDeliveryMethodConfig slackConfig = new SlackNotificationDeliveryMethodConfig();