dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed custom msg type to NA

Browse Source
This commit is contained in:
ShvaykaD 2023-08-11 20:34:17 +03:00
parent cebe1040d4
commit ea5a855272
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/data/src/main/java/org/thingsboard/server/common/data/msg/TbMsgType.java
View File

@ -78,7 +78,7 @@ public enum TbMsgType {
MSG_COUNT_SELF_MSG(null, true), MSG_COUNT_SELF_MSG(null, true),
// Custom or N/A type: // Custom or N/A type:
CUSTOM_OR_NA_TYPE(null, false); NA(null, false);
public static final List<String> NODE_CONNECTIONS = EnumSet.allOf(TbMsgType.class).stream() public static final List<String> NODE_CONNECTIONS = EnumSet.allOf(TbMsgType.class).stream()
.filter(tbMsgType -> !tbMsgType.isTellSelfOnly()) .filter(tbMsgType -> !tbMsgType.isTellSelfOnly())

4
common/data/src/test/java/org/thingsboard/server/common/data/msg/TbMsgTypeTest.java
View File

@ -22,7 +22,7 @@ import java.util.List;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.thingsboard.server.common.data.msg.TbMsgType.ALARM; import static org.thingsboard.server.common.data.msg.TbMsgType.ALARM;
import static org.thingsboard.server.common.data.msg.TbMsgType.ALARM_DELETE; import static org.thingsboard.server.common.data.msg.TbMsgType.ALARM_DELETE;
import static org.thingsboard.server.common.data.msg.TbMsgType.CUSTOM_OR_NA_TYPE; import static org.thingsboard.server.common.data.msg.TbMsgType.NA;
import static org.thingsboard.server.common.data.msg.TbMsgType.DEDUPLICATION_TIMEOUT_SELF_MSG; import static org.thingsboard.server.common.data.msg.TbMsgType.DEDUPLICATION_TIMEOUT_SELF_MSG;
import static org.thingsboard.server.common.data.msg.TbMsgType.DELAY_TIMEOUT_SELF_MSG; import static org.thingsboard.server.common.data.msg.TbMsgType.DELAY_TIMEOUT_SELF_MSG;
import static org.thingsboard.server.common.data.msg.TbMsgType.ENTITY_ASSIGNED_TO_EDGE; import static org.thingsboard.server.common.data.msg.TbMsgType.ENTITY_ASSIGNED_TO_EDGE;
@ -53,7 +53,7 @@ class TbMsgTypeTest {
DEDUPLICATION_TIMEOUT_SELF_MSG, DEDUPLICATION_TIMEOUT_SELF_MSG,
DELAY_TIMEOUT_SELF_MSG, DELAY_TIMEOUT_SELF_MSG,
MSG_COUNT_SELF_MSG, MSG_COUNT_SELF_MSG,
CUSTOM_OR_NA_TYPE NA
); );
// backward-compatibility tests // backward-compatibility tests

2
common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java
View File

@ -479,7 +479,7 @@ public final class TbMsg implements Serializable {
try { try {
return TbMsgType.valueOf(type); return TbMsgType.valueOf(type);
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
return TbMsgType.CUSTOM_OR_NA_TYPE; return TbMsgType.NA;
} }
} }