简柏林 / thingskit · Commits

Commit d30ac7d2050c17b434b6d6a66c3b1ec742ef6344

Authored by Volodymyr Babak
1 parent 77c080f8

Added v1 to edge package for future versioning capability

Inline Side-by-side
Showing 39 changed files with 207 additions and 207 deletions
... ... @@ -34,9 +34,9 @@ import org.thingsboard.server.common.data.id.TenantId;
34 34 import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
35 35 import org.thingsboard.server.common.data.kv.BooleanDataEntry;
36 36 import org.thingsboard.server.common.data.kv.LongDataEntry;
37   -import org.thingsboard.server.gen.edge.EdgeRpcServiceGrpc;
38   -import org.thingsboard.server.gen.edge.RequestMsg;
39   -import org.thingsboard.server.gen.edge.ResponseMsg;
  37 +import org.thingsboard.server.gen.edge.v1.EdgeRpcServiceGrpc;
  38 +import org.thingsboard.server.gen.edge.v1.RequestMsg;
  39 +import org.thingsboard.server.gen.edge.v1.ResponseMsg;
40 40 import org.thingsboard.server.queue.util.TbCoreComponent;
41 41 import org.thingsboard.server.service.edge.EdgeContextComponent;
42 42 import org.thingsboard.server.service.state.DefaultDeviceStateService;
... ...
... ... @@ -40,34 +40,34 @@ import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
40 40 import org.thingsboard.server.common.data.kv.LongDataEntry;
41 41 import org.thingsboard.server.common.data.page.PageData;
42 42 import org.thingsboard.server.common.data.page.PageLink;
43   -import org.thingsboard.server.gen.edge.AlarmUpdateMsg;
44   -import org.thingsboard.server.gen.edge.AttributesRequestMsg;
45   -import org.thingsboard.server.gen.edge.ConnectRequestMsg;
46   -import org.thingsboard.server.gen.edge.ConnectResponseCode;
47   -import org.thingsboard.server.gen.edge.ConnectResponseMsg;
48   -import org.thingsboard.server.gen.edge.DeviceCredentialsRequestMsg;
49   -import org.thingsboard.server.gen.edge.DeviceCredentialsUpdateMsg;
50   -import org.thingsboard.server.gen.edge.DeviceProfileDevicesRequestMsg;
51   -import org.thingsboard.server.gen.edge.DeviceRpcCallMsg;
52   -import org.thingsboard.server.gen.edge.DeviceUpdateMsg;
53   -import org.thingsboard.server.gen.edge.DownlinkMsg;
54   -import org.thingsboard.server.gen.edge.DownlinkResponseMsg;
55   -import org.thingsboard.server.gen.edge.EdgeConfiguration;
56   -import org.thingsboard.server.gen.edge.EdgeUpdateMsg;
57   -import org.thingsboard.server.gen.edge.EntityDataProto;
58   -import org.thingsboard.server.gen.edge.EntityViewsRequestMsg;
59   -import org.thingsboard.server.gen.edge.RelationRequestMsg;
60   -import org.thingsboard.server.gen.edge.RelationUpdateMsg;
61   -import org.thingsboard.server.gen.edge.RequestMsg;
62   -import org.thingsboard.server.gen.edge.RequestMsgType;
63   -import org.thingsboard.server.gen.edge.ResponseMsg;
64   -import org.thingsboard.server.gen.edge.RuleChainMetadataRequestMsg;
65   -import org.thingsboard.server.gen.edge.SyncCompletedMsg;
66   -import org.thingsboard.server.gen.edge.UpdateMsgType;
67   -import org.thingsboard.server.gen.edge.UplinkMsg;
68   -import org.thingsboard.server.gen.edge.UplinkResponseMsg;
69   -import org.thingsboard.server.gen.edge.UserCredentialsRequestMsg;
70   -import org.thingsboard.server.gen.edge.WidgetBundleTypesRequestMsg;
  43 +import org.thingsboard.server.gen.edge.v1.AlarmUpdateMsg;
  44 +import org.thingsboard.server.gen.edge.v1.AttributesRequestMsg;
  45 +import org.thingsboard.server.gen.edge.v1.ConnectRequestMsg;
  46 +import org.thingsboard.server.gen.edge.v1.ConnectResponseCode;
  47 +import org.thingsboard.server.gen.edge.v1.ConnectResponseMsg;
  48 +import org.thingsboard.server.gen.edge.v1.DeviceCredentialsRequestMsg;
  49 +import org.thingsboard.server.gen.edge.v1.DeviceCredentialsUpdateMsg;
  50 +import org.thingsboard.server.gen.edge.v1.DeviceProfileDevicesRequestMsg;
  51 +import org.thingsboard.server.gen.edge.v1.DeviceRpcCallMsg;
  52 +import org.thingsboard.server.gen.edge.v1.DeviceUpdateMsg;
  53 +import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
  54 +import org.thingsboard.server.gen.edge.v1.DownlinkResponseMsg;
  55 +import org.thingsboard.server.gen.edge.v1.EdgeConfiguration;
  56 +import org.thingsboard.server.gen.edge.v1.EdgeUpdateMsg;
  57 +import org.thingsboard.server.gen.edge.v1.EntityDataProto;
  58 +import org.thingsboard.server.gen.edge.v1.EntityViewsRequestMsg;
  59 +import org.thingsboard.server.gen.edge.v1.RelationRequestMsg;
  60 +import org.thingsboard.server.gen.edge.v1.RelationUpdateMsg;
  61 +import org.thingsboard.server.gen.edge.v1.RequestMsg;
  62 +import org.thingsboard.server.gen.edge.v1.RequestMsgType;
  63 +import org.thingsboard.server.gen.edge.v1.ResponseMsg;
  64 +import org.thingsboard.server.gen.edge.v1.RuleChainMetadataRequestMsg;
  65 +import org.thingsboard.server.gen.edge.v1.SyncCompletedMsg;
  66 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
  67 +import org.thingsboard.server.gen.edge.v1.UplinkMsg;
  68 +import org.thingsboard.server.gen.edge.v1.UplinkResponseMsg;
  69 +import org.thingsboard.server.gen.edge.v1.UserCredentialsRequestMsg;
  70 +import org.thingsboard.server.gen.edge.v1.WidgetBundleTypesRequestMsg;
71 71 import org.thingsboard.server.service.edge.EdgeContextComponent;
72 72 import org.thingsboard.server.service.edge.rpc.fetch.AdminSettingsEdgeEventFetcher;
73 73 import org.thingsboard.server.service.edge.rpc.fetch.AssetsEdgeEventFetcher;
... ...
... ... @@ -18,7 +18,7 @@ package org.thingsboard.server.service.edge.rpc.constructor;
18 18 import org.springframework.stereotype.Component;
19 19 import org.thingsboard.server.common.data.AdminSettings;
20 20 import org.thingsboard.common.util.JacksonUtil;
21   -import org.thingsboard.server.gen.edge.AdminSettingsUpdateMsg;
  21 +import org.thingsboard.server.gen.edge.v1.AdminSettingsUpdateMsg;
22 22 import org.thingsboard.server.queue.util.TbCoreComponent;
23 23
24 24 @Component
... ...
... ... @@ -26,8 +26,8 @@ import org.thingsboard.server.dao.asset.AssetService;
26 26 import org.thingsboard.server.dao.device.DeviceService;
27 27 import org.thingsboard.server.dao.entityview.EntityViewService;
28 28 import org.thingsboard.common.util.JacksonUtil;
29   -import org.thingsboard.server.gen.edge.AlarmUpdateMsg;
30   -import org.thingsboard.server.gen.edge.UpdateMsgType;
  29 +import org.thingsboard.server.gen.edge.v1.AlarmUpdateMsg;
  30 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
31 31 import org.thingsboard.server.queue.util.TbCoreComponent;
32 32
33 33 @Component
... ...
... ... @@ -20,8 +20,8 @@ import org.thingsboard.server.common.data.asset.Asset;
20 20 import org.thingsboard.server.common.data.id.AssetId;
21 21 import org.thingsboard.server.common.data.id.CustomerId;
22 22 import org.thingsboard.common.util.JacksonUtil;
23   -import org.thingsboard.server.gen.edge.AssetUpdateMsg;
24   -import org.thingsboard.server.gen.edge.UpdateMsgType;
  23 +import org.thingsboard.server.gen.edge.v1.AssetUpdateMsg;
  24 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
25 25 import org.thingsboard.server.queue.util.TbCoreComponent;
26 26
27 27 @Component
... ...
... ... @@ -19,8 +19,8 @@ import org.springframework.stereotype.Component;
19 19 import org.thingsboard.server.common.data.Customer;
20 20 import org.thingsboard.server.common.data.id.CustomerId;
21 21 import org.thingsboard.common.util.JacksonUtil;
22   -import org.thingsboard.server.gen.edge.CustomerUpdateMsg;
23   -import org.thingsboard.server.gen.edge.UpdateMsgType;
  22 +import org.thingsboard.server.gen.edge.v1.CustomerUpdateMsg;
  23 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
24 24 import org.thingsboard.server.queue.util.TbCoreComponent;
25 25
26 26 @Component
... ...
... ... @@ -20,8 +20,8 @@ import org.thingsboard.server.common.data.Dashboard;
20 20 import org.thingsboard.server.common.data.id.CustomerId;
21 21 import org.thingsboard.server.common.data.id.DashboardId;
22 22 import org.thingsboard.common.util.JacksonUtil;
23   -import org.thingsboard.server.gen.edge.DashboardUpdateMsg;
24   -import org.thingsboard.server.gen.edge.UpdateMsgType;
  23 +import org.thingsboard.server.gen.edge.v1.DashboardUpdateMsg;
  24 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
25 25 import org.thingsboard.server.queue.util.TbCoreComponent;
26 26
27 27 @Component
... ...
... ... @@ -23,11 +23,11 @@ import org.thingsboard.server.common.data.Device;
23 23 import org.thingsboard.server.common.data.id.CustomerId;
24 24 import org.thingsboard.server.common.data.id.DeviceId;
25 25 import org.thingsboard.server.common.data.security.DeviceCredentials;
26   -import org.thingsboard.server.gen.edge.DeviceCredentialsUpdateMsg;
27   -import org.thingsboard.server.gen.edge.DeviceRpcCallMsg;
28   -import org.thingsboard.server.gen.edge.DeviceUpdateMsg;
29   -import org.thingsboard.server.gen.edge.RpcRequestMsg;
30   -import org.thingsboard.server.gen.edge.UpdateMsgType;
  26 +import org.thingsboard.server.gen.edge.v1.DeviceCredentialsUpdateMsg;
  27 +import org.thingsboard.server.gen.edge.v1.DeviceRpcCallMsg;
  28 +import org.thingsboard.server.gen.edge.v1.DeviceUpdateMsg;
  29 +import org.thingsboard.server.gen.edge.v1.RpcRequestMsg;
  30 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
31 31 import org.thingsboard.server.queue.util.TbCoreComponent;
32 32
33 33 import java.util.UUID;
... ...
... ... @@ -21,8 +21,8 @@ import org.springframework.stereotype.Component;
21 21 import org.thingsboard.server.common.data.DeviceProfile;
22 22 import org.thingsboard.server.common.data.id.DeviceProfileId;
23 23 import org.thingsboard.server.common.transport.util.DataDecodingEncodingService;
24   -import org.thingsboard.server.gen.edge.DeviceProfileUpdateMsg;
25   -import org.thingsboard.server.gen.edge.UpdateMsgType;
  24 +import org.thingsboard.server.gen.edge.v1.DeviceProfileUpdateMsg;
  25 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
26 26 import org.thingsboard.server.queue.util.TbCoreComponent;
27 27
28 28 @Component
... ...
... ... @@ -25,8 +25,8 @@ import org.springframework.stereotype.Component;
25 25 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
26 26 import org.thingsboard.server.common.data.id.EntityId;
27 27 import org.thingsboard.server.common.transport.adaptor.JsonConverter;
28   -import org.thingsboard.server.gen.edge.AttributeDeleteMsg;
29   -import org.thingsboard.server.gen.edge.EntityDataProto;
  28 +import org.thingsboard.server.gen.edge.v1.AttributeDeleteMsg;
  29 +import org.thingsboard.server.gen.edge.v1.EntityDataProto;
30 30 import org.thingsboard.server.gen.transport.TransportProtos;
31 31 import org.thingsboard.server.queue.util.TbCoreComponent;
32 32
... ...
... ... @@ -20,9 +20,9 @@ import org.thingsboard.server.common.data.EntityView;
20 20 import org.thingsboard.server.common.data.id.CustomerId;
21 21 import org.thingsboard.server.common.data.id.EntityViewId;
22 22 import org.thingsboard.common.util.JacksonUtil;
23   -import org.thingsboard.server.gen.edge.EdgeEntityType;
24   -import org.thingsboard.server.gen.edge.EntityViewUpdateMsg;
25   -import org.thingsboard.server.gen.edge.UpdateMsgType;
  23 +import org.thingsboard.server.gen.edge.v1.EdgeEntityType;
  24 +import org.thingsboard.server.gen.edge.v1.EntityViewUpdateMsg;
  25 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
26 26 import org.thingsboard.server.queue.util.TbCoreComponent;
27 27
28 28 @Component
... ...
... ... @@ -18,8 +18,8 @@ package org.thingsboard.server.service.edge.rpc.constructor;
18 18 import org.springframework.stereotype.Component;
19 19 import org.thingsboard.server.common.data.relation.EntityRelation;
20 20 import org.thingsboard.common.util.JacksonUtil;
21   -import org.thingsboard.server.gen.edge.RelationUpdateMsg;
22   -import org.thingsboard.server.gen.edge.UpdateMsgType;
  21 +import org.thingsboard.server.gen.edge.v1.RelationUpdateMsg;
  22 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
23 23 import org.thingsboard.server.queue.util.TbCoreComponent;
24 24
25 25 @Component
... ...
... ... @@ -26,12 +26,12 @@ import org.thingsboard.server.common.data.rule.RuleChainConnectionInfo;
26 26 import org.thingsboard.server.common.data.rule.RuleChainMetaData;
27 27 import org.thingsboard.server.common.data.rule.RuleNode;
28 28 import org.thingsboard.common.util.JacksonUtil;
29   -import org.thingsboard.server.gen.edge.NodeConnectionInfoProto;
30   -import org.thingsboard.server.gen.edge.RuleChainConnectionInfoProto;
31   -import org.thingsboard.server.gen.edge.RuleChainMetadataUpdateMsg;
32   -import org.thingsboard.server.gen.edge.RuleChainUpdateMsg;
33   -import org.thingsboard.server.gen.edge.RuleNodeProto;
34   -import org.thingsboard.server.gen.edge.UpdateMsgType;
  29 +import org.thingsboard.server.gen.edge.v1.NodeConnectionInfoProto;
  30 +import org.thingsboard.server.gen.edge.v1.RuleChainConnectionInfoProto;
  31 +import org.thingsboard.server.gen.edge.v1.RuleChainMetadataUpdateMsg;
  32 +import org.thingsboard.server.gen.edge.v1.RuleChainUpdateMsg;
  33 +import org.thingsboard.server.gen.edge.v1.RuleNodeProto;
  34 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
35 35 import org.thingsboard.server.queue.util.TbCoreComponent;
36 36
37 37 import java.util.ArrayList;
... ...
... ... @@ -21,9 +21,9 @@ import org.thingsboard.server.common.data.id.CustomerId;
21 21 import org.thingsboard.server.common.data.id.UserId;
22 22 import org.thingsboard.server.common.data.security.UserCredentials;
23 23 import org.thingsboard.common.util.JacksonUtil;
24   -import org.thingsboard.server.gen.edge.UpdateMsgType;
25   -import org.thingsboard.server.gen.edge.UserCredentialsUpdateMsg;
26   -import org.thingsboard.server.gen.edge.UserUpdateMsg;
  24 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
  25 +import org.thingsboard.server.gen.edge.v1.UserCredentialsUpdateMsg;
  26 +import org.thingsboard.server.gen.edge.v1.UserUpdateMsg;
27 27 import org.thingsboard.server.queue.util.TbCoreComponent;
28 28
29 29 @Component
... ...
... ... @@ -20,8 +20,8 @@ import org.thingsboard.server.common.data.id.TenantId;
20 20 import org.thingsboard.server.common.data.id.WidgetTypeId;
21 21 import org.thingsboard.server.common.data.widget.WidgetType;
22 22 import org.thingsboard.common.util.JacksonUtil;
23   -import org.thingsboard.server.gen.edge.UpdateMsgType;
24   -import org.thingsboard.server.gen.edge.WidgetTypeUpdateMsg;
  23 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
  24 +import org.thingsboard.server.gen.edge.v1.WidgetTypeUpdateMsg;
25 25 import org.thingsboard.server.queue.util.TbCoreComponent;
26 26
27 27 @Component
... ...
... ... @@ -20,8 +20,8 @@ import org.springframework.stereotype.Component;
20 20 import org.thingsboard.server.common.data.id.TenantId;
21 21 import org.thingsboard.server.common.data.id.WidgetsBundleId;
22 22 import org.thingsboard.server.common.data.widget.WidgetsBundle;
23   -import org.thingsboard.server.gen.edge.UpdateMsgType;
24   -import org.thingsboard.server.gen.edge.WidgetsBundleUpdateMsg;
  23 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
  24 +import org.thingsboard.server.gen.edge.v1.WidgetsBundleUpdateMsg;
25 25 import org.thingsboard.server.queue.util.TbCoreComponent;
26 26
27 27 import java.nio.charset.StandardCharsets;
... ...
... ... @@ -20,8 +20,8 @@ import org.springframework.stereotype.Component;
20 20 import org.thingsboard.server.common.data.AdminSettings;
21 21 import org.thingsboard.server.common.data.EdgeUtils;
22 22 import org.thingsboard.server.common.data.edge.EdgeEvent;
23   -import org.thingsboard.server.gen.edge.AdminSettingsUpdateMsg;
24   -import org.thingsboard.server.gen.edge.DownlinkMsg;
  23 +import org.thingsboard.server.gen.edge.v1.AdminSettingsUpdateMsg;
  24 +import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
25 25 import org.thingsboard.server.queue.util.TbCoreComponent;
26 26
27 27 import java.util.Collections;
... ...
... ... @@ -36,9 +36,9 @@ import org.thingsboard.server.common.data.id.EntityId;
36 36 import org.thingsboard.server.common.data.id.TenantId;
37 37 import org.thingsboard.server.common.data.page.PageData;
38 38 import org.thingsboard.server.common.data.page.PageLink;
39   -import org.thingsboard.server.gen.edge.AlarmUpdateMsg;
40   -import org.thingsboard.server.gen.edge.DownlinkMsg;
41   -import org.thingsboard.server.gen.edge.UpdateMsgType;
  39 +import org.thingsboard.server.gen.edge.v1.AlarmUpdateMsg;
  40 +import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
  41 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
42 42 import org.thingsboard.server.gen.transport.TransportProtos;
43 43 import org.thingsboard.server.queue.util.TbCoreComponent;
44 44
... ...
... ... @@ -24,9 +24,9 @@ import org.thingsboard.server.common.data.edge.EdgeEvent;
24 24 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
25 25 import org.thingsboard.server.common.data.id.AssetId;
26 26 import org.thingsboard.server.common.data.id.CustomerId;
27   -import org.thingsboard.server.gen.edge.AssetUpdateMsg;
28   -import org.thingsboard.server.gen.edge.DownlinkMsg;
29   -import org.thingsboard.server.gen.edge.UpdateMsgType;
  27 +import org.thingsboard.server.gen.edge.v1.AssetUpdateMsg;
  28 +import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
  29 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
30 30 import org.thingsboard.server.queue.util.TbCoreComponent;
31 31
32 32 import java.util.Collections;
... ...
... ... @@ -29,9 +29,9 @@ import org.thingsboard.server.common.data.id.EntityIdFactory;
29 29 import org.thingsboard.server.common.data.id.TenantId;
30 30 import org.thingsboard.server.common.data.page.PageData;
31 31 import org.thingsboard.server.common.data.page.PageLink;
32   -import org.thingsboard.server.gen.edge.CustomerUpdateMsg;
33   -import org.thingsboard.server.gen.edge.DownlinkMsg;
34   -import org.thingsboard.server.gen.edge.UpdateMsgType;
  32 +import org.thingsboard.server.gen.edge.v1.CustomerUpdateMsg;
  33 +import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
  34 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
35 35 import org.thingsboard.server.gen.transport.TransportProtos;
36 36 import org.thingsboard.server.queue.util.TbCoreComponent;
37 37
... ...
... ... @@ -24,9 +24,9 @@ import org.thingsboard.server.common.data.edge.EdgeEvent;
24 24 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
25 25 import org.thingsboard.server.common.data.id.CustomerId;
26 26 import org.thingsboard.server.common.data.id.DashboardId;
27   -import org.thingsboard.server.gen.edge.DashboardUpdateMsg;
28   -import org.thingsboard.server.gen.edge.DownlinkMsg;
29   -import org.thingsboard.server.gen.edge.UpdateMsgType;
  27 +import org.thingsboard.server.gen.edge.v1.DashboardUpdateMsg;
  28 +import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
  29 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
30 30 import org.thingsboard.server.queue.util.TbCoreComponent;
31 31
32 32 import java.util.Collections;
... ...
... ... @@ -52,11 +52,11 @@ import org.thingsboard.server.common.msg.TbMsg;
52 52 import org.thingsboard.server.common.msg.TbMsgDataType;
53 53 import org.thingsboard.server.common.msg.TbMsgMetaData;
54 54 import org.thingsboard.server.dao.model.ModelConstants;
55   -import org.thingsboard.server.gen.edge.DeviceCredentialsUpdateMsg;
56   -import org.thingsboard.server.gen.edge.DeviceRpcCallMsg;
57   -import org.thingsboard.server.gen.edge.DeviceUpdateMsg;
58   -import org.thingsboard.server.gen.edge.DownlinkMsg;
59   -import org.thingsboard.server.gen.edge.UpdateMsgType;
  55 +import org.thingsboard.server.gen.edge.v1.DeviceCredentialsUpdateMsg;
  56 +import org.thingsboard.server.gen.edge.v1.DeviceRpcCallMsg;
  57 +import org.thingsboard.server.gen.edge.v1.DeviceUpdateMsg;
  58 +import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
  59 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
60 60 import org.thingsboard.server.queue.TbQueueCallback;
61 61 import org.thingsboard.server.queue.TbQueueMsgMetadata;
62 62 import org.thingsboard.server.queue.util.TbCoreComponent;
... ...
... ... @@ -22,9 +22,9 @@ import org.thingsboard.server.common.data.EdgeUtils;
22 22 import org.thingsboard.server.common.data.edge.EdgeEvent;
23 23 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
24 24 import org.thingsboard.server.common.data.id.DeviceProfileId;
25   -import org.thingsboard.server.gen.edge.DeviceProfileUpdateMsg;
26   -import org.thingsboard.server.gen.edge.DownlinkMsg;
27   -import org.thingsboard.server.gen.edge.UpdateMsgType;
  25 +import org.thingsboard.server.gen.edge.v1.DeviceProfileUpdateMsg;
  26 +import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
  27 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
28 28 import org.thingsboard.server.queue.util.TbCoreComponent;
29 29
30 30 import java.util.Collections;
... ...
... ... @@ -38,10 +38,10 @@ import org.thingsboard.server.common.data.page.PageData;
38 38 import org.thingsboard.server.common.data.page.PageLink;
39 39 import org.thingsboard.server.common.data.rule.RuleChain;
40 40 import org.thingsboard.server.common.data.rule.RuleChainConnectionInfo;
41   -import org.thingsboard.server.gen.edge.DeviceCredentialsRequestMsg;
42   -import org.thingsboard.server.gen.edge.DeviceUpdateMsg;
43   -import org.thingsboard.server.gen.edge.DownlinkMsg;
44   -import org.thingsboard.server.gen.edge.UpdateMsgType;
  41 +import org.thingsboard.server.gen.edge.v1.DeviceCredentialsRequestMsg;
  42 +import org.thingsboard.server.gen.edge.v1.DeviceUpdateMsg;
  43 +import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
  44 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
45 45 import org.thingsboard.server.gen.transport.TransportProtos;
46 46 import org.thingsboard.server.queue.util.TbCoreComponent;
47 47
... ...
... ... @@ -24,9 +24,9 @@ import org.thingsboard.server.common.data.edge.EdgeEvent;
24 24 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
25 25 import org.thingsboard.server.common.data.id.CustomerId;
26 26 import org.thingsboard.server.common.data.id.EntityViewId;
27   -import org.thingsboard.server.gen.edge.DownlinkMsg;
28   -import org.thingsboard.server.gen.edge.EntityViewUpdateMsg;
29   -import org.thingsboard.server.gen.edge.UpdateMsgType;
  27 +import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
  28 +import org.thingsboard.server.gen.edge.v1.EntityViewUpdateMsg;
  29 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
30 30 import org.thingsboard.server.queue.util.TbCoreComponent;
31 31
32 32 import java.util.Collections;
... ...
... ... @@ -41,9 +41,9 @@ import org.thingsboard.server.common.data.page.PageData;
41 41 import org.thingsboard.server.common.data.page.PageLink;
42 42 import org.thingsboard.server.common.data.relation.EntityRelation;
43 43 import org.thingsboard.server.common.data.relation.RelationTypeGroup;
44   -import org.thingsboard.server.gen.edge.DownlinkMsg;
45   -import org.thingsboard.server.gen.edge.RelationUpdateMsg;
46   -import org.thingsboard.server.gen.edge.UpdateMsgType;
  44 +import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
  45 +import org.thingsboard.server.gen.edge.v1.RelationUpdateMsg;
  46 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
47 47 import org.thingsboard.server.gen.transport.TransportProtos;
48 48 import org.thingsboard.server.queue.util.TbCoreComponent;
49 49
... ...
... ... @@ -24,10 +24,10 @@ import org.thingsboard.server.common.data.edge.EdgeEventActionType;
24 24 import org.thingsboard.server.common.data.id.RuleChainId;
25 25 import org.thingsboard.server.common.data.rule.RuleChain;
26 26 import org.thingsboard.server.common.data.rule.RuleChainMetaData;
27   -import org.thingsboard.server.gen.edge.DownlinkMsg;
28   -import org.thingsboard.server.gen.edge.RuleChainMetadataUpdateMsg;
29   -import org.thingsboard.server.gen.edge.RuleChainUpdateMsg;
30   -import org.thingsboard.server.gen.edge.UpdateMsgType;
  27 +import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
  28 +import org.thingsboard.server.gen.edge.v1.RuleChainMetadataUpdateMsg;
  29 +import org.thingsboard.server.gen.edge.v1.RuleChainUpdateMsg;
  30 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
31 31 import org.thingsboard.server.queue.util.TbCoreComponent;
32 32
33 33 import java.util.Collections;
... ...
... ... @@ -55,9 +55,9 @@ import org.thingsboard.server.common.msg.queue.ServiceQueue;
55 55 import org.thingsboard.server.common.msg.session.SessionMsgType;
56 56 import org.thingsboard.server.common.transport.adaptor.JsonConverter;
57 57 import org.thingsboard.server.common.transport.util.JsonUtils;
58   -import org.thingsboard.server.gen.edge.AttributeDeleteMsg;
59   -import org.thingsboard.server.gen.edge.DownlinkMsg;
60   -import org.thingsboard.server.gen.edge.EntityDataProto;
  58 +import org.thingsboard.server.gen.edge.v1.AttributeDeleteMsg;
  59 +import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
  60 +import org.thingsboard.server.gen.edge.v1.EntityDataProto;
61 61 import org.thingsboard.server.gen.transport.TransportProtos;
62 62 import org.thingsboard.server.queue.TbQueueCallback;
63 63 import org.thingsboard.server.queue.TbQueueMsgMetadata;
... ...
... ... @@ -25,9 +25,9 @@ import org.thingsboard.server.common.data.edge.EdgeEventActionType;
25 25 import org.thingsboard.server.common.data.id.CustomerId;
26 26 import org.thingsboard.server.common.data.id.UserId;
27 27 import org.thingsboard.server.common.data.security.UserCredentials;
28   -import org.thingsboard.server.gen.edge.DownlinkMsg;
29   -import org.thingsboard.server.gen.edge.UpdateMsgType;
30   -import org.thingsboard.server.gen.edge.UserCredentialsUpdateMsg;
  28 +import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
  29 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
  30 +import org.thingsboard.server.gen.edge.v1.UserCredentialsUpdateMsg;
31 31 import org.thingsboard.server.queue.util.TbCoreComponent;
32 32
33 33 import java.util.Collections;
... ...
... ... @@ -22,9 +22,9 @@ import org.thingsboard.server.common.data.edge.EdgeEvent;
22 22 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
23 23 import org.thingsboard.server.common.data.id.WidgetsBundleId;
24 24 import org.thingsboard.server.common.data.widget.WidgetsBundle;
25   -import org.thingsboard.server.gen.edge.DownlinkMsg;
26   -import org.thingsboard.server.gen.edge.UpdateMsgType;
27   -import org.thingsboard.server.gen.edge.WidgetsBundleUpdateMsg;
  25 +import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
  26 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
  27 +import org.thingsboard.server.gen.edge.v1.WidgetsBundleUpdateMsg;
28 28 import org.thingsboard.server.queue.util.TbCoreComponent;
29 29
30 30 import java.util.Collections;
... ...
... ... @@ -22,9 +22,9 @@ import org.thingsboard.server.common.data.edge.EdgeEvent;
22 22 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
23 23 import org.thingsboard.server.common.data.id.WidgetTypeId;
24 24 import org.thingsboard.server.common.data.widget.WidgetType;
25   -import org.thingsboard.server.gen.edge.DownlinkMsg;
26   -import org.thingsboard.server.gen.edge.UpdateMsgType;
27   -import org.thingsboard.server.gen.edge.WidgetTypeUpdateMsg;
  25 +import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
  26 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
  27 +import org.thingsboard.server.gen.edge.v1.WidgetTypeUpdateMsg;
28 28 import org.thingsboard.server.queue.util.TbCoreComponent;
29 29
30 30 import java.util.Collections;
... ...
... ... @@ -63,14 +63,14 @@ import org.thingsboard.server.dao.entityview.EntityViewService;
63 63 import org.thingsboard.server.dao.relation.RelationService;
64 64 import org.thingsboard.server.dao.widget.WidgetTypeService;
65 65 import org.thingsboard.server.dao.widget.WidgetsBundleService;
66   -import org.thingsboard.server.gen.edge.AttributesRequestMsg;
67   -import org.thingsboard.server.gen.edge.DeviceCredentialsRequestMsg;
68   -import org.thingsboard.server.gen.edge.DeviceProfileDevicesRequestMsg;
69   -import org.thingsboard.server.gen.edge.EntityViewsRequestMsg;
70   -import org.thingsboard.server.gen.edge.RelationRequestMsg;
71   -import org.thingsboard.server.gen.edge.RuleChainMetadataRequestMsg;
72   -import org.thingsboard.server.gen.edge.UserCredentialsRequestMsg;
73   -import org.thingsboard.server.gen.edge.WidgetBundleTypesRequestMsg;
  66 +import org.thingsboard.server.gen.edge.v1.AttributesRequestMsg;
  67 +import org.thingsboard.server.gen.edge.v1.DeviceCredentialsRequestMsg;
  68 +import org.thingsboard.server.gen.edge.v1.DeviceProfileDevicesRequestMsg;
  69 +import org.thingsboard.server.gen.edge.v1.EntityViewsRequestMsg;
  70 +import org.thingsboard.server.gen.edge.v1.RelationRequestMsg;
  71 +import org.thingsboard.server.gen.edge.v1.RuleChainMetadataRequestMsg;
  72 +import org.thingsboard.server.gen.edge.v1.UserCredentialsRequestMsg;
  73 +import org.thingsboard.server.gen.edge.v1.WidgetBundleTypesRequestMsg;
74 74 import org.thingsboard.server.service.edge.rpc.EdgeEventUtils;
75 75 import org.thingsboard.server.service.executors.DbCallbackExecutorService;
76 76 import org.thingsboard.server.service.queue.TbClusterService;
... ...
... ... @@ -18,14 +18,14 @@ package org.thingsboard.server.service.edge.rpc.sync;
18 18 import com.google.common.util.concurrent.ListenableFuture;
19 19 import org.thingsboard.server.common.data.edge.Edge;
20 20 import org.thingsboard.server.common.data.id.TenantId;
21   -import org.thingsboard.server.gen.edge.AttributesRequestMsg;
22   -import org.thingsboard.server.gen.edge.DeviceCredentialsRequestMsg;
23   -import org.thingsboard.server.gen.edge.DeviceProfileDevicesRequestMsg;
24   -import org.thingsboard.server.gen.edge.EntityViewsRequestMsg;
25   -import org.thingsboard.server.gen.edge.RelationRequestMsg;
26   -import org.thingsboard.server.gen.edge.RuleChainMetadataRequestMsg;
27   -import org.thingsboard.server.gen.edge.UserCredentialsRequestMsg;
28   -import org.thingsboard.server.gen.edge.WidgetBundleTypesRequestMsg;
  21 +import org.thingsboard.server.gen.edge.v1.AttributesRequestMsg;
  22 +import org.thingsboard.server.gen.edge.v1.DeviceCredentialsRequestMsg;
  23 +import org.thingsboard.server.gen.edge.v1.DeviceProfileDevicesRequestMsg;
  24 +import org.thingsboard.server.gen.edge.v1.EntityViewsRequestMsg;
  25 +import org.thingsboard.server.gen.edge.v1.RelationRequestMsg;
  26 +import org.thingsboard.server.gen.edge.v1.RuleChainMetadataRequestMsg;
  27 +import org.thingsboard.server.gen.edge.v1.UserCredentialsRequestMsg;
  28 +import org.thingsboard.server.gen.edge.v1.WidgetBundleTypesRequestMsg;
29 29
30 30 public interface EdgeRequestsService {
31 31
... ...
... ... @@ -37,12 +37,12 @@ import org.thingsboard.server.common.data.page.PageLink;
37 37 import org.thingsboard.server.common.data.security.Authority;
38 38 import org.thingsboard.server.dao.model.ModelConstants;
39 39 import org.thingsboard.server.edge.imitator.EdgeImitator;
40   -import org.thingsboard.server.gen.edge.AssetUpdateMsg;
41   -import org.thingsboard.server.gen.edge.DeviceProfileUpdateMsg;
42   -import org.thingsboard.server.gen.edge.DeviceUpdateMsg;
43   -import org.thingsboard.server.gen.edge.RuleChainUpdateMsg;
44   -import org.thingsboard.server.gen.edge.UserCredentialsUpdateMsg;
45   -import org.thingsboard.server.gen.edge.UserUpdateMsg;
  40 +import org.thingsboard.server.gen.edge.v1.AssetUpdateMsg;
  41 +import org.thingsboard.server.gen.edge.v1.DeviceProfileUpdateMsg;
  42 +import org.thingsboard.server.gen.edge.v1.DeviceUpdateMsg;
  43 +import org.thingsboard.server.gen.edge.v1.RuleChainUpdateMsg;
  44 +import org.thingsboard.server.gen.edge.v1.UserCredentialsUpdateMsg;
  45 +import org.thingsboard.server.gen.edge.v1.UserUpdateMsg;
46 46
47 47 import java.util.ArrayList;
48 48 import java.util.Collections;
... ...
... ... @@ -85,34 +85,34 @@ import org.thingsboard.server.common.transport.adaptor.JsonConverter;
85 85 import org.thingsboard.server.controller.AbstractControllerTest;
86 86 import org.thingsboard.server.dao.edge.EdgeEventService;
87 87 import org.thingsboard.server.edge.imitator.EdgeImitator;
88   -import org.thingsboard.server.gen.edge.AlarmUpdateMsg;
89   -import org.thingsboard.server.gen.edge.AssetUpdateMsg;
90   -import org.thingsboard.server.gen.edge.AttributeDeleteMsg;
91   -import org.thingsboard.server.gen.edge.AttributesRequestMsg;
92   -import org.thingsboard.server.gen.edge.CustomerUpdateMsg;
93   -import org.thingsboard.server.gen.edge.DashboardUpdateMsg;
94   -import org.thingsboard.server.gen.edge.DeviceCredentialsRequestMsg;
95   -import org.thingsboard.server.gen.edge.DeviceCredentialsUpdateMsg;
96   -import org.thingsboard.server.gen.edge.DeviceProfileUpdateMsg;
97   -import org.thingsboard.server.gen.edge.DeviceRpcCallMsg;
98   -import org.thingsboard.server.gen.edge.DeviceUpdateMsg;
99   -import org.thingsboard.server.gen.edge.EdgeConfiguration;
100   -import org.thingsboard.server.gen.edge.EntityDataProto;
101   -import org.thingsboard.server.gen.edge.EntityViewUpdateMsg;
102   -import org.thingsboard.server.gen.edge.EntityViewsRequestMsg;
103   -import org.thingsboard.server.gen.edge.RelationRequestMsg;
104   -import org.thingsboard.server.gen.edge.RelationUpdateMsg;
105   -import org.thingsboard.server.gen.edge.RpcResponseMsg;
106   -import org.thingsboard.server.gen.edge.RuleChainMetadataRequestMsg;
107   -import org.thingsboard.server.gen.edge.RuleChainMetadataUpdateMsg;
108   -import org.thingsboard.server.gen.edge.RuleChainUpdateMsg;
109   -import org.thingsboard.server.gen.edge.UpdateMsgType;
110   -import org.thingsboard.server.gen.edge.UplinkMsg;
111   -import org.thingsboard.server.gen.edge.UserCredentialsRequestMsg;
112   -import org.thingsboard.server.gen.edge.UserCredentialsUpdateMsg;
113   -import org.thingsboard.server.gen.edge.UserUpdateMsg;
114   -import org.thingsboard.server.gen.edge.WidgetTypeUpdateMsg;
115   -import org.thingsboard.server.gen.edge.WidgetsBundleUpdateMsg;
  88 +import org.thingsboard.server.gen.edge.v1.AlarmUpdateMsg;
  89 +import org.thingsboard.server.gen.edge.v1.AssetUpdateMsg;
  90 +import org.thingsboard.server.gen.edge.v1.AttributeDeleteMsg;
  91 +import org.thingsboard.server.gen.edge.v1.AttributesRequestMsg;
  92 +import org.thingsboard.server.gen.edge.v1.CustomerUpdateMsg;
  93 +import org.thingsboard.server.gen.edge.v1.DashboardUpdateMsg;
  94 +import org.thingsboard.server.gen.edge.v1.DeviceCredentialsRequestMsg;
  95 +import org.thingsboard.server.gen.edge.v1.DeviceCredentialsUpdateMsg;
  96 +import org.thingsboard.server.gen.edge.v1.DeviceProfileUpdateMsg;
  97 +import org.thingsboard.server.gen.edge.v1.DeviceRpcCallMsg;
  98 +import org.thingsboard.server.gen.edge.v1.DeviceUpdateMsg;
  99 +import org.thingsboard.server.gen.edge.v1.EdgeConfiguration;
  100 +import org.thingsboard.server.gen.edge.v1.EntityDataProto;
  101 +import org.thingsboard.server.gen.edge.v1.EntityViewUpdateMsg;
  102 +import org.thingsboard.server.gen.edge.v1.EntityViewsRequestMsg;
  103 +import org.thingsboard.server.gen.edge.v1.RelationRequestMsg;
  104 +import org.thingsboard.server.gen.edge.v1.RelationUpdateMsg;
  105 +import org.thingsboard.server.gen.edge.v1.RpcResponseMsg;
  106 +import org.thingsboard.server.gen.edge.v1.RuleChainMetadataRequestMsg;
  107 +import org.thingsboard.server.gen.edge.v1.RuleChainMetadataUpdateMsg;
  108 +import org.thingsboard.server.gen.edge.v1.RuleChainUpdateMsg;
  109 +import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
  110 +import org.thingsboard.server.gen.edge.v1.UplinkMsg;
  111 +import org.thingsboard.server.gen.edge.v1.UserCredentialsRequestMsg;
  112 +import org.thingsboard.server.gen.edge.v1.UserCredentialsUpdateMsg;
  113 +import org.thingsboard.server.gen.edge.v1.UserUpdateMsg;
  114 +import org.thingsboard.server.gen.edge.v1.WidgetTypeUpdateMsg;
  115 +import org.thingsboard.server.gen.edge.v1.WidgetsBundleUpdateMsg;
116 116 import org.thingsboard.server.gen.transport.TransportProtos;
117 117 import org.thingsboard.server.service.queue.TbClusterService;
118 118
... ...
... ... @@ -26,29 +26,29 @@ import lombok.extern.slf4j.Slf4j;
26 26 import org.checkerframework.checker.nullness.qual.Nullable;
27 27 import org.thingsboard.edge.rpc.EdgeGrpcClient;
28 28 import org.thingsboard.edge.rpc.EdgeRpcClient;
29   -import org.thingsboard.server.gen.edge.AlarmUpdateMsg;
30   -import org.thingsboard.server.gen.edge.AssetUpdateMsg;
31   -import org.thingsboard.server.gen.edge.CustomerUpdateMsg;
32   -import org.thingsboard.server.gen.edge.DashboardUpdateMsg;
33   -import org.thingsboard.server.gen.edge.DeviceCredentialsRequestMsg;
34   -import org.thingsboard.server.gen.edge.DeviceCredentialsUpdateMsg;
35   -import org.thingsboard.server.gen.edge.DeviceProfileUpdateMsg;
36   -import org.thingsboard.server.gen.edge.DeviceRpcCallMsg;
37   -import org.thingsboard.server.gen.edge.DeviceUpdateMsg;
38   -import org.thingsboard.server.gen.edge.DownlinkMsg;
39   -import org.thingsboard.server.gen.edge.DownlinkResponseMsg;
40   -import org.thingsboard.server.gen.edge.EdgeConfiguration;
41   -import org.thingsboard.server.gen.edge.EntityDataProto;
42   -import org.thingsboard.server.gen.edge.EntityViewUpdateMsg;
43   -import org.thingsboard.server.gen.edge.RelationUpdateMsg;
44   -import org.thingsboard.server.gen.edge.RuleChainMetadataUpdateMsg;
45   -import org.thingsboard.server.gen.edge.RuleChainUpdateMsg;
46   -import org.thingsboard.server.gen.edge.UplinkMsg;
47   -import org.thingsboard.server.gen.edge.UplinkResponseMsg;
48   -import org.thingsboard.server.gen.edge.UserCredentialsUpdateMsg;
49   -import org.thingsboard.server.gen.edge.UserUpdateMsg;
50   -import org.thingsboard.server.gen.edge.WidgetTypeUpdateMsg;
51   -import org.thingsboard.server.gen.edge.WidgetsBundleUpdateMsg;
  29 +import org.thingsboard.server.gen.edge.v1.AlarmUpdateMsg;
  30 +import org.thingsboard.server.gen.edge.v1.AssetUpdateMsg;
  31 +import org.thingsboard.server.gen.edge.v1.CustomerUpdateMsg;
  32 +import org.thingsboard.server.gen.edge.v1.DashboardUpdateMsg;
  33 +import org.thingsboard.server.gen.edge.v1.DeviceCredentialsRequestMsg;
  34 +import org.thingsboard.server.gen.edge.v1.DeviceCredentialsUpdateMsg;
  35 +import org.thingsboard.server.gen.edge.v1.DeviceProfileUpdateMsg;
  36 +import org.thingsboard.server.gen.edge.v1.DeviceRpcCallMsg;
  37 +import org.thingsboard.server.gen.edge.v1.DeviceUpdateMsg;
  38 +import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
  39 +import org.thingsboard.server.gen.edge.v1.DownlinkResponseMsg;
  40 +import org.thingsboard.server.gen.edge.v1.EdgeConfiguration;
  41 +import org.thingsboard.server.gen.edge.v1.EntityDataProto;
  42 +import org.thingsboard.server.gen.edge.v1.EntityViewUpdateMsg;
  43 +import org.thingsboard.server.gen.edge.v1.RelationUpdateMsg;
  44 +import org.thingsboard.server.gen.edge.v1.RuleChainMetadataUpdateMsg;
  45 +import org.thingsboard.server.gen.edge.v1.RuleChainUpdateMsg;
  46 +import org.thingsboard.server.gen.edge.v1.UplinkMsg;
  47 +import org.thingsboard.server.gen.edge.v1.UplinkResponseMsg;
  48 +import org.thingsboard.server.gen.edge.v1.UserCredentialsUpdateMsg;
  49 +import org.thingsboard.server.gen.edge.v1.UserUpdateMsg;
  50 +import org.thingsboard.server.gen.edge.v1.WidgetTypeUpdateMsg;
  51 +import org.thingsboard.server.gen.edge.v1.WidgetsBundleUpdateMsg;
52 52
53 53 import java.lang.reflect.Field;
54 54 import java.util.ArrayList;
... ...
... ... @@ -24,19 +24,19 @@ import lombok.extern.slf4j.Slf4j;
24 24 import org.springframework.beans.factory.annotation.Value;
25 25 import org.springframework.stereotype.Service;
26 26 import org.thingsboard.edge.exception.EdgeConnectionException;
27   -import org.thingsboard.server.gen.edge.ConnectRequestMsg;
28   -import org.thingsboard.server.gen.edge.ConnectResponseCode;
29   -import org.thingsboard.server.gen.edge.ConnectResponseMsg;
30   -import org.thingsboard.server.gen.edge.DownlinkMsg;
31   -import org.thingsboard.server.gen.edge.DownlinkResponseMsg;
32   -import org.thingsboard.server.gen.edge.EdgeConfiguration;
33   -import org.thingsboard.server.gen.edge.EdgeRpcServiceGrpc;
34   -import org.thingsboard.server.gen.edge.RequestMsg;
35   -import org.thingsboard.server.gen.edge.RequestMsgType;
36   -import org.thingsboard.server.gen.edge.ResponseMsg;
37   -import org.thingsboard.server.gen.edge.SyncRequestMsg;
38   -import org.thingsboard.server.gen.edge.UplinkMsg;
39   -import org.thingsboard.server.gen.edge.UplinkResponseMsg;
  27 +import org.thingsboard.server.gen.edge.v1.ConnectRequestMsg;
  28 +import org.thingsboard.server.gen.edge.v1.ConnectResponseCode;
  29 +import org.thingsboard.server.gen.edge.v1.ConnectResponseMsg;
  30 +import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
  31 +import org.thingsboard.server.gen.edge.v1.DownlinkResponseMsg;
  32 +import org.thingsboard.server.gen.edge.v1.EdgeConfiguration;
  33 +import org.thingsboard.server.gen.edge.v1.EdgeRpcServiceGrpc;
  34 +import org.thingsboard.server.gen.edge.v1.RequestMsg;
  35 +import org.thingsboard.server.gen.edge.v1.RequestMsgType;
  36 +import org.thingsboard.server.gen.edge.v1.ResponseMsg;
  37 +import org.thingsboard.server.gen.edge.v1.SyncRequestMsg;
  38 +import org.thingsboard.server.gen.edge.v1.UplinkMsg;
  39 +import org.thingsboard.server.gen.edge.v1.UplinkResponseMsg;
40 40
41 41 import javax.net.ssl.SSLException;
42 42 import java.io.File;
... ...
... ... @@ -15,11 +15,11 @@
15 15 */
16 16 package org.thingsboard.edge.rpc;
17 17
18   -import org.thingsboard.server.gen.edge.DownlinkMsg;
19   -import org.thingsboard.server.gen.edge.DownlinkResponseMsg;
20   -import org.thingsboard.server.gen.edge.EdgeConfiguration;
21   -import org.thingsboard.server.gen.edge.UplinkMsg;
22   -import org.thingsboard.server.gen.edge.UplinkResponseMsg;
  18 +import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
  19 +import org.thingsboard.server.gen.edge.v1.DownlinkResponseMsg;
  20 +import org.thingsboard.server.gen.edge.v1.EdgeConfiguration;
  21 +import org.thingsboard.server.gen.edge.v1.UplinkMsg;
  22 +import org.thingsboard.server.gen.edge.v1.UplinkResponseMsg;
23 23
24 24 import java.util.function.Consumer;
25 25
... ...
... ... @@ -15,7 +15,7 @@
15 15 */
16 16 syntax = "proto3";
17 17
18   -option java_package = "org.thingsboard.server.gen.edge";
  18 +option java_package = "org.thingsboard.server.gen.edge.v1";
19 19 option java_multiple_files = true;
20 20 option java_outer_classname = "EdgeProtos";
21 21
... ...