From e32dfcfb31f5171f3c9c6bd5ef17e1a64013c960 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Tue, 15 Dec 2020 08:49:44 +0200
Subject: [PATCH] Code review fixes

---
 .../main/data/upgrade/2.5.0/schema_update.sql | 30 -------------------
 .../RuleChainActorMessageProcessor.java       | 14 ++++-----
 .../edge/rpc/init/DefaultSyncEdgeService.java |  3 +-
 3 files changed, 9 insertions(+), 38 deletions(-)
 delete mode 100644 application/src/main/data/upgrade/2.5.0/schema_update.sql

diff --git a/application/src/main/data/upgrade/2.5.0/schema_update.sql b/application/src/main/data/upgrade/2.5.0/schema_update.sql
deleted file mode 100644
index 27c7c6eb44..0000000000
--- a/application/src/main/data/upgrade/2.5.0/schema_update.sql
+++ /dev/null
@@ -1,30 +0,0 @@
---
--- Copyright © 2016-2020 The Thingsboard Authors
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
-
-CREATE TABLE IF NOT EXISTS edge (
-    id varchar(31) NOT NULL CONSTRAINT edge_pkey PRIMARY KEY,
-    additional_info varchar,
-    customer_id varchar(31),
-    root_rule_chain_id varchar(31),
-    configuration varchar(10000000),
-    type varchar(255),
-    name varchar(255),
-    label varchar(255),
-    routing_key varchar(255),
-    secret varchar(255),
-    search_text varchar(255),
-    tenant_id varchar(31)
-);
\ No newline at end of file
diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java
index e9f2a1da02..83307a4604 100644
--- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java
@@ -136,13 +136,13 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh
                 }
             }
 
-                Set<RuleNodeId> existingNodes = ruleNodeList.stream().map(RuleNode::getId).collect(Collectors.toSet());
-                List<RuleNodeId> removedRules = nodeActors.keySet().stream().filter(node -> !existingNodes.contains(node)).collect(Collectors.toList());
-                removedRules.forEach(ruleNodeId -> {
-                    log.trace("[{}][{}] Removing rule node [{}]", tenantId, entityId, ruleNodeId);
-                    RuleNodeCtx removed = nodeActors.remove(ruleNodeId);
-                    removed.getSelfActor().tellWithHighPriority(new ComponentLifecycleMsg(tenantId, removed.getSelf().getId(), ComponentLifecycleEvent.DELETED));
-                });
+            Set<RuleNodeId> existingNodes = ruleNodeList.stream().map(RuleNode::getId).collect(Collectors.toSet());
+            List<RuleNodeId> removedRules = nodeActors.keySet().stream().filter(node -> !existingNodes.contains(node)).collect(Collectors.toList());
+            removedRules.forEach(ruleNodeId -> {
+                log.trace("[{}][{}] Removing rule node [{}]", tenantId, entityId, ruleNodeId);
+                RuleNodeCtx removed = nodeActors.remove(ruleNodeId);
+                removed.getSelfActor().tellWithHighPriority(new ComponentLifecycleMsg(tenantId, removed.getSelf().getId(), ComponentLifecycleEvent.DELETED));
+            });
 
             initRoutes(ruleChain, ruleNodeList);
         }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/init/DefaultSyncEdgeService.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/init/DefaultSyncEdgeService.java
index dbbdd5f081..727e4991a7 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/init/DefaultSyncEdgeService.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/init/DefaultSyncEdgeService.java
@@ -149,7 +149,8 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
         log.trace("[{}][{}] Staring edge sync process", edge.getTenantId(), edge.getId());
         try {
             syncWidgetsBundleAndWidgetTypes(edge);
-            syncAdminSettings(edge);
+            // TODO: voba - implement this functionality
+            // syncAdminSettings(edge);
             syncRuleChains(edge);
             syncUsers(edge);
             syncDevices(edge);