Refactoring due to review. Fix naming, improve upgrade logic

application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java

@@ -479,11 +479,13 @@ public final class EdgeGrpcSession implements Closeable {
                     log.trace("[{}][{}][{}] downlink msg(s) are going to be send.", this.tenantId, this.sessionId, copy.size());
                     for (DownlinkMsg downlinkMsg : copy) {
                         if (this.clientMaxInboundMessageSize != 0 && downlinkMsg.getSerializedSize() > this.clientMaxInboundMessageSize) {
+                            String error = String.format("Client max inbound message size [{%s}] is exceeded. Please increase value of CLOUD_RPC_MAX_INBOUND_MESSAGE_SIZE " +
+                                    "env variable on the edge and restart it.", this.clientMaxInboundMessageSize);
                             String message = String.format("Downlink msg size [{%s}] exceeds client max inbound message size [{%s}]. " +
                                     "Please increase value of CLOUD_RPC_MAX_INBOUND_MESSAGE_SIZE env variable on the edge and restart it.", downlinkMsg.getSerializedSize(), this.clientMaxInboundMessageSize);
                             log.error("[{}][{}][{}] {} Message {}", this.tenantId, edge.getId(), this.sessionId, message, downlinkMsg);
                             ctx.getNotificationRuleProcessor().process(EdgeCommunicationFailureTrigger.builder().tenantId(tenantId)
-                                    .edgeId(edge.getId()).customerId(edge.getCustomerId()).edgeName(edge.getName()).failureMsg(message).error(message).build());
+                                    .edgeId(edge.getId()).customerId(edge.getCustomerId()).edgeName(edge.getName()).failureMsg(message).error(error).build());
                             sessionState.getPendingMsgsMap().remove(downlinkMsg.getDownlinkMsgId());
                         } else {
                             sendDownlinkMsg(ResponseMsg.newBuilder()

application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java

@@ -696,6 +696,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
     }
 
     @Override
+    @SneakyThrows
     public void updateDefaultNotificationConfigs() {
         PageDataIterable<TenantId> tenants = new PageDataIterable<>(tenantService::findTenantsIds, 500);
         ExecutorService executor = Executors.newFixedThreadPool(Math.max(Runtime.getRuntime().availableProcessors(), 4));
@@ -710,6 +711,8 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
                 }
             });
         }
+        executor.shutdown();
+        executor.awaitTermination(Integer.MAX_VALUE, TimeUnit.SECONDS);
         notificationSettingsService.updateDefaultNotificationConfigs(TenantId.SYS_TENANT_ID);
     }
 

application/src/main/java/org/thingsboard/server/service/notification/DefaultNotificationCenter.java

@@ -241,11 +241,13 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
             case PLATFORM_USERS: {
                 PlatformUsersNotificationTargetConfig targetConfig = (PlatformUsersNotificationTargetConfig) target.getConfiguration();
                 if (targetConfig.getUsersFilter().getType().isForRules() && ctx.getRequest().getInfo() instanceof RuleOriginatedNotificationInfo) {
-                    recipients = new PageDataIterable<>(pageLink ->
+                    recipients = new PageDataIterable<>(pageLink -> {
-                            notificationTargetService.findRecipientsForRuleNotificationTargetConfig(ctx.getTenantId(), targetConfig, (RuleOriginatedNotificationInfo) ctx.getRequest().getInfo(), pageLink), 500);
+                        return notificationTargetService.findRecipientsForRuleNotificationTargetConfig(ctx.getTenantId(), targetConfig, (RuleOriginatedNotificationInfo) ctx.getRequest().getInfo(), pageLink);
+                    }, 500);
                 } else {
-                    recipients = new PageDataIterable<>(pageLink ->
+                    recipients = new PageDataIterable<>(pageLink -> {
-                            notificationTargetService.findRecipientsForNotificationTargetConfig(ctx.getTenantId(), targetConfig, pageLink), 500);
+                        return notificationTargetService.findRecipientsForNotificationTargetConfig(ctx.getTenantId(), targetConfig, pageLink);
+                    }, 500);
                 }
                 break;
             }

application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/EdgeCommunicationFailureTriggerProcessor.java

@@ -53,7 +53,7 @@ public class EdgeCommunicationFailureTriggerProcessor implements NotificationRul
     }
 
     private String truncateFailureMsg(String input) {
-        int maxLength = 800;
+        int maxLength = 500;
         if (input != null && input.length() > maxLength) {
             return input.substring(0, maxLength);
         }

application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/NotificationRuleExportService.java

@@ -29,8 +29,8 @@ import org.thingsboard.server.common.data.notification.rule.EscalatedNotificatio
 import org.thingsboard.server.common.data.notification.rule.NotificationRule;
 import org.thingsboard.server.common.data.notification.rule.NotificationRuleRecipientsConfig;
 import org.thingsboard.server.common.data.notification.rule.trigger.config.DeviceActivityNotificationRuleTriggerConfig;
-import org.thingsboard.server.common.data.notification.rule.trigger.config.EdgeConnectionNotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.rule.trigger.config.EdgeCommunicationFailureNotificationRuleTriggerConfig;
+import org.thingsboard.server.common.data.notification.rule.trigger.config.EdgeConnectionNotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.rule.trigger.config.NotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.rule.trigger.config.RuleEngineComponentLifecycleEventNotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.sync.ie.EntityExportData;
@@ -92,8 +92,9 @@ public class NotificationRuleExportService<I extends EntityId, E extends Exporta
             case ALARM: {
                 EscalatedNotificationRuleRecipientsConfig recipientsConfig = (EscalatedNotificationRuleRecipientsConfig) ruleRecipientsConfig;
                 Map<Integer, List<UUID>> escalationTable = new LinkedHashMap<>(recipientsConfig.getEscalationTable());
-                escalationTable.replaceAll((delay, targets) ->
+                escalationTable.replaceAll((delay, targets) -> {
-                        toExternalIds(targets, NotificationTargetId::new, ctx).collect(Collectors.toList()));
+                    return toExternalIds(targets, NotificationTargetId::new, ctx).collect(Collectors.toList());
+                });
                 recipientsConfig.setEscalationTable(escalationTable);
                 break;
             }

common/data/src/main/java/org/thingsboard/server/common/data/notification/info/EdgeCommunicationFailureNotificationInfo.java

@@ -43,7 +43,6 @@ public class EdgeCommunicationFailureNotificationInfo implements RuleOriginatedN
     @Override
     public Map<String, String> getTemplateData() {
         return mapOf(
-                "tenantId", tenantId.toString(),
                 "edgeId", edgeId.toString(),
                 "edgeName", edgeName,
                 "failureMsg", failureMsg

common/data/src/main/java/org/thingsboard/server/common/data/notification/info/EdgeConnectionNotificationInfo.java

@@ -44,7 +44,6 @@ public class EdgeConnectionNotificationInfo implements RuleOriginatedNotificatio
     public Map<String, String> getTemplateData() {
         return mapOf(
                 "eventType", eventType,
-                "tenantId", tenantId.toString(),
                 "edgeId", edgeId.toString(),
                 "edgeName", edgeName
         );

common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/EdgeCommunicationFailureTrigger.java

@@ -43,7 +43,7 @@ public class EdgeCommunicationFailureTrigger implements NotificationRuleTrigger
 
     @Override
     public String getDeduplicationKey() {
-        return String.join(":", NotificationRuleTrigger.super.getDeduplicationKey(), edgeId.toString(), error);
+        return String.join(":", NotificationRuleTrigger.super.getDeduplicationKey(), error);
     }
 
     @Override

common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/EdgeConnectionTrigger.java

@@ -42,12 +42,12 @@ public class EdgeConnectionTrigger implements NotificationRuleTrigger {
 
     @Override
     public String getDeduplicationKey() {
-        return String.join(":", NotificationRuleTrigger.super.getDeduplicationKey(), edgeName, String.valueOf(connected));
+        return String.join(":", NotificationRuleTrigger.super.getDeduplicationKey(), String.valueOf(connected));
     }
 
     @Override
     public long getDefaultDeduplicationDuration() {
-        return TimeUnit.MINUTES.toMillis(30);
+        return TimeUnit.MINUTES.toMillis(1);
     }
 
     @Override

dao/src/main/java/org/thingsboard/server/dao/edge/BaseEdgeEventService.java

@@ -41,9 +41,10 @@ public class BaseEdgeEventService implements EdgeEventService {
 
     @Override
     public ListenableFuture<Void> saveAsync(EdgeEvent edgeEvent) {
-        boolean isEdgeEventTenantRateLimitReached = !rateLimitService.checkRateLimit(LimitedApi.EDGE_EVENTS, edgeEvent.getTenantId());
+        if (!rateLimitService.checkRateLimit(LimitedApi.EDGE_EVENTS, edgeEvent.getTenantId())) {
-        boolean isEdgeEventRateLimitPerEdgeReached = !rateLimitService.checkRateLimit(LimitedApi.EDGE_EVENTS_PER_EDGE, edgeEvent.getTenantId(), edgeEvent.getEdgeId());
+            throw new TbRateLimitsException(EntityType.TENANT);
-        if (isEdgeEventTenantRateLimitReached || isEdgeEventRateLimitPerEdgeReached) {
+        }
+        if (!rateLimitService.checkRateLimit(LimitedApi.EDGE_EVENTS_PER_EDGE, edgeEvent.getTenantId(), edgeEvent.getEdgeId())) {
             throw new TbRateLimitsException(EntityType.EDGE);
         }
         edgeEventValidator.validate(edgeEvent, EdgeEvent::getTenantId);

dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java

@@ -210,19 +210,22 @@ public class DefaultNotificationSettingsService implements NotificationSettingsS
             defaultNotifications.create(tenantId, DefaultNotifications.exceededPerEntityRateLimits, affectedTenantAdmins.getId());
             defaultNotifications.create(tenantId, DefaultNotifications.exceededRateLimitsForSysadmin, sysAdmins.getId());
         } else {
-            List<NotificationType> requiredNotificationTypes = List.of(NotificationType.EDGE_CONNECTION, NotificationType.EDGE_COMMUNICATION_FAILURE);
+            var requiredNotificationTypes = List.of(NotificationType.EDGE_CONNECTION, NotificationType.EDGE_COMMUNICATION_FAILURE);
-            List<NotificationType> existingNotificationTypes = notificationTemplateService.findNotificationTemplatesByTenantIdAndNotificationTypes(
+            var existingNotificationTypes = notificationTemplateService.findNotificationTemplatesByTenantIdAndNotificationTypes(
                             tenantId, requiredNotificationTypes, new PageLink(1))
                     .getData()
                     .stream()
                     .map(NotificationTemplate::getNotificationType)
-                    .collect(Collectors.toList());
+                    .collect(Collectors.toSet());
+
+            if (existingNotificationTypes.containsAll(requiredNotificationTypes)) {
+                return;
+            }
 
             NotificationTarget tenantAdmins = notificationTargetService.findNotificationTargetsByTenantIdAndUsersFilterType(tenantId, UsersFilterType.TENANT_ADMINISTRATORS)
                     .stream()
                     .findFirst()
-                    .orElseGet(() -> createTarget(tenantId, "Tenant administrators", new TenantAdministratorsFilter(),
+                    .orElseGet(() -> createTarget(tenantId, "Tenant administrators", new TenantAdministratorsFilter(), "Tenant administrators"));
-                            tenantId.isSysTenantId() ? "All tenant administrators" : "Tenant administrators"));
 
             for (NotificationType type : requiredNotificationTypes) {
                 if (!existingNotificationTypes.contains(type)) {

ui-ngx/src/assets/help/en_US/notification/edge_communication_failure.md

@@ -1,4 +1,4 @@
-#### Edge notification templatization
+#### Edge communication failure notification templatization
 
 <div class="divider"></div>
 <br/>

ui-ngx/src/assets/help/en_US/notification/edge_connection.md

@@ -1,4 +1,4 @@
-#### Edge notification templatization
+#### Edge connection notification templatization
 
 <div class="divider"></div>
 <br/>