Commit e32dfcfb31f5171f3c9c6bd5ef17e1a64013c960

Authored by Volodymyr Babak
1 parent 6bc247c0

Code review fixes

1 ---  
2 --- Copyright © 2016-2020 The Thingsboard Authors  
3 ---  
4 --- Licensed under the Apache License, Version 2.0 (the "License");  
5 --- you may not use this file except in compliance with the License.  
6 --- You may obtain a copy of the License at  
7 ---  
8 --- http://www.apache.org/licenses/LICENSE-2.0  
9 ---  
10 --- Unless required by applicable law or agreed to in writing, software  
11 --- distributed under the License is distributed on an "AS IS" BASIS,  
12 --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
13 --- See the License for the specific language governing permissions and  
14 --- limitations under the License.  
15 ---  
16 -  
17 -CREATE TABLE IF NOT EXISTS edge (  
18 - id varchar(31) NOT NULL CONSTRAINT edge_pkey PRIMARY KEY,  
19 - additional_info varchar,  
20 - customer_id varchar(31),  
21 - root_rule_chain_id varchar(31),  
22 - configuration varchar(10000000),  
23 - type varchar(255),  
24 - name varchar(255),  
25 - label varchar(255),  
26 - routing_key varchar(255),  
27 - secret varchar(255),  
28 - search_text varchar(255),  
29 - tenant_id varchar(31)  
30 -);  
@@ -136,13 +136,13 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh @@ -136,13 +136,13 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh
136 } 136 }
137 } 137 }
138 138
139 - Set<RuleNodeId> existingNodes = ruleNodeList.stream().map(RuleNode::getId).collect(Collectors.toSet());  
140 - List<RuleNodeId> removedRules = nodeActors.keySet().stream().filter(node -> !existingNodes.contains(node)).collect(Collectors.toList());  
141 - removedRules.forEach(ruleNodeId -> {  
142 - log.trace("[{}][{}] Removing rule node [{}]", tenantId, entityId, ruleNodeId);  
143 - RuleNodeCtx removed = nodeActors.remove(ruleNodeId);  
144 - removed.getSelfActor().tellWithHighPriority(new ComponentLifecycleMsg(tenantId, removed.getSelf().getId(), ComponentLifecycleEvent.DELETED));  
145 - }); 139 + Set<RuleNodeId> existingNodes = ruleNodeList.stream().map(RuleNode::getId).collect(Collectors.toSet());
  140 + List<RuleNodeId> removedRules = nodeActors.keySet().stream().filter(node -> !existingNodes.contains(node)).collect(Collectors.toList());
  141 + removedRules.forEach(ruleNodeId -> {
  142 + log.trace("[{}][{}] Removing rule node [{}]", tenantId, entityId, ruleNodeId);
  143 + RuleNodeCtx removed = nodeActors.remove(ruleNodeId);
  144 + removed.getSelfActor().tellWithHighPriority(new ComponentLifecycleMsg(tenantId, removed.getSelf().getId(), ComponentLifecycleEvent.DELETED));
  145 + });
146 146
147 initRoutes(ruleChain, ruleNodeList); 147 initRoutes(ruleChain, ruleNodeList);
148 } 148 }
@@ -149,7 +149,8 @@ public class DefaultSyncEdgeService implements SyncEdgeService { @@ -149,7 +149,8 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
149 log.trace("[{}][{}] Staring edge sync process", edge.getTenantId(), edge.getId()); 149 log.trace("[{}][{}] Staring edge sync process", edge.getTenantId(), edge.getId());
150 try { 150 try {
151 syncWidgetsBundleAndWidgetTypes(edge); 151 syncWidgetsBundleAndWidgetTypes(edge);
152 - syncAdminSettings(edge); 152 + // TODO: voba - implement this functionality
  153 + // syncAdminSettings(edge);
153 syncRuleChains(edge); 154 syncRuleChains(edge);
154 syncUsers(edge); 155 syncUsers(edge);
155 syncDevices(edge); 156 syncDevices(edge);