Merge remote-tracking branch 'upstream/master' into feature/cell-click-action

application/src/main/data/upgrade/3.6.3/schema_update.sql

@@ -14,123 +14,14 @@
 -- limitations under the License.
 --
 
--- create new attribute_kv table schema
+-- NOTIFICATIONS UPDATE START
-DO
-$$
-    BEGIN
-        -- in case of running the upgrade script a second time:
-        IF EXISTS(SELECT 1 FROM information_schema.columns WHERE table_name = 'attribute_kv' and column_name='entity_type') THEN
-            DROP VIEW IF EXISTS device_info_view;
-            DROP VIEW IF EXISTS device_info_active_attribute_view;
-            ALTER INDEX IF EXISTS idx_attribute_kv_by_key_and_last_update_ts RENAME TO idx_attribute_kv_by_key_and_last_update_ts_old;
-            IF EXISTS(SELECT 1 FROM pg_constraint WHERE conname = 'attribute_kv_pkey') THEN
-                ALTER TABLE attribute_kv RENAME CONSTRAINT attribute_kv_pkey TO attribute_kv_pkey_old;
-            END IF;
-            ALTER TABLE attribute_kv RENAME TO attribute_kv_old;
-            CREATE TABLE IF NOT EXISTS attribute_kv
-            (
-                entity_id uuid,
-                attribute_type int,
-                attribute_key int,
-                bool_v boolean,
-                str_v varchar(10000000),
-                long_v bigint,
-                dbl_v double precision,
-                json_v json,
-                last_update_ts bigint,
-                CONSTRAINT attribute_kv_pkey PRIMARY KEY (entity_id, attribute_type, attribute_key)
-            );
-        END IF;
-    END;
-$$;
 
--- rename ts_kv_dictionary table to key_dictionary or create table if not exists
+ALTER TABLE notification ADD COLUMN IF NOT EXISTS delivery_method VARCHAR(50) NOT NULL default 'WEB';
-DO
-$$
-    BEGIN
-        IF EXISTS(SELECT 1 FROM information_schema.tables WHERE table_name = 'ts_kv_dictionary') THEN
-            ALTER TABLE ts_kv_dictionary RENAME CONSTRAINT ts_key_id_pkey TO key_dictionary_id_pkey;
-            ALTER TABLE ts_kv_dictionary RENAME TO key_dictionary;
-        ELSE CREATE TABLE IF NOT EXISTS key_dictionary(
-                key    varchar(255) NOT NULL,
-                key_id serial UNIQUE,
-                CONSTRAINT key_dictionary_id_pkey PRIMARY KEY (key)
-                );
-        END IF;
-    END;
-$$;
 
--- insert keys into key_dictionary
+DROP INDEX IF EXISTS idx_notification_recipient_id_created_time;
-DO
+DROP INDEX IF EXISTS idx_notification_recipient_id_unread;
-$$
-    BEGIN
-        IF EXISTS(SELECT 1 FROM information_schema.tables WHERE table_name = 'attribute_kv_old') THEN
-            INSERT INTO key_dictionary(key) SELECT DISTINCT attribute_key FROM attribute_kv_old ON CONFLICT DO NOTHING;
-        END IF;
-    END;
-$$;
 
--- migrate attributes from attribute_kv_old to attribute_kv
+CREATE INDEX IF NOT EXISTS idx_notification_delivery_method_recipient_id_created_time ON notification(delivery_method, recipient_id, created_time DESC);
-DO
+CREATE INDEX IF NOT EXISTS idx_notification_delivery_method_recipient_id_unread ON notification(delivery_method, recipient_id) WHERE status <> 'READ';
-$$
-DECLARE
-    row_num_old integer;
-    row_num integer;
-BEGIN
-    IF EXISTS(SELECT 1 FROM information_schema.tables WHERE table_name = 'attribute_kv_old') THEN
-        INSERT INTO attribute_kv(entity_id, attribute_type, attribute_key, bool_v, str_v, long_v, dbl_v, json_v, last_update_ts)
-            SELECT a.entity_id, CASE
-                        WHEN a.attribute_type = 'CLIENT_SCOPE' THEN 1
-                        WHEN a.attribute_type = 'SERVER_SCOPE' THEN 2
-                        WHEN a.attribute_type = 'SHARED_SCOPE' THEN 3
-                        ELSE 0
-                        END,
-                k.key_id,  a.bool_v, a.str_v, a.long_v, a.dbl_v, a.json_v, a.last_update_ts
-                FROM attribute_kv_old a INNER JOIN key_dictionary k ON (a.attribute_key = k.key);
-        SELECT COUNT(*) INTO row_num_old FROM attribute_kv_old;
-        SELECT COUNT(*) INTO row_num FROM attribute_kv;
-        RAISE NOTICE 'Migrated % of % rows', row_num, row_num_old;
 
-        IF row_num != 0 THEN
+-- NOTIFICATIONS UPDATE END
-            DROP TABLE IF EXISTS attribute_kv_old;
-        ELSE
-           RAISE EXCEPTION 'Table attribute_kv is empty';
-        END IF;
-
-        CREATE INDEX IF NOT EXISTS idx_attribute_kv_by_key_and_last_update_ts ON attribute_kv(entity_id, attribute_key, last_update_ts desc);
-    END IF;
-EXCEPTION
-    WHEN others THEN
-        ROLLBACK;
-        RAISE EXCEPTION 'Error during COPY: %', SQLERRM;
-END
-$$;
-
--- OAUTH2 PARAMS ALTER TABLE START
-
-ALTER TABLE oauth2_params
-    ADD COLUMN IF NOT EXISTS edge_enabled boolean DEFAULT false;
-
--- OAUTH2 PARAMS ALTER TABLE END
-
--- QUEUE STATS UPDATE START
-
-CREATE TABLE IF NOT EXISTS queue_stats (
-    id uuid NOT NULL CONSTRAINT queue_stats_pkey PRIMARY KEY,
-    created_time bigint NOT NULL,
-    tenant_id uuid NOT NULL,
-    queue_name varchar(255) NOT NULL,
-    service_id varchar(255) NOT NULL,
-    CONSTRAINT queue_stats_name_unq_key UNIQUE (tenant_id, queue_name, service_id)
-);
-
-INSERT INTO queue_stats
-    SELECT id, created_time, tenant_id, substring(name FROM 1 FOR position('_' IN name) - 1) AS queue_name,
-           substring(name FROM position('_' IN name) + 1) AS service_id
-    FROM asset
-    WHERE type = 'TbServiceQueue' and name LIKE '%\_%';
-
-DELETE FROM asset WHERE type='TbServiceQueue';
-DELETE FROM asset_profile WHERE name ='TbServiceQueue';
-
--- QUEUE STATS UPDATE END

application/src/main/data/upgrade/3.6.4/schema_update.sql

@@ -0,0 +1,136 @@
+--
+-- Copyright © 2016-2024 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 new attribute_kv table schema
+DO
+$$
+    BEGIN
+        -- in case of running the upgrade script a second time:
+        IF EXISTS(SELECT 1 FROM information_schema.columns WHERE table_name = 'attribute_kv' and column_name='entity_type') THEN
+            DROP VIEW IF EXISTS device_info_view;
+            DROP VIEW IF EXISTS device_info_active_attribute_view;
+            ALTER INDEX IF EXISTS idx_attribute_kv_by_key_and_last_update_ts RENAME TO idx_attribute_kv_by_key_and_last_update_ts_old;
+            IF EXISTS(SELECT 1 FROM pg_constraint WHERE conname = 'attribute_kv_pkey') THEN
+                ALTER TABLE attribute_kv RENAME CONSTRAINT attribute_kv_pkey TO attribute_kv_pkey_old;
+            END IF;
+            ALTER TABLE attribute_kv RENAME TO attribute_kv_old;
+            CREATE TABLE IF NOT EXISTS attribute_kv
+            (
+                entity_id uuid,
+                attribute_type int,
+                attribute_key int,
+                bool_v boolean,
+                str_v varchar(10000000),
+                long_v bigint,
+                dbl_v double precision,
+                json_v json,
+                last_update_ts bigint,
+                CONSTRAINT attribute_kv_pkey PRIMARY KEY (entity_id, attribute_type, attribute_key)
+            );
+        END IF;
+    END;
+$$;
+
+-- rename ts_kv_dictionary table to key_dictionary or create table if not exists
+DO
+$$
+    BEGIN
+        IF EXISTS(SELECT 1 FROM information_schema.tables WHERE table_name = 'ts_kv_dictionary') THEN
+            ALTER TABLE ts_kv_dictionary RENAME CONSTRAINT ts_key_id_pkey TO key_dictionary_id_pkey;
+            ALTER TABLE ts_kv_dictionary RENAME TO key_dictionary;
+        ELSE CREATE TABLE IF NOT EXISTS key_dictionary(
+                key    varchar(255) NOT NULL,
+                key_id serial UNIQUE,
+                CONSTRAINT key_dictionary_id_pkey PRIMARY KEY (key)
+                );
+        END IF;
+    END;
+$$;
+
+-- insert keys into key_dictionary
+DO
+$$
+    BEGIN
+        IF EXISTS(SELECT 1 FROM information_schema.tables WHERE table_name = 'attribute_kv_old') THEN
+            INSERT INTO key_dictionary(key) SELECT DISTINCT attribute_key FROM attribute_kv_old ON CONFLICT DO NOTHING;
+        END IF;
+    END;
+$$;
+
+-- migrate attributes from attribute_kv_old to attribute_kv
+DO
+$$
+DECLARE
+    row_num_old integer;
+    row_num integer;
+BEGIN
+    IF EXISTS(SELECT 1 FROM information_schema.tables WHERE table_name = 'attribute_kv_old') THEN
+        INSERT INTO attribute_kv(entity_id, attribute_type, attribute_key, bool_v, str_v, long_v, dbl_v, json_v, last_update_ts)
+            SELECT a.entity_id, CASE
+                        WHEN a.attribute_type = 'CLIENT_SCOPE' THEN 1
+                        WHEN a.attribute_type = 'SERVER_SCOPE' THEN 2
+                        WHEN a.attribute_type = 'SHARED_SCOPE' THEN 3
+                        ELSE 0
+                        END,
+                k.key_id,  a.bool_v, a.str_v, a.long_v, a.dbl_v, a.json_v, a.last_update_ts
+                FROM attribute_kv_old a INNER JOIN key_dictionary k ON (a.attribute_key = k.key);
+        SELECT COUNT(*) INTO row_num_old FROM attribute_kv_old;
+        SELECT COUNT(*) INTO row_num FROM attribute_kv;
+        RAISE NOTICE 'Migrated % of % rows', row_num, row_num_old;
+
+        IF row_num != 0 THEN
+            DROP TABLE IF EXISTS attribute_kv_old;
+        ELSE
+           RAISE EXCEPTION 'Table attribute_kv is empty';
+        END IF;
+
+        CREATE INDEX IF NOT EXISTS idx_attribute_kv_by_key_and_last_update_ts ON attribute_kv(entity_id, attribute_key, last_update_ts desc);
+    END IF;
+EXCEPTION
+    WHEN others THEN
+        ROLLBACK;
+        RAISE EXCEPTION 'Error during COPY: %', SQLERRM;
+END
+$$;
+
+-- OAUTH2 PARAMS ALTER TABLE START
+
+ALTER TABLE oauth2_params
+    ADD COLUMN IF NOT EXISTS edge_enabled boolean DEFAULT false;
+
+-- OAUTH2 PARAMS ALTER TABLE END
+
+-- QUEUE STATS UPDATE START
+
+CREATE TABLE IF NOT EXISTS queue_stats (
+    id uuid NOT NULL CONSTRAINT queue_stats_pkey PRIMARY KEY,
+    created_time bigint NOT NULL,
+    tenant_id uuid NOT NULL,
+    queue_name varchar(255) NOT NULL,
+    service_id varchar(255) NOT NULL,
+    CONSTRAINT queue_stats_name_unq_key UNIQUE (tenant_id, queue_name, service_id)
+);
+
+INSERT INTO queue_stats
+    SELECT id, created_time, tenant_id, substring(name FROM 1 FOR position('_' IN name) - 1) AS queue_name,
+           substring(name FROM position('_' IN name) + 1) AS service_id
+    FROM asset
+    WHERE type = 'TbServiceQueue' and name LIKE '%\_%';
+
+DELETE FROM asset WHERE type='TbServiceQueue';
+DELETE FROM asset_profile WHERE name ='TbServiceQueue';
+
+-- QUEUE STATS UPDATE END

application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java

@@ -460,7 +460,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
             handleSessionActivity(sessionInfo, msg.getSubscriptionInfo());
         }
         if (msg.hasClaimDevice()) {
-            handleClaimDeviceMsg(msg.getClaimDevice());
+            handleClaimDeviceMsg(sessionInfo, msg.getClaimDevice());
         }
         if (msg.hasRpcResponseStatusMsg()) {
             processRpcResponseStatus(sessionInfo, msg.getRpcResponseStatusMsg());
@@ -485,9 +485,22 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
                 });
     }
 
-    private void handleClaimDeviceMsg(ClaimDeviceMsg msg) {
+    private void handleClaimDeviceMsg(SessionInfoProto sessionInfo, ClaimDeviceMsg msg) {
+        UUID sessionId = getSessionId(sessionInfo);
         DeviceId deviceId = new DeviceId(new UUID(msg.getDeviceIdMSB(), msg.getDeviceIdLSB()));
-        systemContext.getClaimDevicesService().registerClaimingInfo(tenantId, deviceId, msg.getSecretKey(), msg.getDurationMs());
+        ListenableFuture<Void> registrationFuture = systemContext.getClaimDevicesService()
+                        .registerClaimingInfo(tenantId, deviceId, msg.getSecretKey(), msg.getDurationMs());
+        Futures.addCallback(registrationFuture, new FutureCallback<>() {
+            @Override
+            public void onSuccess(Void result) {
+                log.debug("[{}][{}] Successfully processed register claiming info request!", sessionId, deviceId);
+            }
+
+            @Override
+            public void onFailure(Throwable t) {
+                log.error("[{}][{}] Failed to process register claiming info request due to: ", sessionId, deviceId, t);
+            }
+        }, MoreExecutors.directExecutor());
     }
 
     private void reportSessionOpen() {

application/src/main/java/org/thingsboard/server/controller/ComponentDescriptorController.java

@@ -68,7 +68,7 @@ public class ComponentDescriptorController extends BaseController {
     @RequestMapping(value = "/components/{componentType}", method = RequestMethod.GET)
     @ResponseBody
     public List<ComponentDescriptor> getComponentDescriptorsByType(
-            @Parameter(description = "Type of the Rule Node", schema = @Schema(allowableValues = "ENRICHMENT,FILTER,TRANSFORMATION,ACTION,EXTERNAL", required = true))
+            @Parameter(description = "Type of the Rule Node", schema = @Schema(allowableValues = "ENRICHMENT,FILTER,TRANSFORMATION,ACTION,EXTERNAL", requiredMode = Schema.RequiredMode.REQUIRED))
             @PathVariable("componentType") String strComponentType,
             @Parameter(description = "Type of the Rule Chain", schema = @Schema(allowableValues = "CORE,EDGE"))
             @RequestParam(value = "ruleChainType", required = false) String strRuleChainType) throws ThingsboardException {

application/src/main/java/org/thingsboard/server/controller/NotificationController.java

@@ -16,6 +16,7 @@
 package org.thingsboard.server.controller;
 
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -105,6 +106,8 @@ public class NotificationController extends BaseController {
     private final NotificationCenter notificationCenter;
     private final NotificationSettingsService notificationSettingsService;
 
+    private static final String DELIVERY_METHOD_ALLOWABLE_VALUES = "WEB,MOBILE_APP";
+
     @ApiOperation(value = "Get notifications (getNotifications)",
             notes = "Returns the page of notifications for current user." + NEW_LINE +
                     PAGE_DATA_PARAMETERS +
@@ -172,10 +175,23 @@ public class NotificationController extends BaseController {
                                                    @RequestParam(required = false) String sortOrder,
                                                    @Parameter(description = "To search for unread notifications only")
                                                    @RequestParam(defaultValue = "false") boolean unreadOnly,
+                                                   @Parameter(description = "Delivery method", schema = @Schema(allowableValues = {DELIVERY_METHOD_ALLOWABLE_VALUES}))
+                                                   @RequestParam(defaultValue = "WEB") NotificationDeliveryMethod deliveryMethod,
                                                    @AuthenticationPrincipal SecurityUser user) throws ThingsboardException {
         // no permissions
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
-        return notificationService.findNotificationsByRecipientIdAndReadStatus(user.getTenantId(), user.getId(), unreadOnly, pageLink);
+        return notificationService.findNotificationsByRecipientIdAndReadStatus(user.getTenantId(), deliveryMethod, user.getId(), unreadOnly, pageLink);
+    }
+
+    @ApiOperation(value = "Get unread notifications count (getUnreadNotificationsCount)",
+            notes = "Returns unread notifications count for chosen delivery method." +
+                    AVAILABLE_FOR_ANY_AUTHORIZED_USER)
+    @GetMapping("/notifications/unread/count")
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
+    public Integer getUnreadNotificationsCount(@Parameter(description = "Delivery method", schema = @Schema(allowableValues = {DELIVERY_METHOD_ALLOWABLE_VALUES}))
+                                               @RequestParam(defaultValue = "MOBILE_APP") NotificationDeliveryMethod deliveryMethod,
+                                               @AuthenticationPrincipal SecurityUser user) {
+        return notificationService.countUnreadNotificationsByRecipientId(user.getTenantId(), deliveryMethod, user.getId());
     }
 
     @ApiOperation(value = "Mark notification as read (markNotificationAsRead)",
@@ -195,9 +211,11 @@ public class NotificationController extends BaseController {
                     AVAILABLE_FOR_ANY_AUTHORIZED_USER)
     @PutMapping("/notifications/read")
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
-    public void markAllNotificationsAsRead(@AuthenticationPrincipal SecurityUser user) {
+    public void markAllNotificationsAsRead(@Parameter(description = "Delivery method", schema = @Schema(allowableValues = {DELIVERY_METHOD_ALLOWABLE_VALUES}))
+                                           @RequestParam(defaultValue = "WEB") NotificationDeliveryMethod deliveryMethod,
+                                           @AuthenticationPrincipal SecurityUser user) {
         // no permissions
-        notificationCenter.markAllNotificationsAsRead(user.getTenantId(), user.getId());
+        notificationCenter.markAllNotificationsAsRead(user.getTenantId(), deliveryMethod, user.getId());
     }
 
     @ApiOperation(value = "Delete notification (deleteNotification)",

application/src/main/java/org/thingsboard/server/controller/QueueController.java

@@ -67,7 +67,7 @@ public class QueueController extends BaseController {
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     @RequestMapping(value = "/queues", params = {"serviceType", "pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
-    public PageData<Queue> getTenantQueuesByServiceType(@Parameter(description = QUEUE_SERVICE_TYPE_DESCRIPTION, schema = @Schema(allowableValues = {"TB-RULE-ENGINE", "TB-CORE", "TB-TRANSPORT", "JS-EXECUTOR"}, required = true))
+    public PageData<Queue> getTenantQueuesByServiceType(@Parameter(description = QUEUE_SERVICE_TYPE_DESCRIPTION, schema = @Schema(allowableValues = {"TB-RULE-ENGINE", "TB-CORE", "TB-TRANSPORT", "JS-EXECUTOR"}, requiredMode = Schema.RequiredMode.REQUIRED))
                                                         @RequestParam String serviceType,
                                                         @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
                                                         @RequestParam int pageSize,
@@ -126,7 +126,7 @@ public class QueueController extends BaseController {
     @ResponseBody
     public Queue saveQueue(@Parameter(description = "A JSON value representing the queue.")
                            @RequestBody Queue queue,
-                           @Parameter(description = QUEUE_SERVICE_TYPE_DESCRIPTION, schema = @Schema(allowableValues = {"TB-RULE-ENGINE", "TB-CORE", "TB-TRANSPORT", "JS-EXECUTOR"}, required = true))
+                           @Parameter(description = QUEUE_SERVICE_TYPE_DESCRIPTION, schema = @Schema(allowableValues = {"TB-RULE-ENGINE", "TB-CORE", "TB-TRANSPORT", "JS-EXECUTOR"}, requiredMode = Schema.RequiredMode.REQUIRED))
                            @RequestParam String serviceType) throws ThingsboardException {
         checkParameter("serviceType", serviceType);
         queue.setTenantId(getCurrentUser().getTenantId());

application/src/main/java/org/thingsboard/server/controller/TbResourceController.java

@@ -268,9 +268,9 @@ public class TbResourceController extends BaseController {
                     "You can specify parameters to filter the results. " + LWM2M_OBJECT_DESCRIPTION + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @GetMapping(value = "/resource/lwm2m")
-    public List<LwM2mObject> getLwm2mListObjects(@Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}, required = true))
+    public List<LwM2mObject> getLwm2mListObjects(@Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}, requiredMode = Schema.RequiredMode.REQUIRED))
                                                  @RequestParam String sortOrder,
-                                                 @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"id", "name"}, required = true))
+                                                 @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"id", "name"}, requiredMode = Schema.RequiredMode.REQUIRED))
                                                  @RequestParam String sortProperty,
                                                  @Parameter(description = "LwM2M Object ids.", required = true)
                                                  @RequestParam(required = false) String[] objectIds) throws ThingsboardException {
@@ -315,4 +315,4 @@ public class TbResourceController extends BaseController {
                 .body(resource);
     }
 
-}
+}

application/src/main/java/org/thingsboard/server/controller/TelemetryController.java

@@ -236,7 +236,7 @@ public class TelemetryController extends BaseController {
     public DeferredResult<ResponseEntity> getAttributesByScope(
             @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
             @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
-            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE", "CLIENT_SCOPE"}, required = true)) @PathVariable("scope") AttributeScope scope,
+            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE", "CLIENT_SCOPE"}, requiredMode = Schema.RequiredMode.REQUIRED)) @PathVariable("scope") AttributeScope scope,
             @Parameter(description = ATTRIBUTES_KEYS_DESCRIPTION) @RequestParam(name = "keys", required = false) String keysStr) throws ThingsboardException {
         SecurityUser user = getCurrentUser();
         return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_ATTRIBUTES, entityType, entityIdStr,
@@ -353,7 +353,7 @@ public class TelemetryController extends BaseController {
     @ResponseBody
     public DeferredResult<ResponseEntity> saveDeviceAttributes(
             @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION, required = true) @PathVariable("deviceId") String deviceIdStr,
-            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE"}, required = true)) @PathVariable("scope") AttributeScope scope,
+            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE"}, requiredMode = Schema.RequiredMode.REQUIRED)) @PathVariable("scope") AttributeScope scope,
             @io.swagger.v3.oas.annotations.parameters.RequestBody(description = ATTRIBUTES_JSON_REQUEST_DESCRIPTION, required = true) @RequestBody JsonNode request) throws ThingsboardException {
         EntityId entityId = EntityIdFactory.getByTypeAndUuid(EntityType.DEVICE, deviceIdStr);
         return saveAttributes(getTenantId(), entityId, scope, request);
@@ -399,7 +399,7 @@ public class TelemetryController extends BaseController {
     public DeferredResult<ResponseEntity> saveEntityAttributesV2(
             @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
             @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
-            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE"}, required = true)) @PathVariable("scope")AttributeScope scope,
+            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE"}, requiredMode = Schema.RequiredMode.REQUIRED)) @PathVariable("scope")AttributeScope scope,
             @io.swagger.v3.oas.annotations.parameters.RequestBody(description = ATTRIBUTES_JSON_REQUEST_DESCRIPTION, required = true) @RequestBody JsonNode request) throws ThingsboardException {
         EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
         return saveAttributes(getTenantId(), entityId, scope, request);
@@ -550,7 +550,7 @@ public class TelemetryController extends BaseController {
     @ResponseBody
     public DeferredResult<ResponseEntity> deleteDeviceAttributes(
             @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION, required = true) @PathVariable(DEVICE_ID) String deviceIdStr,
-            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE", "CLIENT_SCOPE"}, required = true)) @PathVariable("scope")AttributeScope scope,
+            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE", "CLIENT_SCOPE"}, requiredMode = Schema.RequiredMode.REQUIRED)) @PathVariable("scope")AttributeScope scope,
                     @Parameter(description = ATTRIBUTES_KEYS_DESCRIPTION, required = true)@RequestParam(name = "keys")String keysStr) throws ThingsboardException {
         EntityId entityId = EntityIdFactory.getByTypeAndUuid(EntityType.DEVICE, deviceIdStr);
         return deleteAttributes(entityId, scope, keysStr);

application/src/main/java/org/thingsboard/server/controller/TwoFactorAuthConfigController.java

@@ -100,7 +100,7 @@ public class TwoFactorAuthConfigController extends BaseController {
                     ControllerConstants.AVAILABLE_FOR_ANY_AUTHORIZED_USER)
     @PostMapping("/account/config/generate")
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
-    public TwoFaAccountConfig generateTwoFaAccountConfig(@Parameter(description = "2FA provider type to generate new account config for", schema = @Schema(defaultValue = "TOTP", required = true))
+    public TwoFaAccountConfig generateTwoFaAccountConfig(@Parameter(description = "2FA provider type to generate new account config for", schema = @Schema(defaultValue = "TOTP", requiredMode = Schema.RequiredMode.REQUIRED))
                                                          @RequestParam TwoFaProviderType providerType) throws Exception {
         SecurityUser user = getCurrentUser();
         return twoFactorAuthService.generateNewAccountConfig(user, providerType);

application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java

@@ -128,8 +128,11 @@ public class ThingsboardInstallService {
                             databaseEntitiesUpgradeService.upgradeDatabase("3.6.2");
                             systemDataLoaderService.updateDefaultNotificationConfigs();
                         case "3.6.3":
-                            log.info("Upgrading ThingsBoard from version 3.6.3 to 3.7.0 ...");
+                            log.info("Upgrading ThingsBoard from version 3.6.3 to 3.6.4 ...");
                             databaseEntitiesUpgradeService.upgradeDatabase("3.6.3");
+                        case "3.6.4":
+                            log.info("Upgrading ThingsBoard from version 3.6.4 to 3.7.0 ...");
+                            databaseEntitiesUpgradeService.upgradeDatabase("3.6.4");
                             //TODO DON'T FORGET to update switch statement in the CacheCleanupService if you need to clear the cache
                             break;
                         default:

application/src/main/java/org/thingsboard/server/service/device/ClaimDevicesServiceImpl.java

@@ -20,6 +20,7 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
+import jakarta.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -28,7 +29,6 @@ import org.springframework.cache.CacheManager;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.RuleEngineTelemetryService;
-import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.Device;
@@ -51,9 +51,7 @@ import org.thingsboard.server.dao.device.claim.ReclaimResult;
 import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
-import jakarta.annotation.Nullable;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -89,16 +87,16 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
         Device device = deviceService.findDeviceById(tenantId, deviceId);
         Cache cache = cacheManager.getCache(CLAIM_DEVICES_CACHE);
         List<Object> key = constructCacheKey(device.getId());
+        String deviceName = device.getName();
         if (isAllowedClaimingByDefault) {
             if (device.getCustomerId().getId().equals(ModelConstants.NULL_UUID)) {
                 persistInCache(secretKey, durationMs, cache, key);
                 return Futures.immediateFuture(null);
             }
-            log.warn("The device [{}] has been already claimed!", device.getName());
+            return Futures.immediateFailedFuture(new IllegalArgumentException("Device [" + deviceName + "] has been already claimed!"));
-            return Futures.immediateFailedFuture(new IllegalArgumentException());
         } else {
             ListenableFuture<List<AttributeKvEntry>> claimingAllowedFuture = attributesService.find(tenantId, device.getId(),
-                    AttributeScope.SERVER_SCOPE, Collections.singletonList(CLAIM_ATTRIBUTE_NAME));
+                    AttributeScope.SERVER_SCOPE, List.of(CLAIM_ATTRIBUTE_NAME));
             return Futures.transform(claimingAllowedFuture, list -> {
                 if (list != null && !list.isEmpty()) {
                     Optional<Boolean> claimingAllowedOptional = list.get(0).getBooleanValue();
@@ -108,8 +106,7 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
                         return null;
                     }
                 }
-                log.warn("Failed to find claimingAllowed attribute for device or it is already claimed![{}]", device.getName());
+                throw new IllegalArgumentException("Failed to find claimingAllowed attribute for device [" + deviceName + "] or it is already claimed!");
-                throw new IllegalArgumentException();
             }, MoreExecutors.directExecutor());
         }
     }
@@ -182,7 +179,7 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
             }
             SettableFuture<ReclaimResult> result = SettableFuture.create();
             telemetryService.saveAndNotify(
-                    tenantId, savedDevice.getId(), AttributeScope.SERVER_SCOPE, Collections.singletonList(
+                    tenantId, savedDevice.getId(), AttributeScope.SERVER_SCOPE, List.of(
                             new BaseAttributeKvEntry(new BooleanDataEntry(CLAIM_ATTRIBUTE_NAME, true), System.currentTimeMillis())
                     ),
                     new FutureCallback<>() {
@@ -203,7 +200,7 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
     }
 
     private List<Object> constructCacheKey(DeviceId deviceId) {
-        return Collections.singletonList(deviceId);
+        return List.of(deviceId);
     }
 
     private void persistInCache(String secretKey, long durationMs, Cache cache, List<Object> key) {

application/src/main/java/org/thingsboard/server/service/edge/DefaultEdgeNotificationService.java

@@ -16,6 +16,8 @@
 package org.thingsboard.server.service.edge;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -42,6 +44,7 @@ import org.thingsboard.server.service.edge.rpc.processor.device.DeviceEdgeProces
 import org.thingsboard.server.service.edge.rpc.processor.device.profile.DeviceProfileEdgeProcessor;
 import org.thingsboard.server.service.edge.rpc.processor.edge.EdgeProcessor;
 import org.thingsboard.server.service.edge.rpc.processor.entityview.EntityViewEdgeProcessor;
+import org.thingsboard.server.service.edge.rpc.processor.notification.NotificationEdgeProcessor;
 import org.thingsboard.server.service.edge.rpc.processor.oauth2.OAuth2EdgeProcessor;
 import org.thingsboard.server.service.edge.rpc.processor.ota.OtaPackageEdgeProcessor;
 import org.thingsboard.server.service.edge.rpc.processor.queue.QueueEdgeProcessor;
@@ -54,8 +57,6 @@ import org.thingsboard.server.service.edge.rpc.processor.user.UserEdgeProcessor;
 import org.thingsboard.server.service.edge.rpc.processor.widget.WidgetBundleEdgeProcessor;
 import org.thingsboard.server.service.edge.rpc.processor.widget.WidgetTypeEdgeProcessor;
 
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.PreDestroy;
 import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -127,6 +128,9 @@ public class DefaultEdgeNotificationService implements EdgeNotificationService {
     @Autowired
     private ResourceEdgeProcessor resourceEdgeProcessor;
 
+    @Autowired
+    private NotificationEdgeProcessor notificationEdgeProcessor;
+
     @Autowired
     private OAuth2EdgeProcessor oAuth2EdgeProcessor;
 
@@ -175,71 +179,30 @@ public class DefaultEdgeNotificationService implements EdgeNotificationService {
                     }
                     EdgeEventType type = EdgeEventType.valueOf(edgeNotificationMsg.getType());
                     switch (type) {
-                        case EDGE:
+                        case EDGE -> edgeProcessor.processEdgeNotification(tenantId, edgeNotificationMsg);
-                            edgeProcessor.processEdgeNotification(tenantId, edgeNotificationMsg);
+                        case ASSET -> assetProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
+                        case ASSET_PROFILE -> assetProfileEdgeProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                        case ASSET:
+                        case DEVICE -> deviceProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            assetProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
+                        case DEVICE_PROFILE -> deviceProfileEdgeProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
+                        case ENTITY_VIEW -> entityViewProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                        case ASSET_PROFILE:
+                        case DASHBOARD -> dashboardProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            assetProfileEdgeProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
+                        case RULE_CHAIN -> ruleChainProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
+                        case USER -> userProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                        case DEVICE:
+                        case CUSTOMER -> customerProcessor.processCustomerNotification(tenantId, edgeNotificationMsg);
-                            deviceProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
+                        case OTA_PACKAGE -> otaPackageProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
+                        case WIDGETS_BUNDLE -> widgetBundleProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                        case DEVICE_PROFILE:
+                        case WIDGET_TYPE -> widgetTypeProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            deviceProfileEdgeProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
+                        case QUEUE -> queueProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
+                        case ALARM -> alarmProcessor.processAlarmNotification(tenantId, edgeNotificationMsg);
-                        case ENTITY_VIEW:
+                        case ALARM_COMMENT -> alarmProcessor.processAlarmCommentNotification(tenantId, edgeNotificationMsg);
-                            entityViewProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
+                        case RELATION -> relationProcessor.processRelationNotification(tenantId, edgeNotificationMsg);
-                            break;
+                        case TENANT -> tenantEdgeProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                        case DASHBOARD:
+                        case TENANT_PROFILE -> tenantProfileEdgeProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            dashboardProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
+                        case NOTIFICATION_RULE, NOTIFICATION_TARGET, NOTIFICATION_TEMPLATE ->
-                            break;
+                                notificationEdgeProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                        case RULE_CHAIN:
+                        case TB_RESOURCE -> resourceEdgeProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            ruleChainProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
+                        case OAUTH2 -> oAuth2EdgeProcessor.processOAuth2Notification(tenantId, edgeNotificationMsg);
-                            break;
+                        default -> log.warn("[{}] Edge event type [{}] is not designed to be pushed to edge", tenantId, type);
-                        case USER:
-                            userProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case CUSTOMER:
-                            customerProcessor.processCustomerNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case OTA_PACKAGE:
-                            otaPackageProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case WIDGETS_BUNDLE:
-                            widgetBundleProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case WIDGET_TYPE:
-                            widgetTypeProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case QUEUE:
-                            queueProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case ALARM:
-                            alarmProcessor.processAlarmNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case ALARM_COMMENT:
-                            alarmProcessor.processAlarmCommentNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case RELATION:
-                            relationProcessor.processRelationNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case TENANT:
-                            tenantEdgeProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case TENANT_PROFILE:
-                            tenantProfileEdgeProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case TB_RESOURCE:
-                            resourceEdgeProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case OAUTH2:
-                            oAuth2EdgeProcessor.processOAuth2Notification(tenantId, edgeNotificationMsg);
-                            break;
-                        default:
-                            log.warn("[{}] Edge event type [{}] is not designed to be pushed to edge", tenantId, type);
                     }
                 } catch (Exception e) {
                     callBackFailure(tenantId, edgeNotificationMsg, callback, e);
@@ -255,4 +218,5 @@ public class DefaultEdgeNotificationService implements EdgeNotificationService {
         log.error("[{}] Can't push to edge updates, edgeNotificationMsg [{}]", tenantId, edgeNotificationMsg, throwable);
         callback.onFailure(throwable);
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/EdgeContextComponent.java

@@ -32,6 +32,9 @@ import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.edge.EdgeEventService;
 import org.thingsboard.server.dao.edge.EdgeService;
 import org.thingsboard.server.dao.entityview.EntityViewService;
+import org.thingsboard.server.dao.notification.NotificationRuleService;
+import org.thingsboard.server.dao.notification.NotificationTargetService;
+import org.thingsboard.server.dao.notification.NotificationTemplateService;
 import org.thingsboard.server.dao.oauth2.OAuth2Service;
 import org.thingsboard.server.dao.ota.OtaPackageService;
 import org.thingsboard.server.dao.queue.QueueService;
@@ -62,6 +65,7 @@ import org.thingsboard.server.service.edge.rpc.processor.device.profile.DevicePr
 import org.thingsboard.server.service.edge.rpc.processor.edge.EdgeProcessor;
 import org.thingsboard.server.service.edge.rpc.processor.entityview.EntityViewEdgeProcessor;
 import org.thingsboard.server.service.edge.rpc.processor.entityview.EntityViewProcessorFactory;
+import org.thingsboard.server.service.edge.rpc.processor.notification.NotificationEdgeProcessor;
 import org.thingsboard.server.service.edge.rpc.processor.oauth2.OAuth2EdgeProcessor;
 import org.thingsboard.server.service.edge.rpc.processor.ota.OtaPackageEdgeProcessor;
 import org.thingsboard.server.service.edge.rpc.processor.queue.QueueEdgeProcessor;
@@ -153,6 +157,15 @@ public class EdgeContextComponent {
     @Autowired
     private ResourceService resourceService;
 
+    @Autowired
+    private NotificationRuleService notificationRuleService;
+
+    @Autowired
+    private NotificationTargetService notificationTargetService;
+
+    @Autowired
+    private NotificationTemplateService notificationTemplateService;
+
     @Autowired
     private OAuth2Service oAuth2Service;
 
@@ -225,6 +238,9 @@ public class EdgeContextComponent {
     @Autowired
     private ResourceEdgeProcessor resourceEdgeProcessor;
 
+    @Autowired
+    private NotificationEdgeProcessor notificationEdgeProcessor;
+
     @Autowired
     private OAuth2EdgeProcessor oAuth2EdgeProcessor;
 

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

@@ -683,6 +683,12 @@ public final class EdgeGrpcSession implements Closeable {
                 return ctx.getTenantEdgeProcessor().convertTenantEventToDownlink(edgeEvent, this.edgeVersion);
             case TENANT_PROFILE:
                 return ctx.getTenantProfileEdgeProcessor().convertTenantProfileEventToDownlink(edgeEvent, this.edgeVersion);
+            case NOTIFICATION_RULE:
+                return ctx.getNotificationEdgeProcessor().convertNotificationRuleToDownlink(edgeEvent);
+            case NOTIFICATION_TARGET:
+                return ctx.getNotificationEdgeProcessor().convertNotificationTargetToDownlink(edgeEvent);
+            case NOTIFICATION_TEMPLATE:
+                return ctx.getNotificationEdgeProcessor().convertNotificationTemplateToDownlink(edgeEvent);
             case OAUTH2:
                 return ctx.getOAuth2EdgeProcessor().convertOAuth2EventToDownlink(edgeEvent);
             default:

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

@@ -30,6 +30,9 @@ import org.thingsboard.server.service.edge.rpc.fetch.DeviceProfilesEdgeEventFetc
 import org.thingsboard.server.service.edge.rpc.fetch.DevicesEdgeEventFetcher;
 import org.thingsboard.server.service.edge.rpc.fetch.EdgeEventFetcher;
 import org.thingsboard.server.service.edge.rpc.fetch.EntityViewsEdgeEventFetcher;
+import org.thingsboard.server.service.edge.rpc.fetch.NotificationRuleEdgeEventFetcher;
+import org.thingsboard.server.service.edge.rpc.fetch.NotificationTargetEdgeEventFetcher;
+import org.thingsboard.server.service.edge.rpc.fetch.NotificationTemplateEdgeEventFetcher;
 import org.thingsboard.server.service.edge.rpc.fetch.OAuth2EdgeEventFetcher;
 import org.thingsboard.server.service.edge.rpc.fetch.OtaPackagesEdgeEventFetcher;
 import org.thingsboard.server.service.edge.rpc.fetch.QueuesEdgeEventFetcher;
@@ -74,6 +77,9 @@ public class EdgeSyncCursor {
         fetchers.add(new AssetsEdgeEventFetcher(ctx.getAssetService()));
         fetchers.add(new EntityViewsEdgeEventFetcher(ctx.getEntityViewService()));
         if (fullSync) {
+            fetchers.add(new NotificationTemplateEdgeEventFetcher(ctx.getNotificationTemplateService()));
+            fetchers.add(new NotificationTargetEdgeEventFetcher(ctx.getNotificationTargetService()));
+            fetchers.add(new NotificationRuleEdgeEventFetcher(ctx.getNotificationRuleService()));
             fetchers.add(new SystemWidgetTypesEdgeEventFetcher(ctx.getWidgetTypeService()));
             fetchers.add(new TenantWidgetTypesEdgeEventFetcher(ctx.getWidgetTypeService()));
             fetchers.add(new SystemWidgetsBundlesEdgeEventFetcher(ctx.getWidgetsBundleService()));
@@ -100,4 +106,5 @@ public class EdgeSyncCursor {
     public int getCurrentIdx() {
         return currentIdx;
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/dashboard/BaseDashboardMsgConstructor.java

@@ -28,4 +28,5 @@ public abstract class BaseDashboardMsgConstructor implements DashboardMsgConstru
                 .setIdMSB(dashboardId.getId().getMostSignificantBits())
                 .setIdLSB(dashboardId.getId().getLeastSignificantBits()).build();
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/dashboard/DashboardMsgConstructor.java

@@ -26,4 +26,5 @@ public interface DashboardMsgConstructor extends MsgConstructor {
     DashboardUpdateMsg constructDashboardUpdatedMsg(UpdateMsgType msgType, Dashboard dashboard);
 
     DashboardUpdateMsg constructDashboardDeleteMsg(DashboardId dashboardId);
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/dashboard/DashboardMsgConstructorV2.java

@@ -32,4 +32,5 @@ public class DashboardMsgConstructorV2 extends BaseDashboardMsgConstructor {
                 .setIdMSB(dashboard.getId().getId().getMostSignificantBits())
                 .setIdLSB(dashboard.getId().getId().getLeastSignificantBits()).build();
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/device/DeviceMsgConstructor.java

@@ -43,4 +43,5 @@ public interface DeviceMsgConstructor extends MsgConstructor {
     DeviceProfileUpdateMsg constructDeviceProfileDeleteMsg(DeviceProfileId deviceProfileId);
 
     DeviceRpcCallMsg constructDeviceRpcCallMsg(UUID deviceId, JsonNode body);
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/device/DeviceMsgConstructorV2.java

@@ -48,4 +48,5 @@ public class DeviceMsgConstructorV2 extends BaseDeviceMsgConstructor {
                 .setIdMSB(deviceProfile.getId().getId().getMostSignificantBits())
                 .setIdLSB(deviceProfile.getId().getId().getLeastSignificantBits()).build();
     }
+
 }

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

@@ -43,4 +43,5 @@ public class EdgeMsgConstructor {
         }
         return builder.build();
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/entityview/BaseEntityViewMsgConstructor.java

@@ -28,4 +28,5 @@ public abstract class BaseEntityViewMsgConstructor implements EntityViewMsgConst
                 .setIdMSB(entityViewId.getId().getMostSignificantBits())
                 .setIdLSB(entityViewId.getId().getLeastSignificantBits()).build();
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/entityview/EntityViewMsgConstructor.java

@@ -26,4 +26,5 @@ public interface EntityViewMsgConstructor extends MsgConstructor {
     EntityViewUpdateMsg constructEntityViewUpdatedMsg(UpdateMsgType msgType, EntityView entityView);
 
     EntityViewUpdateMsg constructEntityViewDeleteMsg(EntityViewId entityViewId);
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/entityview/EntityViewMsgConstructorV1.java

@@ -51,13 +51,11 @@ public class EntityViewMsgConstructorV1 extends BaseEntityViewMsgConstructor {
     }
 
     private EdgeEntityType checkEntityType(EntityType entityType) {
-        switch (entityType) {
+        return switch (entityType) {
-            case DEVICE:
+            case DEVICE -> EdgeEntityType.DEVICE;
-                return EdgeEntityType.DEVICE;
+            case ASSET -> EdgeEntityType.ASSET;
-            case ASSET:
+            default -> throw new RuntimeException("Unsupported entity type [" + entityType + "]");
-                return EdgeEntityType.ASSET;
+        };
-            default:
-                throw new RuntimeException("Unsupported entity type [" + entityType + "]");
-        }
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/entityview/EntityViewMsgConstructorV2.java

@@ -32,4 +32,5 @@ public class EntityViewMsgConstructorV2 extends BaseEntityViewMsgConstructor {
                 .setIdMSB(entityView.getId().getId().getMostSignificantBits())
                 .setIdLSB(entityView.getId().getId().getLeastSignificantBits()).build();
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/notification/NotificationMsgConstructor.java

@@ -0,0 +1,43 @@
+/**
+ * Copyright © 2016-2024 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.
+ */
+package org.thingsboard.server.service.edge.rpc.constructor.notification;
+
+import org.thingsboard.server.common.data.id.NotificationRuleId;
+import org.thingsboard.server.common.data.id.NotificationTargetId;
+import org.thingsboard.server.common.data.id.NotificationTemplateId;
+import org.thingsboard.server.common.data.notification.rule.NotificationRule;
+import org.thingsboard.server.common.data.notification.targets.NotificationTarget;
+import org.thingsboard.server.common.data.notification.template.NotificationTemplate;
+import org.thingsboard.server.gen.edge.v1.NotificationRuleUpdateMsg;
+import org.thingsboard.server.gen.edge.v1.NotificationTargetUpdateMsg;
+import org.thingsboard.server.gen.edge.v1.NotificationTemplateUpdateMsg;
+import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
+
+public interface NotificationMsgConstructor {
+
+    NotificationRuleUpdateMsg constructNotificationRuleUpdateMsg(UpdateMsgType msgType, NotificationRule notificationRule);
+
+    NotificationRuleUpdateMsg constructNotificationRuleDeleteMsg(NotificationRuleId notificationRuleId);
+
+    NotificationTargetUpdateMsg constructNotificationTargetUpdateMsg(UpdateMsgType msgType, NotificationTarget notificationTarget);
+
+    NotificationTargetUpdateMsg constructNotificationTargetDeleteMsg(NotificationTargetId notificationTargetId);
+
+    NotificationTemplateUpdateMsg constructNotificationTemplateUpdateMsg(UpdateMsgType msgType, NotificationTemplate notificationTemplate);
+
+    NotificationTemplateUpdateMsg constructNotificationTemplateDeleteMsg(NotificationTemplateId notificationTemplateId);
+
+}

application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/notification/NotificationMsgConstructorImpl.java

@@ -0,0 +1,75 @@
+/**
+ * Copyright © 2016-2024 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.
+ */
+package org.thingsboard.server.service.edge.rpc.constructor.notification;
+
+import org.springframework.stereotype.Component;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.id.NotificationRuleId;
+import org.thingsboard.server.common.data.id.NotificationTargetId;
+import org.thingsboard.server.common.data.id.NotificationTemplateId;
+import org.thingsboard.server.common.data.notification.rule.NotificationRule;
+import org.thingsboard.server.common.data.notification.targets.NotificationTarget;
+import org.thingsboard.server.common.data.notification.template.NotificationTemplate;
+import org.thingsboard.server.gen.edge.v1.NotificationRuleUpdateMsg;
+import org.thingsboard.server.gen.edge.v1.NotificationTargetUpdateMsg;
+import org.thingsboard.server.gen.edge.v1.NotificationTemplateUpdateMsg;
+import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
+import org.thingsboard.server.queue.util.TbCoreComponent;
+
+@Component
+@TbCoreComponent
+public class NotificationMsgConstructorImpl implements NotificationMsgConstructor {
+
+    @Override
+    public NotificationRuleUpdateMsg constructNotificationRuleUpdateMsg(UpdateMsgType msgType, NotificationRule notificationRule) {
+        return NotificationRuleUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(notificationRule)).build();
+    }
+
+    @Override
+    public NotificationRuleUpdateMsg constructNotificationRuleDeleteMsg(NotificationRuleId notificationRuleId) {
+        return NotificationRuleUpdateMsg.newBuilder()
+                .setMsgType(UpdateMsgType.ENTITY_DELETED_RPC_MESSAGE)
+                .setIdMSB(notificationRuleId.getId().getMostSignificantBits())
+                .setIdLSB(notificationRuleId.getId().getLeastSignificantBits()).build();
+    }
+
+    @Override
+    public NotificationTargetUpdateMsg constructNotificationTargetUpdateMsg(UpdateMsgType msgType, NotificationTarget notificationTarget) {
+        return NotificationTargetUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(notificationTarget)).build();
+    }
+
+    @Override
+    public NotificationTargetUpdateMsg constructNotificationTargetDeleteMsg(NotificationTargetId notificationTargetId) {
+        return NotificationTargetUpdateMsg.newBuilder()
+                .setMsgType(UpdateMsgType.ENTITY_DELETED_RPC_MESSAGE)
+                .setIdMSB(notificationTargetId.getId().getMostSignificantBits())
+                .setIdLSB(notificationTargetId.getId().getLeastSignificantBits()).build();
+    }
+
+    @Override
+    public NotificationTemplateUpdateMsg constructNotificationTemplateUpdateMsg(UpdateMsgType msgType, NotificationTemplate notificationTemplate) {
+        return NotificationTemplateUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(notificationTemplate)).build();
+    }
+
+    @Override
+    public NotificationTemplateUpdateMsg constructNotificationTemplateDeleteMsg(NotificationTemplateId notificationTemplateId) {
+        return NotificationTemplateUpdateMsg.newBuilder()
+                .setMsgType(UpdateMsgType.ENTITY_DELETED_RPC_MESSAGE)
+                .setIdMSB(notificationTemplateId.getId().getMostSignificantBits())
+                .setIdLSB(notificationTemplateId.getId().getLeastSignificantBits()).build();
+    }
+
+}

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

@@ -62,4 +62,5 @@ public class AdminSettingsEdgeEventFetcher implements EdgeEventFetcher {
         }
         return result;
     }
+
 }

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

@@ -35,7 +35,7 @@ public class AssetProfilesEdgeEventFetcher extends BasePageableEdgeEventFetcher<
     private final AssetProfileService assetProfileService;
 
     @Override
-    PageData<AssetProfile> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<AssetProfile> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         return assetProfileService.findAssetProfiles(tenantId, pageLink);
     }
 
@@ -44,4 +44,5 @@ public class AssetProfilesEdgeEventFetcher extends BasePageableEdgeEventFetcher<
         return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.ASSET_PROFILE,
                 EdgeEventActionType.ADDED, assetProfile.getId(), null);
     }
+
 }

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

@@ -35,7 +35,7 @@ public class AssetsEdgeEventFetcher extends BasePageableEdgeEventFetcher<Asset>
     private final AssetService assetService;
 
     @Override
-    PageData<Asset> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<Asset> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         return assetService.findAssetsByTenantIdAndEdgeId(tenantId, edge.getId(), pageLink);
     }
 

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

@@ -36,17 +36,18 @@ public abstract class BasePageableEdgeEventFetcher<T> implements EdgeEventFetche
     @Override
     public PageData<EdgeEvent> fetchEdgeEvents(TenantId tenantId, Edge edge, PageLink pageLink) {
         log.trace("[{}] start fetching edge events [{}]", tenantId, edge.getId());
-        PageData<T> pageData = fetchPageData(tenantId, edge, pageLink);
+        PageData<T> entities = fetchEntities(tenantId, edge, pageLink);
         List<EdgeEvent> result = new ArrayList<>();
-        if (!pageData.getData().isEmpty()) {
+        if (!entities.getData().isEmpty()) {
-            for (T entity : pageData.getData()) {
+            for (T entity : entities.getData()) {
                 result.add(constructEdgeEvent(tenantId, edge, entity));
             }
         }
-        return new PageData<>(result, pageData.getTotalPages(), pageData.getTotalElements(), pageData.hasNext());
+        return new PageData<>(result, entities.getTotalPages(), entities.getTotalElements(), entities.hasNext());
     }
 
-    abstract PageData<T> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink);
+    abstract PageData<T> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink);
 
     abstract EdgeEvent constructEdgeEvent(TenantId tenantId, Edge edge, T entity);
+
 }

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

@@ -35,7 +35,7 @@ public abstract class BaseUsersEdgeEventFetcher extends BasePageableEdgeEventFet
     protected final UserService userService;
 
     @Override
-    PageData<User> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<User> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         return findUsers(tenantId, pageLink);
     }
 
@@ -46,4 +46,5 @@ public abstract class BaseUsersEdgeEventFetcher extends BasePageableEdgeEventFet
     }
 
     protected abstract PageData<User> findUsers(TenantId tenantId, PageLink pageLink);
+
 }

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

@@ -25,11 +25,8 @@ import org.thingsboard.server.common.data.edge.EdgeEventType;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
-import org.thingsboard.server.common.data.widget.WidgetTypeDetails;
 import org.thingsboard.server.common.data.widget.WidgetTypeInfo;
-import org.thingsboard.server.common.data.widget.WidgetsBundle;
 import org.thingsboard.server.dao.widget.WidgetTypeService;
-import org.thingsboard.server.dao.widget.WidgetsBundleService;
 
 @Slf4j
 @AllArgsConstructor
@@ -38,7 +35,7 @@ public abstract class BaseWidgetTypesEdgeEventFetcher extends BasePageableEdgeEv
     protected final WidgetTypeService widgetTypeService;
 
     @Override
-    PageData<WidgetTypeInfo> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<WidgetTypeInfo> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         return findWidgetTypes(tenantId, pageLink);
     }
 
@@ -49,4 +46,5 @@ public abstract class BaseWidgetTypesEdgeEventFetcher extends BasePageableEdgeEv
     }
 
     protected abstract PageData<WidgetTypeInfo> findWidgetTypes(TenantId tenantId, PageLink pageLink);
+
 }

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

@@ -35,7 +35,7 @@ public abstract class BaseWidgetsBundlesEdgeEventFetcher extends BasePageableEdg
     protected final WidgetsBundleService widgetsBundleService;
 
     @Override
-    PageData<WidgetsBundle> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<WidgetsBundle> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         return findWidgetsBundles(tenantId, pageLink);
     }
 
@@ -46,4 +46,5 @@ public abstract class BaseWidgetsBundlesEdgeEventFetcher extends BasePageableEdg
     }
 
     protected abstract PageData<WidgetsBundle> findWidgetsBundles(TenantId tenantId, PageLink pageLink);
+
 }

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

@@ -49,4 +49,5 @@ public class CustomerEdgeEventFetcher implements EdgeEventFetcher {
         // returns PageData object to be in sync with other fetchers
         return new PageData<>(result, 1, result.size(), false);
     }
+
 }

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

@@ -35,4 +35,5 @@ public class CustomerUsersEdgeEventFetcher extends BaseUsersEdgeEventFetcher {
     protected PageData<User> findUsers(TenantId tenantId, PageLink pageLink) {
         return userService.findCustomerUsers(tenantId, customerId, pageLink);
     }
+
 }

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

@@ -35,7 +35,7 @@ public class DashboardsEdgeEventFetcher extends BasePageableEdgeEventFetcher<Das
     private final DashboardService dashboardService;
 
     @Override
-    PageData<DashboardInfo> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<DashboardInfo> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         return dashboardService.findDashboardsByTenantIdAndEdgeId(tenantId, edge.getId(), pageLink);
     }
 
@@ -44,4 +44,5 @@ public class DashboardsEdgeEventFetcher extends BasePageableEdgeEventFetcher<Das
         return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.DASHBOARD,
                 EdgeEventActionType.ADDED, dashboardInfo.getId(), null);
     }
+
 }

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

@@ -59,4 +59,5 @@ public class DefaultProfilesEdgeEventFetcher implements EdgeEventFetcher {
 
         return new PageData<>(result, 1, result.size(), false);
     }
-}
+
+}

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

@@ -35,7 +35,7 @@ public class DeviceProfilesEdgeEventFetcher extends BasePageableEdgeEventFetcher
     private final DeviceProfileService deviceProfileService;
 
     @Override
-    PageData<DeviceProfile> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<DeviceProfile> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         return deviceProfileService.findDeviceProfiles(tenantId, pageLink);
     }
 
@@ -44,4 +44,5 @@ public class DeviceProfilesEdgeEventFetcher extends BasePageableEdgeEventFetcher
         return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.DEVICE_PROFILE,
                 EdgeEventActionType.ADDED, deviceProfile.getId(), null);
     }
+
 }

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

@@ -35,7 +35,7 @@ public class DevicesEdgeEventFetcher extends BasePageableEdgeEventFetcher<Device
     private final DeviceService deviceService;
 
     @Override
-    PageData<Device> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<Device> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         return deviceService.findDevicesByTenantIdAndEdgeId(tenantId, edge.getId(), pageLink);
     }
 
@@ -44,4 +44,5 @@ public class DevicesEdgeEventFetcher extends BasePageableEdgeEventFetcher<Device
         return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.DEVICE,
                 EdgeEventActionType.ADDED, device.getId(), null);
     }
+
 }

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

@@ -26,4 +26,5 @@ public interface EdgeEventFetcher {
     PageLink getPageLink(int pageSize);
 
     PageData<EdgeEvent> fetchEdgeEvents(TenantId tenantId, Edge edge, PageLink pageLink) throws Exception;
+
 }

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

@@ -35,7 +35,7 @@ public class EntityViewsEdgeEventFetcher extends BasePageableEdgeEventFetcher<En
     private final EntityViewService entityViewService;
 
     @Override
-    PageData<EntityView> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<EntityView> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         return entityViewService.findEntityViewsByTenantIdAndEdgeId(tenantId, edge.getId(), pageLink);
     }
 
@@ -44,4 +44,5 @@ public class EntityViewsEdgeEventFetcher extends BasePageableEdgeEventFetcher<En
         return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.ENTITY_VIEW,
                 EdgeEventActionType.ADDED, entityView.getId(), null);
     }
+
 }

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

@@ -73,4 +73,5 @@ public class GeneralEdgeEventFetcher implements EdgeEventFetcher {
         }
         return new PageData<>();
     }
+
 }

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

@@ -0,0 +1,48 @@
+/**
+ * Copyright © 2016-2024 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.
+ */
+package org.thingsboard.server.service.edge.rpc.fetch;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.server.common.data.EdgeUtils;
+import org.thingsboard.server.common.data.edge.Edge;
+import org.thingsboard.server.common.data.edge.EdgeEvent;
+import org.thingsboard.server.common.data.edge.EdgeEventActionType;
+import org.thingsboard.server.common.data.edge.EdgeEventType;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.notification.rule.NotificationRule;
+import org.thingsboard.server.common.data.page.PageData;
+import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.dao.notification.NotificationRuleService;
+
+@AllArgsConstructor
+@Slf4j
+public class NotificationRuleEdgeEventFetcher extends BasePageableEdgeEventFetcher<NotificationRule>{
+
+    private NotificationRuleService notificationRuleService;
+
+    @Override
+    PageData<NotificationRule> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
+        return notificationRuleService.findNotificationRulesByTenantId(tenantId, pageLink);
+    }
+
+    @Override
+    EdgeEvent constructEdgeEvent(TenantId tenantId, Edge edge, NotificationRule notificationRule) {
+        return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.NOTIFICATION_RULE,
+                EdgeEventActionType.ADDED, notificationRule.getId(), null);
+    }
+
+}

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

@@ -0,0 +1,48 @@
+/**
+ * Copyright © 2016-2024 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.
+ */
+package org.thingsboard.server.service.edge.rpc.fetch;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.server.common.data.EdgeUtils;
+import org.thingsboard.server.common.data.edge.Edge;
+import org.thingsboard.server.common.data.edge.EdgeEvent;
+import org.thingsboard.server.common.data.edge.EdgeEventActionType;
+import org.thingsboard.server.common.data.edge.EdgeEventType;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.notification.targets.NotificationTarget;
+import org.thingsboard.server.common.data.page.PageData;
+import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.dao.notification.NotificationTargetService;
+
+@AllArgsConstructor
+@Slf4j
+public class NotificationTargetEdgeEventFetcher extends BasePageableEdgeEventFetcher<NotificationTarget> {
+
+    private NotificationTargetService notificationTargetService;
+
+    @Override
+    PageData<NotificationTarget> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
+        return notificationTargetService.findNotificationTargetsByTenantId(tenantId, pageLink);
+    }
+
+    @Override
+    EdgeEvent constructEdgeEvent(TenantId tenantId, Edge edge, NotificationTarget notificationTarget) {
+        return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.NOTIFICATION_TARGET,
+                EdgeEventActionType.ADDED, notificationTarget.getId(), null);
+    }
+
+}

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

@@ -0,0 +1,51 @@
+/**
+ * Copyright © 2016-2024 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.
+ */
+package org.thingsboard.server.service.edge.rpc.fetch;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.server.common.data.EdgeUtils;
+import org.thingsboard.server.common.data.edge.Edge;
+import org.thingsboard.server.common.data.edge.EdgeEvent;
+import org.thingsboard.server.common.data.edge.EdgeEventActionType;
+import org.thingsboard.server.common.data.edge.EdgeEventType;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.notification.NotificationType;
+import org.thingsboard.server.common.data.notification.template.NotificationTemplate;
+import org.thingsboard.server.common.data.page.PageData;
+import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.dao.notification.NotificationTemplateService;
+
+import java.util.List;
+
+@AllArgsConstructor
+@Slf4j
+public class NotificationTemplateEdgeEventFetcher extends BasePageableEdgeEventFetcher<NotificationTemplate> {
+
+    private NotificationTemplateService notificationTemplateService;
+
+    @Override
+    PageData<NotificationTemplate> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
+        return notificationTemplateService.findNotificationTemplatesByTenantIdAndNotificationTypes(tenantId, List.of(NotificationType.values()), pageLink);
+    }
+
+    @Override
+    EdgeEvent constructEdgeEvent(TenantId tenantId, Edge edge, NotificationTemplate notificationTemplate) {
+        return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.NOTIFICATION_TEMPLATE,
+                EdgeEventActionType.ADDED, notificationTemplate.getId(), null);
+    }
+
+}

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

@@ -35,7 +35,7 @@ public class OtaPackagesEdgeEventFetcher extends BasePageableEdgeEventFetcher<Ot
     private final OtaPackageService otaPackageService;
 
     @Override
-    PageData<OtaPackageInfo> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<OtaPackageInfo> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         return otaPackageService.findTenantOtaPackagesByTenantId(tenantId, pageLink);
     }
 
@@ -44,4 +44,5 @@ public class OtaPackagesEdgeEventFetcher extends BasePageableEdgeEventFetcher<Ot
         return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.OTA_PACKAGE,
                 EdgeEventActionType.ADDED, otaPackageInfo.getId(), null);
     }
+
 }

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

@@ -35,7 +35,7 @@ public class QueuesEdgeEventFetcher extends BasePageableEdgeEventFetcher<Queue>
     private final QueueService queueService;
 
     @Override
-    PageData<Queue> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<Queue> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         return queueService.findQueuesByTenantId(tenantId, pageLink);
     }
 
@@ -44,4 +44,5 @@ public class QueuesEdgeEventFetcher extends BasePageableEdgeEventFetcher<Queue>
         return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.QUEUE,
                 EdgeEventActionType.ADDED, queue.getId(), null);
     }
+
 }

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

@@ -39,7 +39,7 @@ public class RuleChainsEdgeEventFetcher extends BasePageableEdgeEventFetcher<Rul
     private final RuleChainService ruleChainService;
 
     @Override
-    PageData<RuleChain> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<RuleChain> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         return ruleChainService.findRuleChainsByTenantIdAndEdgeId(tenantId, edge.getId(), pageLink);
     }
 
@@ -54,4 +54,5 @@ public class RuleChainsEdgeEventFetcher extends BasePageableEdgeEventFetcher<Rul
         return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.RULE_CHAIN,
                 EdgeEventActionType.ADDED, ruleChain.getId(), isRootBody);
     }
+
 }

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

@@ -37,7 +37,7 @@ public class TenantEdgeEventFetcher extends BasePageableEdgeEventFetcher<Tenant>
     private final TenantService tenantService;
 
     @Override
-    PageData<Tenant> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<Tenant> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         Tenant tenant = tenantService.findTenantById(tenantId);
         // returns PageData object to be in sync with other fetchers
         return new PageData<>(List.of(tenant), 1, 1, false);
@@ -48,4 +48,5 @@ public class TenantEdgeEventFetcher extends BasePageableEdgeEventFetcher<Tenant>
         return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.TENANT,
                 EdgeEventActionType.UPDATED, entity.getId(), null);
     }
+
 }

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

@@ -35,7 +35,7 @@ public class TenantResourcesEdgeEventFetcher extends BasePageableEdgeEventFetche
     private final ResourceService resourceService;
 
     @Override
-    PageData<TbResource> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<TbResource> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         return resourceService.findAllTenantResources(tenantId, pageLink);
     }
 
@@ -44,4 +44,5 @@ public class TenantResourcesEdgeEventFetcher extends BasePageableEdgeEventFetche
         return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.TB_RESOURCE,
                 EdgeEventActionType.ADDED, tbResource.getId(), null);
     }
+
 }

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

@@ -73,6 +73,9 @@ import org.thingsboard.server.dao.edge.EdgeEventService;
 import org.thingsboard.server.dao.edge.EdgeService;
 import org.thingsboard.server.dao.edge.EdgeSynchronizationManager;
 import org.thingsboard.server.dao.entityview.EntityViewService;
+import org.thingsboard.server.dao.notification.NotificationRuleService;
+import org.thingsboard.server.dao.notification.NotificationTargetService;
+import org.thingsboard.server.dao.notification.NotificationTemplateService;
 import org.thingsboard.server.dao.oauth2.OAuth2Service;
 import org.thingsboard.server.dao.ota.OtaPackageService;
 import org.thingsboard.server.dao.queue.QueueService;
@@ -99,6 +102,7 @@ import org.thingsboard.server.service.edge.rpc.constructor.dashboard.DashboardMs
 import org.thingsboard.server.service.edge.rpc.constructor.device.DeviceMsgConstructorFactory;
 import org.thingsboard.server.service.edge.rpc.constructor.edge.EdgeMsgConstructor;
 import org.thingsboard.server.service.edge.rpc.constructor.entityview.EntityViewMsgConstructorFactory;
+import org.thingsboard.server.service.edge.rpc.constructor.notification.NotificationMsgConstructor;
 import org.thingsboard.server.service.edge.rpc.constructor.oauth2.OAuth2MsgConstructor;
 import org.thingsboard.server.service.edge.rpc.constructor.ota.OtaPackageMsgConstructorFactory;
 import org.thingsboard.server.service.edge.rpc.constructor.queue.QueueMsgConstructorFactory;
@@ -226,6 +230,15 @@ public abstract class BaseEdgeProcessor {
     @Autowired
     protected ResourceService resourceService;
 
+    @Autowired
+    protected NotificationRuleService notificationRuleService;
+
+    @Autowired
+    protected NotificationTargetService notificationTargetService;
+
+    @Autowired
+    protected NotificationTemplateService notificationTemplateService;
+
     @Autowired
     protected OAuth2Service oAuth2Service;
 
@@ -260,9 +273,13 @@ public abstract class BaseEdgeProcessor {
     @Autowired
     protected EntityDataMsgConstructor entityDataMsgConstructor;
 
+    @Autowired
+    protected NotificationMsgConstructor notificationMsgConstructor;
+
     @Autowired
     protected OAuth2MsgConstructor oAuth2MsgConstructor;
 
+
     @Autowired
     protected RuleChainMsgConstructorFactory ruleChainMsgConstructorFactory;
 
@@ -359,7 +376,8 @@ public abstract class BaseEdgeProcessor {
             case TIMESERIES_UPDATED, ALARM_ACK, ALARM_CLEAR, ALARM_ASSIGNED, ALARM_UNASSIGNED, CREDENTIALS_REQUEST, ADDED_COMMENT, UPDATED_COMMENT ->
                     true;
             default -> switch (type) {
-                case ALARM, ALARM_COMMENT, RULE_CHAIN, RULE_CHAIN_METADATA, USER, CUSTOMER, TENANT, TENANT_PROFILE, WIDGETS_BUNDLE, WIDGET_TYPE, ADMIN_SETTINGS, OTA_PACKAGE, QUEUE, RELATION ->
+                case ALARM, ALARM_COMMENT, RULE_CHAIN, RULE_CHAIN_METADATA, USER, CUSTOMER, TENANT, TENANT_PROFILE, WIDGETS_BUNDLE, WIDGET_TYPE,
+                        ADMIN_SETTINGS, OTA_PACKAGE, QUEUE, RELATION, NOTIFICATION_TEMPLATE, NOTIFICATION_TARGET, NOTIFICATION_RULE ->
                         true;
                 default -> false;
             };
@@ -417,10 +435,8 @@ public abstract class BaseEdgeProcessor {
         return switch (actionType) {
             case UPDATED, CREDENTIALS_UPDATED, ASSIGNED_TO_CUSTOMER, UNASSIGNED_FROM_CUSTOMER, UPDATED_COMMENT ->
                     UpdateMsgType.ENTITY_UPDATED_RPC_MESSAGE;
-            case ADDED, ASSIGNED_TO_EDGE, RELATION_ADD_OR_UPDATE, ADDED_COMMENT ->
+            case ADDED, ASSIGNED_TO_EDGE, RELATION_ADD_OR_UPDATE, ADDED_COMMENT -> UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE;
-                    UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE;
+            case DELETED, UNASSIGNED_FROM_EDGE, RELATION_DELETED, DELETED_COMMENT, ALARM_DELETE -> UpdateMsgType.ENTITY_DELETED_RPC_MESSAGE;
-            case DELETED, UNASSIGNED_FROM_EDGE, RELATION_DELETED, DELETED_COMMENT, ALARM_DELETE ->
-                    UpdateMsgType.ENTITY_DELETED_RPC_MESSAGE;
             case ALARM_ACK -> UpdateMsgType.ALARM_ACK_RPC_MESSAGE;
             case ALARM_CLEAR -> UpdateMsgType.ALARM_CLEAR_RPC_MESSAGE;
             default -> throw new RuntimeException("Unsupported actionType [" + actionType + "]");
@@ -528,28 +544,21 @@ public abstract class BaseEdgeProcessor {
 
     protected EntityId constructEntityId(String entityTypeStr, long entityIdMSB, long entityIdLSB) {
         EntityType entityType = EntityType.valueOf(entityTypeStr);
-        switch (entityType) {
+        return switch (entityType) {
-            case DEVICE:
+            case DEVICE -> new DeviceId(new UUID(entityIdMSB, entityIdLSB));
-                return new DeviceId(new UUID(entityIdMSB, entityIdLSB));
+            case ASSET -> new AssetId(new UUID(entityIdMSB, entityIdLSB));
-            case ASSET:
+            case ENTITY_VIEW -> new EntityViewId(new UUID(entityIdMSB, entityIdLSB));
-                return new AssetId(new UUID(entityIdMSB, entityIdLSB));
+            case DASHBOARD -> new DashboardId(new UUID(entityIdMSB, entityIdLSB));
-            case ENTITY_VIEW:
+            case TENANT -> TenantId.fromUUID(new UUID(entityIdMSB, entityIdLSB));
-                return new EntityViewId(new UUID(entityIdMSB, entityIdLSB));
+            case CUSTOMER -> new CustomerId(new UUID(entityIdMSB, entityIdLSB));
-            case DASHBOARD:
+            case USER -> new UserId(new UUID(entityIdMSB, entityIdLSB));
-                return new DashboardId(new UUID(entityIdMSB, entityIdLSB));
+            case EDGE -> new EdgeId(new UUID(entityIdMSB, entityIdLSB));
-            case TENANT:
+            default -> {
-                return TenantId.fromUUID(new UUID(entityIdMSB, entityIdLSB));
-            case CUSTOMER:
-                return new CustomerId(new UUID(entityIdMSB, entityIdLSB));
-            case USER:
-                return new UserId(new UUID(entityIdMSB, entityIdLSB));
-            case EDGE:
-                return new EdgeId(new UUID(entityIdMSB, entityIdLSB));
-            default:
                 log.warn("Unsupported entity type [{}] during construct of entity id. entityIdMSB [{}], entityIdLSB [{}]",
                         entityTypeStr, entityIdMSB, entityIdLSB);
-                return null;
+                yield null;
-        }
+            }
+        };
     }
 
     protected UUID safeGetUUID(long mSB, long lSB) {
@@ -570,8 +579,7 @@ public abstract class BaseEdgeProcessor {
             case TENANT -> tenantService.findTenantById(tenantId) != null;
             case DEVICE -> deviceService.findDeviceById(tenantId, new DeviceId(entityId.getId())) != null;
             case ASSET -> assetService.findAssetById(tenantId, new AssetId(entityId.getId())) != null;
-            case ENTITY_VIEW ->
+            case ENTITY_VIEW -> entityViewService.findEntityViewById(tenantId, new EntityViewId(entityId.getId())) != null;
-                    entityViewService.findEntityViewById(tenantId, new EntityViewId(entityId.getId())) != null;
             case CUSTOMER -> customerService.findCustomerById(tenantId, new CustomerId(entityId.getId())) != null;
             case USER -> userService.findUserById(tenantId, new UserId(entityId.getId())) != null;
             case DASHBOARD -> dashboardService.findDashboardById(tenantId, new DashboardId(entityId.getId())) != null;

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

@@ -31,16 +31,10 @@ public abstract class BaseEdgeProcessorFactory<T extends EdgeProcessor, U extend
     protected U v2Processor;
 
     public EdgeProcessor getProcessorByEdgeVersion(EdgeVersion edgeVersion) {
-        switch (edgeVersion) {
+        return switch (edgeVersion) {
-            case V_3_3_0:
+            case V_3_3_0, V_3_3_3, V_3_4_0, V_3_6_0, V_3_6_1 -> v1Processor;
-            case V_3_3_3:
+            default -> v2Processor;
-            case V_3_4_0:
+        };
-            case V_3_6_0:
-            case V_3_6_1:
-                return v1Processor;
-            case V_3_6_2:
-            default:
-                return v2Processor;
-        }
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/AlarmEdgeProcessor.java

@@ -156,4 +156,5 @@ public abstract class AlarmEdgeProcessor extends BaseAlarmProcessor implements A
         }
         return futures;
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/AlarmEdgeProcessorV1.java

@@ -58,15 +58,12 @@ public class AlarmEdgeProcessorV1 extends AlarmEdgeProcessor {
     }
 
     private EntityId getAlarmOriginator(TenantId tenantId, String entityName, EntityType entityType) {
-        switch (entityType) {
+        return switch (entityType) {
-            case DEVICE:
+            case DEVICE -> deviceService.findDeviceByTenantIdAndName(tenantId, entityName).getId();
-                return deviceService.findDeviceByTenantIdAndName(tenantId, entityName).getId();
+            case ASSET -> assetService.findAssetByTenantIdAndName(tenantId, entityName).getId();
-            case ASSET:
+            case ENTITY_VIEW -> entityViewService.findEntityViewByTenantIdAndName(tenantId, entityName).getId();
-                return assetService.findAssetByTenantIdAndName(tenantId, entityName).getId();
+            default -> null;
-            case ENTITY_VIEW:
+        };
-                return entityViewService.findEntityViewByTenantIdAndName(tenantId, entityName).getId();
-            default:
-                return null;
-        }
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/AlarmEdgeProcessorV2.java

@@ -40,4 +40,5 @@ public class AlarmEdgeProcessorV2 extends AlarmEdgeProcessor {
     protected Alarm constructAlarmFromUpdateMsg(TenantId tenantId, AlarmId alarmId, EntityId originatorId, AlarmUpdateMsg alarmUpdateMsg) {
         return JacksonUtil.fromString(alarmUpdateMsg.getEntity(), Alarm.class, true);
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/AlarmProcessor.java

@@ -34,4 +34,5 @@ public interface AlarmProcessor extends EdgeProcessor {
     ListenableFuture<Void> processAlarmCommentMsgFromEdge(TenantId tenantId, EdgeId edgeId, AlarmCommentUpdateMsg alarmCommentUpdateMsg);
 
     DownlinkMsg convertAlarmCommentEventToDownlink(EdgeEvent edgeEvent, EdgeVersion edgeVersion);
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/BaseAlarmProcessor.java

@@ -144,23 +144,20 @@ public abstract class BaseAlarmProcessor extends BaseEdgeProcessor {
         AlarmId alarmId = new AlarmId(entityId);
         UpdateMsgType msgType = getUpdateMsgType(actionType);
         switch (actionType) {
-            case ADDED:
+            case ADDED, UPDATED, ALARM_ACK, ALARM_CLEAR -> {
-            case UPDATED:
-            case ALARM_ACK:
-            case ALARM_CLEAR:
                 Alarm alarm = alarmService.findAlarmById(tenantId, alarmId);
                 if (alarm != null) {
                     return ((AlarmMsgConstructor) alarmMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion))
                             .constructAlarmUpdatedMsg(msgType, alarm, findOriginatorEntityName(tenantId, alarm));
                 }
-                break;
+            }
-            case ALARM_DELETE:
+            case ALARM_DELETE, DELETED -> {
-            case DELETED:
                 Alarm deletedAlarm = JacksonUtil.convertValue(body, Alarm.class);
                 if (deletedAlarm != null) {
                     return ((AlarmMsgConstructor) alarmMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion))
                             .constructAlarmUpdatedMsg(msgType, deletedAlarm, findOriginatorEntityName(tenantId, deletedAlarm));
                 }
+            }
         }
         return null;
     }
@@ -168,25 +165,26 @@ public abstract class BaseAlarmProcessor extends BaseEdgeProcessor {
     private String findOriginatorEntityName(TenantId tenantId, Alarm alarm) {
         String entityName = null;
         switch (alarm.getOriginator().getEntityType()) {
-            case DEVICE:
+            case DEVICE -> {
                 Device deviceById = deviceService.findDeviceById(tenantId, new DeviceId(alarm.getOriginator().getId()));
                 if (deviceById != null) {
                     entityName = deviceById.getName();
                 }
-                break;
+            }
-            case ASSET:
+            case ASSET -> {
                 Asset assetById = assetService.findAssetById(tenantId, new AssetId(alarm.getOriginator().getId()));
                 if (assetById != null) {
                     entityName = assetById.getName();
                 }
-                break;
+            }
-            case ENTITY_VIEW:
+            case ENTITY_VIEW -> {
                 EntityView entityViewById = entityViewService.findEntityViewById(tenantId, new EntityViewId(alarm.getOriginator().getId()));
                 if (entityViewById != null) {
                     entityName = entityViewById.getName();
                 }
-                break;
+            }
         }
         return entityName;
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/AssetEdgeProcessor.java

@@ -108,11 +108,7 @@ public abstract class AssetEdgeProcessor extends BaseAssetProcessor implements A
         AssetId assetId = new AssetId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ADDED:
+            case ADDED, UPDATED, ASSIGNED_TO_EDGE, ASSIGNED_TO_CUSTOMER, UNASSIGNED_FROM_CUSTOMER -> {
-            case UPDATED:
-            case ASSIGNED_TO_EDGE:
-            case ASSIGNED_TO_CUSTOMER:
-            case UNASSIGNED_FROM_CUSTOMER:
                 Asset asset = assetService.findAssetById(edgeEvent.getTenantId(), assetId);
                 if (asset != null) {
                     UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
@@ -129,17 +125,17 @@ public abstract class AssetEdgeProcessor extends BaseAssetProcessor implements A
                     }
                     downlinkMsg = builder.build();
                 }
-                break;
+            }
-            case DELETED:
+            case DELETED, UNASSIGNED_FROM_EDGE -> {
-            case UNASSIGNED_FROM_EDGE:
                 AssetUpdateMsg assetUpdateMsg = ((AssetMsgConstructor)
                         assetMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructAssetDeleteMsg(assetId);
                 downlinkMsg = DownlinkMsg.newBuilder()
                         .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
                         .addAssetUpdateMsg(assetUpdateMsg)
                         .build();
-                break;
+            }
         }
         return downlinkMsg;
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/AssetEdgeProcessorV1.java

@@ -56,4 +56,5 @@ public class AssetEdgeProcessorV1 extends AssetEdgeProcessor {
         CustomerId customerUUID = safeGetCustomerId(assetUpdateMsg.getCustomerIdMSB(), assetUpdateMsg.getCustomerIdLSB());
         asset.setCustomerId(customerUUID != null ? customerUUID : customerId);
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/AssetEdgeProcessorV2.java

@@ -40,4 +40,5 @@ public class AssetEdgeProcessorV2 extends AssetEdgeProcessor {
         CustomerId customerUUID = asset.getCustomerId() != null ? asset.getCustomerId() : customerId;
         asset.setCustomerId(customerUUID);
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/AssetProcessor.java

@@ -30,4 +30,5 @@ public interface AssetProcessor extends EdgeProcessor {
     ListenableFuture<Void> processAssetMsgFromEdge(TenantId tenantId, Edge edge, AssetUpdateMsg assetUpdateMsg);
 
     DownlinkMsg convertAssetEventToDownlink(EdgeEvent edgeEvent, EdgeId edgeId, EdgeVersion edgeVersion);
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/BaseAssetProcessor.java

@@ -72,4 +72,5 @@ public abstract class BaseAssetProcessor extends BaseEdgeProcessor {
     protected abstract Asset constructAssetFromUpdateMsg(TenantId tenantId, AssetId assetId, AssetUpdateMsg assetUpdateMsg);
 
     protected abstract void setCustomerId(TenantId tenantId, CustomerId customerId, Asset asset, AssetUpdateMsg assetUpdateMsg);
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/profile/AssetProfileEdgeProcessor.java

@@ -97,8 +97,7 @@ public abstract class AssetProfileEdgeProcessor extends BaseAssetProfileProcesso
         AssetProfileId assetProfileId = new AssetProfileId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ADDED:
+            case ADDED, UPDATED -> {
-            case UPDATED:
                 AssetProfile assetProfile = assetProfileService.findAssetProfileById(edgeEvent.getTenantId(), assetProfileId);
                 if (assetProfile != null) {
                     UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
@@ -110,16 +109,17 @@ public abstract class AssetProfileEdgeProcessor extends BaseAssetProfileProcesso
                             .addAssetProfileUpdateMsg(assetProfileUpdateMsg)
                             .build();
                 }
-                break;
+            }
-            case DELETED:
+            case DELETED -> {
                 AssetProfileUpdateMsg assetProfileUpdateMsg = ((AssetMsgConstructor)
                         assetMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructAssetProfileDeleteMsg(assetProfileId);
                 downlinkMsg = DownlinkMsg.newBuilder()
                         .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
                         .addAssetProfileUpdateMsg(assetProfileUpdateMsg)
                         .build();
-                break;
+            }
         }
         return downlinkMsg;
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/customer/CustomerEdgeProcessor.java

@@ -52,8 +52,7 @@ public class CustomerEdgeProcessor extends BaseEdgeProcessor {
         CustomerId customerId = new CustomerId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ADDED:
+            case ADDED, UPDATED -> {
-            case UPDATED:
                 Customer customer = customerService.findCustomerById(edgeEvent.getTenantId(), customerId);
                 if (customer != null) {
                     UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
@@ -64,15 +63,15 @@ public class CustomerEdgeProcessor extends BaseEdgeProcessor {
                             .addCustomerUpdateMsg(customerUpdateMsg)
                             .build();
                 }
-                break;
+            }
-            case DELETED:
+            case DELETED -> {
                 CustomerUpdateMsg customerUpdateMsg = ((CustomerMsgConstructor)
                         customerMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructCustomerDeleteMsg(customerId);
                 downlinkMsg = DownlinkMsg.newBuilder()
                         .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
                         .addCustomerUpdateMsg(customerUpdateMsg)
                         .build();
-                break;
+            }
         }
         return downlinkMsg;
     }
@@ -97,4 +96,5 @@ public class CustomerEdgeProcessor extends BaseEdgeProcessor {
                 return Futures.immediateFuture(null);
         }
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/dashboard/DashboardEdgeProcessor.java

@@ -101,11 +101,7 @@ public abstract class DashboardEdgeProcessor extends BaseDashboardProcessor impl
         DashboardId dashboardId = new DashboardId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ADDED:
+            case ADDED, UPDATED, ASSIGNED_TO_EDGE, ASSIGNED_TO_CUSTOMER, UNASSIGNED_FROM_CUSTOMER -> {
-            case UPDATED:
-            case ASSIGNED_TO_EDGE:
-            case ASSIGNED_TO_CUSTOMER:
-            case UNASSIGNED_FROM_CUSTOMER:
                 Dashboard dashboard = dashboardService.findDashboardById(edgeEvent.getTenantId(), dashboardId);
                 if (dashboard != null) {
                     UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
@@ -116,16 +112,15 @@ public abstract class DashboardEdgeProcessor extends BaseDashboardProcessor impl
                             .addDashboardUpdateMsg(dashboardUpdateMsg)
                             .build();
                 }
-                break;
+            }
-            case DELETED:
+            case DELETED, UNASSIGNED_FROM_EDGE -> {
-            case UNASSIGNED_FROM_EDGE:
                 DashboardUpdateMsg dashboardUpdateMsg = ((DashboardMsgConstructor)
                         dashboardMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructDashboardDeleteMsg(dashboardId);
                 downlinkMsg = DownlinkMsg.newBuilder()
                         .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
                         .addDashboardUpdateMsg(dashboardUpdateMsg)
                         .build();
-                break;
+            }
         }
         return downlinkMsg;
     }
@@ -135,4 +130,5 @@ public abstract class DashboardEdgeProcessor extends BaseDashboardProcessor impl
         // do nothing on cloud
         return assignedCustomers;
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/device/DeviceEdgeProcessor.java

@@ -286,4 +286,5 @@ public abstract class DeviceEdgeProcessor extends BaseDeviceProcessor implements
                 .addDeviceCredentialsRequestMsg(deviceCredentialsRequestMsg);
         return builder.build();
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/device/profile/DeviceProfileEdgeProcessor.java

@@ -97,8 +97,7 @@ public abstract class DeviceProfileEdgeProcessor extends BaseDeviceProfileProces
         DeviceProfileId deviceProfileId = new DeviceProfileId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ADDED:
+            case ADDED, UPDATED -> {
-            case UPDATED:
                 DeviceProfile deviceProfile = deviceProfileService.findDeviceProfileById(edgeEvent.getTenantId(), deviceProfileId);
                 if (deviceProfile != null) {
                     UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
@@ -110,16 +109,17 @@ public abstract class DeviceProfileEdgeProcessor extends BaseDeviceProfileProces
                             .addDeviceProfileUpdateMsg(deviceProfileUpdateMsg)
                             .build();
                 }
-                break;
+            }
-            case DELETED:
+            case DELETED -> {
                 DeviceProfileUpdateMsg deviceProfileUpdateMsg = ((DeviceMsgConstructor)
                         deviceMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructDeviceProfileDeleteMsg(deviceProfileId);
                 downlinkMsg = DownlinkMsg.newBuilder()
                         .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
                         .addDeviceProfileUpdateMsg(deviceProfileUpdateMsg)
                         .build();
-                break;
+            }
         }
         return downlinkMsg;
     }
+
 }

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

@@ -50,8 +50,7 @@ public class EdgeProcessor extends BaseEdgeProcessor {
         EdgeId edgeId = new EdgeId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ASSIGNED_TO_CUSTOMER:
+            case ASSIGNED_TO_CUSTOMER, UNASSIGNED_FROM_CUSTOMER -> {
-            case UNASSIGNED_FROM_CUSTOMER:
                 Edge edge = edgeService.findEdgeById(edgeEvent.getTenantId(), edgeId);
                 if (edge != null) {
                     EdgeConfiguration edgeConfigMsg =
@@ -61,7 +60,7 @@ public class EdgeProcessor extends BaseEdgeProcessor {
                             .setEdgeConfiguration(edgeConfigMsg)
                             .build();
                 }
-                break;
+            }
         }
         return downlinkMsg;
     }
@@ -112,4 +111,5 @@ public class EdgeProcessor extends BaseEdgeProcessor {
             return Futures.immediateFailedFuture(e);
         }
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/BaseEntityViewProcessor.java

@@ -64,4 +64,5 @@ public abstract class BaseEntityViewProcessor extends BaseEdgeProcessor {
     protected abstract EntityView constructEntityViewFromUpdateMsg(TenantId tenantId, EntityViewId entityViewId, EntityViewUpdateMsg entityViewUpdateMsg);
 
     protected abstract void setCustomerId(TenantId tenantId, CustomerId customerId, EntityView entityView, EntityViewUpdateMsg entityViewUpdateMsg);
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/EntityViewEdgeProcessor.java

@@ -105,11 +105,7 @@ public abstract class EntityViewEdgeProcessor extends BaseEntityViewProcessor im
         EntityViewId entityViewId = new EntityViewId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ADDED:
+            case ADDED, UPDATED, ASSIGNED_TO_EDGE, ASSIGNED_TO_CUSTOMER, UNASSIGNED_FROM_CUSTOMER -> {
-            case UPDATED:
-            case ASSIGNED_TO_EDGE:
-            case ASSIGNED_TO_CUSTOMER:
-            case UNASSIGNED_FROM_CUSTOMER:
                 EntityView entityView = entityViewService.findEntityViewById(edgeEvent.getTenantId(), entityViewId);
                 if (entityView != null) {
                     UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
@@ -120,17 +116,17 @@ public abstract class EntityViewEdgeProcessor extends BaseEntityViewProcessor im
                             .addEntityViewUpdateMsg(entityViewUpdateMsg)
                             .build();
                 }
-                break;
+            }
-            case DELETED:
+            case DELETED, UNASSIGNED_FROM_EDGE -> {
-            case UNASSIGNED_FROM_EDGE:
                 EntityViewUpdateMsg entityViewUpdateMsg = ((EntityViewMsgConstructor)
                         entityViewMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructEntityViewDeleteMsg(entityViewId);
                 downlinkMsg = DownlinkMsg.newBuilder()
                         .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
                         .addEntityViewUpdateMsg(entityViewUpdateMsg)
                         .build();
-                break;
+            }
         }
         return downlinkMsg;
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/EntityViewProcessor.java

@@ -29,4 +29,5 @@ public interface EntityViewProcessor extends EdgeProcessor {
     ListenableFuture<Void> processEntityViewMsgFromEdge(TenantId tenantId, Edge edge, EntityViewUpdateMsg entityViewUpdateMsg);
 
     DownlinkMsg convertEntityViewEventToDownlink(EdgeEvent edgeEvent, EdgeVersion edgeVersion);
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/EntityViewProcessorV1.java

@@ -62,4 +62,5 @@ public class EntityViewProcessorV1 extends EntityViewEdgeProcessor {
         CustomerId customerUUID = safeGetCustomerId(entityViewUpdateMsg.getCustomerIdMSB(), entityViewUpdateMsg.getCustomerIdLSB());
         entityView.setCustomerId(customerUUID != null ? customerUUID : customerId);
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/EntityViewProcessorV2.java

@@ -40,4 +40,5 @@ public class EntityViewProcessorV2 extends EntityViewEdgeProcessor {
         CustomerId customerUUID = entityView.getCustomerId() != null ? entityView.getCustomerId() : customerId;
         entityView.setCustomerId(customerUUID);
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/notification/NotificationEdgeProcessor.java

@@ -0,0 +1,119 @@
+/**
+ * Copyright © 2016-2024 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.
+ */
+package org.thingsboard.server.service.edge.rpc.processor.notification;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.EdgeUtils;
+import org.thingsboard.server.common.data.edge.EdgeEvent;
+import org.thingsboard.server.common.data.id.NotificationRuleId;
+import org.thingsboard.server.common.data.id.NotificationTargetId;
+import org.thingsboard.server.common.data.id.NotificationTemplateId;
+import org.thingsboard.server.common.data.notification.rule.NotificationRule;
+import org.thingsboard.server.common.data.notification.targets.NotificationTarget;
+import org.thingsboard.server.common.data.notification.template.NotificationTemplate;
+import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
+import org.thingsboard.server.gen.edge.v1.NotificationRuleUpdateMsg;
+import org.thingsboard.server.gen.edge.v1.NotificationTargetUpdateMsg;
+import org.thingsboard.server.gen.edge.v1.NotificationTemplateUpdateMsg;
+import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
+import org.thingsboard.server.queue.util.TbCoreComponent;
+import org.thingsboard.server.service.edge.rpc.processor.BaseEdgeProcessor;
+
+@Slf4j
+@Component
+@TbCoreComponent
+public class NotificationEdgeProcessor extends BaseEdgeProcessor {
+
+    public DownlinkMsg convertNotificationRuleToDownlink(EdgeEvent edgeEvent) {
+        NotificationRuleId notificationRuleId = new NotificationRuleId(edgeEvent.getEntityId());
+        DownlinkMsg downlinkMsg = null;
+        switch (edgeEvent.getAction()) {
+            case ADDED, UPDATED -> {
+                NotificationRule notificationRule = notificationRuleService.findNotificationRuleById(edgeEvent.getTenantId(), notificationRuleId);
+                if (notificationRule != null) {
+                    UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
+                    NotificationRuleUpdateMsg notificationRuleUpdateMsg = notificationMsgConstructor.constructNotificationRuleUpdateMsg(msgType, notificationRule);
+                    downlinkMsg = DownlinkMsg.newBuilder()
+                            .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
+                            .addNotificationRuleUpdateMsg(notificationRuleUpdateMsg)
+                            .build();
+                }
+            }
+            case DELETED -> {
+                NotificationRuleUpdateMsg notificationRuleUpdateMsg = notificationMsgConstructor.constructNotificationRuleDeleteMsg(notificationRuleId);
+                downlinkMsg = DownlinkMsg.newBuilder()
+                        .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
+                        .addNotificationRuleUpdateMsg(notificationRuleUpdateMsg)
+                        .build();
+            }
+        }
+        return downlinkMsg;
+    }
+
+    public DownlinkMsg convertNotificationTargetToDownlink(EdgeEvent edgeEvent) {
+        NotificationTargetId notificationTargetId = new NotificationTargetId(edgeEvent.getEntityId());
+        DownlinkMsg downlinkMsg = null;
+        switch (edgeEvent.getAction()) {
+            case ADDED, UPDATED -> {
+                NotificationTarget notificationTarget = notificationTargetService.findNotificationTargetById(edgeEvent.getTenantId(), notificationTargetId);
+                if (notificationTarget != null) {
+                    UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
+                    NotificationTargetUpdateMsg notificationTargetUpdateMsg = notificationMsgConstructor.constructNotificationTargetUpdateMsg(msgType, notificationTarget);
+                    downlinkMsg = DownlinkMsg.newBuilder()
+                            .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
+                            .addNotificationTargetUpdateMsg(notificationTargetUpdateMsg)
+                            .build();
+                }
+            }
+            case DELETED -> {
+                NotificationTargetUpdateMsg notificationTargetUpdateMsg = notificationMsgConstructor.constructNotificationTargetDeleteMsg(notificationTargetId);
+                downlinkMsg = DownlinkMsg.newBuilder()
+                        .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
+                        .addNotificationTargetUpdateMsg(notificationTargetUpdateMsg)
+                        .build();
+            }
+        }
+        return downlinkMsg;
+    }
+
+    public DownlinkMsg convertNotificationTemplateToDownlink(EdgeEvent edgeEvent) {
+        NotificationTemplateId notificationTemplateId = new NotificationTemplateId(edgeEvent.getEntityId());
+        DownlinkMsg downlinkMsg = null;
+        switch (edgeEvent.getAction()) {
+            case ADDED, UPDATED -> {
+                NotificationTemplate notificationTemplate = notificationTemplateService.findNotificationTemplateById(edgeEvent.getTenantId(), notificationTemplateId);
+                if (notificationTemplate != null) {
+                    UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
+                    NotificationTemplateUpdateMsg notificationTemplateUpdateMsg = notificationMsgConstructor.constructNotificationTemplateUpdateMsg(msgType, notificationTemplate);
+                    downlinkMsg = DownlinkMsg.newBuilder()
+                            .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
+                            .addNotificationTemplateUpdateMsg(notificationTemplateUpdateMsg)
+                            .build();
+                }
+            }
+            case DELETED -> {
+                NotificationTemplateUpdateMsg notificationTemplateUpdateMsg = notificationMsgConstructor.constructNotificationTemplateDeleteMsg(notificationTemplateId);
+                downlinkMsg = DownlinkMsg.newBuilder()
+                        .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
+                        .addNotificationTemplateUpdateMsg(notificationTemplateUpdateMsg)
+                        .build();
+            }
+        }
+        return downlinkMsg;
+    }
+
+}

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/ota/OtaPackageEdgeProcessor.java

@@ -38,8 +38,7 @@ public class OtaPackageEdgeProcessor extends BaseEdgeProcessor {
         OtaPackageId otaPackageId = new OtaPackageId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ADDED:
+            case ADDED, UPDATED -> {
-            case UPDATED:
                 OtaPackage otaPackage = otaPackageService.findOtaPackageById(edgeEvent.getTenantId(), otaPackageId);
                 if (otaPackage != null) {
                     UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
@@ -50,16 +49,17 @@ public class OtaPackageEdgeProcessor extends BaseEdgeProcessor {
                             .addOtaPackageUpdateMsg(otaPackageUpdateMsg)
                             .build();
                 }
-                break;
+            }
-            case DELETED:
+            case DELETED -> {
                 OtaPackageUpdateMsg otaPackageUpdateMsg = ((OtaPackageMsgConstructor)
                         otaPackageMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructOtaPackageDeleteMsg(otaPackageId);
                 downlinkMsg = DownlinkMsg.newBuilder()
                         .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
                         .addOtaPackageUpdateMsg(otaPackageUpdateMsg)
                         .build();
-                break;
+            }
         }
         return downlinkMsg;
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/queue/QueueEdgeProcessor.java

@@ -38,8 +38,7 @@ public class QueueEdgeProcessor extends BaseEdgeProcessor {
         QueueId queueId = new QueueId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ADDED:
+            case ADDED, UPDATED -> {
-            case UPDATED:
                 Queue queue = queueService.findQueueById(edgeEvent.getTenantId(), queueId);
                 if (queue != null) {
                     UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
@@ -50,16 +49,17 @@ public class QueueEdgeProcessor extends BaseEdgeProcessor {
                             .addQueueUpdateMsg(queueUpdateMsg)
                             .build();
                 }
-                break;
+            }
-            case DELETED:
+            case DELETED -> {
                 QueueUpdateMsg queueDeleteMsg = ((QueueMsgConstructor)
                         queueMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructQueueDeleteMsg(queueId);
                 downlinkMsg = DownlinkMsg.newBuilder()
                         .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
                         .addQueueUpdateMsg(queueDeleteMsg)
                         .build();
-                break;
+            }
         }
         return downlinkMsg;
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/relation/BaseRelationProcessor.java

@@ -58,4 +58,5 @@ public abstract class BaseRelationProcessor extends BaseEdgeProcessor {
     }
 
     protected abstract EntityRelation constructEntityRelationFromUpdateMsg(RelationUpdateMsg relationUpdateMsg);
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/relation/RelationEdgeProcessor.java

@@ -91,4 +91,5 @@ public abstract class RelationEdgeProcessor extends BaseRelationProcessor implem
         }
         return Futures.transform(Futures.allAsList(futures), voids -> null, dbCallbackExecutorService);
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/relation/RelationEdgeProcessorV1.java

@@ -49,4 +49,5 @@ public class RelationEdgeProcessorV1 extends RelationEdgeProcessor {
         entityRelation.setAdditionalInfo(JacksonUtil.toJsonNode(relationUpdateMsg.getAdditionalInfo()));
         return entityRelation;
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/relation/RelationEdgeProcessorV2.java

@@ -31,4 +31,5 @@ public class RelationEdgeProcessorV2 extends RelationEdgeProcessor {
     protected EntityRelation constructEntityRelationFromUpdateMsg(RelationUpdateMsg relationUpdateMsg) {
         return JacksonUtil.fromString(relationUpdateMsg.getEntity(), EntityRelation.class, true);
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/relation/RelationProcessor.java

@@ -29,4 +29,5 @@ public interface RelationProcessor extends EdgeProcessor {
     ListenableFuture<Void> processRelationMsgFromEdge(TenantId tenantId, Edge edge, RelationUpdateMsg relationUpdateMsg);
 
     DownlinkMsg convertRelationEventToDownlink(EdgeEvent edgeEvent, EdgeVersion edgeVersion);
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/BaseResourceProcessor.java

@@ -72,4 +72,5 @@ public abstract class BaseResourceProcessor extends BaseEdgeProcessor {
     }
 
     protected abstract TbResource constructResourceFromUpdateMsg(TenantId tenantId, TbResourceId tbResourceId, ResourceUpdateMsg resourceUpdateMsg);
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/ResourceEdgeProcessor.java

@@ -74,8 +74,7 @@ public abstract class ResourceEdgeProcessor extends BaseResourceProcessor implem
         TbResourceId tbResourceId = new TbResourceId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ADDED:
+            case ADDED, UPDATED -> {
-            case UPDATED:
                 TbResource tbResource = resourceService.findResourceById(edgeEvent.getTenantId(), tbResourceId);
                 if (tbResource != null) {
                     UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
@@ -86,16 +85,17 @@ public abstract class ResourceEdgeProcessor extends BaseResourceProcessor implem
                             .addResourceUpdateMsg(resourceUpdateMsg)
                             .build() : null;
                 }
-                break;
+            }
-            case DELETED:
+            case DELETED -> {
                 ResourceUpdateMsg resourceUpdateMsg = ((ResourceMsgConstructor)
                         resourceMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructResourceDeleteMsg(tbResourceId);
                 downlinkMsg = DownlinkMsg.newBuilder()
                         .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
                         .addResourceUpdateMsg(resourceUpdateMsg)
                         .build();
-                break;
+            }
         }
         return downlinkMsg;
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/ResourceEdgeProcessorV1.java

@@ -45,4 +45,5 @@ public class ResourceEdgeProcessorV1 extends ResourceEdgeProcessor {
         resource.setEtag(resourceUpdateMsg.hasEtag() ? resourceUpdateMsg.getEtag() : null);
         return resource;
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/ResourceEdgeProcessorV2.java

@@ -33,4 +33,5 @@ public class ResourceEdgeProcessorV2 extends ResourceEdgeProcessor {
     protected TbResource constructResourceFromUpdateMsg(TenantId tenantId, TbResourceId tbResourceId, ResourceUpdateMsg resourceUpdateMsg) {
         return JacksonUtil.fromString(resourceUpdateMsg.getEntity(), TbResource.class, true);
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/ResourceProcessor.java

@@ -29,4 +29,5 @@ public interface ResourceProcessor extends EdgeProcessor {
     ListenableFuture<Void> processResourceMsgFromEdge(TenantId tenantId, Edge edge, ResourceUpdateMsg resourceUpdateMsg);
 
     DownlinkMsg convertResourceEventToDownlink(EdgeEvent edgeEvent, EdgeVersion edgeVersion);
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/rule/RuleChainEdgeProcessor.java

@@ -43,16 +43,15 @@ public class RuleChainEdgeProcessor extends BaseEdgeProcessor {
         RuleChainId ruleChainId = new RuleChainId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ADDED:
+            case ADDED, UPDATED, ASSIGNED_TO_EDGE -> {
-            case UPDATED:
-            case ASSIGNED_TO_EDGE:
                 RuleChain ruleChain = ruleChainService.findRuleChainById(edgeEvent.getTenantId(), ruleChainId);
                 if (ruleChain != null) {
                     boolean isRoot = false;
                     if (edgeEvent.getBody() != null && edgeEvent.getBody().get(EDGE_IS_ROOT_BODY_KEY) != null) {
                         try {
                             isRoot = Boolean.parseBoolean(edgeEvent.getBody().get(EDGE_IS_ROOT_BODY_KEY).asText());
-                        } catch (Exception ignored) {}
+                        } catch (Exception ignored) {
+                        }
                     }
                     if (!isRoot) {
                         Edge edge = edgeService.findEdgeById(edgeEvent.getTenantId(), edgeEvent.getEdgeId());
@@ -67,15 +66,12 @@ public class RuleChainEdgeProcessor extends BaseEdgeProcessor {
                             .addRuleChainUpdateMsg(ruleChainUpdateMsg)
                             .build();
                 }
-                break;
+            }
-            case DELETED:
+            case DELETED, UNASSIGNED_FROM_EDGE -> downlinkMsg = DownlinkMsg.newBuilder()
-            case UNASSIGNED_FROM_EDGE:
+                    .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
-                downlinkMsg = DownlinkMsg.newBuilder()
+                    .addRuleChainUpdateMsg(((RuleChainMsgConstructor) ruleChainMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion))
-                        .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
+                            .constructRuleChainDeleteMsg(ruleChainId))
-                        .addRuleChainUpdateMsg(((RuleChainMsgConstructor) ruleChainMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion))
+                    .build();
-                                .constructRuleChainDeleteMsg(ruleChainId))
-                        .build();
-                break;
         }
         return downlinkMsg;
     }
@@ -99,4 +95,5 @@ public class RuleChainEdgeProcessor extends BaseEdgeProcessor {
         }
         return downlinkMsg;
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/settings/AdminSettingsEdgeProcessor.java

@@ -45,4 +45,5 @@ public class AdminSettingsEdgeProcessor extends BaseEdgeProcessor {
                 .addAdminSettingsUpdateMsg(adminSettingsUpdateMsg)
                 .build();
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/telemetry/BaseTelemetryProcessor.java

@@ -138,41 +138,39 @@ public abstract class BaseTelemetryProcessor extends BaseEdgeProcessor {
         TbMsgMetaData metaData = new TbMsgMetaData();
         CustomerId customerId = null;
         switch (entityId.getEntityType()) {
-            case DEVICE:
+            case DEVICE -> {
                 Device device = deviceService.findDeviceById(tenantId, new DeviceId(entityId.getId()));
                 if (device != null) {
                     customerId = device.getCustomerId();
                     metaData.putValue("deviceName", device.getName());
                     metaData.putValue("deviceType", device.getType());
                 }
-                break;
+            }
-            case ASSET:
+            case ASSET -> {
                 Asset asset = assetService.findAssetById(tenantId, new AssetId(entityId.getId()));
                 if (asset != null) {
                     customerId = asset.getCustomerId();
                     metaData.putValue("assetName", asset.getName());
                     metaData.putValue("assetType", asset.getType());
                 }
-                break;
+            }
-            case ENTITY_VIEW:
+            case ENTITY_VIEW -> {
                 EntityView entityView = entityViewService.findEntityViewById(tenantId, new EntityViewId(entityId.getId()));
                 if (entityView != null) {
                     customerId = entityView.getCustomerId();
                     metaData.putValue("entityViewName", entityView.getName());
                     metaData.putValue("entityViewType", entityView.getType());
                 }
-                break;
+            }
-            case EDGE:
+            case EDGE -> {
                 Edge edge = edgeService.findEdgeById(tenantId, new EdgeId(entityId.getId()));
                 if (edge != null) {
                     customerId = edge.getCustomerId();
                     metaData.putValue("edgeName", edge.getName());
                     metaData.putValue("edgeType", edge.getType());
                 }
-                break;
+            }
-            default:
+            default -> log.debug("[{}] Using empty metadata for entityId [{}]", tenantId, entityId);
-                log.debug("[{}] Using empty metadata for entityId [{}]", tenantId, entityId);
-                break;
         }
         return new ImmutablePair<>(metaData, customerId != null ? customerId : new CustomerId(ModelConstants.NULL_UUID));
     }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/tenant/TenantProfileEdgeProcessor.java

@@ -53,4 +53,5 @@ public class TenantProfileEdgeProcessor extends BaseEdgeProcessor {
         }
         return downlinkMsg;
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/user/UserEdgeProcessor.java

@@ -39,8 +39,7 @@ public class UserEdgeProcessor extends BaseEdgeProcessor {
         UserId userId = new UserId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ADDED:
+            case ADDED, UPDATED -> {
-            case UPDATED:
                 User user = userService.findUserById(edgeEvent.getTenantId(), userId);
                 if (user != null) {
                     UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
@@ -49,14 +48,12 @@ public class UserEdgeProcessor extends BaseEdgeProcessor {
                             .addUserUpdateMsg(((UserMsgConstructor) userMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructUserUpdatedMsg(msgType, user))
                             .build();
                 }
-                break;
+            }
-            case DELETED:
+            case DELETED -> downlinkMsg = DownlinkMsg.newBuilder()
-                downlinkMsg = DownlinkMsg.newBuilder()
+                    .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
-                        .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
+                    .addUserUpdateMsg(((UserMsgConstructor) userMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructUserDeleteMsg(userId))
-                        .addUserUpdateMsg(((UserMsgConstructor) userMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructUserDeleteMsg(userId))
+                    .build();
-                        .build();
+            case CREDENTIALS_UPDATED -> {
-                break;
-            case CREDENTIALS_UPDATED:
                 UserCredentials userCredentialsByUserId = userService.findUserCredentialsByUserId(edgeEvent.getTenantId(), userId);
                 if (userCredentialsByUserId != null && userCredentialsByUserId.isEnabled()) {
                     UserCredentialsUpdateMsg userCredentialsUpdateMsg =
@@ -66,8 +63,9 @@ public class UserEdgeProcessor extends BaseEdgeProcessor {
                             .addUserCredentialsUpdateMsg(userCredentialsUpdateMsg)
                             .build();
                 }
-                break;
+            }
         }
         return downlinkMsg;
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/widget/WidgetBundleEdgeProcessor.java

@@ -40,8 +40,7 @@ public class WidgetBundleEdgeProcessor extends BaseEdgeProcessor {
         WidgetsBundleId widgetsBundleId = new WidgetsBundleId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ADDED:
+            case ADDED, UPDATED -> {
-            case UPDATED:
                 WidgetsBundle widgetsBundle = widgetsBundleService.findWidgetsBundleById(edgeEvent.getTenantId(), widgetsBundleId);
                 if (widgetsBundle != null) {
                     List<String> widgets = widgetTypeService.findWidgetFqnsByWidgetsBundleId(edgeEvent.getTenantId(), widgetsBundleId);
@@ -53,16 +52,17 @@ public class WidgetBundleEdgeProcessor extends BaseEdgeProcessor {
                             .addWidgetsBundleUpdateMsg(widgetsBundleUpdateMsg)
                             .build();
                 }
-                break;
+            }
-            case DELETED:
+            case DELETED -> {
                 WidgetsBundleUpdateMsg widgetsBundleUpdateMsg =
                         ((WidgetMsgConstructor) widgetMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructWidgetsBundleDeleteMsg(widgetsBundleId);
                 downlinkMsg = DownlinkMsg.newBuilder()
                         .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
                         .addWidgetsBundleUpdateMsg(widgetsBundleUpdateMsg)
                         .build();
-                break;
+            }
         }
         return downlinkMsg;
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/widget/WidgetTypeEdgeProcessor.java

@@ -38,8 +38,7 @@ public class WidgetTypeEdgeProcessor extends BaseEdgeProcessor {
         WidgetTypeId widgetTypeId = new WidgetTypeId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ADDED:
+            case ADDED, UPDATED -> {
-            case UPDATED:
                 WidgetTypeDetails widgetTypeDetails = widgetTypeService.findWidgetTypeDetailsById(edgeEvent.getTenantId(), widgetTypeId);
                 if (widgetTypeDetails != null) {
                     UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
@@ -50,16 +49,17 @@ public class WidgetTypeEdgeProcessor extends BaseEdgeProcessor {
                             .addWidgetTypeUpdateMsg(widgetTypeUpdateMsg)
                             .build();
                 }
-                break;
+            }
-            case DELETED:
+            case DELETED -> {
                 WidgetTypeUpdateMsg widgetTypeUpdateMsg =
                         ((WidgetMsgConstructor) widgetMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructWidgetTypeDeleteMsg(widgetTypeId);
                 downlinkMsg = DownlinkMsg.newBuilder()
                         .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
                         .addWidgetTypeUpdateMsg(widgetTypeUpdateMsg)
                         .build();
-                break;
+            }
         }
         return downlinkMsg;
     }
+
 }

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

@@ -27,7 +27,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.JacksonUtil;
-import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.EdgeUtils;
 import org.thingsboard.server.common.data.EntityType;
@@ -110,9 +109,6 @@ public class DefaultEdgeRequestsService implements EdgeRequestsService {
     @Autowired
     private DbCallbackExecutorService dbCallbackExecutorService;
 
-    @Autowired
-    private TbClusterService tbClusterService;
-
     @Override
     public ListenableFuture<Void> processRuleChainMetadataRequestMsg(TenantId tenantId, Edge edge, RuleChainMetadataRequestMsg ruleChainMetadataRequestMsg) {
         log.trace("[{}] processRuleChainMetadataRequestMsg [{}][{}]", tenantId, edge.getName(), ruleChainMetadataRequestMsg);
@@ -292,8 +288,7 @@ public class DefaultEdgeRequestsService implements EdgeRequestsService {
         return futureToSet;
     }
 
-    private ListenableFuture<List<EntityRelation>> findRelationByQuery(TenantId tenantId, Edge edge,
+    private ListenableFuture<List<EntityRelation>> findRelationByQuery(TenantId tenantId, Edge edge, EntityId entityId, EntitySearchDirection direction) {
-                                                                       EntityId entityId, EntitySearchDirection direction) {
         EntityRelationsQuery query = new EntityRelationsQuery();
         query.setParameters(new RelationsSearchParameters(entityId, direction, 1, false));
         return relationService.findByQuery(tenantId, query);

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

@@ -116,7 +116,10 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
                 updateSchema("3.6.2", 3006002, "3.6.3", 3006003, null);
                 break;
             case "3.6.3":
-                updateSchema("3.6.3", 3006003, "3.7.0", 3007000, null);
+                updateSchema("3.6.3", 3006003, "3.6.4", 3006004, null);
+                break;
+            case "3.6.4":
+                updateSchema("3.6.4", 3006004, "3.7.0", 3007000, null);
                 break;
             default:
                 throw new RuntimeException("Unable to upgrade SQL database, unsupported fromVersion: " + fromVersion);

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

@@ -81,6 +81,8 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
+import static org.thingsboard.server.common.data.notification.NotificationDeliveryMethod.WEB;
+
 @Service
 @Slf4j
 @RequiredArgsConstructor
@@ -191,7 +193,7 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
             NotificationProcessingContext ctx = NotificationProcessingContext.builder()
                     .tenantId(tenantId)
                     .request(notificationRequest)
-                    .deliveryMethods(Set.of(NotificationDeliveryMethod.WEB))
+                    .deliveryMethods(Set.of(WEB))
                     .template(template)
                     .build();
 
@@ -247,7 +249,7 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
     private void processForTarget(NotificationTarget target, NotificationProcessingContext ctx) {
         Iterable<? extends NotificationRecipient> recipients;
         switch (target.getConfiguration().getType()) {
-            case PLATFORM_USERS: {
+            case PLATFORM_USERS -> {
                 PlatformUsersNotificationTargetConfig targetConfig = (PlatformUsersNotificationTargetConfig) target.getConfiguration();
                 if (targetConfig.getUsersFilter().getType().isForRules() && ctx.getRequest().getInfo() instanceof RuleOriginatedNotificationInfo) {
                     recipients = new PageDataIterable<>(pageLink -> {
@@ -258,21 +260,16 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
                         return notificationTargetService.findRecipientsForNotificationTargetConfig(ctx.getTenantId(), targetConfig, pageLink);
                     }, 256);
                 }
-                break;
             }
-            case SLACK: {
+            case SLACK -> {
                 SlackNotificationTargetConfig targetConfig = (SlackNotificationTargetConfig) target.getConfiguration();
                 recipients = List.of(targetConfig.getConversation());
-                break;
             }
-            case MICROSOFT_TEAMS: {
+            case MICROSOFT_TEAMS -> {
                 MicrosoftTeamsNotificationTargetConfig targetConfig = (MicrosoftTeamsNotificationTargetConfig) target.getConfiguration();
                 recipients = List.of(targetConfig);
-                break;
-            }
-            default: {
-                recipients = Collections.emptyList();
             }
+            default -> recipients = Collections.emptyList();
         }
 
         Set<NotificationDeliveryMethod> deliveryMethods = new HashSet<>(ctx.getDeliveryMethods());
@@ -322,6 +319,7 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
                 .requestId(request.getId())
                 .recipientId(recipient.getId())
                 .type(ctx.getNotificationType())
+                .deliveryMethod(WEB)
                 .subject(processedTemplate.getSubject())
                 .text(processedTemplate.getBody())
                 .additionalConfig(processedTemplate.getAdditionalConfig())
@@ -347,19 +345,22 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
         boolean updated = notificationService.markNotificationAsRead(tenantId, recipientId, notificationId);
         if (updated) {
             log.trace("Marked notification {} as read (recipient id: {}, tenant id: {})", notificationId, recipientId, tenantId);
-            NotificationUpdate update = NotificationUpdate.builder()
+            Notification notification = notificationService.findNotificationById(tenantId, notificationId);
-                    .updated(true)
+            if (notification.getDeliveryMethod() == WEB) {
-                    .notificationId(notificationId.getId())
+                NotificationUpdate update = NotificationUpdate.builder()
-                    .newStatus(NotificationStatus.READ)
+                        .updated(true)
-                    .build();
+                        .notificationId(notificationId.getId())
-            onNotificationUpdate(tenantId, recipientId, update);
+                        .newStatus(NotificationStatus.READ)
+                        .build();
+                onNotificationUpdate(tenantId, recipientId, update);
+            }
         }
     }
 
     @Override
-    public void markAllNotificationsAsRead(TenantId tenantId, UserId recipientId) {
+    public void markAllNotificationsAsRead(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId) {
-        int updatedCount = notificationService.markAllNotificationsAsRead(tenantId, recipientId);
+        int updatedCount = notificationService.markAllNotificationsAsRead(tenantId, deliveryMethod, recipientId);
-        if (updatedCount > 0) {
+        if (updatedCount > 0 && deliveryMethod == WEB) {
             log.trace("Marked all notifications as read (recipient id: {}, tenant id: {})", recipientId, tenantId);
             NotificationUpdate update = NotificationUpdate.builder()
                     .updated(true)
@@ -374,7 +375,7 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
     public void deleteNotification(TenantId tenantId, UserId recipientId, NotificationId notificationId) {
         Notification notification = notificationService.findNotificationById(tenantId, notificationId);
         boolean deleted = notificationService.deleteNotification(tenantId, recipientId, notificationId);
-        if (deleted) {
+        if (deleted && notification.getDeliveryMethod() == WEB) {
             NotificationUpdate update = NotificationUpdate.builder()
                     .deleted(true)
                     .notification(notification)
@@ -451,7 +452,7 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
 
     @Override
     public NotificationDeliveryMethod getDeliveryMethod() {
-        return NotificationDeliveryMethod.WEB;
+        return WEB;
     }
 
     @Override
@@ -462,7 +463,7 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
     @Autowired
     public void setChannels(List<NotificationChannel> channels, NotificationCenter webNotificationChannel) {
         this.channels = channels.stream().collect(Collectors.toMap(NotificationChannel::getDeliveryMethod, c -> c));
-        this.channels.put(NotificationDeliveryMethod.WEB, (NotificationChannel) webNotificationChannel);
+        this.channels.put(WEB, (NotificationChannel) webNotificationChannel);
     }
 
 }

application/src/main/java/org/thingsboard/server/service/notification/channels/MobileAppNotificationChannel.java

@@ -16,6 +16,7 @@
 package org.thingsboard.server.service.notification.channels;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.base.Strings;
 import com.google.firebase.messaging.FirebaseMessagingException;
 import com.google.firebase.messaging.MessagingErrorCode;
@@ -26,11 +27,15 @@ import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.notification.FirebaseService;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.notification.Notification;
 import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
+import org.thingsboard.server.common.data.notification.NotificationRequest;
+import org.thingsboard.server.common.data.notification.NotificationStatus;
 import org.thingsboard.server.common.data.notification.info.NotificationInfo;
 import org.thingsboard.server.common.data.notification.settings.MobileAppNotificationDeliveryMethodConfig;
 import org.thingsboard.server.common.data.notification.settings.NotificationSettings;
 import org.thingsboard.server.common.data.notification.template.MobileAppDeliveryMethodNotificationTemplate;
+import org.thingsboard.server.dao.notification.NotificationService;
 import org.thingsboard.server.dao.notification.NotificationSettingsService;
 import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.service.notification.NotificationProcessingContext;
@@ -41,6 +46,8 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
+import static org.thingsboard.server.common.data.notification.NotificationDeliveryMethod.MOBILE_APP;
+
 @Component
 @RequiredArgsConstructor
 @Slf4j
@@ -48,25 +55,54 @@ public class MobileAppNotificationChannel implements NotificationChannel<User, M
 
     private final FirebaseService firebaseService;
     private final UserService userService;
+    private final NotificationService notificationService;
     private final NotificationSettingsService notificationSettingsService;
 
     @Override
     public void sendNotification(User recipient, MobileAppDeliveryMethodNotificationTemplate processedTemplate, NotificationProcessingContext ctx) throws Exception {
+        NotificationRequest request = ctx.getRequest();
+        NotificationInfo info = request.getInfo();
+        if (info != null && info.getDashboardId() != null) {
+            ObjectNode additionalConfig = JacksonUtil.asObject(processedTemplate.getAdditionalConfig());
+            ObjectNode onClick = JacksonUtil.asObject(additionalConfig.get("onClick"));
+            if (onClick.get("enabled") == null || !Boolean.parseBoolean(onClick.get("enabled").asText())) {
+                onClick.put("enabled", true);
+                onClick.put("linkType", "DASHBOARD");
+                onClick.put("setEntityIdInState", true);
+                onClick.put("dashboardId", info.getDashboardId().toString());
+                additionalConfig.set("onClick", onClick);
+            }
+            processedTemplate.setAdditionalConfig(additionalConfig);
+        }
+        Notification notification = Notification.builder()
+                .requestId(request.getId())
+                .recipientId(recipient.getId())
+                .type(ctx.getNotificationType())
+                .deliveryMethod(MOBILE_APP)
+                .subject(processedTemplate.getSubject())
+                .text(processedTemplate.getBody())
+                .additionalConfig(processedTemplate.getAdditionalConfig())
+                .info(info)
+                .status(NotificationStatus.SENT)
+                .build();
+        notificationService.saveNotification(recipient.getTenantId(), notification);
+
         var mobileSessions = userService.findMobileSessions(recipient.getTenantId(), recipient.getId());
         if (mobileSessions.isEmpty()) {
             throw new IllegalArgumentException("User doesn't use the mobile app");
         }
 
-        MobileAppNotificationDeliveryMethodConfig config = ctx.getDeliveryMethodConfig(NotificationDeliveryMethod.MOBILE_APP);
+        MobileAppNotificationDeliveryMethodConfig config = ctx.getDeliveryMethodConfig(MOBILE_APP);
         String credentials = config.getFirebaseServiceAccountCredentials();
         Set<String> validTokens = new HashSet<>(mobileSessions.keySet());
 
         String subject = processedTemplate.getSubject();
         String body = processedTemplate.getBody();
         Map<String, String> data = getNotificationData(processedTemplate, ctx);
+        int unreadCount = notificationService.countUnreadNotificationsByRecipientId(ctx.getTenantId(), MOBILE_APP, recipient.getId());
         for (String token : mobileSessions.keySet()) {
             try {
-                firebaseService.sendMessage(ctx.getTenantId(), credentials, token, subject, body, data);
+                firebaseService.sendMessage(ctx.getTenantId(), credentials, token, subject, body, data, unreadCount);
             } catch (FirebaseMessagingException e) {
                 MessagingErrorCode errorCode = e.getMessagingErrorCode();
                 if (errorCode == MessagingErrorCode.UNREGISTERED || errorCode == MessagingErrorCode.INVALID_ARGUMENT) {
@@ -92,12 +128,6 @@ public class MobileAppNotificationChannel implements NotificationChannel<User, M
         Optional.ofNullable(info.getStateEntityId()).ifPresent(stateEntityId -> {
             data.put("stateEntityId", stateEntityId.getId().toString());
             data.put("stateEntityType", stateEntityId.getEntityType().name());
-            if (!"true".equals(data.get("onClick.enabled")) && info.getDashboardId() != null) {
-                data.put("onClick.enabled", "true");
-                data.put("onClick.linkType", "DASHBOARD");
-                data.put("onClick.setEntityIdInState", "true");
-                data.put("onClick.dashboardId", info.getDashboardId().toString());
-            }
         });
         data.put("notificationType", ctx.getNotificationType().name());
         switch (ctx.getNotificationType()) {
@@ -116,14 +146,14 @@ public class MobileAppNotificationChannel implements NotificationChannel<User, M
     @Override
     public void check(TenantId tenantId) throws Exception {
         NotificationSettings systemSettings = notificationSettingsService.findNotificationSettings(TenantId.SYS_TENANT_ID);
-        if (!systemSettings.getDeliveryMethodsConfigs().containsKey(NotificationDeliveryMethod.MOBILE_APP)) {
+        if (!systemSettings.getDeliveryMethodsConfigs().containsKey(MOBILE_APP)) {
             throw new RuntimeException("Push-notifications to mobile are not configured");
         }
     }
 
     @Override
     public NotificationDeliveryMethod getDeliveryMethod() {
-        return NotificationDeliveryMethod.MOBILE_APP;
+        return MOBILE_APP;
     }
 
 }

application/src/main/java/org/thingsboard/server/service/notification/provider/DefaultFirebaseService.java

@@ -54,7 +54,8 @@ public class DefaultFirebaseService implements FirebaseService {
             .build();
 
     @Override
-    public void sendMessage(TenantId tenantId, String credentials, String fcmToken, String title, String body, Map<String, String> data) throws FirebaseMessagingException {
+    public void sendMessage(TenantId tenantId, String credentials, String fcmToken, String title, String body,
+                            Map<String, String> data, Integer badge) throws FirebaseMessagingException {
         FirebaseContext firebaseContext = contexts.asMap().compute(tenantId.toString(), (key, context) -> {
             if (context == null) {
                 return new FirebaseContext(key, credentials);
@@ -64,6 +65,12 @@ public class DefaultFirebaseService implements FirebaseService {
             }
         });
 
+        Aps.Builder apsConfig = Aps.builder()
+                .setSound("default");
+        if (badge != null) {
+            apsConfig.setBadge(badge);
+        }
+
         Message message = Message.builder()
                 .setToken(fcmToken)
                 .setNotification(Notification.builder()
@@ -74,14 +81,17 @@ public class DefaultFirebaseService implements FirebaseService {
                         .setPriority(AndroidConfig.Priority.HIGH)
                         .build())
                 .setApnsConfig(ApnsConfig.builder()
-                        .setAps(Aps.builder()
+                        .setAps(apsConfig.build())
-                                .setContentAvailable(true)
-                                .build())
                         .build())
                 .putAllData(data)
                 .build();
-        firebaseContext.getMessaging().send(message);
+        try {
-        log.trace("[{}] Sent message for FCM token {}", tenantId, fcmToken);
+            firebaseContext.getMessaging().send(message);
+            log.trace("[{}] Sent message for FCM token {}", tenantId, fcmToken);
+        } catch (Throwable t) {
+            log.debug("[{}] Failed to send message for FCM token {}", tenantId, fcmToken, t);
+            throw t;
+        }
     }
 
     public static class FirebaseContext {

application/src/main/java/org/thingsboard/server/service/security/auth/rest/LoginRequest.java

@@ -32,12 +32,12 @@ public class LoginRequest {
         this.password = password;
     }
 
-    @Schema(required = true, description = "User email", example = "tenant@thingsboard.org")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "User email", example = "tenant@thingsboard.org")
     public String getUsername() {
         return username;
     }
 
-    @Schema(required = true, description = "User password", example = "tenant")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "User password", example = "tenant")
     public String getPassword() {
         return password;
     }