简柏林 / thingskit · Commits

Commit 963b2274ec2717aa9eab4035130f88a32e8a4ae9

Authored by Volodymyr Babak
1 parent 214cc7a9

Code clean up

Inline Side-by-side
Showing 3 changed files with 2 additions and 49 deletions
@@ -42,13 +42,11 @@ import org.thingsboard.server.common.data.page.TimePageData; @@ -42,13 +42,11 @@ import org.thingsboard.server.common.data.page.TimePageData;
42 import org.thingsboard.server.common.data.page.TimePageLink; 42 import org.thingsboard.server.common.data.page.TimePageLink;
43 import org.thingsboard.server.common.data.relation.EntityRelation; 43 import org.thingsboard.server.common.data.relation.EntityRelation;
44 import org.thingsboard.server.common.data.relation.RelationTypeGroup; 44 import org.thingsboard.server.common.data.relation.RelationTypeGroup;
45 -import org.thingsboard.server.common.data.rule.RuleChainMetaData;  
46 import org.thingsboard.server.common.msg.queue.TbCallback; 45 import org.thingsboard.server.common.msg.queue.TbCallback;
47 import org.thingsboard.server.dao.alarm.AlarmService; 46 import org.thingsboard.server.dao.alarm.AlarmService;
48 import org.thingsboard.server.dao.edge.EdgeEventService; 47 import org.thingsboard.server.dao.edge.EdgeEventService;
49 import org.thingsboard.server.dao.edge.EdgeService; 48 import org.thingsboard.server.dao.edge.EdgeService;
50 import org.thingsboard.server.dao.relation.RelationService; 49 import org.thingsboard.server.dao.relation.RelationService;
51 -import org.thingsboard.server.dao.rule.RuleChainService;  
52 import org.thingsboard.server.gen.transport.TransportProtos; 50 import org.thingsboard.server.gen.transport.TransportProtos;
53 import org.thingsboard.server.queue.util.TbCoreComponent; 51 import org.thingsboard.server.queue.util.TbCoreComponent;
54 import org.thingsboard.server.service.executors.DbCallbackExecutorService; 52 import org.thingsboard.server.service.executors.DbCallbackExecutorService;
@@ -28,7 +28,9 @@ import com.google.gson.JsonObject; @@ -28,7 +28,9 @@ import com.google.gson.JsonObject;
28 import io.grpc.stub.StreamObserver; 28 import io.grpc.stub.StreamObserver;
29 import lombok.Data; 29 import lombok.Data;
30 import lombok.extern.slf4j.Slf4j; 30 import lombok.extern.slf4j.Slf4j;
  31 +import org.apache.commons.lang3.RandomStringUtils;
31 import org.checkerframework.checker.nullness.qual.Nullable; 32 import org.checkerframework.checker.nullness.qual.Nullable;
  33 +import org.springframework.util.StringUtils;
32 import org.thingsboard.server.common.data.Dashboard; 34 import org.thingsboard.server.common.data.Dashboard;
33 import org.thingsboard.server.common.data.DataConstants; 35 import org.thingsboard.server.common.data.DataConstants;
34 import org.thingsboard.server.common.data.Device; 36 import org.thingsboard.server.common.data.Device;
@@ -827,8 +829,6 @@ public final class EdgeGrpcSession implements Closeable { @@ -827,8 +829,6 @@ public final class EdgeGrpcSession implements Closeable {
827 } catch (Exception e) { 829 } catch (Exception e) {
828 log.error("Can't update device credentials for device [{}], deviceCredentialsUpdateMsg [{}]", device.getName(), deviceCredentialsUpdateMsg, e); 830 log.error("Can't update device credentials for device [{}], deviceCredentialsUpdateMsg [{}]", device.getName(), deviceCredentialsUpdateMsg, e);
829 } 831 }
830 - log.debug("Updating device credentials for device [{}]. New device credentials Id [{}], value [{}]",  
831 - device.getName(), deviceCredentialsUpdateMsg.getCredentialsId(), deviceCredentialsUpdateMsg.getCredentialsValue());  
832 } 832 }
833 } 833 }
834 834
@@ -21,12 +21,10 @@ import com.fasterxml.jackson.databind.node.ObjectNode; @@ -21,12 +21,10 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
21 import com.google.common.util.concurrent.FutureCallback; 21 import com.google.common.util.concurrent.FutureCallback;
22 import com.google.common.util.concurrent.Futures; 22 import com.google.common.util.concurrent.Futures;
23 import com.google.common.util.concurrent.ListenableFuture; 23 import com.google.common.util.concurrent.ListenableFuture;
24 -import io.grpc.stub.StreamObserver;  
25 import lombok.extern.slf4j.Slf4j; 24 import lombok.extern.slf4j.Slf4j;
26 import org.checkerframework.checker.nullness.qual.Nullable; 25 import org.checkerframework.checker.nullness.qual.Nullable;
27 import org.springframework.beans.factory.annotation.Autowired; 26 import org.springframework.beans.factory.annotation.Autowired;
28 import org.springframework.stereotype.Service; 27 import org.springframework.stereotype.Service;
29 -import org.thingsboard.server.common.data.Dashboard;  
30 import org.thingsboard.server.common.data.DashboardInfo; 28 import org.thingsboard.server.common.data.DashboardInfo;
31 import org.thingsboard.server.common.data.DataConstants; 29 import org.thingsboard.server.common.data.DataConstants;
32 import org.thingsboard.server.common.data.Device; 30 import org.thingsboard.server.common.data.Device;
@@ -56,51 +54,23 @@ import org.thingsboard.server.common.data.relation.EntityRelationsQuery; @@ -56,51 +54,23 @@ import org.thingsboard.server.common.data.relation.EntityRelationsQuery;
56 import org.thingsboard.server.common.data.relation.EntitySearchDirection; 54 import org.thingsboard.server.common.data.relation.EntitySearchDirection;
57 import org.thingsboard.server.common.data.relation.RelationsSearchParameters; 55 import org.thingsboard.server.common.data.relation.RelationsSearchParameters;
58 import org.thingsboard.server.common.data.rule.RuleChain; 56 import org.thingsboard.server.common.data.rule.RuleChain;
59 -import org.thingsboard.server.common.data.rule.RuleChainMetaData;  
60 -import org.thingsboard.server.common.data.security.DeviceCredentials;  
61 -import org.thingsboard.server.common.data.security.UserCredentials;  
62 -import org.thingsboard.server.common.transport.util.JsonUtils;  
63 import org.thingsboard.server.dao.asset.AssetService; 57 import org.thingsboard.server.dao.asset.AssetService;
64 import org.thingsboard.server.dao.attributes.AttributesService; 58 import org.thingsboard.server.dao.attributes.AttributesService;
65 import org.thingsboard.server.dao.dashboard.DashboardService; 59 import org.thingsboard.server.dao.dashboard.DashboardService;
66 -import org.thingsboard.server.dao.device.DeviceCredentialsService;  
67 import org.thingsboard.server.dao.device.DeviceService; 60 import org.thingsboard.server.dao.device.DeviceService;
68 import org.thingsboard.server.dao.edge.EdgeEventService; 61 import org.thingsboard.server.dao.edge.EdgeEventService;
69 import org.thingsboard.server.dao.entityview.EntityViewService; 62 import org.thingsboard.server.dao.entityview.EntityViewService;
70 import org.thingsboard.server.dao.relation.RelationService; 63 import org.thingsboard.server.dao.relation.RelationService;
71 import org.thingsboard.server.dao.rule.RuleChainService; 64 import org.thingsboard.server.dao.rule.RuleChainService;
72 import org.thingsboard.server.dao.user.UserService; 65 import org.thingsboard.server.dao.user.UserService;
73 -import org.thingsboard.server.gen.edge.AssetUpdateMsg;  
74 import org.thingsboard.server.gen.edge.AttributesRequestMsg; 66 import org.thingsboard.server.gen.edge.AttributesRequestMsg;
75 -import org.thingsboard.server.gen.edge.DashboardUpdateMsg;  
76 import org.thingsboard.server.gen.edge.DeviceCredentialsRequestMsg; 67 import org.thingsboard.server.gen.edge.DeviceCredentialsRequestMsg;
77 -import org.thingsboard.server.gen.edge.DeviceUpdateMsg;  
78 -import org.thingsboard.server.gen.edge.DownlinkMsg;  
79 -import org.thingsboard.server.gen.edge.EntityDataProto;  
80 -import org.thingsboard.server.gen.edge.EntityUpdateMsg;  
81 -import org.thingsboard.server.gen.edge.EntityViewUpdateMsg;  
82 import org.thingsboard.server.gen.edge.RelationRequestMsg; 68 import org.thingsboard.server.gen.edge.RelationRequestMsg;
83 -import org.thingsboard.server.gen.edge.RelationUpdateMsg;  
84 -import org.thingsboard.server.gen.edge.ResponseMsg;  
85 import org.thingsboard.server.gen.edge.RuleChainMetadataRequestMsg; 69 import org.thingsboard.server.gen.edge.RuleChainMetadataRequestMsg;
86 -import org.thingsboard.server.gen.edge.RuleChainMetadataUpdateMsg;  
87 -import org.thingsboard.server.gen.edge.RuleChainUpdateMsg;  
88 -import org.thingsboard.server.gen.edge.UpdateMsgType;  
89 import org.thingsboard.server.gen.edge.UserCredentialsRequestMsg; 70 import org.thingsboard.server.gen.edge.UserCredentialsRequestMsg;
90 -import org.thingsboard.server.gen.edge.UserUpdateMsg;  
91 -import org.thingsboard.server.service.edge.EdgeNotificationService;  
92 -import org.thingsboard.server.service.edge.rpc.constructor.AssetUpdateMsgConstructor;  
93 -import org.thingsboard.server.service.edge.rpc.constructor.DashboardUpdateMsgConstructor;  
94 -import org.thingsboard.server.service.edge.rpc.constructor.DeviceUpdateMsgConstructor;  
95 -import org.thingsboard.server.service.edge.rpc.constructor.EntityDataMsgConstructor;  
96 -import org.thingsboard.server.service.edge.rpc.constructor.EntityViewUpdateMsgConstructor;  
97 -import org.thingsboard.server.service.edge.rpc.constructor.RelationUpdateMsgConstructor;  
98 -import org.thingsboard.server.service.edge.rpc.constructor.RuleChainUpdateMsgConstructor;  
99 -import org.thingsboard.server.service.edge.rpc.constructor.UserUpdateMsgConstructor;  
100 import org.thingsboard.server.service.executors.DbCallbackExecutorService; 71 import org.thingsboard.server.service.executors.DbCallbackExecutorService;
101 72
102 import java.util.ArrayList; 73 import java.util.ArrayList;
103 -import java.util.Collections;  
104 import java.util.List; 74 import java.util.List;
105 import java.util.UUID; 75 import java.util.UUID;
106 76
@@ -126,9 +96,6 @@ public class DefaultSyncEdgeService implements SyncEdgeService { @@ -126,9 +96,6 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
126 private DeviceService deviceService; 96 private DeviceService deviceService;
127 97
128 @Autowired 98 @Autowired
129 - private DeviceCredentialsService deviceCredentialsService;  
130 -  
131 - @Autowired  
132 private AssetService assetService; 99 private AssetService assetService;
133 100
134 @Autowired 101 @Autowired
@@ -141,18 +108,6 @@ public class DefaultSyncEdgeService implements SyncEdgeService { @@ -141,18 +108,6 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
141 private UserService userService; 108 private UserService userService;
142 109
143 @Autowired 110 @Autowired
144 - private DeviceUpdateMsgConstructor deviceUpdateMsgConstructor;  
145 -  
146 - @Autowired  
147 - private UserUpdateMsgConstructor userUpdateMsgConstructor;  
148 -  
149 - @Autowired  
150 - private RelationUpdateMsgConstructor relationUpdateMsgConstructor;  
151 -  
152 - @Autowired  
153 - private EntityDataMsgConstructor entityDataMsgConstructor;  
154 -  
155 - @Autowired  
156 private DbCallbackExecutorService dbCallbackExecutorService; 111 private DbCallbackExecutorService dbCallbackExecutorService;
157 112
158 @Override 113 @Override