From 07e4e89be6e658239125a8b99e05ce4d132e1d9e Mon Sep 17 00:00:00 2001
From: Anatoliy Golubev <darth.naihil@gmail.com>
Date: Sun, 10 Sep 2017 01:51:31 +0300
Subject: Inherit AdmProtocolEncoder from StringProtocolEncoder

---
 src/org/traccar/protocol/AdmProtocolEncoder.java | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

(limited to 'src/org/traccar/protocol/AdmProtocolEncoder.java')

diff --git a/src/org/traccar/protocol/AdmProtocolEncoder.java b/src/org/traccar/protocol/AdmProtocolEncoder.java
index 1cdfbf0b0..8cbd8618d 100644
--- a/src/org/traccar/protocol/AdmProtocolEncoder.java
+++ b/src/org/traccar/protocol/AdmProtocolEncoder.java
@@ -16,32 +16,21 @@
  */
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.traccar.BaseProtocolEncoder;
+import org.traccar.StringProtocolEncoder;
 import org.traccar.helper.Log;
 import org.traccar.model.Command;
 
-import java.nio.charset.StandardCharsets;
-
-public class AdmProtocolEncoder extends BaseProtocolEncoder {
-
-    private ChannelBuffer encodeContent(String data) {
-        ChannelBuffer buf = ChannelBuffers.copiedBuffer(data, StandardCharsets.UTF_8);
-        buf.writeByte(0x0D);
-        buf.writeByte(0x0A);
-        return buf;
-    }
+public class AdmProtocolEncoder extends StringProtocolEncoder {
 
     @Override
     protected Object encodeCommand(Command command) {
 
         switch (command.getType()) {
             case Command.TYPE_GET_DEVICE_STATUS:
-                return encodeContent("STATUS");
+                return formatCommand(command, "STATUS\r\n");
 
             case Command.TYPE_CUSTOM:
-                return encodeContent(command.getString(Command.KEY_DATA));
+                return formatCommand(command, "{%s}\r\n", Command.KEY_DATA);
 
             default:
                 Log.warning(new UnsupportedOperationException(command.getType()));
-- 
cgit v1.2.3