Merge branch 'master' into feature/toggle-button

application/src/main/java/org/thingsboard/server/service/ws/DefaultWebSocketService.java

@@ -260,7 +260,8 @@ public class DefaultWebSocketService implements WebSocketService {
 
     @Override
     public void sendUpdate(String sessionId, int cmdId, TelemetrySubscriptionUpdate update) {
-        doSendUpdate(sessionId, cmdId, update);
+        // We substitute the subscriptionId with cmdId for old-style subscriptions.
+        doSendUpdate(sessionId, cmdId, update.copyWithNewSubscriptionId(cmdId));
     }
 
     @Override

application/src/main/java/org/thingsboard/server/service/ws/telemetry/sub/TelemetrySubscriptionUpdate.java

@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.service.ws.telemetry.sub;
 
+import lombok.AllArgsConstructor;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.service.subscription.SubscriptionErrorCode;
 
@@ -26,8 +27,8 @@ import java.util.Map;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
 
+@AllArgsConstructor
 public class TelemetrySubscriptionUpdate {
-
     private final int subscriptionId;
     private int errorCode;
     private String errorMsg;
@@ -93,6 +94,10 @@ public class TelemetrySubscriptionUpdate {
         return errorMsg;
     }
 
+    public TelemetrySubscriptionUpdate copyWithNewSubscriptionId(int subscriptionId){
+        return new TelemetrySubscriptionUpdate(subscriptionId, errorCode, errorMsg, data);
+    }
+
     @Override
     public String toString() {
         StringBuilder result = new StringBuilder("TelemetrySubscriptionUpdate [subscriptionId=" + subscriptionId + ", errorCode=" + errorCode + ", errorMsg=" + errorMsg + ", data=");

dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java

@@ -26,6 +26,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.hibernate.exception.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.event.TransactionalEventListener;
@@ -106,6 +107,7 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
     private RelationService relationService;
 
     @Autowired
+    @Lazy
     private TimeseriesService timeseriesService;
 
     @Autowired