From b04949c62cff2ae1960bb35657fd8fa6368addda Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Mon, 29 Nov 2021 19:20:08 +0200
Subject: [PATCH] Null values support for subscription update values proto

---
 .../subscription/DefaultSubscriptionManagerService.java  | 6 ++++--
 .../server/service/subscription/TbSubscriptionUtils.java | 8 +++++---
 common/cluster-api/src/main/proto/queue.proto            | 9 +++++++--
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java b/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java
index 018d80f013..6e5ca1669f 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java
@@ -492,12 +492,14 @@ public class DefaultSubscriptionManagerService extends TbApplicationEventListene
             boolean hasData = false;
             for (Object v : value) {
                 Object[] array = (Object[]) v;
-                dataBuilder.addTs((long) array[0]);
+                TbSubscriptionUpdateTsValue.Builder tsValueBuilder = TbSubscriptionUpdateTsValue.newBuilder();
+                tsValueBuilder.setTs((long) array[0]);
                 String strVal = (String) array[1];
                 if (strVal != null) {
                     hasData = true;
-                    dataBuilder.addValue(strVal);
+                    tsValueBuilder.setValue(strVal);
                 }
+                dataBuilder.addTsValue(tsValueBuilder.build());
             }
             if (!ignoreEmptyUpdates || hasData) {
                 builder.addData(dataBuilder.build());
diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/TbSubscriptionUtils.java b/application/src/main/java/org/thingsboard/server/service/subscription/TbSubscriptionUtils.java
index 978d7aaac3..25b67d3a06 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/TbSubscriptionUtils.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/TbSubscriptionUtils.java
@@ -42,6 +42,7 @@ import org.thingsboard.server.gen.transport.TransportProtos.TbSubscriptionCloseP
 import org.thingsboard.server.gen.transport.TransportProtos.TbSubscriptionKetStateProto;
 import org.thingsboard.server.gen.transport.TransportProtos.TbSubscriptionProto;
 import org.thingsboard.server.gen.transport.TransportProtos.TbSubscriptionUpdateProto;
+import org.thingsboard.server.gen.transport.TransportProtos.TbSubscriptionUpdateTsValue;
 import org.thingsboard.server.gen.transport.TransportProtos.TbTimeSeriesSubscriptionProto;
 import org.thingsboard.server.gen.transport.TransportProtos.TbTimeSeriesUpdateProto;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
@@ -171,10 +172,11 @@ public class TbSubscriptionUtils {
             Map<String, List<Object>> data = new TreeMap<>();
             proto.getDataList().forEach(v -> {
                 List<Object> values = data.computeIfAbsent(v.getKey(), k -> new ArrayList<>());
-                for (int i = 0; i < v.getTsCount(); i++) {
+                for (int i = 0; i < v.getTsValueCount(); i++) {
                     Object[] value = new Object[2];
-                    value[0] = v.getTs(i);
-                    value[1] = v.getValue(i);
+                    TbSubscriptionUpdateTsValue tsValue = v.getTsValue(i);
+                    value[0] = tsValue.getTs();
+                    value[1] = tsValue.hasValue() ? tsValue.getValue() : null;
                     values.add(value);
                 }
             });
diff --git a/common/cluster-api/src/main/proto/queue.proto b/common/cluster-api/src/main/proto/queue.proto
index 5b220974ef..dca92c1c7a 100644
--- a/common/cluster-api/src/main/proto/queue.proto
+++ b/common/cluster-api/src/main/proto/queue.proto
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 syntax = "proto3";
+
 package transport;
 
 option java_package = "org.thingsboard.server.gen.transport";
@@ -581,8 +582,12 @@ message TbSubscriptionKetStateProto {
 
 message TbSubscriptionUpdateValueListProto {
   string key = 1;
-  repeated int64 ts = 2;
-  repeated string value = 3;
+  repeated TbSubscriptionUpdateTsValue tsValue = 2;
+}
+
+message TbSubscriptionUpdateTsValue {
+   int64 ts = 1;
+   optional string value = 2;
 }
 
 /**