From 79fd341d2ee1d6ff2ce9139e84dab0ad6820a1ec Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Mon, 16 May 2016 10:43:03 +0500 Subject: Implemented few commands for Wondex protocol. --- src/org/traccar/protocol/WondexProtocol.java | 10 ++++++++ .../traccar/protocol/WondexProtocolEncoder.java | 29 ++++++++++++++++++++++ .../protocol/WondexProtocolEncoderTest.java | 23 +++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 src/org/traccar/protocol/WondexProtocolEncoder.java create mode 100644 test/org/traccar/protocol/WondexProtocolEncoderTest.java diff --git a/src/org/traccar/protocol/WondexProtocol.java b/src/org/traccar/protocol/WondexProtocol.java index b07f84909..574b36e6d 100644 --- a/src/org/traccar/protocol/WondexProtocol.java +++ b/src/org/traccar/protocol/WondexProtocol.java @@ -19,8 +19,10 @@ import org.jboss.netty.bootstrap.ConnectionlessBootstrap; 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.TrackerServer; +import org.traccar.model.Command; import java.util.List; @@ -28,6 +30,10 @@ public class WondexProtocol extends BaseProtocol { public WondexProtocol() { super("wondex"); + setSupportedCommands( + Command.TYPE_REBOOT_DEVICE, + Command.TYPE_POSITION_SINGLE, + Command.TYPE_CUSTOM); } @Override @@ -36,14 +42,18 @@ public class WondexProtocol extends BaseProtocol { @Override protected void addSpecificHandlers(ChannelPipeline pipeline) { pipeline.addLast("frameDecoder", new WondexFrameDecoder()); + pipeline.addLast("stringEncoder", new StringEncoder()); pipeline.addLast("stringDecoder", new StringDecoder()); + pipeline.addLast("objectEncoder", new WondexProtocolEncoder()); pipeline.addLast("objectDecoder", new WondexProtocolDecoder(WondexProtocol.this)); } }); serverList.add(new TrackerServer(new ConnectionlessBootstrap(), this.getName()) { @Override protected void addSpecificHandlers(ChannelPipeline pipeline) { + pipeline.addLast("stringEncoder", new StringEncoder()); pipeline.addLast("stringDecoder", new StringDecoder()); + pipeline.addLast("objectEncoder", new WondexProtocolEncoder()); pipeline.addLast("objectDecoder", new WondexProtocolDecoder(WondexProtocol.this)); } }); diff --git a/src/org/traccar/protocol/WondexProtocolEncoder.java b/src/org/traccar/protocol/WondexProtocolEncoder.java new file mode 100644 index 000000000..83db4ecda --- /dev/null +++ b/src/org/traccar/protocol/WondexProtocolEncoder.java @@ -0,0 +1,29 @@ +package org.traccar.protocol; + +import org.traccar.StringProtocolEncoder; +import org.traccar.helper.Log; +import org.traccar.model.Command;; + +public class WondexProtocolEncoder extends StringProtocolEncoder { + @Override + protected Object encodeCommand(Command command) { + + // Temporary put default password + command.set(Command.KEY_DEVICE_PASSWORD, "0000"); + + switch (command.getType()) { + case Command.TYPE_REBOOT_DEVICE: + return formatCommand(command, "$WP+REBOOT={%s}", Command.KEY_DEVICE_PASSWORD); + case Command.TYPE_POSITION_SINGLE: + return formatCommand(command, "$WP+GETLOCATION={%s}", Command.KEY_DEVICE_PASSWORD); + case Command.TYPE_CUSTOM: + return formatCommand(command, Command.KEY_DATA); + default: + Log.warning(new UnsupportedOperationException(command.getType())); + break; + } + + return null; + } + +} diff --git a/test/org/traccar/protocol/WondexProtocolEncoderTest.java b/test/org/traccar/protocol/WondexProtocolEncoderTest.java new file mode 100644 index 000000000..b898b2c8a --- /dev/null +++ b/test/org/traccar/protocol/WondexProtocolEncoderTest.java @@ -0,0 +1,23 @@ +package org.traccar.protocol; + +import org.junit.Assert; +import org.junit.Test; +import org.traccar.ProtocolTest; +import org.traccar.model.Command; + +public class WondexProtocolEncoderTest extends ProtocolTest { + @Test + public void testEncode() throws Exception { + + WondexProtocolEncoder encoder = new WondexProtocolEncoder(); + + Command command = new Command(); + command.setDeviceId(2); + command.setType(Command.TYPE_POSITION_SINGLE); + command.set(Command.KEY_DEVICE_PASSWORD, "0000"); + + Assert.assertEquals("$WP+GETLOCATION=0000", encoder.encodeCommand(command)); + + } + +} -- cgit v1.2.3 From 1df49e504686ba324b9d31aba9d730ab6bf8bf33 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Mon, 16 May 2016 11:33:36 +0500 Subject: Removed unnecessary TYPE_CUSTOM implementation --- src/org/traccar/protocol/WondexProtocol.java | 3 +-- src/org/traccar/protocol/WondexProtocolEncoder.java | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/org/traccar/protocol/WondexProtocol.java b/src/org/traccar/protocol/WondexProtocol.java index 574b36e6d..0049429b7 100644 --- a/src/org/traccar/protocol/WondexProtocol.java +++ b/src/org/traccar/protocol/WondexProtocol.java @@ -32,8 +32,7 @@ public class WondexProtocol extends BaseProtocol { super("wondex"); setSupportedCommands( Command.TYPE_REBOOT_DEVICE, - Command.TYPE_POSITION_SINGLE, - Command.TYPE_CUSTOM); + Command.TYPE_POSITION_SINGLE); } @Override diff --git a/src/org/traccar/protocol/WondexProtocolEncoder.java b/src/org/traccar/protocol/WondexProtocolEncoder.java index 83db4ecda..628546760 100644 --- a/src/org/traccar/protocol/WondexProtocolEncoder.java +++ b/src/org/traccar/protocol/WondexProtocolEncoder.java @@ -16,8 +16,6 @@ public class WondexProtocolEncoder extends StringProtocolEncoder { return formatCommand(command, "$WP+REBOOT={%s}", Command.KEY_DEVICE_PASSWORD); case Command.TYPE_POSITION_SINGLE: return formatCommand(command, "$WP+GETLOCATION={%s}", Command.KEY_DEVICE_PASSWORD); - case Command.TYPE_CUSTOM: - return formatCommand(command, Command.KEY_DATA); default: Log.warning(new UnsupportedOperationException(command.getType())); break; -- cgit v1.2.3 From 4915e5e1fd8f3fa440a3cac18679b42f495e7d1d Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Mon, 16 May 2016 12:41:29 +0500 Subject: Code style fixes --- src/org/traccar/protocol/WondexProtocol.java | 4 +- .../traccar/protocol/WondexProtocolEncoder.java | 54 +++++++++++----------- .../protocol/WondexProtocolEncoderTest.java | 4 +- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/org/traccar/protocol/WondexProtocol.java b/src/org/traccar/protocol/WondexProtocol.java index 0049429b7..639669767 100644 --- a/src/org/traccar/protocol/WondexProtocol.java +++ b/src/org/traccar/protocol/WondexProtocol.java @@ -50,9 +50,9 @@ public class WondexProtocol extends BaseProtocol { serverList.add(new TrackerServer(new ConnectionlessBootstrap(), this.getName()) { @Override protected void addSpecificHandlers(ChannelPipeline pipeline) { - pipeline.addLast("stringEncoder", new StringEncoder()); + pipeline.addLast("stringEncoder", new StringEncoder()); pipeline.addLast("stringDecoder", new StringDecoder()); - pipeline.addLast("objectEncoder", new WondexProtocolEncoder()); + pipeline.addLast("objectEncoder", new WondexProtocolEncoder()); pipeline.addLast("objectDecoder", new WondexProtocolDecoder(WondexProtocol.this)); } }); diff --git a/src/org/traccar/protocol/WondexProtocolEncoder.java b/src/org/traccar/protocol/WondexProtocolEncoder.java index 628546760..c8bc58b40 100644 --- a/src/org/traccar/protocol/WondexProtocolEncoder.java +++ b/src/org/traccar/protocol/WondexProtocolEncoder.java @@ -1,27 +1,27 @@ -package org.traccar.protocol; - -import org.traccar.StringProtocolEncoder; -import org.traccar.helper.Log; -import org.traccar.model.Command;; - -public class WondexProtocolEncoder extends StringProtocolEncoder { - @Override - protected Object encodeCommand(Command command) { - - // Temporary put default password - command.set(Command.KEY_DEVICE_PASSWORD, "0000"); - - switch (command.getType()) { - case Command.TYPE_REBOOT_DEVICE: - return formatCommand(command, "$WP+REBOOT={%s}", Command.KEY_DEVICE_PASSWORD); - case Command.TYPE_POSITION_SINGLE: - return formatCommand(command, "$WP+GETLOCATION={%s}", Command.KEY_DEVICE_PASSWORD); - default: - Log.warning(new UnsupportedOperationException(command.getType())); - break; - } - - return null; - } - -} +package org.traccar.protocol; + +import org.traccar.StringProtocolEncoder; +import org.traccar.helper.Log; +import org.traccar.model.Command;; + +public class WondexProtocolEncoder extends StringProtocolEncoder { + @Override + protected Object encodeCommand(Command command) { + + // Temporary put default password + command.set(Command.KEY_DEVICE_PASSWORD, "0000"); + + switch (command.getType()) { + case Command.TYPE_REBOOT_DEVICE: + return formatCommand(command, "$WP+REBOOT={%s}", Command.KEY_DEVICE_PASSWORD); + case Command.TYPE_POSITION_SINGLE: + return formatCommand(command, "$WP+GETLOCATION={%s}", Command.KEY_DEVICE_PASSWORD); + default: + Log.warning(new UnsupportedOperationException(command.getType())); + break; + } + + return null; + } + +} diff --git a/test/org/traccar/protocol/WondexProtocolEncoderTest.java b/test/org/traccar/protocol/WondexProtocolEncoderTest.java index b898b2c8a..fb038a18b 100644 --- a/test/org/traccar/protocol/WondexProtocolEncoderTest.java +++ b/test/org/traccar/protocol/WondexProtocolEncoderTest.java @@ -10,12 +10,12 @@ public class WondexProtocolEncoderTest extends ProtocolTest { public void testEncode() throws Exception { WondexProtocolEncoder encoder = new WondexProtocolEncoder(); - + Command command = new Command(); command.setDeviceId(2); command.setType(Command.TYPE_POSITION_SINGLE); command.set(Command.KEY_DEVICE_PASSWORD, "0000"); - + Assert.assertEquals("$WP+GETLOCATION=0000", encoder.encodeCommand(command)); } -- cgit v1.2.3