Migrate G protocols

1 files changed, 13 insertions, 12 deletions

diff --git a/src/org/traccar/protocol/Gps056ProtocolDecoder.java b/src/org/traccar/protocol/Gps056ProtocolDecoder.java
index ccb389250..d8d63cce2 100644
--- a/src/org/traccar/protocol/Gps056ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gps056ProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 - 2018 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,12 @@
  */
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
 import org.traccar.BaseProtocolDecoder;
 import org.traccar.DeviceSession;
+import org.traccar.NetworkMessage;
 import org.traccar.helper.DateBuilder;
 import org.traccar.helper.UnitsConverter;
 import org.traccar.model.Position;
@@ -33,20 +34,20 @@ public class Gps056ProtocolDecoder extends BaseProtocolDecoder {
         super(protocol);
     }
 
-    private static void sendResponse(Channel channel, String type, String imei, ChannelBuffer content) {
+    private static void sendResponse(Channel channel, String type, String imei, ByteBuf content) {
         if (channel != null) {
-            ChannelBuffer response = ChannelBuffers.dynamicBuffer();
+            ByteBuf response = Unpooled.buffer();
             String header = "*" + type + imei;
             response.writeBytes(header.getBytes(StandardCharsets.US_ASCII));
             if (content != null) {
                 response.writeBytes(content);
             }
             response.writeByte('#');
-            channel.write(response);
+            channel.write(new NetworkMessage(response, channel.remoteAddress()));
         }
     }
 
-    private static double decodeCoordinate(ChannelBuffer buf) {
+    private static double decodeCoordinate(ByteBuf buf) {
         double degrees = buf.getUnsignedShort(buf.readerIndex()) / 100;
         double minutes = buf.readUnsignedShort() % 100 + buf.readUnsignedShort() * 0.0001;
         degrees += minutes / 60;
@@ -57,12 +58,12 @@ public class Gps056ProtocolDecoder extends BaseProtocolDecoder {
         return degrees;
     }
 
-    private static void decodeStatus(ChannelBuffer buf, Position position) {
+    private static void decodeStatus(ByteBuf buf, Position position) {
 
         position.set(Position.KEY_INPUT, buf.readUnsignedByte());
         position.set(Position.KEY_OUTPUT, buf.readUnsignedByte());
 
-        position.set(Position.PREFIX_ADC + 1, ChannelBuffers.swapShort(buf.readShort()) * 5.06); // mV
+        position.set(Position.PREFIX_ADC + 1, buf.readShortLE() * 5.06); // mV
 
         position.set(Position.KEY_SATELLITES, buf.readUnsignedByte());
         position.set(Position.KEY_RSSI, buf.readUnsignedByte());
@@ -73,7 +74,7 @@ public class Gps056ProtocolDecoder extends BaseProtocolDecoder {
     protected Object decode(
             Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
 
-        ChannelBuffer buf = (ChannelBuffer) msg;
+        ByteBuf buf = (ByteBuf) msg;
 
         buf.skipBytes(2); // header
         buf.skipBytes(2); // length
@@ -89,7 +90,7 @@ public class Gps056ProtocolDecoder extends BaseProtocolDecoder {
         if (type.startsWith("LOGN")) {
 
             sendResponse(channel, "LGSA" + type.substring(4), imei,
-                    ChannelBuffers.copiedBuffer("1", StandardCharsets.US_ASCII));
+                    Unpooled.copiedBuffer("1", StandardCharsets.US_ASCII));
 
         } else if (type.startsWith("GPSL")) {