Merge tag 'tags/v6.3'

1 files changed, 3 insertions, 9 deletions

diff --git a/src/main/java/org/traccar/BaseMqttProtocolDecoder.java b/src/main/java/org/traccar/BaseMqttProtocolDecoder.java
index 0388563f5..5a55eee74 100644
--- a/src/main/java/org/traccar/BaseMqttProtocolDecoder.java
+++ b/src/main/java/org/traccar/BaseMqttProtocolDecoder.java
@@ -38,9 +38,7 @@ public abstract class BaseMqttProtocolDecoder extends BaseProtocolDecoder {
     protected final Object decode(
             Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
 
-        if (msg instanceof MqttConnectMessage) {
-
-            MqttConnectMessage message = (MqttConnectMessage) msg;
+        if (msg instanceof MqttConnectMessage message) {
 
             DeviceSession deviceSession = getDeviceSession(
                     channel, remoteAddress, message.payload().clientIdentifier());
@@ -55,9 +53,7 @@ public abstract class BaseMqttProtocolDecoder extends BaseProtocolDecoder {
                 channel.writeAndFlush(new NetworkMessage(response, remoteAddress));
             }
 
-        } else if (msg instanceof MqttSubscribeMessage) {
-
-            MqttSubscribeMessage message = (MqttSubscribeMessage) msg;
+        } else if (msg instanceof MqttSubscribeMessage message) {
 
             MqttMessage response = MqttMessageBuilders.subAck()
                     .packetId(message.variableHeader().messageId())
@@ -67,15 +63,13 @@ public abstract class BaseMqttProtocolDecoder extends BaseProtocolDecoder {
                 channel.writeAndFlush(new NetworkMessage(response, remoteAddress));
             }
 
-        } else if (msg instanceof MqttPublishMessage) {
+        } else if (msg instanceof MqttPublishMessage message) {
 
             DeviceSession deviceSession = getDeviceSession(channel, remoteAddress);
             if (deviceSession == null) {
                 return null;
             }
 
-            MqttPublishMessage message = (MqttPublishMessage) msg;
-
             Object result = decode(deviceSession, message);
 
             MqttMessage response = MqttMessageBuilders.pubAck()