From 6fad315a03434ea8bc32b035629c2fb70543c22b Mon Sep 17 00:00:00 2001 From: zbeacon Date: Tue, 6 Dec 2022 12:55:45 +0200 Subject: [PATCH] Added changes due to comments --- .../mqtt/mqttv3/credentials/BasicMqttCredentialsTest.java | 1 + .../server/transport/mqtt/mqttv5/MqttV5TestClient.java | 2 +- .../thingsboard/server/transport/mqtt/MqttTransportHandler.java | 1 - .../server/transport/mqtt/session/DeviceSessionCtx.java | 2 -- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/credentials/BasicMqttCredentialsTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/credentials/BasicMqttCredentialsTest.java index 9e22a226d4..af463e320e 100644 --- a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/credentials/BasicMqttCredentialsTest.java +++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/credentials/BasicMqttCredentialsTest.java @@ -121,6 +121,7 @@ public class BasicMqttCredentialsTest extends AbstractMqttIntegrationTest { MqttTestClient mqttTestClient = new MqttTestClient(CLIENT_ID); try { mqttTestClient.connectAndWait(USER_NAME3, "WRONG PASSWORD"); + Assert.fail(); // This should not happens, because we have a wrong password } catch (MqttException e) { Assert.assertEquals(4, e.getReasonCode()); // 4 - Reason code for bad username or password in MQTT v3 } diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv5/MqttV5TestClient.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv5/MqttV5TestClient.java index d7d75229f4..0671dd6f95 100644 --- a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv5/MqttV5TestClient.java +++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv5/MqttV5TestClient.java @@ -27,7 +27,7 @@ import org.thingsboard.server.common.data.StringUtils; import java.util.concurrent.TimeUnit; -public class MqttV5TestClient { +public class MqttV5TestClient { // We should copy part of MqttV3TestClient, due to different package names in import private static final String MQTT_URL = "tcp://localhost:1883"; private static final int TIMEOUT = 30; // seconds 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 2c3ac45326..7515a1fcd2 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 @@ -947,7 +947,6 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement case 5: return MqttVersion.MQTT_5; default: - case 4: return MqttVersion.MQTT_3_1_1; } } 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 e1077600f0..7189b46469 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 @@ -79,8 +79,6 @@ public class DeviceSessionCtx extends MqttDeviceAwareSessionContext { @Setter private MqttVersion mqttVersion; - - private volatile MqttTopicFilter telemetryTopicFilter = MqttTopicFilterFactory.getDefaultTelemetryFilter(); private volatile MqttTopicFilter attributesTopicFilter = MqttTopicFilterFactory.getDefaultAttributesFilter(); private volatile TransportPayloadType payloadType = TransportPayloadType.JSON;