Move server init into constructor

traccar · Oct 17, 2018 · 61d4c1f · 61d4c1f
1 parent ae32084
commit 61d4c1f
Show file tree

Hide file tree

Showing 186 changed files with 229 additions and 1,293 deletions.
diff --git a/src/org/traccar/BaseProtocol.java b/src/org/traccar/BaseProtocol.java
@@ -24,13 +24,16 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Set;
 
 public abstract class BaseProtocol implements Protocol {
 
     private final String name;
     private final Set<String> supportedDataCommands = new HashSet<>();
     private final Set<String> supportedTextCommands = new HashSet<>();
+    private final List<TrackerServer> serverList = new LinkedList<>();
 
     private StringProtocolEncoder textCommandEncoder = null;
 
@@ -48,6 +51,15 @@ public String getName() {
         return name;
     }
 
+    protected void addServer(TrackerServer server) {
+        serverList.add(server);
+    }
+
+    @Override
+    public Collection<TrackerServer> getServerList() {
+        return serverList;
+    }
+
     public void setSupportedDataCommands(String... commands) {
         supportedDataCommands.addAll(Arrays.asList(commands));
     }

diff --git a/src/org/traccar/Protocol.java b/src/org/traccar/Protocol.java
@@ -19,18 +19,17 @@
 import org.traccar.model.Command;
 
 import java.util.Collection;
-import java.util.List;
 
 public interface Protocol {
 
     String getName();
 
+    Collection<TrackerServer> getServerList();
+
     Collection<String> getSupportedDataCommands();
 
     void sendDataCommand(ActiveDevice activeDevice, Command command);
 
-    void initTrackerServers(List<TrackerServer> serverList);
-
     Collection<String> getSupportedTextCommands();
 
     void sendTextCommand(String destAddress, Command command) throws Exception;

diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java
@@ -70,10 +70,11 @@ public ServerManager() throws Exception {
 
         for (String name : names) {
             Class protocolClass = Class.forName(packageName + '.' + name);
-            if (BaseProtocol.class.isAssignableFrom(protocolClass)) {
-                BaseProtocol baseProtocol = (BaseProtocol) protocolClass.newInstance();
-                initProtocolServer(baseProtocol);
-                protocolList.put(baseProtocol.getName(), baseProtocol);
+            if (BaseProtocol.class.isAssignableFrom(protocolClass)
+                    && Context.getConfig().hasKey(BaseProtocol.nameFromClass(protocolClass) + ".port")) {
+                BaseProtocol protocol = (BaseProtocol) protocolClass.newInstance();
+                serverList.addAll(protocol.getServerList());
+                protocolList.put(protocol.getName(), protocol);
             }
         }
     }
@@ -99,10 +100,4 @@ public void stop() {
         GlobalTimer.release();
     }
 
-    private void initProtocolServer(final Protocol protocol) {
-        if (Context.getConfig().hasKey(protocol.getName() + ".port")) {
-            protocol.initTrackerServers(serverList);
-        }
-    }
-
 }
diff --git a/src/org/traccar/protocol/AdmProtocol.java b/src/org/traccar/protocol/AdmProtocol.java
@@ -23,19 +23,14 @@
 import org.traccar.model.Command;
 
 import java.nio.ByteOrder;
-import java.util.List;
 
 public class AdmProtocol extends BaseProtocol {
 
     public AdmProtocol() {
         setSupportedDataCommands(
                 Command.TYPE_GET_DEVICE_STATUS,
                 Command.TYPE_CUSTOM);
-    }
-
-    @Override
-    public void initTrackerServers(List<TrackerServer> serverList) {
-        serverList.add(new TrackerServer(false, getName()) {
+        addServer(new TrackerServer(false, getName()) {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
                 pipeline.addLast(new LengthFieldBasedFrameDecoder(ByteOrder.LITTLE_ENDIAN, 1024, 2, 1, -3, 0, true));

diff --git a/src/org/traccar/protocol/AisProtocol.java b/src/org/traccar/protocol/AisProtocol.java
@@ -20,16 +20,10 @@
 import org.traccar.PipelineBuilder;
 import org.traccar.TrackerServer;
 
-import java.util.List;
-
 public class AisProtocol extends BaseProtocol {
 
     public AisProtocol() {
-    }
-
-    @Override
-    public void initTrackerServers(List<TrackerServer> serverList) {
-        serverList.add(new TrackerServer(false, getName()) {
+        addServer(new TrackerServer(false, getName()) {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
                 pipeline.addLast(new StringDecoder());

diff --git a/src/org/traccar/protocol/AlematicsProtocol.java b/src/org/traccar/protocol/AlematicsProtocol.java
@@ -21,16 +21,10 @@
 import org.traccar.PipelineBuilder;
 import org.traccar.TrackerServer;
 
-import java.util.List;
-
 public class AlematicsProtocol extends BaseProtocol {
 
     public AlematicsProtocol() {
-    }
-
-    @Override
-    public void initTrackerServers(List<TrackerServer> serverList) {
-        serverList.add(new TrackerServer(false, getName()) {
+        addServer(new TrackerServer(false, getName()) {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
                 pipeline.addLast(new AlematicsFrameDecoder(1024));

diff --git a/src/org/traccar/protocol/AnytrekProtocol.java b/src/org/traccar/protocol/AnytrekProtocol.java
@@ -20,16 +20,10 @@
 import org.traccar.PipelineBuilder;
 import org.traccar.TrackerServer;
 
-import java.util.List;
-
 public class AnytrekProtocol extends BaseProtocol {
 
     public AnytrekProtocol() {
-    }
-
-    @Override
-    public void initTrackerServers(List<TrackerServer> serverList) {
-        serverList.add(new TrackerServer(false, getName()) {
+        addServer(new TrackerServer(false, getName()) {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
                 pipeline.addLast(new LengthFieldBasedFrameDecoder(1024, 2, 2, 2, 0));

diff --git a/src/org/traccar/protocol/ApelProtocol.java b/src/org/traccar/protocol/ApelProtocol.java
@@ -21,16 +21,10 @@
 import org.traccar.TrackerServer;
 
 import java.nio.ByteOrder;
-import java.util.List;
-
 public class ApelProtocol extends BaseProtocol {
 
     public ApelProtocol() {
-    }
-
-    @Override
-    public void initTrackerServers(List<TrackerServer> serverList) {
-        serverList.add(new TrackerServer(false, getName()) {
+        addServer(new TrackerServer(false, getName()) {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
                 pipeline.addLast(new LengthFieldBasedFrameDecoder(ByteOrder.LITTLE_ENDIAN, 1024, 2, 2, 4, 0, true));

diff --git a/src/org/traccar/protocol/AplicomProtocol.java b/src/org/traccar/protocol/AplicomProtocol.java
@@ -19,16 +19,10 @@
 import org.traccar.PipelineBuilder;
 import org.traccar.TrackerServer;
 
-import java.util.List;
-
 public class AplicomProtocol extends BaseProtocol {
 
     public AplicomProtocol() {
-    }
-
-    @Override
-    public void initTrackerServers(List<TrackerServer> serverList) {
-        serverList.add(new TrackerServer(false, getName()) {
+        addServer(new TrackerServer(false, getName()) {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
                 pipeline.addLast(new AplicomFrameDecoder());

diff --git a/src/org/traccar/protocol/AppelloProtocol.java b/src/org/traccar/protocol/AppelloProtocol.java
@@ -22,16 +22,10 @@
 import org.traccar.PipelineBuilder;
 import org.traccar.TrackerServer;
 
-import java.util.List;
-
 public class AppelloProtocol extends BaseProtocol {
 
     public AppelloProtocol() {
-    }
-
-    @Override
-    public void initTrackerServers(List<TrackerServer> serverList) {
-        serverList.add(new TrackerServer(false, getName()) {
+        addServer(new TrackerServer(false, getName()) {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
                 pipeline.addLast(new LineBasedFrameDecoder(1024));

diff --git a/src/org/traccar/protocol/AppletProtocol.java b/src/org/traccar/protocol/AppletProtocol.java
@@ -22,16 +22,10 @@
 import org.traccar.PipelineBuilder;
 import org.traccar.TrackerServer;
 
-import java.util.List;
-
 public class AppletProtocol extends BaseProtocol {
 
     public AppletProtocol() {
-    }
-
-    @Override
-    public void initTrackerServers(List<TrackerServer> serverList) {
-        serverList.add(new TrackerServer(false, getName()) {
+        addServer(new TrackerServer(false, getName()) {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
                 pipeline.addLast(new HttpResponseEncoder());

diff --git a/src/org/traccar/protocol/AquilaProtocol.java b/src/org/traccar/protocol/AquilaProtocol.java
@@ -22,16 +22,10 @@
 import org.traccar.PipelineBuilder;
 import org.traccar.TrackerServer;
 
-import java.util.List;
-
 public class AquilaProtocol extends BaseProtocol {
 
     public AquilaProtocol() {
-    }
-
-    @Override
-    public void initTrackerServers(List<TrackerServer> serverList) {
-        serverList.add(new TrackerServer(false, getName()) {
+        addServer(new TrackerServer(false, getName()) {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
                 pipeline.addLast(new LineBasedFrameDecoder(1024));

diff --git a/src/org/traccar/protocol/Ardi01Protocol.java b/src/org/traccar/protocol/Ardi01Protocol.java
@@ -22,16 +22,10 @@
 import org.traccar.PipelineBuilder;
 import org.traccar.TrackerServer;
 
-import java.util.List;
-
 public class Ardi01Protocol extends BaseProtocol {
 
     public Ardi01Protocol() {
-    }
-
-    @Override
-    public void initTrackerServers(List<TrackerServer> serverList) {
-        serverList.add(new TrackerServer(false, getName()) {
+        addServer(new TrackerServer(false, getName()) {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
                 pipeline.addLast(new LineBasedFrameDecoder(1024));

diff --git a/src/org/traccar/protocol/ArknavProtocol.java b/src/org/traccar/protocol/ArknavProtocol.java
@@ -22,16 +22,10 @@
 import org.traccar.PipelineBuilder;
 import org.traccar.TrackerServer;
 
-import java.util.List;
-
 public class ArknavProtocol extends BaseProtocol {
 
     public ArknavProtocol() {
-    }
-
-    @Override
-    public void initTrackerServers(List<TrackerServer> serverList) {
-        serverList.add(new TrackerServer(false, getName()) {
+        addServer(new TrackerServer(false, getName()) {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
                 pipeline.addLast(new CharacterDelimiterFrameDecoder(1024, '\r'));

diff --git a/src/org/traccar/protocol/ArknavX8Protocol.java b/src/org/traccar/protocol/ArknavX8Protocol.java
@@ -22,16 +22,10 @@
 import org.traccar.PipelineBuilder;
 import org.traccar.TrackerServer;
 
-import java.util.List;
-
 public class ArknavX8Protocol extends BaseProtocol {
 
     public ArknavX8Protocol() {
-    }
-
-    @Override
-    public void initTrackerServers(List<TrackerServer> serverList) {
-        serverList.add(new TrackerServer(false, getName()) {
+        addServer(new TrackerServer(false, getName()) {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
                 pipeline.addLast(new CharacterDelimiterFrameDecoder(1024, ';'));

diff --git a/src/org/traccar/protocol/ArnaviProtocol.java b/src/org/traccar/protocol/ArnaviProtocol.java
@@ -22,16 +22,10 @@
 import org.traccar.PipelineBuilder;
 import org.traccar.TrackerServer;
 
-import java.util.List;
-
 public class ArnaviProtocol extends BaseProtocol {
 
     public ArnaviProtocol() {
-    }
-
-    @Override
-    public void initTrackerServers(List<TrackerServer> serverList) {
-        serverList.add(new TrackerServer(false, getName()) {
+        addServer(new TrackerServer(false, getName()) {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
                 pipeline.addLast(new LineBasedFrameDecoder(1024));

diff --git a/src/org/traccar/protocol/AstraProtocol.java b/src/org/traccar/protocol/AstraProtocol.java
@@ -20,23 +20,17 @@
 import org.traccar.PipelineBuilder;
 import org.traccar.TrackerServer;
 
-import java.util.List;
-
 public class AstraProtocol extends BaseProtocol {
 
     public AstraProtocol() {
-    }
-
-    @Override
-    public void initTrackerServers(List<TrackerServer> serverList) {
-        serverList.add(new TrackerServer(false, getName()) {
+        addServer(new TrackerServer(false, getName()) {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
                 pipeline.addLast(new LengthFieldBasedFrameDecoder(1024, 1, 2, -3, 0));
                 pipeline.addLast(new AstraProtocolDecoder(AstraProtocol.this));
             }
         });
-        serverList.add(new TrackerServer(true, getName()) {
+        addServer(new TrackerServer(true, getName()) {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
                 pipeline.addLast(new AstraProtocolDecoder(AstraProtocol.this));

diff --git a/src/org/traccar/protocol/At2000Protocol.java b/src/org/traccar/protocol/At2000Protocol.java
@@ -19,16 +19,10 @@
 import org.traccar.PipelineBuilder;
 import org.traccar.TrackerServer;
 
-import java.util.List;
-
 public class At2000Protocol extends BaseProtocol {
 
     public At2000Protocol() {
-    }
-
-    @Override
-    public void initTrackerServers(List<TrackerServer> serverList) {
-        serverList.add(new TrackerServer(false, getName()) {
+        addServer(new TrackerServer(false, getName()) {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
                 pipeline.addLast(new At2000FrameDecoder());

diff --git a/src/org/traccar/protocol/AtrackProtocol.java b/src/org/traccar/protocol/AtrackProtocol.java
@@ -20,26 +20,20 @@
 import org.traccar.TrackerServer;
 import org.traccar.model.Command;
 
-import java.util.List;
-
 public class AtrackProtocol extends BaseProtocol {
 
     public AtrackProtocol() {
         setSupportedDataCommands(
                 Command.TYPE_CUSTOM);
-    }
-
-    @Override
-    public void initTrackerServers(List<TrackerServer> serverList) {
-        serverList.add(new TrackerServer(false, getName()) {
+        addServer(new TrackerServer(false, getName()) {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
                 pipeline.addLast(new AtrackFrameDecoder());
                 pipeline.addLast(new AtrackProtocolEncoder());
                 pipeline.addLast(new AtrackProtocolDecoder(AtrackProtocol.this));
             }
         });
-        serverList.add(new TrackerServer(true, getName()) {
+        addServer(new TrackerServer(true, getName()) {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
                 pipeline.addLast(new AtrackProtocolEncoder());