Merge tag 'tags/v6.3'

1 files changed, 11 insertions, 18 deletions

diff --git a/src/main/java/org/traccar/protocol/TrakMateProtocolDecoder.java b/src/main/java/org/traccar/protocol/TrakMateProtocolDecoder.java
index b1f50dc10..78c21b40d 100644
--- a/src/main/java/org/traccar/protocol/TrakMateProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/TrakMateProtocolDecoder.java
@@ -91,16 +91,12 @@ public class TrakMateProtocolDecoder extends BaseProtocolDecoder {
             .compile();
 
     private String decodeAlarm(int value) {
-        switch (value) {
-            case 1:
-                return Position.ALARM_SOS;
-            case 3:
-                return Position.ALARM_GEOFENCE;
-            case 4:
-                return Position.ALARM_POWER_CUT;
-            default:
-                return null;
-        }
+        return switch (value) {
+            case 1 -> Position.ALARM_SOS;
+            case 3 -> Position.ALARM_GEOFENCE;
+            case 4 -> Position.ALARM_POWER_CUT;
+            default -> null;
+        };
     }
 
     private Object decodeSrt(Channel channel, SocketAddress remoteAddress, String sentence) {
@@ -220,14 +216,11 @@ public class TrakMateProtocolDecoder extends BaseProtocolDecoder {
         }
 
         String type = sentence.substring(typeIndex + 3, typeIndex + 6);
-        switch (type) {
-            case "ALT":
-                return decodeAlt(channel, remoteAddress, sentence);
-            case "SRT":
-                return decodeSrt(channel, remoteAddress, sentence);
-            default:
-                return decodePer(channel, remoteAddress, sentence);
-        }
+        return switch (type) {
+            case "ALT" -> decodeAlt(channel, remoteAddress, sentence);
+            case "SRT" -> decodeSrt(channel, remoteAddress, sentence);
+            default -> decodePer(channel, remoteAddress, sentence);
+        };
     }
 
 }