dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

edge.proto - mark deprecated fields

Browse Source
This commit is contained in:
Volodymyr Babak 2025-02-27 13:41:17 +02:00
parent b29b192efc
commit cc925a75c4
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
common/edge-api/src/main/proto/edge.proto
View File

@ -42,6 +42,8 @@ enum EdgeVersion {
V_3_8_0 = 8;
V_3_9_0 = 9;
V_4_0_0 = 10;
V_LATEST = 999;
}
/**
@ -303,8 +305,9 @@ message NotificationTemplateUpdateMsg {
optional string entity = 4;
}
// deprecated
// DEPRECATED. FOR REMOVAL
message RuleChainMetadataRequestMsg {
option deprecated = true;
int64 ruleChainIdMSB = 1;
int64 ruleChainIdLSB = 2;
}
@ -322,22 +325,30 @@ message RelationRequestMsg {
string entityType = 3;
}
// DEPRECATED. FOR REMOVAL
message UserCredentialsRequestMsg {
option deprecated = true;
int64 userIdMSB = 1;
int64 userIdLSB = 2;
}
// DEPRECATED. FOR REMOVAL
message DeviceCredentialsRequestMsg {
option deprecated = true;
int64 deviceIdMSB = 1;
int64 deviceIdLSB = 2;
}
// DEPRECATED. FOR REMOVAL
message WidgetBundleTypesRequestMsg {
option deprecated = true;
int64 widgetBundleIdMSB = 1;
int64 widgetBundleIdLSB = 2;
}
// DEPRECATED. FOR REMOVAL
message EntityViewsRequestMsg {
option deprecated = true;
int64 entityIdMSB = 1;
int64 entityIdLSB = 2;
string entityType = 3;
@ -395,14 +406,14 @@ message UplinkMsg {
repeated DeviceCredentialsUpdateMsg deviceCredentialsUpdateMsg = 4;
repeated AlarmUpdateMsg alarmUpdateMsg = 5;
repeated RelationUpdateMsg relationUpdateMsg = 6;
repeated RuleChainMetadataRequestMsg ruleChainMetadataRequestMsg = 7; // deprecated
repeated RuleChainMetadataRequestMsg ruleChainMetadataRequestMsg = 7 [deprecated = true];
repeated AttributesRequestMsg attributesRequestMsg = 8;
repeated RelationRequestMsg relationRequestMsg = 9;
repeated UserCredentialsRequestMsg userCredentialsRequestMsg = 10;
repeated DeviceCredentialsRequestMsg deviceCredentialsRequestMsg = 11;
repeated UserCredentialsRequestMsg userCredentialsRequestMsg = 10 [deprecated = true];
repeated DeviceCredentialsRequestMsg deviceCredentialsRequestMsg = 11 [deprecated = true];
repeated DeviceRpcCallMsg deviceRpcCallMsg = 12;
repeated WidgetBundleTypesRequestMsg widgetBundleTypesRequestMsg = 14;
repeated EntityViewsRequestMsg entityViewsRequestMsg = 15;
repeated WidgetBundleTypesRequestMsg widgetBundleTypesRequestMsg = 14 [deprecated = true];
repeated EntityViewsRequestMsg entityViewsRequestMsg = 15 [deprecated = true];
repeated AssetUpdateMsg assetUpdateMsg = 16;
repeated DashboardUpdateMsg dashboardUpdateMsg = 17;
repeated EntityViewUpdateMsg entityViewUpdateMsg = 18;
@ -430,7 +441,7 @@ message DownlinkMsg {
int32 downlinkMsgId = 1;
SyncCompletedMsg syncCompletedMsg = 2;
repeated EntityDataProto entityData = 3;
repeated DeviceCredentialsRequestMsg deviceCredentialsRequestMsg = 4;
repeated DeviceCredentialsRequestMsg deviceCredentialsRequestMsg = 4 [deprecated = true];
repeated DeviceUpdateMsg deviceUpdateMsg = 5;
repeated DeviceProfileUpdateMsg deviceProfileUpdateMsg = 6;
repeated DeviceCredentialsUpdateMsg deviceCredentialsUpdateMsg = 7;

3
dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
View File

@ -179,8 +179,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
@Transactional
@Override
public RuleChainUpdateResult saveRuleChainMetaData(TenantId tenantId, RuleChainMetaData ruleChainMetaData, Function<RuleNode, RuleNode> ruleNodeUpdater,
boolean publishSaveEvent) {
public RuleChainUpdateResult saveRuleChainMetaData(TenantId tenantId, RuleChainMetaData ruleChainMetaData, Function<RuleNode, RuleNode> ruleNodeUpdater, boolean publishSaveEvent) {
Validator.validateId(ruleChainMetaData.getRuleChainId(), "Incorrect rule chain id.");
RuleChain ruleChain = findRuleChainById(tenantId, ruleChainMetaData.getRuleChainId());
if (ruleChain == null) {