From e1b18e7bed022d0a54680946cd124fe2bf2f6f59 Mon Sep 17 00:00:00 2001
From: ShvaykaD <dshvaika@thingsboard.io>
Date: Sat, 12 Aug 2023 09:17:21 +0300
Subject: [PATCH] additional updates after review

---
 .../server/common/data/msg/TbMsgType.java     | 20 +++++++++++--------
 .../thingsboard/server/common/msg/TbMsg.java  |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/msg/TbMsgType.java b/common/data/src/main/java/org/thingsboard/server/common/data/msg/TbMsgType.java
index 1f7691c7f5..23149c79c1 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/msg/TbMsgType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/msg/TbMsgType.java
@@ -38,10 +38,10 @@ public enum TbMsgType {
     ENTITY_UNASSIGNED("Entity Unassigned"),
     ATTRIBUTES_UPDATED("Attributes Updated"),
     ATTRIBUTES_DELETED("Attributes Deleted"),
-    ALARM(null),
+    ALARM,
     ALARM_ACK("Alarm Acknowledged"),
     ALARM_CLEAR("Alarm Cleared"),
-    ALARM_DELETE(null),
+    ALARM_DELETE,
     ALARM_ASSIGNED("Alarm Assigned"),
     ALARM_UNASSIGNED("Alarm Unassigned"),
     COMMENT_CREATED("Comment Created"),
@@ -49,8 +49,8 @@ public enum TbMsgType {
     RPC_CALL_FROM_SERVER_TO_DEVICE("RPC Request to Device"),
     ENTITY_ASSIGNED_FROM_TENANT("Entity Assigned From Tenant"),
     ENTITY_ASSIGNED_TO_TENANT("Entity Assigned To Tenant"),
-    ENTITY_ASSIGNED_TO_EDGE(null),
-    ENTITY_UNASSIGNED_FROM_EDGE(null),
+    ENTITY_ASSIGNED_TO_EDGE,
+    ENTITY_UNASSIGNED_FROM_EDGE,
     TIMESERIES_UPDATED("Timeseries Updated"),
     TIMESERIES_DELETED("Timeseries Deleted"),
     RPC_QUEUED("RPC Queued"),
@@ -64,9 +64,9 @@ public enum TbMsgType {
     RELATION_ADD_OR_UPDATE("Relation Added or Updated"),
     RELATION_DELETED("Relation Deleted"),
     RELATIONS_DELETED("All Relations Deleted"),
-    PROVISION_SUCCESS(null),
-    PROVISION_FAILURE(null),
-    SEND_EMAIL(null),
+    PROVISION_SUCCESS,
+    PROVISION_FAILURE,
+    SEND_EMAIL,
 
     // tellSelfOnly types
     GENERATOR_NODE_SELF_MSG(null, true),
@@ -78,7 +78,7 @@ public enum TbMsgType {
     MSG_COUNT_SELF_MSG(null, true),
 
     // Custom or N/A type:
-    NA(null, false);
+    NA;
 
     public static final List<String> NODE_CONNECTIONS = EnumSet.allOf(TbMsgType.class).stream()
             .filter(tbMsgType -> !tbMsgType.isTellSelfOnly())
@@ -101,4 +101,8 @@ public enum TbMsgType {
         this(ruleNodeConnection, false);
     }
 
+    TbMsgType() {
+        this(null, false);
+    }
+
 }
diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java
index 8b76677c76..63c1e27385 100644
--- a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java
+++ b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java
@@ -484,7 +484,7 @@ public final class TbMsg implements Serializable {
     }
 
     public boolean isTypeOf(TbMsgType tbMsgType) {
-        return tbMsgType != null && tbMsgType.equals(getInternalType());
+        return internalType.equals(tbMsgType);
     }
 
     public boolean isTypeOneOf(TbMsgType... types) {