Inherit AdmProtocolEncoder from StringProtocolEncoder

2 files changed, 7 insertions, 16 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()));