From 98cd0aeea65b5a4394c77a2c931cd877d8fbabe3 Mon Sep 17 00:00:00 2001
From: nickAS21 <nick@thingsboard.io>
Date: Wed, 1 Jun 2022 16:01:50 +0300
Subject: [PATCH] refactoring: comments6

---
 .../DefaultTbOtaPackageService.java             |  2 +-
 .../service/rule/DefaultTbRuleChainService.java | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/otaPackageController/DefaultTbOtaPackageService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/otaPackageController/DefaultTbOtaPackageService.java
index df67456116..555041ed8f 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/otaPackageController/DefaultTbOtaPackageService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/otaPackageController/DefaultTbOtaPackageService.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.service.entitiy.otaPackageController;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
+import org.thingsboard.server.common.data.StringUtils;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.OtaPackage;
diff --git a/application/src/main/java/org/thingsboard/server/service/rule/DefaultTbRuleChainService.java b/application/src/main/java/org/thingsboard/server/service/rule/DefaultTbRuleChainService.java
index 1ef64d4f89..b54578107f 100644
--- a/application/src/main/java/org/thingsboard/server/service/rule/DefaultTbRuleChainService.java
+++ b/application/src/main/java/org/thingsboard/server/service/rule/DefaultTbRuleChainService.java
@@ -297,19 +297,15 @@ public class DefaultTbRuleChainService extends AbstractTbEntityService implement
                 notificationEntityService.notifySendMsgToEdgeService(tenantId, ruleChain.getId(), EdgeEventActionType.UPDATED);
             }
 
-            updatedRuleChains.forEach(updatedRuleChain -> {
+            for (RuleChain updatedRuleChain : updatedRuleChains) {
                 if (RuleChainType.EDGE.equals(ruleChain.getType())) {
-                    notificationEntityService.notifySendMsgToEdgeService(tenantId, updatedRuleChain.getId(),  EdgeEventActionType.UPDATED);
+                    notificationEntityService.notifySendMsgToEdgeService(tenantId, updatedRuleChain.getId(), EdgeEventActionType.UPDATED);
                 } else {
-                    try {
-                        RuleChainMetaData updatedRuleChainMetaData = checkNotNull(ruleChainService.loadRuleChainMetaData(tenantId, updatedRuleChain.getId()));
-                        notificationEntityService.notifyCreateOrUpdateOrDelete(tenantId, null, updatedRuleChain.getId(),
-                                updatedRuleChain, user, ActionType.UPDATED, false, null, updatedRuleChainMetaData);
-                    } catch (ThingsboardException e) {
-                        e.printStackTrace();
-                    }
+                    RuleChainMetaData updatedRuleChainMetaData = checkNotNull(ruleChainService.loadRuleChainMetaData(tenantId, updatedRuleChain.getId()));
+                    notificationEntityService.notifyCreateOrUpdateOrDelete(tenantId, null, updatedRuleChain.getId(),
+                            updatedRuleChain, user, ActionType.UPDATED, false, null, updatedRuleChainMetaData);
                 }
-            });
+            }
             return savedRuleChainMetaData;
         } catch (Exception e) {
             notificationEntityService.notifyCreateOrUpdateOrDelete(tenantId, null, emptyId(EntityType.RULE_CHAIN),
@@ -398,6 +394,7 @@ public class DefaultTbRuleChainService extends AbstractTbEntityService implement
             throw handleException(e);
         }
     }
+
     public Set<RuleChainId> updateRelatedRuleChains(TenantId tenantId, RuleChainId ruleChainId, Map<String, String> labelsMap) {
         Set<RuleChainId> updatedRuleChains = new HashSet<>();
         List<RuleChainOutputLabelsUsage> usageList = getOutputLabelUsage(tenantId, ruleChainId);