Fix merge issues

1 files changed, 6 insertions, 16 deletions

diff --git a/src/main/java/org/traccar/protocol/Arnavi4Protocol.java b/src/main/java/org/traccar/protocol/Arnavi4Protocol.java
index 381a9b457..8a9337b56 100644
--- a/src/main/java/org/traccar/protocol/Arnavi4Protocol.java
+++ b/src/main/java/org/traccar/protocol/Arnavi4Protocol.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright 2020 Anton Tananaev (anton@traccar.org)
  * Copyright 2017 Ivan Muratov (binakot@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,31 +16,20 @@
  */
 package org.traccar.protocol;
 
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.ChannelPipeline;
 import org.traccar.BaseProtocol;
+import org.traccar.PipelineBuilder;
 import org.traccar.TrackerServer;
 
-import java.nio.ByteOrder;
-import java.util.List;
-
 public class Arnavi4Protocol extends BaseProtocol {
 
     public Arnavi4Protocol() {
-        super("arnavi4");
-    }
-
-    @Override
-    public void initTrackerServers(List<TrackerServer> serverList) {
-        TrackerServer server = new TrackerServer(new ServerBootstrap(), getName()) {
+        TrackerServer server = new TrackerServer(false, getName()) {
             @Override
-            protected void addSpecificHandlers(ChannelPipeline pipeline) {
-                pipeline.addLast("frameDecoder", new Arnavi4FrameDecoder());
-                pipeline.addLast("objectDecoder", new Arnavi4ProtocolDecoder(Arnavi4Protocol.this));
+            protected void addProtocolHandlers(PipelineBuilder pipeline) {
+                pipeline.addLast(new Arnavi4FrameDecoder());
+                pipeline.addLast(new Arnavi4ProtocolDecoder(Arnavi4Protocol.this));
             }
         };
-        server.setEndianness(ByteOrder.LITTLE_ENDIAN);
-        serverList.add(server);
     }
 
 }