From da6fa2c00b29638eb9906ab3922b561a1c098c61 Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Thu, 29 May 2025 11:47:11 +0300
Subject: [PATCH] Refactor TelemetrySubscriptionUpdate

---
 .../service/subscription/TbAbstractEntityQuerySubCtx.java   | 2 +-
 .../server/service/subscription/TbAlarmDataSubCtx.java      | 2 +-
 .../server/service/subscription/TbEntityDataSubCtx.java     | 4 ++--
 .../ws/telemetry/sub/TelemetrySubscriptionUpdate.java       | 6 ++----
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/TbAbstractEntityQuerySubCtx.java b/application/src/main/java/org/thingsboard/server/service/subscription/TbAbstractEntityQuerySubCtx.java
index 2c3127bc4d..9d51c2ec4a 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/TbAbstractEntityQuerySubCtx.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/TbAbstractEntityQuerySubCtx.java
@@ -155,7 +155,7 @@ public abstract class TbAbstractEntityQuerySubCtx<T extends EntityCountQuery> ex
     private void dynamicValueSubUpdate(String sessionId, TelemetrySubscriptionUpdate subscriptionUpdate,
                                        Map<String, DynamicValueKeySub> dynamicValueKeySubMap) {
         Map<String, TsValue> latestUpdate = new HashMap<>();
-        subscriptionUpdate.getData().forEach((key, values) -> {
+        subscriptionUpdate.getValues().forEach((key, values) -> {
             latestUpdate.put(key, getLatest(values));
         });
 
diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmDataSubCtx.java b/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmDataSubCtx.java
index b9956288a4..e896b520bc 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmDataSubCtx.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmDataSubCtx.java
@@ -190,7 +190,7 @@ public class TbAlarmDataSubCtx extends TbAbstractDataSubCtx<AlarmDataQuery> {
         EntityId entityId = subToEntityIdMap.get(subscriptionUpdate.getSubscriptionId());
         if (entityId != null) {
             Map<String, TsValue> latestUpdate = new HashMap<>();
-            subscriptionUpdate.getData().forEach((key, values) -> {
+            subscriptionUpdate.getValues().forEach((key, values) -> {
                 latestUpdate.put(key, getLatest(values));
             });
             EntityData entityData = entitiesMap.get(entityId);
diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/TbEntityDataSubCtx.java b/application/src/main/java/org/thingsboard/server/service/subscription/TbEntityDataSubCtx.java
index 6e3ebdc13b..3df03283d7 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/TbEntityDataSubCtx.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/TbEntityDataSubCtx.java
@@ -93,7 +93,7 @@ public class TbEntityDataSubCtx extends TbAbstractDataSubCtx<EntityDataQuery> {
 
     private void sendLatestWsMsg(EntityId entityId, String sessionId, TelemetrySubscriptionUpdate subscriptionUpdate, EntityKeyType keyType) {
         Map<String, TsValue> latestUpdate = new HashMap<>();
-        subscriptionUpdate.getData().forEach((key, values) -> {
+        subscriptionUpdate.getValues().forEach((key, values) -> {
             latestUpdate.put(key, getLatest(values));
         });
         EntityData entityData = getDataForEntity(entityId);
@@ -129,7 +129,7 @@ public class TbEntityDataSubCtx extends TbAbstractDataSubCtx<EntityDataQuery> {
 
     private void sendTsWsMsg(EntityId entityId, String sessionId, TelemetrySubscriptionUpdate subscriptionUpdate, EntityKeyType keyType) {
         Map<String, List<TsValue>> tsUpdate = new HashMap<>();
-        subscriptionUpdate.getData().forEach((key, values) -> {
+        subscriptionUpdate.getValues().forEach((key, values) -> {
             tsUpdate.put(key, new ArrayList<>(values));
         });
         Map<String, TsValue> latestCtxValues = getLatestTsValuesForEntity(entityId);
diff --git a/application/src/main/java/org/thingsboard/server/service/ws/telemetry/sub/TelemetrySubscriptionUpdate.java b/application/src/main/java/org/thingsboard/server/service/ws/telemetry/sub/TelemetrySubscriptionUpdate.java
index 6fca1a159a..e24ab368ec 100644
--- a/application/src/main/java/org/thingsboard/server/service/ws/telemetry/sub/TelemetrySubscriptionUpdate.java
+++ b/application/src/main/java/org/thingsboard/server/service/ws/telemetry/sub/TelemetrySubscriptionUpdate.java
@@ -31,15 +31,13 @@ import java.util.Map;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
 
+@Getter
 @AllArgsConstructor
 public class TelemetrySubscriptionUpdate {
 
-    @Getter
     @With
     private final int subscriptionId;
-    @Getter
     private int errorCode;
-    @Getter
     private String errorMsg;
     private Map<String, List<Object>> data;
 
@@ -75,7 +73,7 @@ public class TelemetrySubscriptionUpdate {
         this.errorMsg = errorMsg != null ? errorMsg : errorCode.getDefaultMsg();
     }
 
-    public Map<String, List<TsValue>> getData() {
+    public Map<String, List<TsValue>> getValues() {
         if (data == null || data.isEmpty()) {
             return Collections.emptyMap();
         }