diff options
| -rw-r--r-- | src/org/traccar/protocol/HuaShengFrameDecoder.java | 44 | ||||
| -rw-r--r-- | src/org/traccar/protocol/HuaShengProtocol.java | 2 | ||||
| -rw-r--r-- | src/org/traccar/web/JsonConverter.java | 12 | ||||
| -rw-r--r-- | test/org/traccar/protocol/HuaShengFrameDecoderTest.java | 24 | ||||
| -rw-r--r-- | test/org/traccar/protocol/HuaShengProtocolDecoderTest.java | 6 |
5 files changed, 84 insertions, 4 deletions
diff --git a/src/org/traccar/protocol/HuaShengFrameDecoder.java b/src/org/traccar/protocol/HuaShengFrameDecoder.java new file mode 100644 index 000000000..922bc3979 --- /dev/null +++ b/src/org/traccar/protocol/HuaShengFrameDecoder.java @@ -0,0 +1,44 @@ +/* + * Copyright 2016 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.buffer.ChannelBuffer; +import org.jboss.netty.buffer.ChannelBuffers; +import org.jboss.netty.channel.Channel; +import org.jboss.netty.channel.ChannelHandlerContext; +import org.jboss.netty.handler.codec.frame.FrameDecoder; + +public class HuaShengFrameDecoder extends FrameDecoder { + + @Override + protected Object decode( + ChannelHandlerContext ctx, + Channel channel, + ChannelBuffer buf) throws Exception { + + if (buf.readableBytes() < 2) { + return null; + } + + int index = buf.indexOf(buf.readerIndex() + 1, buf.writerIndex(), (byte) 0xC0); + if (index != -1) { + return buf.readBytes(index + 1 - buf.readerIndex()); + } + + return null; + } + +} diff --git a/src/org/traccar/protocol/HuaShengProtocol.java b/src/org/traccar/protocol/HuaShengProtocol.java index 7c1d48860..351f886db 100644 --- a/src/org/traccar/protocol/HuaShengProtocol.java +++ b/src/org/traccar/protocol/HuaShengProtocol.java @@ -34,7 +34,7 @@ public class HuaShengProtocol extends BaseProtocol { serverList.add(new TrackerServer(new ServerBootstrap(), this.getName()) { @Override protected void addSpecificHandlers(ChannelPipeline pipeline) { - pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(1024, 3, 2, 0, 0)); + pipeline.addLast("frameDecoder", new HuaShengFrameDecoder()); pipeline.addLast("objectDecoder", new HuaShengProtocolDecoder(HuaShengProtocol.this)); } }); diff --git a/src/org/traccar/web/JsonConverter.java b/src/org/traccar/web/JsonConverter.java index f9682f90d..19ac6f777 100644 --- a/src/org/traccar/web/JsonConverter.java +++ b/src/org/traccar/web/JsonConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com) + * Copyright 2015 - 2016 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. @@ -129,9 +129,15 @@ public final class JsonConverter { json.add(name, DATE_FORMAT.print(new DateTime(value))); } } else if (method.getReturnType().equals(Map.class)) { - json.add(name, MiscFormatter.toJson((Map) method.invoke(object))); + Map value = (Map) method.invoke(object); + if (value != null) { + json.add(name, MiscFormatter.toJson(value)); + } } else if (method.getReturnType().equals(List.class)) { - json.add(name, arrayToJson((List) method.invoke(object))); + List value = (List) method.invoke(object); + if (value != null) { + json.add(name, arrayToJson(value)); + } } } catch (IllegalAccessException | InvocationTargetException error) { Log.warning(error); diff --git a/test/org/traccar/protocol/HuaShengFrameDecoderTest.java b/test/org/traccar/protocol/HuaShengFrameDecoderTest.java new file mode 100644 index 000000000..56b8f210c --- /dev/null +++ b/test/org/traccar/protocol/HuaShengFrameDecoderTest.java @@ -0,0 +1,24 @@ +package org.traccar.protocol; + +import org.junit.Assert; +import org.junit.Test; +import org.traccar.ProtocolTest; + +public class HuaShengFrameDecoderTest extends ProtocolTest { + + @Test + public void testDecode() throws Exception { + + HuaShengFrameDecoder decoder = new HuaShengFrameDecoder(); + + Assert.assertEquals( + binary("c0010c00120060000000000004000600010100c0"), + decoder.decode(null, null, binary("c0010c00120060000000000004000600010100c0"))); + + Assert.assertEquals( + binary("c0010c003e0002000000000010020012a0014f42445f3347315f56312e302e330013a0043335353835353035303434303635380006a08701000006a0a1035fc0"), + decoder.decode(null, null, binary("c0010c003e0002000000000010020012a0014f42445f3347315f56312e302e330013a0043335353835353035303434303635380006a08701000006a0a1035fc0"))); + + } + +} diff --git a/test/org/traccar/protocol/HuaShengProtocolDecoderTest.java b/test/org/traccar/protocol/HuaShengProtocolDecoderTest.java index d44217077..09fa353b5 100644 --- a/test/org/traccar/protocol/HuaShengProtocolDecoderTest.java +++ b/test/org/traccar/protocol/HuaShengProtocolDecoderTest.java @@ -11,6 +11,12 @@ public class HuaShengProtocolDecoderTest extends ProtocolTest { HuaShengProtocolDecoder decoder = new HuaShengProtocolDecoder(new HuaShengProtocol()); verifyNothing(decoder, binary( + "c0010c003e0002000000000010020012a0014f42445f3347315f56312e302e330013a0043335353835353035303434303635380006a08701000006a0a1035fc0")); + + verifyNothing(decoder, binary( + "c0010c00120060000000000004000600010100c0")); + + verifyNothing(decoder, binary( "C00000007EAA020000000000010001001047315F48312E305F56312E3000030013383632393530303238353334333036000400144C342D56374C673979497A7A2D724A6D0005000501000600084341524400070008434152440008000500000900183839383630303530313931343436313130393134000A0009434D4E4554C0")); verifyPosition(decoder, binary( |