diff options
| -rw-r--r-- | debug.xml | 3 | ||||
| -rw-r--r-- | src/org/traccar/protocol/SyrusProtocol.java | 50 | ||||
| -rw-r--r-- | src/org/traccar/protocol/TaipProtocol.java | 17 | ||||
| -rw-r--r-- | src/org/traccar/protocol/TaipProtocolDecoder.java (renamed from src/org/traccar/protocol/SyrusProtocolDecoder.java) | 4 | ||||
| -rw-r--r-- | test/org/traccar/protocol/TaipProtocolDecoderTest.java (renamed from test/org/traccar/protocol/SyrusProtocolDecoderTest.java) | 5 |
5 files changed, 18 insertions, 61 deletions
@@ -236,7 +236,7 @@ <entry key='teltonika.port'>5027</entry> <entry key='mta6.port'>5028</entry> <entry key='tlt2h.port'>5030</entry> - <entry key='syrus.port'>5031</entry> + <entry key='taip.port'>5031</entry> <entry key='wondex.port'>5032</entry> <entry key='cellocator.port'>5033</entry> <entry key='galileo.port'>5034</entry> @@ -263,7 +263,6 @@ <entry key='m2m.port'>5054</entry> <entry key='osmand.port'>5055</entry> <entry key='easytrack.port'>5056</entry> - <entry key='taip.port'>5057</entry> <entry key='khd.port'>5058</entry> <entry key='piligrim.port'>5059</entry> <entry key='stl060.port'>5060</entry> diff --git a/src/org/traccar/protocol/SyrusProtocol.java b/src/org/traccar/protocol/SyrusProtocol.java deleted file mode 100644 index e68215c24..000000000 --- a/src/org/traccar/protocol/SyrusProtocol.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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.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; -import org.traccar.protocol.commands.CommandTemplate; -import org.traccar.http.commands.CommandType; - -import java.util.List; -import java.util.Map; - -public class SyrusProtocol extends BaseProtocol { - - public SyrusProtocol() { - super("syrus"); - } - - @Override - public void initTrackerServers(List<TrackerServer> serverList) { - serverList.add(new TrackerServer(new ServerBootstrap(), this.getName()) { - @Override - protected void addSpecificHandlers(ChannelPipeline pipeline) { - pipeline.addLast("frameDecoder", new CharacterDelimiterFrameDecoder(1024, '<')); - pipeline.addLast("stringDecoder", new StringDecoder()); - pipeline.addLast("stringEncoder", new StringEncoder()); - pipeline.addLast("objectDecoder", new SyrusProtocolDecoder(SyrusProtocol.this, true)); - } - }); - } - -} diff --git a/src/org/traccar/protocol/TaipProtocol.java b/src/org/traccar/protocol/TaipProtocol.java index 7d9f3015f..439fe7696 100644 --- a/src/org/traccar/protocol/TaipProtocol.java +++ b/src/org/traccar/protocol/TaipProtocol.java @@ -16,15 +16,15 @@ package org.traccar.protocol; 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.CharacterDelimiterFrameDecoder; import org.traccar.TrackerServer; -import org.traccar.protocol.commands.CommandTemplate; -import org.traccar.http.commands.CommandType; import java.util.List; -import java.util.Map; public class TaipProtocol extends BaseProtocol { @@ -34,11 +34,20 @@ public class TaipProtocol extends BaseProtocol { @Override public void initTrackerServers(List<TrackerServer> serverList) { + serverList.add(new TrackerServer(new ServerBootstrap(), this.getName()) { + @Override + protected void addSpecificHandlers(ChannelPipeline pipeline) { + pipeline.addLast("frameDecoder", new CharacterDelimiterFrameDecoder(1024, '<')); + pipeline.addLast("stringDecoder", new StringDecoder()); + pipeline.addLast("stringEncoder", new StringEncoder()); + pipeline.addLast("objectDecoder", new TaipProtocolDecoder(TaipProtocol.this, true)); + } + }); serverList.add(new TrackerServer(new ConnectionlessBootstrap(), this.getName()) { @Override protected void addSpecificHandlers(ChannelPipeline pipeline) { pipeline.addLast("stringDecoder", new StringDecoder()); - pipeline.addLast("objectDecoder", new SyrusProtocolDecoder(TaipProtocol.this, false)); + pipeline.addLast("objectDecoder", new TaipProtocolDecoder(TaipProtocol.this, false)); } }); } diff --git a/src/org/traccar/protocol/SyrusProtocolDecoder.java b/src/org/traccar/protocol/TaipProtocolDecoder.java index 236ded2dc..518efac0d 100644 --- a/src/org/traccar/protocol/SyrusProtocolDecoder.java +++ b/src/org/traccar/protocol/TaipProtocolDecoder.java @@ -29,11 +29,11 @@ import org.traccar.Protocol; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; -public class SyrusProtocolDecoder extends BaseProtocolDecoder { +public class TaipProtocolDecoder extends BaseProtocolDecoder { boolean sendResponse; - public SyrusProtocolDecoder(Protocol protocol, boolean sendResponse) { + public TaipProtocolDecoder(TaipProtocol protocol, boolean sendResponse) { super(protocol); this.sendResponse = sendResponse; } diff --git a/test/org/traccar/protocol/SyrusProtocolDecoderTest.java b/test/org/traccar/protocol/TaipProtocolDecoderTest.java index e7ede632b..78ccd4c7f 100644 --- a/test/org/traccar/protocol/SyrusProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TaipProtocolDecoderTest.java @@ -1,16 +1,15 @@ package org.traccar.protocol; import static org.junit.Assert.assertNotNull; -import org.traccar.helper.TestDataManager; import static org.traccar.helper.DecoderVerifier.verify; import org.junit.Test; -public class SyrusProtocolDecoderTest extends ProtocolDecoderTest { +public class TaipProtocolDecoderTest extends ProtocolDecoderTest { @Test public void testDecode() throws Exception { - SyrusProtocolDecoder decoder = new SyrusProtocolDecoder(new SyrusProtocol(), false); + TaipProtocolDecoder decoder = new TaipProtocolDecoder(new TaipProtocol(), false); verify(decoder.decode(null, null, ">RGP230615010248-2682523-065236820000003007F4101;ID=0005;#0002;*2A<")); |