From 7883c78aef55c73cbfb4213f7720f3e450f89c75 Mon Sep 17 00:00:00 2001 From: Hans van den Elsen Date: Tue, 9 Feb 2016 15:46:11 +0100 Subject: Added API endpoint for our raw commands --- src/org/traccar/protocol/MiniFinderProtocol.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/org/traccar/protocol/MiniFinderProtocol.java') diff --git a/src/org/traccar/protocol/MiniFinderProtocol.java b/src/org/traccar/protocol/MiniFinderProtocol.java index cd159c8b7..33cd054f1 100644 --- a/src/org/traccar/protocol/MiniFinderProtocol.java +++ b/src/org/traccar/protocol/MiniFinderProtocol.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import org.jboss.netty.bootstrap.ServerBootstrap; import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.handler.codec.string.StringDecoder; +import org.jboss.netty.handler.codec.string.StringEncoder; import org.traccar.BaseProtocol; import org.traccar.CharacterDelimiterFrameDecoder; import org.traccar.TrackerServer; @@ -38,6 +39,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()); } }); } -- cgit v1.2.3 From 2e5eaa5e9d150a129318d61f01570918eb40c660 Mon Sep 17 00:00:00 2001 From: Hans van den Elsen Date: Thu, 11 Feb 2016 20:54:40 +0100 Subject: added custom command --- src/org/traccar/protocol/MiniFinderProtocol.java | 1 + 1 file changed, 1 insertion(+) (limited to 'src/org/traccar/protocol/MiniFinderProtocol.java') diff --git a/src/org/traccar/protocol/MiniFinderProtocol.java b/src/org/traccar/protocol/MiniFinderProtocol.java index 33cd054f1..19df39617 100644 --- a/src/org/traccar/protocol/MiniFinderProtocol.java +++ b/src/org/traccar/protocol/MiniFinderProtocol.java @@ -29,6 +29,7 @@ public class MiniFinderProtocol extends BaseProtocol { public MiniFinderProtocol() { super("minifinder"); + setSupportedCommands("CUSTOM"); } @Override -- cgit v1.2.3 From b7caadd9aa3da5487ca9bd64ffc6b2486f619c60 Mon Sep 17 00:00:00 2001 From: Hans van den Elsen Date: Fri, 12 Feb 2016 13:16:39 +0100 Subject: Added functionality to Minifinder protocol to send commands --- src/org/traccar/model/Command.java | 1 + src/org/traccar/protocol/MiniFinderProtocol.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/org/traccar/protocol/MiniFinderProtocol.java') diff --git a/src/org/traccar/model/Command.java b/src/org/traccar/model/Command.java index 59e96be0e..5bde1c652 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 CUSTOM = "CUSTOM"; } diff --git a/src/org/traccar/protocol/MiniFinderProtocol.java b/src/org/traccar/protocol/MiniFinderProtocol.java index 19df39617..d6b9a0e36 100644 --- a/src/org/traccar/protocol/MiniFinderProtocol.java +++ b/src/org/traccar/protocol/MiniFinderProtocol.java @@ -22,6 +22,7 @@ import org.jboss.netty.handler.codec.string.StringEncoder; import org.traccar.BaseProtocol; import org.traccar.CharacterDelimiterFrameDecoder; import org.traccar.TrackerServer; +import org.traccar.model.Command; import java.util.List; @@ -29,7 +30,7 @@ public class MiniFinderProtocol extends BaseProtocol { public MiniFinderProtocol() { super("minifinder"); - setSupportedCommands("CUSTOM"); + setSupportedCommands(Command.CUSTOM); } @Override -- cgit v1.2.3 From 8622ba6e081b987a96e3b1885209576f3c389266 Mon Sep 17 00:00:00 2001 From: Hans van den Elsen 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 (limited to 'src/org/traccar/protocol/MiniFinderProtocol.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 From 30d886b86bb76dc7e3a13cffb63252d31f0abe2a Mon Sep 17 00:00:00 2001 From: Hans van den Elsen Date: Sat, 13 Feb 2016 16:16:00 +0100 Subject: Changed supported commands to custom --- src/org/traccar/protocol/MiniFinderProtocol.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/org/traccar/protocol/MiniFinderProtocol.java') diff --git a/src/org/traccar/protocol/MiniFinderProtocol.java b/src/org/traccar/protocol/MiniFinderProtocol.java index b0cedd6b9..a2dbd6c41 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.TYPE_POSITION_PERIODIC); + setSupportedCommands(Command.CUSTOM); } @Override -- cgit v1.2.3 From 3ced99384b1967f5cde9abdf30c1c0184a5ae3f6 Mon Sep 17 00:00:00 2001 From: Hans van den Elsen Date: Mon, 15 Feb 2016 07:28:03 +0100 Subject: Polishing up the custom commands for MiniFinder Renamed Command.CUSTOM to TYPE_CUSTOM. Put the raw command in the 'raw' attribute instead as the key for one. --- src/org/traccar/model/Command.java | 2 +- src/org/traccar/protocol/MiniFinderProtocol.java | 3 +-- src/org/traccar/protocol/MiniFinderProtocolEncoder.java | 4 ++-- test/org/traccar/protocol/MiniFinderProtocolEncoderTest.java | 6 ++---- 4 files changed, 6 insertions(+), 9 deletions(-) (limited to 'src/org/traccar/protocol/MiniFinderProtocol.java') diff --git a/src/org/traccar/model/Command.java b/src/org/traccar/model/Command.java index 5bde1c652..dd541e643 100644 --- a/src/org/traccar/model/Command.java +++ b/src/org/traccar/model/Command.java @@ -38,5 +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 CUSTOM = "CUSTOM"; + public static final String TYPE_CUSTOM = "CUSTOM"; } diff --git a/src/org/traccar/protocol/MiniFinderProtocol.java b/src/org/traccar/protocol/MiniFinderProtocol.java index a2dbd6c41..b22539277 100644 --- a/src/org/traccar/protocol/MiniFinderProtocol.java +++ b/src/org/traccar/protocol/MiniFinderProtocol.java @@ -18,7 +18,6 @@ package org.traccar.protocol; import org.jboss.netty.bootstrap.ServerBootstrap; import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.handler.codec.string.StringDecoder; -import org.jboss.netty.handler.codec.string.StringEncoder; import org.traccar.BaseProtocol; import org.traccar.CharacterDelimiterFrameDecoder; import org.traccar.TrackerServer; @@ -30,7 +29,7 @@ public class MiniFinderProtocol extends BaseProtocol { public MiniFinderProtocol() { super("minifinder"); - setSupportedCommands(Command.CUSTOM); + setSupportedCommands(Command.TYPE_CUSTOM); } @Override diff --git a/src/org/traccar/protocol/MiniFinderProtocolEncoder.java b/src/org/traccar/protocol/MiniFinderProtocolEncoder.java index 5d15bc54a..729c57573 100644 --- a/src/org/traccar/protocol/MiniFinderProtocolEncoder.java +++ b/src/org/traccar/protocol/MiniFinderProtocolEncoder.java @@ -27,8 +27,8 @@ public class MiniFinderProtocolEncoder extends StringProtocolEncoder { protected Object encodeCommand(Command command) { switch (command.getType()) { - case Command.CUSTOM: - return command.getAttributes().keySet().iterator().next().toString(); + case Command.TYPE_CUSTOM: + return command.getAttributes().get("raw"); default: Log.warning(new UnsupportedOperationException(command.getType())); break; diff --git a/test/org/traccar/protocol/MiniFinderProtocolEncoderTest.java b/test/org/traccar/protocol/MiniFinderProtocolEncoderTest.java index 7beb52b51..524152bb8 100644 --- a/test/org/traccar/protocol/MiniFinderProtocolEncoderTest.java +++ b/test/org/traccar/protocol/MiniFinderProtocolEncoderTest.java @@ -1,8 +1,6 @@ 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; @@ -21,8 +19,8 @@ public class MiniFinderProtocolEncoderTest extends ProtocolTest { public void testEncodeCustom() throws Exception { String expected = String.format("%sM,700", prefix); Command command = new Command(); - command.setType(Command.CUSTOM); - command.set(expected, 1); + command.setType(Command.TYPE_CUSTOM); + command.set("raw", expected); Object encoded = encoder.encodeCommand(command); assert expected.equals(encoded); } -- cgit v1.2.3