From b10824bb5769c4abb93e3451673b88efdfb9d467 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Fri, 14 Sep 2018 14:33:49 +1200
Subject: Log using slf4j and java logging

---
 .../traccar/protocol/GranitProtocolEncoder.java    | 29 ++++++++--------------
 1 file changed, 11 insertions(+), 18 deletions(-)

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

diff --git a/src/org/traccar/protocol/GranitProtocolEncoder.java b/src/org/traccar/protocol/GranitProtocolEncoder.java
index bde267ee6..6345ff971 100644
--- a/src/org/traccar/protocol/GranitProtocolEncoder.java
+++ b/src/org/traccar/protocol/GranitProtocolEncoder.java
@@ -20,36 +20,29 @@ import java.nio.charset.StandardCharsets;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.traccar.BaseProtocolEncoder;
-import org.traccar.helper.Log;
 import org.traccar.model.Command;
 
 public class GranitProtocolEncoder extends BaseProtocolEncoder {
-    @Override
-    protected Object encodeCommand(Command command) {
 
-        String commandString = "";
+    private ByteBuf encodeCommand(String commandString) {
+        ByteBuf buffer = Unpooled.buffer();
+        buffer.writeBytes(commandString.getBytes(StandardCharsets.US_ASCII));
+        GranitProtocolDecoder.appendChecksum(buffer, commandString.length());
+        return buffer;
+    }
 
+    @Override
+    protected Object encodeCommand(Command command) {
         switch (command.getType()) {
             case Command.TYPE_IDENTIFICATION:
-                commandString = "BB+IDNT";
-                break;
+                return encodeCommand("BB+IDNT");
             case Command.TYPE_REBOOT_DEVICE:
-                commandString = "BB+RESET";
-                break;
+                return encodeCommand("BB+RESET");
             case Command.TYPE_POSITION_SINGLE:
-                commandString = "BB+RRCD";
-                break;
+                return encodeCommand("BB+RRCD");
             default:
-                Log.warning(new UnsupportedOperationException(command.getType()));
                 return null;
         }
-        if (!commandString.isEmpty()) {
-            ByteBuf commandBuf = Unpooled.buffer();
-            commandBuf.writeBytes(commandString.getBytes(StandardCharsets.US_ASCII));
-            GranitProtocolDecoder.appendChecksum(commandBuf, commandString.length());
-            return commandBuf;
-        }
-        return null;
     }
 
 }
-- 
cgit v1.2.3