From 2336cba89a61b5632742c80a5fc7d99774995952 Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Tue, 9 Jul 2024 16:50:07 +0200
Subject: [PATCH] version in proto should be optional

---
 .../server/common/util/KvProtoUtil.java           | 15 ++++++++++-----
 .../server/common/util/ProtoUtils.java            |  8 ++++++--
 common/proto/src/main/proto/queue.proto           |  4 ++--
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/common/proto/src/main/java/org/thingsboard/server/common/util/KvProtoUtil.java b/common/proto/src/main/java/org/thingsboard/server/common/util/KvProtoUtil.java
index 4b206fd804..1be79a28cc 100644
--- a/common/proto/src/main/java/org/thingsboard/server/common/util/KvProtoUtil.java
+++ b/common/proto/src/main/java/org/thingsboard/server/common/util/KvProtoUtil.java
@@ -86,15 +86,20 @@ public class KvProtoUtil {
                 .setKv(KvProtoUtil.toKeyValueTypeProto(kvEntry)).build();
     }
 
-    public static TransportProtos.TsKvProto toTsKvProto(long ts, KvEntry kvEntry, long version) {
-        return TransportProtos.TsKvProto.newBuilder()
+    public static TransportProtos.TsKvProto toTsKvProto(long ts, KvEntry kvEntry, Long version) {
+        var builder = TransportProtos.TsKvProto.newBuilder()
                 .setTs(ts)
-                .setVersion(version)
-                .setKv(KvProtoUtil.toKeyValueTypeProto(kvEntry)).build();
+                .setKv(KvProtoUtil.toKeyValueTypeProto(kvEntry));
+
+        if (version != null) {
+            builder.setVersion(version);
+        }
+
+        return builder.build();
     }
 
     public static TsKvEntry fromTsKvProto(TransportProtos.TsKvProto proto) {
-        return new BasicTsKvEntry(proto.getTs(), fromTsKvProto(proto.getKv()), proto.getVersion());
+        return new BasicTsKvEntry(proto.getTs(), fromTsKvProto(proto.getKv()), proto.hasVersion() ? proto.getVersion() : null);
     }
 
     public static TransportProtos.KeyValueProto toKeyValueTypeProto(KvEntry kvEntry) {
diff --git a/common/proto/src/main/java/org/thingsboard/server/common/util/ProtoUtils.java b/common/proto/src/main/java/org/thingsboard/server/common/util/ProtoUtils.java
index db1c1fe2e5..b9377ac215 100644
--- a/common/proto/src/main/java/org/thingsboard/server/common/util/ProtoUtils.java
+++ b/common/proto/src/main/java/org/thingsboard/server/common/util/ProtoUtils.java
@@ -295,7 +295,11 @@ public class ProtoUtils {
                 builder.setType(TransportProtos.KeyValueType.JSON_V);
                 break;
         }
-        builder.setVersion(attributeKvEntry.getVersion());
+
+        if (attributeKvEntry.getVersion() != null) {
+            builder.setVersion(attributeKvEntry.getVersion());
+        }
+
         return builder.build();
     }
 
@@ -523,7 +527,7 @@ public class ProtoUtils {
             case JSON_V -> new JsonDataEntry(key, hasValue ? proto.getJsonV() : null);
             default -> null;
         };
-        return new BaseAttributeKvEntry(entry, proto.getLastUpdateTs(), proto.getVersion());
+        return new BaseAttributeKvEntry(entry, proto.getLastUpdateTs(), proto.hasVersion() ? proto.getVersion() : null);
     }
 
     public static TransportProtos.DeviceProto toProto(Device device) {
diff --git a/common/proto/src/main/proto/queue.proto b/common/proto/src/main/proto/queue.proto
index 9b93812708..3317391f01 100644
--- a/common/proto/src/main/proto/queue.proto
+++ b/common/proto/src/main/proto/queue.proto
@@ -157,13 +157,13 @@ message AttributeValueProto {
   string string_v = 7;
   string json_v = 8;
   optional string key = 9;
-  int64 version = 10;
+  optional int64 version = 10;
 }
 
 message TsKvProto {
   int64 ts = 1;
   KeyValueProto kv = 2;
-  int64 version = 3;
+  optional int64 version = 3;
 }
 
 message TsKvListProto {