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/AdmProtocol.java             |  4 +++-
 src/org/traccar/protocol/AdmProtocolEncoder.java      | 19 ++++---------------
 test/org/traccar/protocol/AdmProtocolEncoderTest.java |  5 +++--
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/org/traccar/protocol/AdmProtocol.java b/src/org/traccar/protocol/AdmProtocol.java
index db2adfeaa..4d2cbe7b3 100644
--- a/src/org/traccar/protocol/AdmProtocol.java
+++ b/src/org/traccar/protocol/AdmProtocol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2017 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.
@@ -18,6 +18,7 @@ package org.traccar.protocol;
 import org.jboss.netty.bootstrap.ServerBootstrap;
 import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.handler.codec.frame.LengthFieldBasedFrameDecoder;
+import org.jboss.netty.handler.codec.string.StringEncoder;
 import org.traccar.BaseProtocol;
 import org.traccar.TrackerServer;
 import org.traccar.model.Command;
@@ -40,6 +41,7 @@ public class AdmProtocol extends BaseProtocol {
             @Override
             protected void addSpecificHandlers(ChannelPipeline pipeline) {
                 pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(1024, 2, 1, -3, 0));
+                pipeline.addLast("stringEncoder", new StringEncoder());
                 pipeline.addLast("objectEncoder", new AdmProtocolEncoder());
                 pipeline.addLast("objectDecoder", new AdmProtocolDecoder(AdmProtocol.this));
             }
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()));
diff --git a/test/org/traccar/protocol/AdmProtocolEncoderTest.java b/test/org/traccar/protocol/AdmProtocolEncoderTest.java
index 3a72036bf..6d2452e26 100644
--- a/test/org/traccar/protocol/AdmProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/AdmProtocolEncoderTest.java
@@ -16,6 +16,7 @@
  */
 package org.traccar.protocol;
 
+import org.junit.Assert;
 import org.junit.Test;
 import org.traccar.ProtocolTest;
 import org.traccar.model.Command;
@@ -30,13 +31,13 @@ public class AdmProtocolEncoderTest extends ProtocolTest {
         Command command = new Command();
         command.setDeviceId(1);
         command.setType(Command.TYPE_GET_DEVICE_STATUS);
-        verifyCommand(encoder, command, binary("5354415455530D0A"));
+        Assert.assertEquals("STATUS\r\n", encoder.encodeCommand(command));
 
         command = new Command();
         command.setDeviceId(1);
         command.setType(Command.TYPE_CUSTOM);
         command.set(Command.KEY_DATA, "INPUT 0");
-        verifyCommand(encoder, command, binary("494E50555420300D0A"));
+        Assert.assertEquals("INPUT 0\r\n", encoder.encodeCommand(command));
     }
 
 }
-- 
cgit v1.2.3