From b16d8484e91798ec77a6e73f1726e5159de160b8 Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Wed, 8 May 2024 14:50:11 +0300
Subject: [PATCH] Minor refactoring for notifications consumers

---
 .../queue/processing/AbstractConsumerService.java  |  2 +-
 .../server/common/msg/queue/ServiceType.java       | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractConsumerService.java b/application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractConsumerService.java
index 85227e50ab..a264f912cb 100644
--- a/application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractConsumerService.java
+++ b/application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractConsumerService.java
@@ -85,7 +85,7 @@ public abstract class AbstractConsumerService<N extends com.google.protobuf.Gene
         this.scheduler = Executors.newSingleThreadScheduledExecutor(ThingsBoardThreadFactory.forName(prefix + "-consumer-scheduler"));
 
         this.nfConsumer = QueueConsumerManager.<TbProtoQueueMsg<N>>builder()
-                .name("TB Notifications")
+                .name(getServiceType().getLabel() + " Notifications")
                 .msgPackProcessor(this::processNotifications)
                 .pollInterval(getNotificationPollDuration())
                 .consumerCreator(this::createNotificationsConsumer)
diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/queue/ServiceType.java b/common/message/src/main/java/org/thingsboard/server/common/msg/queue/ServiceType.java
index c823ea4d73..f3a0e47d09 100644
--- a/common/message/src/main/java/org/thingsboard/server/common/msg/queue/ServiceType.java
+++ b/common/message/src/main/java/org/thingsboard/server/common/msg/queue/ServiceType.java
@@ -15,11 +15,23 @@
  */
 package org.thingsboard.server.common.msg.queue;
 
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Getter
 public enum ServiceType {
 
-    TB_CORE, TB_RULE_ENGINE, TB_TRANSPORT, JS_EXECUTOR, TB_VC_EXECUTOR;
+    TB_CORE("TB Core"),
+    TB_RULE_ENGINE("TB Rule Engine"),
+    TB_TRANSPORT("TB Transport"),
+    JS_EXECUTOR("JS Executor"),
+    TB_VC_EXECUTOR("TB VC Executor");
+
+    private final String label;
 
     public static ServiceType of(String serviceType) {
         return ServiceType.valueOf(serviceType.replace("-", "_").toUpperCase());
     }
+
 }