From ee819e2d8067bcb4bc05a81edae960409b67b54c Mon Sep 17 00:00:00 2001
From: nickAS21 <nick@thingsboard.io>
Date: Tue, 20 Dec 2022 11:37:59 +0200
Subject: [PATCH] sparkplug: connection5

---
 .../server/transport/mqtt/MqttTransportHandler.java        | 7 ++++++-
 .../server/transport/mqtt/session/DeviceSessionCtx.java    | 4 ----
 common/transport/mqtt/src/main/proto/sparkplug.proto       | 6 ------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
index d28669895a..d99e2cb801 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
@@ -47,6 +47,7 @@ import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.TransportPayloadType;
+import org.thingsboard.server.common.data.device.profile.MqttDeviceProfileTransportConfiguration;
 import org.thingsboard.server.common.data.device.profile.MqttTopics;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.OtaPackageId;
@@ -979,7 +980,11 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
     }
 
     private void checkSparkPlugSession(SessionMetaData sessionMetaData, MqttConnectMessage connectMessage) {
-        if (deviceSessionCtx.isSparkplug()) {
+        if  (((MqttDeviceProfileTransportConfiguration) deviceSessionCtx
+                .getDeviceProfile()
+                .getProfileData()
+                .getTransportConfiguration())
+                .isSparkPlug()) {
             TransportDeviceInfo device = deviceSessionCtx.getDeviceInfo();
             try {
                 JsonNode infoNode = context.getMapper().readTree(device.getAdditionalInfo());
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/DeviceSessionCtx.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/DeviceSessionCtx.java
index 8499836b26..2163610b38 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/DeviceSessionCtx.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/DeviceSessionCtx.java
@@ -255,8 +255,4 @@ public class DeviceSessionCtx extends MqttDeviceAwareSessionContext {
         return Collections.unmodifiableCollection(msgQueue);
     }
 
-    public boolean isSparkplug () {
-        return ((MqttDeviceProfileTransportConfiguration) this.getDeviceProfile().getProfileData().getTransportConfiguration()).isSparkPlug();
-    }
-
 }
diff --git a/common/transport/mqtt/src/main/proto/sparkplug.proto b/common/transport/mqtt/src/main/proto/sparkplug.proto
index 8e2d0687d8..a06a10325b 100644
--- a/common/transport/mqtt/src/main/proto/sparkplug.proto
+++ b/common/transport/mqtt/src/main/proto/sparkplug.proto
@@ -15,12 +15,6 @@
  */
 syntax = "proto3";
 
-//
-// To compile:
-// cd client_libraries/java
-// protoc --proto_path=../../ --java_out=src/main/java ../../sparkplug_b.proto
-//
-//package com.cirruslink.sparkplug.protobuf;
 import "google/protobuf/any.proto";