removed StringEncoder

4 files changed, 15 insertions, 21 deletions

diff --git a/src/org/traccar/protocol/WatchProtocol.java b/src/org/traccar/protocol/WatchProtocol.java
index 07a146572..b8c990b84 100644
--- a/src/org/traccar/protocol/WatchProtocol.java
+++ b/src/org/traccar/protocol/WatchProtocol.java
@@ -20,10 +20,6 @@ import org.traccar.PipelineBuilder;
 import org.traccar.TrackerServer;
 import org.traccar.model.Command;
 
-import io.netty.handler.codec.string.StringEncoder;
-
-import java.nio.charset.StandardCharsets;
-
 public class WatchProtocol extends BaseProtocol {
 
     public WatchProtocol() {
@@ -47,7 +43,6 @@ public class WatchProtocol extends BaseProtocol {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
                 pipeline.addLast(new WatchFrameDecoder());
-                pipeline.addLast(new StringEncoder(StandardCharsets.ISO_8859_1));
                 pipeline.addLast(new WatchProtocolEncoder());
                 pipeline.addLast(new WatchProtocolDecoder(WatchProtocol.this));
             }
diff --git a/src/org/traccar/protocol/WatchProtocolEncoder.java b/src/org/traccar/protocol/WatchProtocolEncoder.java
index 8048d30ff..df29d83a9 100644
--- a/src/org/traccar/protocol/WatchProtocolEncoder.java
+++ b/src/org/traccar/protocol/WatchProtocolEncoder.java
@@ -47,11 +47,11 @@ public class WatchProtocolEncoder extends StringProtocolEncoder implements Strin
         return null;
     }
 
-    protected String formatTextCommand(Channel channel, Command command, String format, String... keys) {
+    protected ByteBuf formatTextCommand(Channel channel, Command command, String format, String... keys) {
         String content = formatCommand(command, format, this, keys);
         ByteBuf buf = Unpooled.copiedBuffer(content, StandardCharsets.US_ASCII);
 
-        return formatBinaryCommand(channel, command, "", buf).toString(StandardCharsets.US_ASCII);
+        return formatBinaryCommand(channel, command, "", buf);
     }
 
     protected ByteBuf formatBinaryCommand(Channel channel, Command command, String textPrefix, ByteBuf data) {
diff --git a/test/org/traccar/ProtocolTest.java b/test/org/traccar/ProtocolTest.java
index 181af885d..377474556 100644
--- a/test/org/traccar/ProtocolTest.java
+++ b/test/org/traccar/ProtocolTest.java
@@ -68,6 +68,10 @@ public class ProtocolTest extends BaseTest {
         return concatenateStrings(data);
     }
 
+    protected String text(ByteBuf data) {
+        return data.toString(StandardCharsets.ISO_8859_1);
+    }
+
     protected ByteBuf buffer(String... data) {
         return Unpooled.copiedBuffer(concatenateStrings(data), StandardCharsets.ISO_8859_1);
     }
diff --git a/test/org/traccar/protocol/WatchProtocolEncoderTest.java b/test/org/traccar/protocol/WatchProtocolEncoderTest.java
index e73b5bb96..649f5a10d 100644
--- a/test/org/traccar/protocol/WatchProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/WatchProtocolEncoderTest.java
@@ -1,5 +1,6 @@
 package org.traccar.protocol;
 
+import io.netty.buffer.ByteBuf;
 import org.junit.Test;
 import org.traccar.ProtocolTest;
 import org.traccar.model.Command;
@@ -18,20 +19,14 @@ public class WatchProtocolEncoderTest extends ProtocolTest {
         command = new Command();
         command.setDeviceId(1);
         command.setType(Command.TYPE_REBOOT_DEVICE);
-        assertEquals("[CS*123456789012345*0005*RESET]", encoder.encodeCommand(null, command));
+        assertEquals("[CS*123456789012345*0005*RESET]", text((ByteBuf)encoder.encodeCommand(null, command)));
 
         command = new Command();
         command.setDeviceId(1);
         command.setType(Command.TYPE_SOS_NUMBER);
         command.set(Command.KEY_INDEX, 1);
         command.set(Command.KEY_PHONE, "123456789");
-        assertEquals("[CS*123456789012345*000e*SOS1,123456789]", encoder.encodeCommand(null, command));
-
-        command = new Command();
-        command.setDeviceId(1);
-        command.setType(Command.TYPE_VOICE_MESSAGE);
-        command.set(Command.KEY_DATA, "3333");
-        assertEquals(buffer("[CS*123456789012345*0005*TK,33]"), encoder.encodeCommand(null, command));
+        assertEquals("[CS*123456789012345*000e*SOS1,123456789]", text((ByteBuf)encoder.encodeCommand(null, command)));
 
         command = new Command();
         command.setDeviceId(1);
@@ -55,28 +50,28 @@ public class WatchProtocolEncoderTest extends ProtocolTest {
         command.setDeviceId(1);
         command.setType(Command.TYPE_MESSAGE);
         command.set(Command.KEY_MESSAGE, "text");
-        assertEquals("[CS*123456789012345*0018*MESSAGE,0074006500780074]", encoder.encodeCommand(null, command));
+        assertEquals("[CS*123456789012345*0018*MESSAGE,0074006500780074]", text((ByteBuf)encoder.encodeCommand(null, command)));
 
         command = new Command();
         command.setDeviceId(1);
         command.setType(Command.TYPE_CUSTOM);
         command.set(Command.KEY_DATA, "WORK,6-9,11-13,13-15,17-19");
-        assertEquals("[CS*123456789012345*001a*WORK,6-9,11-13,13-15,17-19]", encoder.encodeCommand(null, command));
+        assertEquals("[CS*123456789012345*001a*WORK,6-9,11-13,13-15,17-19]", text((ByteBuf)encoder.encodeCommand(null, command)));
 
         command = new Command();
         command.setDeviceId(1);
         command.setType(Command.TYPE_SET_TIMEZONE);
         command.set(Command.KEY_TIMEZONE, "Europe/Amsterdam");
-        assertEquals("[CS*123456789012345*0006*LZ,,+1]", encoder.encodeCommand(null, command));
+        assertEquals("[CS*123456789012345*0006*LZ,,+1]", text((ByteBuf)encoder.encodeCommand(null, command)));
 
         command.set(Command.KEY_TIMEZONE, "GMT+01:30");
-        assertEquals("[CS*123456789012345*0008*LZ,,+1.5]", encoder.encodeCommand(null, command));
+        assertEquals("[CS*123456789012345*0008*LZ,,+1.5]", text((ByteBuf)encoder.encodeCommand(null, command)));
 
         command.set(Command.KEY_TIMEZONE, "Atlantic/Azores");
-        assertEquals("[CS*123456789012345*0006*LZ,,-1]", encoder.encodeCommand(null, command));
+        assertEquals("[CS*123456789012345*0006*LZ,,-1]", text((ByteBuf)encoder.encodeCommand(null, command)));
 
         command.set(Command.KEY_TIMEZONE, "GMT-11:30");
-        assertEquals("[CS*123456789012345*0009*LZ,,-11.5]", encoder.encodeCommand(null, command));
+        assertEquals("[CS*123456789012345*0009*LZ,,-11.5]", text((ByteBuf)encoder.encodeCommand(null, command)));
 
     }