Refactor TK103 protocol encoder

2 files changed, 61 insertions, 50 deletions

diff --git a/src/org/traccar/protocol/Tk103ProtocolEncoder.java b/src/org/traccar/protocol/Tk103ProtocolEncoder.java
index d7b17eeb7..946f3ad73 100644
--- a/src/org/traccar/protocol/Tk103ProtocolEncoder.java
+++ b/src/org/traccar/protocol/Tk103ProtocolEncoder.java
@@ -33,6 +33,10 @@ public class Tk103ProtocolEncoder extends StringProtocolEncoder {
         this.forceAlternative = forceAlternative;
     }
 
+    private String formatAlt(Command command, String format, String... keys) {
+        return formatCommand(command, "[begin]sms2," + format + ",[end]", keys);
+    }
+
     @Override
     protected Object encodeCommand(Command command) {
 
@@ -41,56 +45,63 @@ public class Tk103ProtocolEncoder extends StringProtocolEncoder {
 
         initDevicePassword(command, "123456");
 
-        switch (command.getType()) {
-            case Command.TYPE_GET_VERSION:
-                return alternative ? formatCommand(command, "[begin]sms2,*about*,[end]")
-                        : formatCommand(command, "({%s}AP07)", Command.KEY_UNIQUE_ID);
-            case Command.TYPE_REBOOT_DEVICE:
-                return alternative ? formatCommand(command, "[begin]sms2,88888888,[end]")
-                        : formatCommand(command, "({%s}AT00)", Command.KEY_UNIQUE_ID);
-            case Command.TYPE_SET_ODOMETER:
-                return formatCommand(command, "({%s}AX01)", Command.KEY_UNIQUE_ID);
-            case Command.TYPE_POSITION_SINGLE:
-                return alternative ? formatCommand(command, "[begin]sms2,*getposl*,[end]")
-                        : formatCommand(command, "({%s}AP00)", Command.KEY_UNIQUE_ID);
-            case Command.TYPE_POSITION_PERIODIC:
-                return alternative ? formatCommand(command, "[begin]sms2,*routetrack*99*,[end]")
-                        : formatCommand(command, "({%s}AR00%s0000)", Command.KEY_UNIQUE_ID,
-                        String.format("%04X", command.getInteger(Command.KEY_FREQUENCY)));
-            case Command.TYPE_POSITION_STOP:
-                return alternative ? formatCommand(command, "[begin]sms2,*routetrackoff*,[end]")
-                        : formatCommand(command, "({%s}AR0000000000)", Command.KEY_UNIQUE_ID);
-            case Command.TYPE_ENGINE_STOP:
-                return formatCommand(command, "({%s}AV011)", Command.KEY_UNIQUE_ID);
-            case Command.TYPE_ENGINE_RESUME:
-                return formatCommand(command, "({%s}AV010)", Command.KEY_UNIQUE_ID);
-            case Command.TYPE_CUSTOM:
-                return formatCommand(command, "[begin]sms2,{%s},[end]", Command.KEY_DATA);
-            case Command.TYPE_GET_DEVICE_STATUS:
-                return formatCommand(command, "[begin]sms2,*status*,[end]");
-            case Command.TYPE_IDENTIFICATION:
-                return formatCommand(command, "[begin]sms2,999999,[end]");
-            case Command.TYPE_MODE_DEEP_SLEEP:
-                return formatCommand(command, command.getBoolean(Command.KEY_ENABLE)
-                        ? "[begin]sms2,*sleep*2*,[end]" : "[begin]sms2,*sleepoff*,[end]");
-            case Command.TYPE_MODE_POWER_SAVING:
-                return formatCommand(command, command.getBoolean(Command.KEY_ENABLE)
-                        ? "[begin]sms2,*sleepv*,[end]" : "[begin]sms2,*sleepoff*,[end]");
-            case Command.TYPE_ALARM_SOS:
-                return formatCommand(command, command.getBoolean(Command.KEY_ENABLE)
-                        ? "[begin]sms2,*soson*,[end]" : "[begin]sms2,*sosoff*,[end]");
-            case Command.TYPE_SET_CONNECTION:
-                return formatCommand(command, "[begin]sms2,*setip*%s*{%s}*,[end]",
-                        command.getString(Command.KEY_SERVER).replace(".", "*"), Command.KEY_PORT);
-            case Command.TYPE_SOS_NUMBER:
-                return formatCommand(command, "[begin]sms2,*master*{%s}*{%s}*,[end]",
-                        Command.KEY_DEVICE_PASSWORD, Command.KEY_PHONE);
-            default:
-                Log.warning(new UnsupportedOperationException(command.getType()));
-                break;
+        if (alternative) {
+            switch (command.getType()) {
+                case Command.TYPE_GET_VERSION:
+                    return formatAlt(command, "*about*");
+                case Command.TYPE_REBOOT_DEVICE:
+                    return formatAlt(command, "88888888");
+                case Command.TYPE_POSITION_SINGLE:
+                    return formatAlt(command, "*getposl*");
+                case Command.TYPE_POSITION_PERIODIC:
+                    return formatAlt(command, "*routetrack*99*");
+                case Command.TYPE_POSITION_STOP:
+                    return formatAlt(command, "*routetrackoff*");
+                case Command.TYPE_CUSTOM:
+                    return formatAlt(command, "{%s}", Command.KEY_DATA);
+                case Command.TYPE_GET_DEVICE_STATUS:
+                    return formatAlt(command, "*status*");
+                case Command.TYPE_IDENTIFICATION:
+                    return formatAlt(command, "999999");
+                case Command.TYPE_MODE_DEEP_SLEEP:
+                    return formatAlt(command, command.getBoolean(Command.KEY_ENABLE) ? "*sleep*2*" : "*sleepoff*");
+                case Command.TYPE_MODE_POWER_SAVING:
+                    return formatAlt(command, command.getBoolean(Command.KEY_ENABLE) ? "*sleepv*" : "*sleepoff*");
+                case Command.TYPE_ALARM_SOS:
+                    return formatAlt(command, command.getBoolean(Command.KEY_ENABLE) ? "*soson*" : "*sosoff*");
+                case Command.TYPE_SET_CONNECTION:
+                    return formatAlt(command, "*setip*%s*{%s}*",
+                            command.getString(Command.KEY_SERVER).replace(".", "*"), Command.KEY_PORT);
+                case Command.TYPE_SOS_NUMBER:
+                    return formatAlt(command, "*master*{%s}*{%s}*", Command.KEY_DEVICE_PASSWORD, Command.KEY_PHONE);
+                default:
+                    Log.warning(new UnsupportedOperationException(command.getType()));
+                    return null;
+            }
+        } else {
+            switch (command.getType()) {
+                case Command.TYPE_GET_VERSION:
+                    return formatCommand(command, "({%s}AP07)", Command.KEY_UNIQUE_ID);
+                case Command.TYPE_REBOOT_DEVICE:
+                    return formatCommand(command, "({%s}AT00)", Command.KEY_UNIQUE_ID);
+                case Command.TYPE_SET_ODOMETER:
+                    return formatCommand(command, "({%s}AX01)", Command.KEY_UNIQUE_ID);
+                case Command.TYPE_POSITION_SINGLE:
+                    return formatCommand(command, "({%s}AP00)", Command.KEY_UNIQUE_ID);
+                case Command.TYPE_POSITION_PERIODIC:
+                    return formatCommand(command, "({%s}AR00%s0000)", Command.KEY_UNIQUE_ID,
+                            String.format("%04X", command.getInteger(Command.KEY_FREQUENCY)));
+                case Command.TYPE_POSITION_STOP:
+                    return formatCommand(command, "({%s}AR0000000000)", Command.KEY_UNIQUE_ID);
+                case Command.TYPE_ENGINE_STOP:
+                    return formatCommand(command, "({%s}AV010)", Command.KEY_UNIQUE_ID);
+                case Command.TYPE_ENGINE_RESUME:
+                    return formatCommand(command, "({%s}AV011)", Command.KEY_UNIQUE_ID);
+                default:
+                    Log.warning(new UnsupportedOperationException(command.getType()));
+                    return null;
+            }
         }
-
-        return null;
     }
 
 }
diff --git a/test/org/traccar/protocol/Tk103ProtocolEncoderTest.java b/test/org/traccar/protocol/Tk103ProtocolEncoderTest.java
index a99889e3b..7e04dcb81 100644
--- a/test/org/traccar/protocol/Tk103ProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/Tk103ProtocolEncoderTest.java
@@ -18,7 +18,7 @@ public class Tk103ProtocolEncoderTest extends ProtocolTest {
         command.setDeviceId(1);
         command.setType(Command.TYPE_ENGINE_STOP);
 
-        Assert.assertEquals("(123456789012345AV011)", encoder.encodeCommand(command));
+        Assert.assertEquals("(123456789012345AV010)", encoder.encodeCommand(command));
 
     }