From 33170298d32b664fb92b253f153206abc2c39286 Mon Sep 17 00:00:00 2001 From: Oleksandra Matviienko Date: Sat, 28 Mar 2026 20:25:38 +0100 Subject: [PATCH 1/3] Fix: improve logging and remove redundant null check in MQTT transport Co-Authored-By: Claude Sonnet 4.6 --- .../thingsboard/server/transport/mqtt/MqttTransportHandler.java | 2 +- .../server/transport/mqtt/util/sparkplug/MetricDataType.java | 2 +- 2 files changed, 2 insertions(+), 2 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 f753579292..f61f24db25 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 @@ -1127,7 +1127,7 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement return (X509Certificate) certChain[0]; } } catch (SSLPeerUnverifiedException e) { - log.warn(e.getMessage()); + log.warn("SSL peer unverified", e); return null; } return null; diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/MetricDataType.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/MetricDataType.java index 6ec2bbf467..325b5803da 100644 --- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/MetricDataType.java +++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/sparkplug/MetricDataType.java @@ -96,7 +96,7 @@ public enum MetricDataType { */ public void checkType(Object value) throws AdaptorException { if (value != null && !clazz.isAssignableFrom(value.getClass())) { - String msgError = "Failed type check - " + clazz + " != " + ((value != null) ? value.getClass().toString() : "null"); + String msgError = "Failed type check - " + clazz + " != " + value.getClass().toString(); log.debug(msgError); throw new AdaptorException(msgError); } From 940918de5a70e8cc74507b6c492f173f83f3f1c0 Mon Sep 17 00:00:00 2001 From: Oleksandra Matviienko Date: Sat, 28 Mar 2026 20:57:38 +0100 Subject: [PATCH 2/3] Fix: improve logging and remove redundant null check in MQTT transport Co-Authored-By: Claude Sonnet 4.6 --- .../server/transport/mqtt/MqttTransportHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 f61f24db25..635762c28f 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 @@ -1127,7 +1127,8 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement return (X509Certificate) certChain[0]; } } catch (SSLPeerUnverifiedException e) { - log.warn("SSL peer unverified", e); + // Expected when client connects without a valid certificate — no stack trace needed + log.warn("SSL peer unverified: {}", e.getMessage()); return null; } return null; From 2c3425bf9a3725ffdc765b50e9f67efce01f0a56 Mon Sep 17 00:00:00 2001 From: Oleksandra Matviienko Date: Sat, 28 Mar 2026 21:08:01 +0100 Subject: [PATCH 3/3] Test: add unit tests for MetricDataType.checkType() Co-Authored-By: Claude Sonnet 4.6 --- .../util/sparkplug/MetricDataTypeTest.java | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/util/sparkplug/MetricDataTypeTest.java diff --git a/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/util/sparkplug/MetricDataTypeTest.java b/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/util/sparkplug/MetricDataTypeTest.java new file mode 100644 index 0000000000..5a3d8375b3 --- /dev/null +++ b/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/util/sparkplug/MetricDataTypeTest.java @@ -0,0 +1,43 @@ +/** + * Copyright © 2016-2026 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.transport.mqtt.util.sparkplug; + +import org.junit.jupiter.api.Test; +import org.thingsboard.server.common.adaptor.AdaptorException; + +import static org.assertj.core.api.Assertions.assertThatNoException; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class MetricDataTypeTest { + + @Test + void checkType_noExceptionWhenValueMatchesExpectedType() { + assertThatNoException().isThrownBy(() -> MetricDataType.String.checkType("hello")); + } + + @Test + void checkType_noExceptionWhenValueIsNull() { + assertThatNoException().isThrownBy(() -> MetricDataType.String.checkType(null)); + } + + @Test + void checkType_throwsAdaptorExceptionWithActualClassNameWhenTypeMismatch() { + assertThatThrownBy(() -> MetricDataType.String.checkType(42)) + .isInstanceOf(AdaptorException.class) + .hasMessageContaining(Integer.class.toString()); + } + +}