From 8622ba6e081b987a96e3b1885209576f3c389266 Mon Sep 17 00:00:00 2001
From: Hans van den Elsen <hans.elsen@esds.nl>
Date: Sat, 13 Feb 2016 16:13:18 +0100
Subject: Added objectEncoder for Minifinder protocol

---
 src/org/traccar/protocol/MiniFinderProtocol.java   |  4 +--
 .../protocol/MiniFinderProtocolEncoder.java        | 40 ++++++++++++++++++++++
 .../protocol/MiniFinderProtocolEncoderTest.java    | 38 ++++++++++++++++++++
 3 files changed, 80 insertions(+), 2 deletions(-)
 create mode 100644 src/org/traccar/protocol/MiniFinderProtocolEncoder.java
 create mode 100644 test/org/traccar/protocol/MiniFinderProtocolEncoderTest.java

diff --git a/src/org/traccar/protocol/MiniFinderProtocol.java b/src/org/traccar/protocol/MiniFinderProtocol.java
index d6b9a0e36..b0cedd6b9 100644
--- a/src/org/traccar/protocol/MiniFinderProtocol.java
+++ b/src/org/traccar/protocol/MiniFinderProtocol.java
@@ -30,7 +30,7 @@ public class MiniFinderProtocol extends BaseProtocol {
 
     public MiniFinderProtocol() {
         super("minifinder");
-        setSupportedCommands(Command.CUSTOM);
+        setSupportedCommands(Command.TYPE_POSITION_PERIODIC);
     }
 
     @Override
@@ -41,7 +41,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("stringEncoder", new StringEncoder());
+                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..5d15bc54a
--- /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.CUSTOM:
+                return command.getAttributes().keySet().iterator().next().toString();
+            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..7beb52b51
--- /dev/null
+++ b/test/org/traccar/protocol/MiniFinderProtocolEncoderTest.java
@@ -0,0 +1,38 @@
+package org.traccar.protocol;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+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.CUSTOM);
+        command.set(expected, 1);
+        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;
+    }
+
+}
-- 
cgit v1.2.3