Browse Source

version in proto should be optional

pull/10977/head
YevhenBondarenko 2 years ago
parent
commit
2336cba89a
  1. 15
      common/proto/src/main/java/org/thingsboard/server/common/util/KvProtoUtil.java
  2. 8
      common/proto/src/main/java/org/thingsboard/server/common/util/ProtoUtils.java
  3. 4
      common/proto/src/main/proto/queue.proto

15
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) {

8
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) {

4
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 {

Loading…
Cancel
Save