diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2019-04-29 21:52:53 -0700 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2019-04-29 21:52:53 -0700 |
commit | 707389659d7d1e08f774bf82557f0bcff4b13e37 (patch) | |
tree | b7f85bb0deb5b6b9b45d2e5dd2bc86289f950526 | |
parent | 3eac8e5dcfbdb607d8f20121768d12c3176f205c (diff) | |
download | trackermap-server-707389659d7d1e08f774bf82557f0bcff4b13e37.tar.gz trackermap-server-707389659d7d1e08f774bf82557f0bcff4b13e37.tar.bz2 trackermap-server-707389659d7d1e08f774bf82557f0bcff4b13e37.zip |
Update protocol name
-rw-r--r-- | setup/default.xml | 2 | ||||
-rw-r--r-- | src/main/java/org/traccar/protocol/Minifinder2Protocol.java (renamed from src/main/java/org/traccar/protocol/PebbellProtocol.java) | 6 | ||||
-rw-r--r-- | src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java (renamed from src/main/java/org/traccar/protocol/PebbellProtocolDecoder.java) | 4 | ||||
-rw-r--r-- | src/test/java/org/traccar/protocol/Minifinder2ProtocolDecoderTest.java (renamed from src/test/java/org/traccar/protocol/PebbellProtocolDecoderTest.java) | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/setup/default.xml b/setup/default.xml index f9907e9e2..d4fdefb8d 100644 --- a/setup/default.xml +++ b/setup/default.xml @@ -263,7 +263,7 @@ <entry key='satsol.port'>5184</entry> <entry key='globalstar.port'>5185</entry> <entry key='sanul.port'>5186</entry> - <entry key='pebbell.port'>5187</entry> + <entry key='minifinder2.port'>5187</entry> <entry key='radar.port'>5188</entry> </properties> diff --git a/src/main/java/org/traccar/protocol/PebbellProtocol.java b/src/main/java/org/traccar/protocol/Minifinder2Protocol.java index 762c30585..957b8f4d0 100644 --- a/src/main/java/org/traccar/protocol/PebbellProtocol.java +++ b/src/main/java/org/traccar/protocol/Minifinder2Protocol.java @@ -22,14 +22,14 @@ import org.traccar.TrackerServer; import java.nio.ByteOrder; -public class PebbellProtocol extends BaseProtocol { +public class Minifinder2Protocol extends BaseProtocol { - public PebbellProtocol() { + public Minifinder2Protocol() { addServer(new TrackerServer(false, getName()) { @Override protected void addProtocolHandlers(PipelineBuilder pipeline) { pipeline.addLast(new LengthFieldBasedFrameDecoder(ByteOrder.LITTLE_ENDIAN, 1024, 2, 2, 4, 0, true)); - pipeline.addLast(new PebbellProtocolDecoder(PebbellProtocol.this)); + pipeline.addLast(new Minifinder2ProtocolDecoder(Minifinder2Protocol.this)); } }); } diff --git a/src/main/java/org/traccar/protocol/PebbellProtocolDecoder.java b/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java index 7271c60d8..256848990 100644 --- a/src/main/java/org/traccar/protocol/PebbellProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java @@ -31,9 +31,9 @@ import org.traccar.model.WifiAccessPoint; import java.net.SocketAddress; import java.nio.charset.StandardCharsets; -public class PebbellProtocolDecoder extends BaseProtocolDecoder { +public class Minifinder2ProtocolDecoder extends BaseProtocolDecoder { - public PebbellProtocolDecoder(Protocol protocol) { + public Minifinder2ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/test/java/org/traccar/protocol/PebbellProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Minifinder2ProtocolDecoderTest.java index a6555dd76..2b1fdf988 100644 --- a/src/test/java/org/traccar/protocol/PebbellProtocolDecoderTest.java +++ b/src/test/java/org/traccar/protocol/Minifinder2ProtocolDecoderTest.java @@ -3,12 +3,12 @@ package org.traccar.protocol; import org.junit.Test; import org.traccar.ProtocolTest; -public class PebbellProtocolDecoderTest extends ProtocolTest { +public class Minifinder2ProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - PebbellProtocolDecoder decoder = new PebbellProtocolDecoder(null); + Minifinder2ProtocolDecoder decoder = new Minifinder2ProtocolDecoder(null); verifyAttributes(decoder, binary( "ab1845005d39370301100133353836383830303030303338303209245b92b55c84004b610502001000002221ca00050b4a005cc30f4a0056c80f4a003ba90e4a0055c8074a005dc3034a0057c8")); |