From 9be785c32c082a11e227270cedd61edc49a6c19a Mon Sep 17 00:00:00 2001
From: nickAS21 <nick@thingsboard.io>
Date: Thu, 16 Feb 2023 19:10:27 +0200
Subject: [PATCH] sparkplug: comment3

---
 .../mqtt/session/AbstractGatewaySessionHandler.java | 13 ++++---------
 .../mqtt/util/sparkplug/SparkplugMessageType.java   | 12 ++----------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java
index 9d45c0a1b0..c8a0c940b2 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java
@@ -36,7 +36,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ConcurrentReferenceHashMap;
 import org.thingsboard.server.common.data.StringUtils;
-import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.transport.TransportService;
 import org.thingsboard.server.common.transport.TransportServiceCallback;
@@ -739,15 +738,11 @@ public abstract class AbstractGatewaySessionHandler {
         log.debug("[{}] Removed device [{}] from the gateway session", sessionId, deviceName);
     }
 
-    public void sendSparkplugStateOnTelemetry(TransportProtos.SessionInfoProto sessionInfo, String deviceName, SparkplugConnectionState typeSate, long ts) {
+    public void sendSparkplugStateOnTelemetry(TransportProtos.SessionInfoProto sessionInfo, String deviceName, SparkplugConnectionState connectionState, long ts) {
         TransportProtos.KeyValueProto.Builder keyValueProtoBuilder = TransportProtos.KeyValueProto.newBuilder();
-        try {
-            keyValueProtoBuilder.setKey(messageName(STATE));
-            keyValueProtoBuilder.setType(TransportProtos.KeyValueType.STRING_V);
-            keyValueProtoBuilder.setStringV(typeSate.name());
-        } catch (ThingsboardException e) {
-            e.printStackTrace();
-        }
+        keyValueProtoBuilder.setKey(messageName(STATE));
+        keyValueProtoBuilder.setType(TransportProtos.KeyValueType.STRING_V);
+        keyValueProtoBuilder.setStringV(connectionState.name());
         TransportProtos.PostTelemetryMsg postTelemetryMsg = postTelemetryMsgCreated(keyValueProtoBuilder.build(), ts);
 
         transportService.process(sessionInfo, postTelemetryMsg, getPubAckCallback(channel, deviceName, -1, postTelemetryMsg));
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/SparkplugMessageType.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/SparkplugMessageType.java
index 0a2eb911aa..7bbcd3548f 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/SparkplugMessageType.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/SparkplugMessageType.java
@@ -87,16 +87,8 @@ public enum SparkplugMessageType {
 		}
 		throw new ThingsboardException("Invalid message type: " + type, ThingsboardErrorCode.INVALID_ARGUMENTS);
 	}
-	public static String messageName(SparkplugMessageType type) throws ThingsboardException {
-		if (STATE.equals(type)) {
-			return "sparkplugConnectionState";
-		}
-		for (SparkplugMessageType messageType : SparkplugMessageType.values()) {
-			if (messageType.name().equals(type)) {
-				return messageType.name();
-			}
-		}
-		throw new ThingsboardException("Invalid message type: " + type, ThingsboardErrorCode.INVALID_ARGUMENTS);
+	public static String messageName(SparkplugMessageType type) {
+		return STATE.equals(type) ? "sparkplugConnectionState" : type.name();
 	}
 	
 	public boolean isDeath() {