Merge pull request #1725 from hanselsen/master

Minifinder CUSTOM commands

4 files changed, 80 insertions, 0 deletions

diff --git a/src/org/traccar/model/Command.java b/src/org/traccar/model/Command.java
index 59e96be0e..dd541e643 100644
--- a/src/org/traccar/model/Command.java
+++ b/src/org/traccar/model/Command.java
@@ -38,4 +38,5 @@ public class Command extends Extensible {
     public static final String KEY_DEVICE_PASSWORD = "devicePassword";
     public static final String KEY_RADIUS = "radius";
 
+    public static final String TYPE_CUSTOM = "CUSTOM";
 }
diff --git a/src/org/traccar/protocol/MiniFinderProtocol.java b/src/org/traccar/protocol/MiniFinderProtocol.java
index cd159c8b7..b22539277 100644
--- a/src/org/traccar/protocol/MiniFinderProtocol.java
+++ b/src/org/traccar/protocol/MiniFinderProtocol.java
@@ -21,6 +21,7 @@ import org.jboss.netty.handler.codec.string.StringDecoder;
 import org.traccar.BaseProtocol;
 import org.traccar.CharacterDelimiterFrameDecoder;
 import org.traccar.TrackerServer;
+import org.traccar.model.Command;
 
 import java.util.List;
 
@@ -28,6 +29,7 @@ public class MiniFinderProtocol extends BaseProtocol {
 
     public MiniFinderProtocol() {
         super("minifinder");
+        setSupportedCommands(Command.TYPE_CUSTOM);
     }
 
     @Override
@@ -38,6 +40,7 @@ public class MiniFinderProtocol extends BaseProtocol {
                 pipeline.addLast("frameDecoder", new CharacterDelimiterFrameDecoder(1024, ';'));
                 pipeline.addLast("stringDecoder", new StringDecoder());
                 pipeline.addLast("objectDecoder", new MiniFinderProtocolDecoder(MiniFinderProtocol.this));
+                pipeline.addLast("objectEncoder", new MiniFinderProtocolEncoder());
             }
         });
     }
diff --git a/src/org/traccar/protocol/MiniFinderProtocolEncoder.java b/src/org/traccar/protocol/MiniFinderProtocolEncoder.java
new file mode 100644
index 000000000..729c57573
--- /dev/null
+++ b/src/org/traccar/protocol/MiniFinderProtocolEncoder.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * 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.traccar.protocol;
+
+import org.traccar.StringProtocolEncoder;
+import org.traccar.helper.Log;
+import org.traccar.model.Command;
+
+public class MiniFinderProtocolEncoder extends StringProtocolEncoder {
+
+    private static final String prefix = "123456";
+
+    @Override
+    protected Object encodeCommand(Command command) {
+
+        switch (command.getType()) {
+            case Command.TYPE_CUSTOM:
+                return command.getAttributes().get("raw");
+            default:
+                Log.warning(new UnsupportedOperationException(command.getType()));
+                break;
+        }
+
+        return null;
+    }
+
+}
diff --git a/test/org/traccar/protocol/MiniFinderProtocolEncoderTest.java b/test/org/traccar/protocol/MiniFinderProtocolEncoderTest.java
new file mode 100644
index 000000000..524152bb8
--- /dev/null
+++ b/test/org/traccar/protocol/MiniFinderProtocolEncoderTest.java
@@ -0,0 +1,36 @@
+package org.traccar.protocol;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+import org.traccar.model.Command;
+
+public class MiniFinderProtocolEncoderTest extends ProtocolTest {
+
+    private String prefix = "123456";
+    private MiniFinderProtocolEncoder encoder;
+
+    @Before
+    public void setup() {
+        encoder = new MiniFinderProtocolEncoder();
+    }
+
+    @Test
+    public void testEncodeCustom() throws Exception {
+        String expected = String.format("%sM,700", prefix);
+        Command command = new Command();
+        command.setType(Command.TYPE_CUSTOM);
+        command.set("raw", expected);
+        Object encoded = encoder.encodeCommand(command);
+        assert expected.equals(encoded);
+    }
+
+    @Test
+    public void testEncodeUnsupportedCommand() throws Exception {
+        Command command = new Command();
+        command.setType("UNSUPPORTED");
+        Object o = encoder.encodeCommand(command);
+        assert o == null;
+    }
+
+}