Refactor MsgConstructors to be in sync with PE logic

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

@@ -28,9 +28,10 @@ import org.thingsboard.server.service.edge.rpc.utils.EdgeVersionUtils;
 public class AdminSettingsMsgConstructor {
 
     public AdminSettingsUpdateMsg constructAdminSettingsUpdateMsg(AdminSettings adminSettings, EdgeVersion edgeVersion) {
-        return EdgeVersionUtils.isEdgeVersionOlderThan_3_6_2(edgeVersion)
+        if (EdgeVersionUtils.isEdgeVersionOlderThan_3_6_2(edgeVersion)) {
-                ? constructDeprecatedWidgetTypeUpdateMsg(adminSettings)
+            return constructDeprecatedWidgetTypeUpdateMsg(adminSettings);
-                : AdminSettingsUpdateMsg.newBuilder().setEntity(JacksonUtil.toString(adminSettings)).build();
+        }
+        return AdminSettingsUpdateMsg.newBuilder().setEntity(JacksonUtil.toString(adminSettings)).build();
     }
 
     private AdminSettingsUpdateMsg constructDeprecatedWidgetTypeUpdateMsg(AdminSettings adminSettings) {

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

@@ -29,9 +29,11 @@ import org.thingsboard.server.service.edge.rpc.utils.EdgeVersionUtils;
 public class AlarmMsgConstructor {
 
     public AlarmUpdateMsg constructAlarmUpdatedMsg(UpdateMsgType msgType, Alarm alarm, String entityName, EdgeVersion edgeVersion) {
-        return EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)
+        if (EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)) {
-                ? constructDeprecatedAlarmUpdatedMsg(msgType, alarm, entityName)
+            return constructDeprecatedAlarmUpdatedMsg(msgType, alarm, entityName);
-                : AlarmUpdateMsg.newBuilder().setMsgType(msgType).setOriginatorName(entityName).setEntity(JacksonUtil.toString(alarm))
+        }
+        return AlarmUpdateMsg.newBuilder().setMsgType(msgType)
+                .setEntity(JacksonUtil.toString(alarm)).setOriginatorName(entityName)
                 .setIdMSB(alarm.getId().getId().getMostSignificantBits())
                 .setIdLSB(alarm.getId().getId().getLeastSignificantBits()).build();
     }

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

@@ -30,9 +30,10 @@ import org.thingsboard.server.service.edge.rpc.utils.EdgeVersionUtils;
 public class AssetMsgConstructor {
 
     public AssetUpdateMsg constructAssetUpdatedMsg(UpdateMsgType msgType, Asset asset, EdgeVersion edgeVersion) {
-        return EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)
+        if (EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)) {
-                ? constructDeprecatedAssetUpdateMsg(msgType, asset)
+            return constructDeprecatedAssetUpdateMsg(msgType, asset);
-                : AssetUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(asset))
+        }
+        return AssetUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(asset))
                 .setIdMSB(asset.getUuidId().getMostSignificantBits())
                 .setIdLSB(asset.getUuidId().getLeastSignificantBits()).build();
     }

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

@@ -33,9 +33,10 @@ import java.nio.charset.StandardCharsets;
 public class AssetProfileMsgConstructor {
 
     public AssetProfileUpdateMsg constructAssetProfileUpdatedMsg(UpdateMsgType msgType, AssetProfile assetProfile, EdgeVersion edgeVersion) {
-        return EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)
+        if (EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)) {
-                ? constructDeprecatedAssetProfileUpdatedMsg(msgType, assetProfile)
+            return constructDeprecatedAssetProfileUpdatedMsg(msgType, assetProfile);
-                : AssetProfileUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(assetProfile))
+        }
+        return AssetProfileUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(assetProfile))
                 .setIdMSB(assetProfile.getId().getId().getMostSignificantBits())
                 .setIdLSB(assetProfile.getId().getId().getLeastSignificantBits()).build();
     }

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

@@ -30,9 +30,10 @@ import org.thingsboard.server.service.edge.rpc.utils.EdgeVersionUtils;
 public class CustomerMsgConstructor {
 
     public CustomerUpdateMsg constructCustomerUpdatedMsg(UpdateMsgType msgType, Customer customer, EdgeVersion edgeVersion) {
-        return EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)
+        if (EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)) {
-                ? constructDeprecatedCustomerUpdatedMsg(msgType, customer)
+            return constructDeprecatedCustomerUpdatedMsg(msgType, customer);
-                : CustomerUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(customer))
+        }
+        return CustomerUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(customer))
                 .setIdMSB(customer.getId().getId().getMostSignificantBits())
                 .setIdLSB(customer.getId().getId().getLeastSignificantBits()).build();
     }

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

@@ -30,9 +30,10 @@ import org.thingsboard.server.service.edge.rpc.utils.EdgeVersionUtils;
 public class DashboardMsgConstructor {
 
     public DashboardUpdateMsg constructDashboardUpdatedMsg(UpdateMsgType msgType, Dashboard dashboard, EdgeVersion edgeVersion) {
-        return EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)
+        if (EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)) {
-                ? constructDeprecatedDashboardUpdatedMsg(msgType, dashboard)
+            return constructDeprecatedDashboardUpdatedMsg(msgType, dashboard);
-                : DashboardUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(dashboard))
+        }
+        return DashboardUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(dashboard))
                 .setIdMSB(dashboard.getId().getId().getMostSignificantBits())
                 .setIdLSB(dashboard.getId().getId().getLeastSignificantBits()).build();
         }

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

@@ -44,9 +44,10 @@ public class DeviceMsgConstructor {
     private DataDecodingEncodingService dataDecodingEncodingService;
 
     public DeviceUpdateMsg constructDeviceUpdatedMsg(UpdateMsgType msgType, Device device, EdgeVersion edgeVersion) {
-        return EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)
+        if (EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)) {
-                ? constructDeprecatedDeviceUpdateMsg(msgType, device)
+            return constructDeprecatedDeviceUpdateMsg(msgType, device);
-                : DeviceUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(device))
+        }
+        return DeviceUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(device))
                 .setIdMSB(device.getId().getId().getMostSignificantBits())
                 .setIdLSB(device.getId().getId().getLeastSignificantBits()).build();
     }

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

@@ -38,9 +38,10 @@ public class DeviceProfileMsgConstructor {
     private DataDecodingEncodingService dataDecodingEncodingService;
 
     public DeviceProfileUpdateMsg constructDeviceProfileUpdatedMsg(UpdateMsgType msgType, DeviceProfile deviceProfile, EdgeVersion edgeVersion) {
-        return EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)
+        if (EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)) {
-                ? constructDeprecatedDeviceProfileUpdatedMsg(msgType, deviceProfile)
+            return constructDeprecatedDeviceProfileUpdatedMsg(msgType, deviceProfile);
-                : DeviceProfileUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(deviceProfile))
+        }
+        return DeviceProfileUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(deviceProfile))
                 .setIdMSB(deviceProfile.getId().getId().getMostSignificantBits())
                 .setIdLSB(deviceProfile.getId().getId().getLeastSignificantBits()).build();
     }

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

@@ -32,14 +32,15 @@ import org.thingsboard.server.service.edge.rpc.utils.EdgeVersionUtils;
 public class EntityViewMsgConstructor {
 
     public EntityViewUpdateMsg constructEntityViewUpdatedMsg(UpdateMsgType msgType, EntityView entityView, EdgeVersion edgeVersion) {
-        return EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)
+        if (EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)) {
-                ? constructEntityViewUpdatedMsgDeprecated(msgType, entityView)
+            return constructDeprecatedEntityViewUpdatedMsg(msgType, entityView);
-                : EntityViewUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(entityView))
+        }
+        return EntityViewUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(entityView))
                 .setIdMSB(entityView.getId().getId().getMostSignificantBits())
                 .setIdLSB(entityView.getId().getId().getLeastSignificantBits()).build();
     }
 
-    private EntityViewUpdateMsg constructEntityViewUpdatedMsgDeprecated(UpdateMsgType msgType, EntityView entityView) {
+    private EntityViewUpdateMsg constructDeprecatedEntityViewUpdatedMsg(UpdateMsgType msgType, EntityView entityView) {
         EdgeEntityType edgeEntityType = checkEntityType(entityView.getEntityId().getEntityType());
         EntityViewUpdateMsg.Builder builder = EntityViewUpdateMsg.newBuilder()
                 .setMsgType(msgType)

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

@@ -31,9 +31,10 @@ import org.thingsboard.server.service.edge.rpc.utils.EdgeVersionUtils;
 public class OtaPackageMsgConstructor {
 
     public OtaPackageUpdateMsg constructOtaPackageUpdatedMsg(UpdateMsgType msgType, OtaPackage otaPackage, EdgeVersion edgeVersion) {
-        return EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)
+        if (EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)) {
-                ? constructDeprecatedOtaPackageUpdatedMsg(msgType, otaPackage)
+            return constructDeprecatedOtaPackageUpdatedMsg(msgType, otaPackage);
-                : OtaPackageUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(otaPackage))
+        }
+        return OtaPackageUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(otaPackage))
                 .setIdMSB(otaPackage.getId().getId().getMostSignificantBits())
                 .setIdLSB(otaPackage.getId().getId().getLeastSignificantBits()).build();
     }

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

@@ -34,9 +34,10 @@ import org.thingsboard.server.service.edge.rpc.utils.EdgeVersionUtils;
 public class QueueMsgConstructor {
 
     public QueueUpdateMsg constructQueueUpdatedMsg(UpdateMsgType msgType, Queue queue, EdgeVersion edgeVersion) {
-        return EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)
+        if (EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)) {
-                ? constructDeprecatedQueueUpdatedMsg(msgType, queue)
+            return constructDeprecatedQueueUpdatedMsg(msgType, queue);
-                : QueueUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(queue))
+        }
+        return QueueUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(queue))
                 .setIdMSB(queue.getId().getId().getMostSignificantBits())
                 .setIdLSB(queue.getId().getId().getLeastSignificantBits()).build();
     }

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

@@ -29,9 +29,10 @@ import org.thingsboard.server.service.edge.rpc.utils.EdgeVersionUtils;
 public class RelationMsgConstructor {
 
     public RelationUpdateMsg constructRelationUpdatedMsg(UpdateMsgType msgType, EntityRelation entityRelation, EdgeVersion edgeVersion) {
-        return EdgeVersionUtils.isEdgeVersionOlderThan_3_6_2(edgeVersion)
+        if (EdgeVersionUtils.isEdgeVersionOlderThan_3_6_2(edgeVersion)) {
-                ? constructDeprecatedRelationUpdatedMsg(msgType, entityRelation)
+            return constructDeprecatedRelationUpdatedMsg(msgType, entityRelation);
-                : RelationUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(entityRelation)).build();
+        }
+        return RelationUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(entityRelation)).build();
     }
 
     private RelationUpdateMsg constructDeprecatedRelationUpdatedMsg(UpdateMsgType msgType, EntityRelation entityRelation) {

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

@@ -38,9 +38,10 @@ public class RuleChainMsgConstructor {
 
     public RuleChainUpdateMsg constructRuleChainUpdatedMsg(UpdateMsgType msgType, RuleChain ruleChain, boolean isRoot, EdgeVersion edgeVersion) {
         ruleChain.setRoot(isRoot);
-        return EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)
+        if (EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)) {
-                ? constructDeprecatedRuleChainUpdatedMsg(msgType, ruleChain)
+            return constructDeprecatedRuleChainUpdatedMsg(msgType, ruleChain);
-                : RuleChainUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(ruleChain))
+        }
+        return RuleChainUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(ruleChain))
                 .setIdMSB(ruleChain.getId().getId().getMostSignificantBits())
                 .setIdLSB(ruleChain.getId().getId().getLeastSignificantBits()).build();
     }

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

@@ -29,9 +29,10 @@ import org.thingsboard.server.service.edge.rpc.utils.EdgeVersionUtils;
 public class TenantMsgConstructor {
 
     public TenantUpdateMsg constructTenantUpdateMsg(UpdateMsgType msgType, Tenant tenant, EdgeVersion edgeVersion) {
-        return EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)
+        if (EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)) {
-                ? constructDeprecatedTenantUpdateMsg(msgType, tenant)
+            return constructDeprecatedTenantUpdateMsg(msgType, tenant);
-                : TenantUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(tenant)).build();
+        }
+        return TenantUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(tenant)).build();
     }
 
     private TenantUpdateMsg constructDeprecatedTenantUpdateMsg(UpdateMsgType msgType, Tenant tenant) {

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

@@ -37,9 +37,10 @@ public class TenantProfileMsgConstructor {
     public TenantProfileUpdateMsg constructTenantProfileUpdateMsg(UpdateMsgType msgType, TenantProfile tenantProfile, EdgeVersion edgeVersion) {
         ByteString profileData = EdgeVersionUtils.isEdgeVersionOlderThan(edgeVersion, EdgeVersion.V_3_6_1) ?
                 ByteString.empty() : ByteString.copyFrom(dataDecodingEncodingService.encode(tenantProfile.getProfileData()));
-        return EdgeVersionUtils.isEdgeVersionOlderThan_3_6_2(edgeVersion)
+        if (EdgeVersionUtils.isEdgeVersionOlderThan_3_6_2(edgeVersion)) {
-                ? constructDeprecatedTenantProfileUpdateMsg(msgType, tenantProfile, profileData)
+            return constructDeprecatedTenantProfileUpdateMsg(msgType, tenantProfile, profileData);
-                : TenantProfileUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(tenantProfile)).build();
+        }
+        return TenantProfileUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(tenantProfile)).build();
     }
 
     private TenantProfileUpdateMsg constructDeprecatedTenantProfileUpdateMsg(UpdateMsgType msgType, TenantProfile tenantProfile, ByteString profileData) {

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

@@ -32,9 +32,10 @@ import org.thingsboard.server.service.edge.rpc.utils.EdgeVersionUtils;
 public class UserMsgConstructor {
 
     public UserUpdateMsg constructUserUpdatedMsg(UpdateMsgType msgType, User user, EdgeVersion edgeVersion) {
-        return EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)
+        if (EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)) {
-                ? constructDeprecatedUserUpdatedMsg(msgType, user)
+            return constructDeprecatedUserUpdatedMsg(msgType, user);
-                : UserUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(user))
+        }
+        return UserUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(user))
                 .setIdMSB(user.getId().getId().getMostSignificantBits())
                 .setIdLSB(user.getId().getId().getLeastSignificantBits()).build();
     }

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

@@ -33,9 +33,10 @@ import java.util.Arrays;
 public class WidgetTypeMsgConstructor {
 
     public WidgetTypeUpdateMsg constructWidgetTypeUpdateMsg(UpdateMsgType msgType, WidgetTypeDetails widgetTypeDetails, EdgeVersion edgeVersion) {
-        return EdgeVersionUtils.isEdgeVersionOlderThan_3_6_2(edgeVersion)
+        if (EdgeVersionUtils.isEdgeVersionOlderThan_3_6_2(edgeVersion)) {
-                ? constructDeprecatedWidgetTypeUpdateMsg(msgType, widgetTypeDetails, edgeVersion)
+            return constructDeprecatedWidgetTypeUpdateMsg(msgType, widgetTypeDetails, edgeVersion);
-                : WidgetTypeUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(widgetTypeDetails))
+        }
+        return WidgetTypeUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(widgetTypeDetails))
                 .setIdMSB(widgetTypeDetails.getId().getId().getMostSignificantBits())
                 .setIdLSB(widgetTypeDetails.getId().getId().getLeastSignificantBits()).build();
     }

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

@@ -35,9 +35,10 @@ import java.util.List;
 public class WidgetsBundleMsgConstructor {
 
     public WidgetsBundleUpdateMsg constructWidgetsBundleUpdateMsg(UpdateMsgType msgType, WidgetsBundle widgetsBundle, List<String> widgets, EdgeVersion edgeVersion) {
-        return EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)
+        if (EdgeVersionUtils.isEdgeProtoDeprecated(edgeVersion)) {
-                ? constructDeprecatedWidgetsBundleUpdateMsg(msgType, widgetsBundle, widgets)
+            return constructDeprecatedWidgetsBundleUpdateMsg(msgType, widgetsBundle, widgets);
-                : WidgetsBundleUpdateMsg.newBuilder().setWidgets(JacksonUtil.toString(widgets)).setEntity(JacksonUtil.toString(widgetsBundle))
+        }
+        return WidgetsBundleUpdateMsg.newBuilder().setWidgets(JacksonUtil.toString(widgets)).setEntity(JacksonUtil.toString(widgetsBundle))
                 .setMsgType(msgType).setIdMSB(widgetsBundle.getId().getId().getMostSignificantBits())
                 .setIdLSB(widgetsBundle.getId().getId().getLeastSignificantBits()).build();
     }

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

@@ -31,15 +31,14 @@ import java.util.Set;
 @Slf4j
 public abstract class BaseDashboardProcessor extends BaseEdgeProcessor {
 
-    protected boolean saveOrUpdateDashboard(TenantId tenantId, DashboardId deprecatedDashboardId, DashboardUpdateMsg dashboardUpdateMsg, boolean isEdgeProtoDeprecated) {
+    protected boolean saveOrUpdateDashboard(TenantId tenantId, DashboardId dashboardId, DashboardUpdateMsg dashboardUpdateMsg, boolean isEdgeProtoDeprecated) {
         boolean created = false;
         Dashboard dashboard = isEdgeProtoDeprecated
-                ? createDashboard(tenantId, deprecatedDashboardId, dashboardUpdateMsg)
+                ? createDashboard(tenantId, dashboardId, dashboardUpdateMsg)
                 : JacksonUtil.fromStringIgnoreUnknownProperties(dashboardUpdateMsg.getEntity(), Dashboard.class);
         if (dashboard == null) {
             throw new RuntimeException("[{" + tenantId + "}] dashboardUpdateMsg {" + dashboardUpdateMsg + "} cannot be converted to dashboard");
         }
-        DashboardId dashboardId = dashboard.getId();
         Dashboard dashboardById = dashboardService.findDashboardById(tenantId, dashboardId);
         if (dashboardById == null) {
             created = true;
@@ -64,7 +63,6 @@ public abstract class BaseDashboardProcessor extends BaseEdgeProcessor {
     private Dashboard createDashboard(TenantId tenantId, DashboardId dashboardId, DashboardUpdateMsg dashboardUpdateMsg) {
         Dashboard dashboard = new Dashboard();
         dashboard.setTenantId(tenantId);
-        dashboard.setId(dashboardId);
         dashboard.setCreatedTime(Uuids.unixTimestamp(dashboardId.getId()));
         dashboard.setTitle(dashboardUpdateMsg.getTitle());
         dashboard.setImage(dashboardUpdateMsg.hasImage() ? dashboardUpdateMsg.getImage() : null);

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

@@ -60,6 +60,7 @@ public abstract class BaseEntityViewProcessor extends BaseEdgeProcessor {
             entityViewNameUpdated = true;
         }
         entityView.setName(entityViewName);
+        setCustomerId(tenantId, created ? null : entityViewById.getCustomerId(), entityView, entityViewUpdateMsg, isEdgeProtoDeprecated);
 
         entityViewValidator.validate(entityView, EntityView::getTenantId);
         if (created) {
@@ -90,4 +91,6 @@ public abstract class BaseEntityViewProcessor extends BaseEdgeProcessor {
         }
         return entityView;
     }
+
+    protected abstract void setCustomerId(TenantId tenantId, CustomerId customerId, EntityView entityView, EntityViewUpdateMsg entityViewUpdateMsg, boolean isEdgeVersionDeprecated);
 }

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

@@ -27,6 +27,7 @@ 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.CustomerId;
 import org.thingsboard.server.common.data.id.EntityViewId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.msg.TbMsgType;
@@ -137,4 +138,12 @@ public class EntityViewEdgeProcessor extends BaseEntityViewProcessor {
         }
         return downlinkMsg;
     }
+
+    @Override
+    protected void setCustomerId(TenantId tenantId, CustomerId customerId, EntityView entityView, EntityViewUpdateMsg entityViewUpdateMsg, boolean isEdgeVersionDeprecated) {
+        CustomerId customerUUID = isEdgeVersionDeprecated
+                ? safeGetCustomerId(entityViewUpdateMsg.getCustomerIdMSB(), entityViewUpdateMsg.getCustomerIdLSB())
+                : entityView.getCustomerId() != null ? entityView.getCustomerId() : customerId;
+        entityView.setCustomerId(customerUUID);
+    }
 }