Browse Source

Fix tenant proto

pull/11112/head
ViacheslavKlimov 2 years ago
parent
commit
874a5b9437
  1. 8
      common/proto/src/main/java/org/thingsboard/server/common/util/ProtoUtils.java
  2. 1
      common/proto/src/main/proto/queue.proto

8
common/proto/src/main/java/org/thingsboard/server/common/util/ProtoUtils.java

@ -17,9 +17,7 @@ package org.thingsboard.server.common.util;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.google.protobuf.ByteString; import com.google.protobuf.ByteString;
import com.google.protobuf.InvalidProtocolBufferException;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.Nullable;
import org.thingsboard.common.util.JacksonUtil; import org.thingsboard.common.util.JacksonUtil;
import org.thingsboard.server.common.data.ApiUsageState; import org.thingsboard.server.common.data.ApiUsageState;
import org.thingsboard.server.common.data.ApiUsageStateValue; import org.thingsboard.server.common.data.ApiUsageStateValue;
@ -752,6 +750,9 @@ public class ProtoUtils {
if (isNotNull(tenant.getAdditionalInfo())) { if (isNotNull(tenant.getAdditionalInfo())) {
builder.setAdditionalInfo(JacksonUtil.toString(tenant.getAdditionalInfo())); builder.setAdditionalInfo(JacksonUtil.toString(tenant.getAdditionalInfo()));
} }
if (isNotNull(tenant.getVersion())) {
builder.setVersion(tenant.getVersion());
}
return builder.build(); return builder.build();
} }
@ -791,6 +792,9 @@ public class ProtoUtils {
if (proto.hasAdditionalInfo()) { if (proto.hasAdditionalInfo()) {
tenant.setAdditionalInfo(JacksonUtil.toJsonNode(proto.getAdditionalInfo())); tenant.setAdditionalInfo(JacksonUtil.toJsonNode(proto.getAdditionalInfo()));
} }
if (proto.hasVersion()) {
tenant.setVersion(proto.getVersion());
}
return tenant; return tenant;
} }

1
common/proto/src/main/proto/queue.proto

@ -262,6 +262,7 @@ message TenantProto {
optional string phone = 14; optional string phone = 14;
optional string email = 15; optional string email = 15;
optional string additionalInfo = 16; optional string additionalInfo = 16;
optional int64 version = 17;
} }
message TenantProfileProto { message TenantProfileProto {

Loading…
Cancel
Save