Improve dependency injection

29 files changed, 232 insertions, 369 deletions

diff --git a/src/main/java/org/traccar/MainModule.java b/src/main/java/org/traccar/MainModule.java
index 79cfcc0a8..60b5854fd 100644
--- a/src/main/java/org/traccar/MainModule.java
+++ b/src/main/java/org/traccar/MainModule.java
@@ -18,7 +18,10 @@ package org.traccar;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
+import com.google.inject.Scopes;
 import com.google.inject.Singleton;
+import io.netty.util.HashedWheelTimer;
+import io.netty.util.Timer;
 import org.traccar.config.Config;
 import org.traccar.config.Keys;
 import org.traccar.database.AttributesManager;
@@ -43,51 +46,35 @@ import org.traccar.geocoder.GoogleGeocoder;
 import org.traccar.geocoder.HereGeocoder;
 import org.traccar.geocoder.MapQuestGeocoder;
 import org.traccar.geocoder.MapTilerGeocoder;
+import org.traccar.geocoder.MapboxGeocoder;
 import org.traccar.geocoder.MapmyIndiaGeocoder;
 import org.traccar.geocoder.NominatimGeocoder;
 import org.traccar.geocoder.OpenCageGeocoder;
 import org.traccar.geocoder.PositionStackGeocoder;
 import org.traccar.geocoder.TomTomGeocoder;
-import org.traccar.geocoder.MapboxGeocoder;
 import org.traccar.geolocation.GeolocationProvider;
 import org.traccar.geolocation.GoogleGeolocationProvider;
 import org.traccar.geolocation.MozillaGeolocationProvider;
 import org.traccar.geolocation.OpenCellIdGeolocationProvider;
 import org.traccar.geolocation.UnwiredGeolocationProvider;
-import org.traccar.handler.ComputedAttributesHandler;
-import org.traccar.handler.CopyAttributesHandler;
-import org.traccar.handler.DefaultDataHandler;
-import org.traccar.handler.DistanceHandler;
-import org.traccar.handler.EngineHoursHandler;
-import org.traccar.handler.FilterHandler;
 import org.traccar.handler.GeocoderHandler;
 import org.traccar.handler.GeolocationHandler;
-import org.traccar.handler.HemisphereHandler;
-import org.traccar.handler.MotionHandler;
-import org.traccar.handler.RemoteAddressHandler;
 import org.traccar.handler.SpeedLimitHandler;
-import org.traccar.handler.TimeHandler;
-import org.traccar.handler.events.AlertEventHandler;
-import org.traccar.handler.events.BehaviorEventHandler;
-import org.traccar.handler.events.CommandResultEventHandler;
-import org.traccar.handler.events.DriverEventHandler;
-import org.traccar.handler.events.FuelDropEventHandler;
-import org.traccar.handler.events.GeofenceEventHandler;
-import org.traccar.handler.events.IgnitionEventHandler;
-import org.traccar.handler.events.MaintenanceEventHandler;
-import org.traccar.handler.events.MotionEventHandler;
-import org.traccar.handler.events.OverspeedEventHandler;
 import org.traccar.reports.model.TripsConfig;
-
-import javax.annotation.Nullable;
-import javax.ws.rs.client.Client;
-import io.netty.util.Timer;
 import org.traccar.speedlimit.OverpassSpeedLimitProvider;
 import org.traccar.speedlimit.SpeedLimitProvider;
 import org.traccar.storage.Storage;
 
+import javax.annotation.Nullable;
+import javax.ws.rs.client.Client;
+
 public class MainModule extends AbstractModule {
 
+    @Override
+    protected void configure() {
+        bind(Timer.class).to(HashedWheelTimer.class).in(Scopes.SINGLETON);
+    }
+
     @Provides
     public static ObjectMapper provideObjectMapper() {
         return Context.getObjectMapper();
@@ -155,13 +142,6 @@ public class MainModule extends AbstractModule {
 
     @Singleton
     @Provides
-    public static StatisticsManager provideStatisticsManager(
-            Config config, DataManager dataManager, Client client, ObjectMapper objectMapper) {
-        return new StatisticsManager(config, dataManager, client, objectMapper);
-    }
-
-    @Singleton
-    @Provides
     public static Geocoder provideGeocoder(Config config) {
         if (config.getBoolean(Keys.GEOCODER_ENABLE)) {
             String type = config.getString(Keys.GEOCODER_TYPE, "google");
@@ -249,50 +229,6 @@ public class MainModule extends AbstractModule {
         return null;
     }
 
-    @Singleton
-    @Provides
-    public static DistanceHandler provideDistanceHandler(Config config, IdentityManager identityManager) {
-        return new DistanceHandler(config, identityManager);
-    }
-
-    @Singleton
-    @Provides
-    public static FilterHandler provideFilterHandler(Config config) {
-        if (config.getBoolean(Keys.FILTER_ENABLE)) {
-            return new FilterHandler(config);
-        }
-        return null;
-    }
-
-    @Singleton
-    @Provides
-    public static HemisphereHandler provideHemisphereHandler(Config config) {
-        if (config.hasKey(Keys.LOCATION_LATITUDE_HEMISPHERE) || config.hasKey(Keys.LOCATION_LONGITUDE_HEMISPHERE)) {
-            return new HemisphereHandler(config);
-        }
-        return null;
-    }
-
-    @Singleton
-    @Provides
-    public static RemoteAddressHandler provideRemoteAddressHandler(Config config) {
-        if (config.getBoolean(Keys.PROCESSING_REMOTE_ADDRESS_ENABLE)) {
-            return new RemoteAddressHandler();
-        }
-        return null;
-    }
-
-    @Singleton
-    @Provides
-    public static WebDataHandler provideWebDataHandler(
-            Config config, IdentityManager identityManager, ObjectMapper objectMapper, Client client) {
-        if (config.hasKey(Keys.FORWARD_URL)) {
-            return new WebDataHandler(config, identityManager, objectMapper, client);
-        }
-        return null;
-    }
-
-    @Singleton
     @Provides
     public static GeolocationHandler provideGeolocationHandler(
             Config config, @Nullable GeolocationProvider geolocationProvider, StatisticsManager statisticsManager) {
@@ -302,7 +238,6 @@ public class MainModule extends AbstractModule {
         return null;
     }
 
-    @Singleton
     @Provides
     public static GeocoderHandler provideGeocoderHandler(
             Config config, @Nullable Geocoder geocoder, IdentityManager identityManager) {
@@ -312,7 +247,6 @@ public class MainModule extends AbstractModule {
         return null;
     }
 
-    @Singleton
     @Provides
     public static SpeedLimitHandler provideSpeedLimitHandler(@Nullable SpeedLimitProvider speedLimitProvider) {
         if (speedLimitProvider != null) {
@@ -321,127 +255,4 @@ public class MainModule extends AbstractModule {
         return null;
     }
 
-    @Singleton
-    @Provides
-    public static MotionHandler provideMotionHandler(TripsConfig tripsConfig) {
-        return new MotionHandler(tripsConfig.getSpeedThreshold());
-    }
-
-    @Singleton
-    @Provides
-    public static EngineHoursHandler provideEngineHoursHandler(Config config, IdentityManager identityManager) {
-        if (config.getBoolean(Keys.PROCESSING_ENGINE_HOURS_ENABLE)) {
-            return new EngineHoursHandler(identityManager);
-        }
-        return null;
-    }
-
-    @Singleton
-    @Provides
-    public static CopyAttributesHandler provideCopyAttributesHandler(Config config, IdentityManager identityManager) {
-        if (config.getBoolean(Keys.PROCESSING_COPY_ATTRIBUTES_ENABLE)) {
-            return new CopyAttributesHandler(identityManager);
-        }
-        return null;
-    }
-
-    @Singleton
-    @Provides
-    public static ComputedAttributesHandler provideComputedAttributesHandler(
-            Config config, IdentityManager identityManager, AttributesManager attributesManager) {
-        if (config.getBoolean(Keys.PROCESSING_COMPUTED_ATTRIBUTES_ENABLE)) {
-            return new ComputedAttributesHandler(config, identityManager, attributesManager);
-        }
-        return null;
-    }
-
-    @Singleton
-    @Provides
-    public static TimeHandler provideTimeHandler(Config config) {
-        if (config.hasKey(Keys.TIME_OVERRIDE)) {
-            return new TimeHandler(config);
-        }
-        return null;
-    }
-
-    @Singleton
-    @Provides
-    public static DefaultDataHandler provideDefaultDataHandler(@Nullable DataManager dataManager) {
-        if (dataManager != null) {
-            return new DefaultDataHandler(dataManager);
-        }
-        return null;
-    }
-
-    @Singleton
-    @Provides
-    public static CommandResultEventHandler provideCommandResultEventHandler() {
-        return new CommandResultEventHandler();
-    }
-
-    @Singleton
-    @Provides
-    public static OverspeedEventHandler provideOverspeedEventHandler(
-            Config config, DeviceManager deviceManager, GeofenceManager geofenceManager) {
-        return new OverspeedEventHandler(config, deviceManager, geofenceManager);
-    }
-
-    @Singleton
-    @Provides
-    public static BehaviorEventHandler provideBehaviorEventHandler(Config config, IdentityManager identityManager) {
-        return new BehaviorEventHandler(config, identityManager);
-    }
-
-    @Singleton
-    @Provides
-    public static FuelDropEventHandler provideFuelDropEventHandler(IdentityManager identityManager) {
-        return new FuelDropEventHandler(identityManager);
-    }
-
-    @Singleton
-    @Provides
-    public static MotionEventHandler provideMotionEventHandler(
-            IdentityManager identityManager, DeviceManager deviceManager, TripsConfig tripsConfig) {
-        return new MotionEventHandler(identityManager, deviceManager, tripsConfig);
-    }
-
-    @Singleton
-    @Provides
-    public static GeofenceEventHandler provideGeofenceEventHandler(
-            IdentityManager identityManager, GeofenceManager geofenceManager, CalendarManager calendarManager,
-            ConnectionManager connectionManager) {
-        return new GeofenceEventHandler(identityManager, geofenceManager, calendarManager, connectionManager);
-    }
-
-    @Singleton
-    @Provides
-    public static AlertEventHandler provideAlertEventHandler(Config config, IdentityManager identityManager) {
-        return new AlertEventHandler(config, identityManager);
-    }
-
-    @Singleton
-    @Provides
-    public static IgnitionEventHandler provideIgnitionEventHandler(IdentityManager identityManager) {
-        return new IgnitionEventHandler(identityManager);
-    }
-
-    @Singleton
-    @Provides
-    public static MaintenanceEventHandler provideMaintenanceEventHandler(
-            IdentityManager identityManager, MaintenancesManager maintenancesManager) {
-        return new MaintenanceEventHandler(identityManager, maintenancesManager);
-    }
-
-    @Singleton
-    @Provides
-    public static DriverEventHandler provideDriverEventHandler(IdentityManager identityManager) {
-        return new DriverEventHandler(identityManager);
-    }
-
-    @Singleton
-    @Provides
-    public static Timer provideTimer() {
-        return GlobalTimer.getTimer();
-    }
-
 }
diff --git a/src/main/java/org/traccar/WebDataHandler.java b/src/main/java/org/traccar/WebDataHandler.java
index 678096d34..2c0aa0f8e 100644
--- a/src/main/java/org/traccar/WebDataHandler.java
+++ b/src/main/java/org/traccar/WebDataHandler.java
@@ -287,8 +287,10 @@ public class WebDataHandler extends BaseDataHandler {
     @Override
     protected Position handlePosition(Position position) {
 
-        AsyncRequestAndCallback request = new AsyncRequestAndCallback(position);
-        request.send();
+        if (url != null) {
+            AsyncRequestAndCallback request = new AsyncRequestAndCallback(position);
+            request.send();
+        }
 
         return position;
     }
diff --git a/src/main/java/org/traccar/config/Keys.java b/src/main/java/org/traccar/config/Keys.java
index bb3ea393a..eebdf7172 100644
--- a/src/main/java/org/traccar/config/Keys.java
+++ b/src/main/java/org/traccar/config/Keys.java
@@ -1022,13 +1022,6 @@ public final class Keys {
             Collections.singletonList(KeyType.GLOBAL));
 
     /**
-     * Enable engine hours calculation on the server side. It uses ignition value to determine engine state.
-     */
-    public static final ConfigKey<Boolean> PROCESSING_ENGINE_HOURS_ENABLE = new ConfigKey<>(
-            "processing.engineHours.enable",
-            Collections.singletonList(KeyType.GLOBAL));
-
-    /**
      * Enable copying of missing attributes from last position to the current one. Might be useful if device doesn't
      * send some values in every message.
      */
@@ -1039,13 +1032,6 @@ public final class Keys {
     /**
      * Enable computed attributes processing.
      */
-    public static final ConfigKey<Boolean> PROCESSING_COMPUTED_ATTRIBUTES_ENABLE = new ConfigKey<>(
-            "processing.computedAttributes.enable",
-            Collections.singletonList(KeyType.GLOBAL));
-
-    /**
-     * Enable computed attributes processing.
-     */
     public static final ConfigKey<Boolean> PROCESSING_COMPUTED_ATTRIBUTES_DEVICE_ATTRIBUTES = new ConfigKey<>(
             "processing.computedAttributes.deviceAttributes",
             Collections.singletonList(KeyType.GLOBAL));
diff --git a/src/main/java/org/traccar/database/ConnectionManager.java b/src/main/java/org/traccar/database/ConnectionManager.java
index 359061f00..f0e40f631 100644
--- a/src/main/java/org/traccar/database/ConnectionManager.java
+++ b/src/main/java/org/traccar/database/ConnectionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2020 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2022 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.
@@ -17,10 +17,10 @@ package org.traccar.database;
 
 import io.netty.channel.Channel;
 import io.netty.util.Timeout;
+import io.netty.util.Timer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.traccar.Context;
-import org.traccar.GlobalTimer;
 import org.traccar.Main;
 import org.traccar.Protocol;
 import org.traccar.config.Keys;
@@ -52,9 +52,12 @@ public class ConnectionManager {
     private final Map<Long, Set<UpdateListener>> listeners = new ConcurrentHashMap<>();
     private final Map<Long, Timeout> timeouts = new ConcurrentHashMap<>();
 
+    private final Timer timer;
+
     public ConnectionManager() {
         deviceTimeout = Context.getConfig().getLong(Keys.STATUS_TIMEOUT) * 1000;
         updateDeviceState = Context.getConfig().getBoolean(Keys.STATUS_UPDATE_DEVICE_STATE);
+        timer = Main.getInjector().getInstance(Timer.class);
     }
 
     public void addActiveDevice(long deviceId, Protocol protocol, Channel channel, SocketAddress remoteAddress) {
@@ -118,7 +121,7 @@ public class ConnectionManager {
         }
 
         if (status.equals(Device.STATUS_ONLINE)) {
-            timeouts.put(deviceId, GlobalTimer.getTimer().newTimeout(timeout1 -> {
+            timeouts.put(deviceId, timer.newTimeout(timeout1 -> {
                 if (!timeout1.isCancelled()) {
                     updateDevice(deviceId, Device.STATUS_UNKNOWN, null);
                 }
diff --git a/src/main/java/org/traccar/handler/ComputedAttributesHandler.java b/src/main/java/org/traccar/handler/ComputedAttributesHandler.java
index 153da29b9..9dc170909 100644
--- a/src/main/java/org/traccar/handler/ComputedAttributesHandler.java
+++ b/src/main/java/org/traccar/handler/ComputedAttributesHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2019 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 - 2022 Anton Tananaev (anton@traccar.org)
  * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -40,6 +40,8 @@ import org.traccar.model.Attribute;
 import org.traccar.model.Device;
 import org.traccar.model.Position;
 
+import javax.inject.Inject;
+
 @ChannelHandler.Sharable
 public class ComputedAttributesHandler extends BaseDataHandler {
 
@@ -52,6 +54,7 @@ public class ComputedAttributesHandler extends BaseDataHandler {
 
     private final boolean includeDeviceAttributes;
 
+    @Inject
     public ComputedAttributesHandler(
             Config config, IdentityManager identityManager, AttributesManager attributesManager) {
         this.identityManager = identityManager;
diff --git a/src/main/java/org/traccar/handler/CopyAttributesHandler.java b/src/main/java/org/traccar/handler/CopyAttributesHandler.java
index f386116b0..8285dcc5d 100644
--- a/src/main/java/org/traccar/handler/CopyAttributesHandler.java
+++ b/src/main/java/org/traccar/handler/CopyAttributesHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2019 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2022 Anton Tananaev (anton@traccar.org)
  * Copyright 2016 - 2017 Andrey Kunitsyn (andrey@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,27 +18,37 @@ package org.traccar.handler;
 
 import io.netty.channel.ChannelHandler;
 import org.traccar.BaseDataHandler;
+import org.traccar.config.Config;
+import org.traccar.config.Keys;
 import org.traccar.database.IdentityManager;
 import org.traccar.model.Position;
 
+import javax.inject.Inject;
+
 @ChannelHandler.Sharable
 public class CopyAttributesHandler extends BaseDataHandler {
 
-    private IdentityManager identityManager;
+    private final boolean enabled;
+    private final IdentityManager identityManager;
 
-    public CopyAttributesHandler(IdentityManager identityManager) {
+    @Inject
+    public CopyAttributesHandler(Config config, IdentityManager identityManager) {
+        enabled = config.getBoolean(Keys.PROCESSING_COPY_ATTRIBUTES_ENABLE);
         this.identityManager = identityManager;
     }
 
     @Override
     protected Position handlePosition(Position position) {
-        String attributesString = identityManager.lookupAttributeString(
-                position.getDeviceId(), "processing.copyAttributes", "", false, true);
-        Position last = identityManager.getLastPosition(position.getDeviceId());
-        if (last != null) {
-            for (String attribute : attributesString.split("[ ,]")) {
-                if (last.getAttributes().containsKey(attribute) && !position.getAttributes().containsKey(attribute)) {
-                    position.getAttributes().put(attribute, last.getAttributes().get(attribute));
+        if (enabled) {
+            String attributesString = identityManager.lookupAttributeString(
+                    position.getDeviceId(), "processing.copyAttributes", "", false, true);
+            Position last = identityManager.getLastPosition(position.getDeviceId());
+            if (last != null) {
+                for (String attribute : attributesString.split("[ ,]")) {
+                    if (last.getAttributes().containsKey(attribute)
+                            && !position.getAttributes().containsKey(attribute)) {
+                        position.getAttributes().put(attribute, last.getAttributes().get(attribute));
+                    }
                 }
             }
         }
diff --git a/src/main/java/org/traccar/handler/DefaultDataHandler.java b/src/main/java/org/traccar/handler/DefaultDataHandler.java
index 9d8ea044d..c2adfd799 100644
--- a/src/main/java/org/traccar/handler/DefaultDataHandler.java
+++ b/src/main/java/org/traccar/handler/DefaultDataHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2019 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2022 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.
@@ -22,6 +22,8 @@ import org.traccar.BaseDataHandler;
 import org.traccar.database.DataManager;
 import org.traccar.model.Position;
 
+import javax.inject.Inject;
+
 @ChannelHandler.Sharable
 public class DefaultDataHandler extends BaseDataHandler {
 
@@ -29,6 +31,7 @@ public class DefaultDataHandler extends BaseDataHandler {
 
     private final DataManager dataManager;
 
+    @Inject
     public DefaultDataHandler(DataManager dataManager) {
         this.dataManager = dataManager;
     }
diff --git a/src/main/java/org/traccar/handler/DistanceHandler.java b/src/main/java/org/traccar/handler/DistanceHandler.java
index 1e7e444f6..08c8c068d 100644
--- a/src/main/java/org/traccar/handler/DistanceHandler.java
+++ b/src/main/java/org/traccar/handler/DistanceHandler.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright 2016 - 2022 Anton Tananaev (anton@traccar.org)
  * Copyright 2015 Amila Silva
- * Copyright 2016 - 2021 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.
@@ -24,6 +24,7 @@ import org.traccar.database.IdentityManager;
 import org.traccar.helper.DistanceCalculator;
 import org.traccar.model.Position;
 
+import javax.inject.Inject;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 
@@ -36,6 +37,7 @@ public class DistanceHandler extends BaseDataHandler {
     private final int coordinatesMinError;
     private final int coordinatesMaxError;
 
+    @Inject
     public DistanceHandler(Config config, IdentityManager identityManager) {
         this.identityManager = identityManager;
         this.filter = config.getBoolean(Keys.COORDINATES_FILTER);
diff --git a/src/main/java/org/traccar/handler/EngineHoursHandler.java b/src/main/java/org/traccar/handler/EngineHoursHandler.java
index 92da84e6b..be2a46ade 100644
--- a/src/main/java/org/traccar/handler/EngineHoursHandler.java
+++ b/src/main/java/org/traccar/handler/EngineHoursHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2019 Anton Tananaev (anton@traccar.org)
+ * Copyright 2018 - 2022 Anton Tananaev (anton@traccar.org)
  * Copyright 2018 Andrey Kunitsyn (andrey@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,11 +21,14 @@ import org.traccar.BaseDataHandler;
 import org.traccar.database.IdentityManager;
 import org.traccar.model.Position;
 
+import javax.inject.Inject;
+
 @ChannelHandler.Sharable
 public class EngineHoursHandler extends BaseDataHandler {
 
     private final IdentityManager identityManager;
 
+    @Inject
     public EngineHoursHandler(IdentityManager identityManager) {
         this.identityManager = identityManager;
     }
diff --git a/src/main/java/org/traccar/handler/FilterHandler.java b/src/main/java/org/traccar/handler/FilterHandler.java
index e576a26b8..0511ec98b 100644
--- a/src/main/java/org/traccar/handler/FilterHandler.java
+++ b/src/main/java/org/traccar/handler/FilterHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2014 - 2022 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.
@@ -19,13 +19,15 @@ import io.netty.channel.ChannelHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.traccar.BaseDataHandler;
-import org.traccar.Context;
 import org.traccar.config.Config;
 import org.traccar.config.Keys;
+import org.traccar.database.DataManager;
+import org.traccar.database.IdentityManager;
 import org.traccar.helper.UnitsConverter;
 import org.traccar.model.Position;
 import org.traccar.storage.StorageException;
 
+import javax.inject.Inject;
 import java.util.Date;
 
 @ChannelHandler.Sharable
@@ -33,21 +35,27 @@ public class FilterHandler extends BaseDataHandler {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(FilterHandler.class);
 
-    private boolean filterInvalid;
-    private boolean filterZero;
-    private boolean filterDuplicate;
-    private long filterFuture;
-    private boolean filterApproximate;
-    private int filterAccuracy;
-    private boolean filterStatic;
-    private int filterDistance;
-    private int filterMaxSpeed;
-    private long filterMinPeriod;
-    private boolean filterRelative;
-    private long skipLimit;
-    private boolean skipAttributes;
-
-    public FilterHandler(Config config) {
+    private final boolean enabled;
+    private final boolean filterInvalid;
+    private final boolean filterZero;
+    private final boolean filterDuplicate;
+    private final long filterFuture;
+    private final boolean filterApproximate;
+    private final int filterAccuracy;
+    private final boolean filterStatic;
+    private final int filterDistance;
+    private final int filterMaxSpeed;
+    private final long filterMinPeriod;
+    private final boolean filterRelative;
+    private final long skipLimit;
+    private final boolean skipAttributes;
+
+    private final IdentityManager identityManager;
+    private final DataManager dataManager;
+
+    @Inject
+    public FilterHandler(Config config, IdentityManager identityManager, DataManager dataManager) {
+        enabled = config.getBoolean(Keys.FILTER_ENABLE);
         filterInvalid = config.getBoolean(Keys.FILTER_INVALID);
         filterZero = config.getBoolean(Keys.FILTER_ZERO);
         filterDuplicate = config.getBoolean(Keys.FILTER_DUPLICATE);
@@ -57,10 +65,12 @@ public class FilterHandler extends BaseDataHandler {
         filterStatic = config.getBoolean(Keys.FILTER_STATIC);
         filterDistance = config.getInteger(Keys.FILTER_DISTANCE);
         filterMaxSpeed = config.getInteger(Keys.FILTER_MAX_SPEED);
-        filterMinPeriod = config.getInteger(Keys.FILTER_MIN_PERIOD) * 1000;
+        filterMinPeriod = config.getInteger(Keys.FILTER_MIN_PERIOD) * 1000L;
         filterRelative = config.getBoolean(Keys.FILTER_RELATIVE);
         skipLimit = config.getLong(Keys.FILTER_SKIP_LIMIT) * 1000;
         skipAttributes = config.getBoolean(Keys.FILTER_SKIP_ATTRIBUTES_ENABLE);
+        this.identityManager = identityManager;
+        this.dataManager = dataManager;
     }
 
     private boolean filterInvalid(Position position) {
@@ -134,7 +144,7 @@ public class FilterHandler extends BaseDataHandler {
 
     private boolean skipAttributes(Position position) {
         if (skipAttributes) {
-            String attributesString = Context.getIdentityManager().lookupAttributeString(
+            String attributesString = identityManager.lookupAttributeString(
                     position.getDeviceId(), "filter.skipAttributes", "", false, true);
             for (String attribute : attributesString.split("[ ,]")) {
                 if (position.getAttributes().containsKey(attribute)) {
@@ -173,7 +183,7 @@ public class FilterHandler extends BaseDataHandler {
             if (filterRelative) {
                 try {
                     Date newFixTime = position.getFixTime();
-                    preceding = Context.getDataManager().getPrecedingPosition(deviceId, newFixTime);
+                    preceding = dataManager.getPrecedingPosition(deviceId, newFixTime);
                 } catch (StorageException e) {
                     LOGGER.warn("Error retrieving preceding position; fallbacking to last received position.", e);
                     preceding = getLastReceivedPosition(deviceId);
@@ -199,14 +209,8 @@ public class FilterHandler extends BaseDataHandler {
         }
 
         if (filterType.length() > 0) {
-
-            StringBuilder message = new StringBuilder();
-            message.append("Position filtered by ");
-            message.append(filterType.toString());
-            message.append("filters from device: ");
-            message.append(Context.getIdentityManager().getById(deviceId).getUniqueId());
-
-            LOGGER.info(message.toString());
+            String uniqueId = identityManager.getById(deviceId).getUniqueId();
+            LOGGER.info("Position filtered by {}filters from device: {}", filterType, uniqueId);
             return true;
         }
 
@@ -214,15 +218,12 @@ public class FilterHandler extends BaseDataHandler {
     }
 
     private Position getLastReceivedPosition(long deviceId) {
-        if (Context.getIdentityManager() != null) {
-            return Context.getIdentityManager().getLastPosition(deviceId);
-        }
-        return null;
+        return identityManager.getLastPosition(deviceId);
     }
 
     @Override
     protected Position handlePosition(Position position) {
-        if (filter(position)) {
+        if (enabled && filter(position)) {
             return null;
         }
         return position;
diff --git a/src/main/java/org/traccar/handler/HemisphereHandler.java b/src/main/java/org/traccar/handler/HemisphereHandler.java
index aff3d8a64..2e3ed9d91 100644
--- a/src/main/java/org/traccar/handler/HemisphereHandler.java
+++ b/src/main/java/org/traccar/handler/HemisphereHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2019 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2022 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.
@@ -21,12 +21,15 @@ import org.traccar.config.Config;
 import org.traccar.config.Keys;
 import org.traccar.model.Position;
 
+import javax.inject.Inject;
+
 @ChannelHandler.Sharable
 public class HemisphereHandler extends BaseDataHandler {
 
     private int latitudeFactor;
     private int longitudeFactor;
 
+    @Inject
     public HemisphereHandler(Config config) {
         String latitudeHemisphere = config.getString(Keys.LOCATION_LATITUDE_HEMISPHERE);
         if (latitudeHemisphere != null) {
diff --git a/src/main/java/org/traccar/handler/MotionHandler.java b/src/main/java/org/traccar/handler/MotionHandler.java
index e8051dd75..864eb455d 100644
--- a/src/main/java/org/traccar/handler/MotionHandler.java
+++ b/src/main/java/org/traccar/handler/MotionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2019 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 - 2022 Anton Tananaev (anton@traccar.org)
  * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,14 +19,18 @@ package org.traccar.handler;
 import io.netty.channel.ChannelHandler;
 import org.traccar.BaseDataHandler;
 import org.traccar.model.Position;
+import org.traccar.reports.model.TripsConfig;
+
+import javax.inject.Inject;
 
 @ChannelHandler.Sharable
 public class MotionHandler extends BaseDataHandler {
 
-    private double speedThreshold;
+    private final double speedThreshold;
 
-    public MotionHandler(double speedThreshold) {
-        this.speedThreshold = speedThreshold;
+    @Inject
+    public MotionHandler(TripsConfig tripsConfig) {
+        speedThreshold = tripsConfig.getSpeedThreshold();
     }
 
     @Override
diff --git a/src/main/java/org/traccar/handler/RemoteAddressHandler.java b/src/main/java/org/traccar/handler/RemoteAddressHandler.java
index c09b8c39a..809f67ca2 100644
--- a/src/main/java/org/traccar/handler/RemoteAddressHandler.java
+++ b/src/main/java/org/traccar/handler/RemoteAddressHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2022 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,22 +18,34 @@ package org.traccar.handler;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
+import org.traccar.config.Config;
+import org.traccar.config.Keys;
 import org.traccar.model.Position;
 
+import javax.inject.Inject;
 import java.net.InetSocketAddress;
 
 @ChannelHandler.Sharable
 public class RemoteAddressHandler extends ChannelInboundHandlerAdapter {
 
+    private final boolean enabled;
+
+    @Inject
+    public RemoteAddressHandler(Config config) {
+        enabled = config.getBoolean(Keys.PROCESSING_REMOTE_ADDRESS_ENABLE);
+    }
+
     @Override
     public void channelRead(ChannelHandlerContext ctx, Object msg) {
 
-        InetSocketAddress remoteAddress = (InetSocketAddress) ctx.channel().remoteAddress();
-        String hostAddress = remoteAddress != null ? remoteAddress.getAddress().getHostAddress() : null;
+        if (enabled) {
+            InetSocketAddress remoteAddress = (InetSocketAddress) ctx.channel().remoteAddress();
+            String hostAddress = remoteAddress != null ? remoteAddress.getAddress().getHostAddress() : null;
 
-        if (msg instanceof Position) {
-            Position position = (Position) msg;
-            position.set(Position.KEY_IP, hostAddress);
+            if (msg instanceof Position) {
+                Position position = (Position) msg;
+                position.set(Position.KEY_IP, hostAddress);
+            }
         }
 
         ctx.fireChannelRead(msg);
diff --git a/src/main/java/org/traccar/handler/SpeedLimitHandler.java b/src/main/java/org/traccar/handler/SpeedLimitHandler.java
index 65f2c9cfe..0469b9f16 100644
--- a/src/main/java/org/traccar/handler/SpeedLimitHandler.java
+++ b/src/main/java/org/traccar/handler/SpeedLimitHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Anton Tananaev (anton@traccar.org)
+ * Copyright 2020 - 2022 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.
@@ -23,6 +23,8 @@ import org.slf4j.LoggerFactory;
 import org.traccar.model.Position;
 import org.traccar.speedlimit.SpeedLimitProvider;
 
+import javax.inject.Inject;
+
 @ChannelHandler.Sharable
 public class SpeedLimitHandler extends ChannelInboundHandlerAdapter {
 
@@ -30,6 +32,7 @@ public class SpeedLimitHandler extends ChannelInboundHandlerAdapter {
 
     private final SpeedLimitProvider speedLimitProvider;
 
+    @Inject
     public SpeedLimitHandler(SpeedLimitProvider speedLimitProvider) {
         this.speedLimitProvider = speedLimitProvider;
     }
diff --git a/src/main/java/org/traccar/handler/TimeHandler.java b/src/main/java/org/traccar/handler/TimeHandler.java
index 822c22a0a..c7e5e6e5c 100644
--- a/src/main/java/org/traccar/handler/TimeHandler.java
+++ b/src/main/java/org/traccar/handler/TimeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 - 2020 Anton Tananaev (anton@traccar.org)
+ * Copyright 2019 - 2022 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.
@@ -24,6 +24,7 @@ import org.traccar.config.Config;
 import org.traccar.config.Keys;
 import org.traccar.model.Position;
 
+import javax.inject.Inject;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
@@ -31,11 +32,18 @@ import java.util.Set;
 @ChannelHandler.Sharable
 public class TimeHandler extends ChannelInboundHandlerAdapter {
 
+    private final boolean enabled;
     private final boolean useServerTime;
     private final Set<String> protocols;
 
+    @Inject
     public TimeHandler(Config config) {
-        useServerTime = config.getString(Keys.TIME_OVERRIDE).equalsIgnoreCase("serverTime");
+        enabled = config.hasKey(Keys.TIME_OVERRIDE);
+        if (enabled) {
+            useServerTime = config.getString(Keys.TIME_OVERRIDE).equalsIgnoreCase("serverTime");
+        } else {
+            useServerTime = false;
+        }
         String protocolList = Context.getConfig().getString(Keys.TIME_PROTOCOLS);
         if (protocolList != null) {
             protocols = new HashSet<>(Arrays.asList(protocolList.split("[, ]")));
@@ -47,7 +55,7 @@ public class TimeHandler extends ChannelInboundHandlerAdapter {
     @Override
     public void channelRead(ChannelHandlerContext ctx, Object msg) {
 
-        if (msg instanceof Position && (protocols == null
+        if (enabled && msg instanceof Position && (protocols == null
                 || protocols.contains(ctx.pipeline().get(BaseProtocolDecoder.class).getProtocolName()))) {
 
             Position position = (Position) msg;
diff --git a/src/main/java/org/traccar/handler/events/AlertEventHandler.java b/src/main/java/org/traccar/handler/events/AlertEventHandler.java
index 05dbc516e..6e7b0b16e 100644
--- a/src/main/java/org/traccar/handler/events/AlertEventHandler.java
+++ b/src/main/java/org/traccar/handler/events/AlertEventHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2019 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2022 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.
@@ -25,12 +25,15 @@ import org.traccar.database.IdentityManager;
 import org.traccar.model.Event;
 import org.traccar.model.Position;
 
+import javax.inject.Inject;
+
 @ChannelHandler.Sharable
 public class AlertEventHandler extends BaseEventHandler {
 
     private final IdentityManager identityManager;
     private final boolean ignoreDuplicateAlerts;
 
+    @Inject
     public AlertEventHandler(Config config, IdentityManager identityManager) {
         this.identityManager = identityManager;
         ignoreDuplicateAlerts = config.getBoolean(Keys.EVENT_IGNORE_DUPLICATE_ALERTS);
diff --git a/src/main/java/org/traccar/handler/events/BehaviorEventHandler.java b/src/main/java/org/traccar/handler/events/BehaviorEventHandler.java
index 767cef3f6..bbf749cdc 100644
--- a/src/main/java/org/traccar/handler/events/BehaviorEventHandler.java
+++ b/src/main/java/org/traccar/handler/events/BehaviorEventHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Anton Tananaev (anton@traccar.org)
+ * Copyright 2021 - 2022 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.
@@ -23,6 +23,7 @@ import org.traccar.helper.UnitsConverter;
 import org.traccar.model.Event;
 import org.traccar.model.Position;
 
+import javax.inject.Inject;
 import java.util.Collections;
 import java.util.Map;
 
@@ -34,6 +35,7 @@ public class BehaviorEventHandler extends BaseEventHandler {
 
     private final IdentityManager identityManager;
 
+    @Inject
     public BehaviorEventHandler(Config config, IdentityManager identityManager) {
         accelerationThreshold = config.getDouble(Keys.EVENT_BEHAVIOR_ACCELERATION_THRESHOLD);
         brakingThreshold = config.getDouble(Keys.EVENT_BEHAVIOR_BRAKING_THRESHOLD);
diff --git a/src/main/java/org/traccar/handler/events/CommandResultEventHandler.java b/src/main/java/org/traccar/handler/events/CommandResultEventHandler.java
index 9b7ff554e..858f84e09 100644
--- a/src/main/java/org/traccar/handler/events/CommandResultEventHandler.java
+++ b/src/main/java/org/traccar/handler/events/CommandResultEventHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2022 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.
@@ -22,9 +22,15 @@ import io.netty.channel.ChannelHandler;
 import org.traccar.model.Event;
 import org.traccar.model.Position;
 
+import javax.inject.Inject;
+
 @ChannelHandler.Sharable
 public class CommandResultEventHandler extends BaseEventHandler {
 
+    @Inject
+    public CommandResultEventHandler() {
+    }
+
     @Override
     protected Map<Event, Position> analyzePosition(Position position) {
         Object commandResult = position.getAttributes().get(Position.KEY_RESULT);
diff --git a/src/main/java/org/traccar/handler/events/DriverEventHandler.java b/src/main/java/org/traccar/handler/events/DriverEventHandler.java
index 6fdf4246b..510ac3465 100644
--- a/src/main/java/org/traccar/handler/events/DriverEventHandler.java
+++ b/src/main/java/org/traccar/handler/events/DriverEventHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2019 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 - 2022 Anton Tananaev (anton@traccar.org)
  * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,11 +24,14 @@ import org.traccar.database.IdentityManager;
 import org.traccar.model.Event;
 import org.traccar.model.Position;
 
+import javax.inject.Inject;
+
 @ChannelHandler.Sharable
 public class DriverEventHandler extends BaseEventHandler {
 
     private final IdentityManager identityManager;
 
+    @Inject
     public DriverEventHandler(IdentityManager identityManager) {
         this.identityManager = identityManager;
     }
diff --git a/src/main/java/org/traccar/handler/events/FuelDropEventHandler.java b/src/main/java/org/traccar/handler/events/FuelDropEventHandler.java
index 343a17311..7849abff9 100644
--- a/src/main/java/org/traccar/handler/events/FuelDropEventHandler.java
+++ b/src/main/java/org/traccar/handler/events/FuelDropEventHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2019 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 - 2022 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.
@@ -21,6 +21,7 @@ import org.traccar.model.Device;
 import org.traccar.model.Event;
 import org.traccar.model.Position;
 
+import javax.inject.Inject;
 import java.util.Collections;
 import java.util.Map;
 
@@ -31,6 +32,7 @@ public class FuelDropEventHandler extends BaseEventHandler {
 
     private final IdentityManager identityManager;
 
+    @Inject
     public FuelDropEventHandler(IdentityManager identityManager) {
         this.identityManager = identityManager;
     }
diff --git a/src/main/java/org/traccar/handler/events/GeofenceEventHandler.java b/src/main/java/org/traccar/handler/events/GeofenceEventHandler.java
index dae0c891f..36df7aaf3 100644
--- a/src/main/java/org/traccar/handler/events/GeofenceEventHandler.java
+++ b/src/main/java/org/traccar/handler/events/GeofenceEventHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2021 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2022 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.
@@ -30,6 +30,8 @@ import org.traccar.model.Device;
 import org.traccar.model.Event;
 import org.traccar.model.Position;
 
+import javax.inject.Inject;
+
 @ChannelHandler.Sharable
 public class GeofenceEventHandler extends BaseEventHandler {
 
@@ -38,6 +40,7 @@ public class GeofenceEventHandler extends BaseEventHandler {
     private final CalendarManager calendarManager;
     private final ConnectionManager connectionManager;
 
+    @Inject
     public GeofenceEventHandler(
             IdentityManager identityManager, GeofenceManager geofenceManager, CalendarManager calendarManager,
             ConnectionManager connectionManager) {
diff --git a/src/main/java/org/traccar/handler/events/IgnitionEventHandler.java b/src/main/java/org/traccar/handler/events/IgnitionEventHandler.java
index 69df9a46b..9887c9db6 100644
--- a/src/main/java/org/traccar/handler/events/IgnitionEventHandler.java
+++ b/src/main/java/org/traccar/handler/events/IgnitionEventHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2019 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2022 Anton Tananaev (anton@traccar.org)
  * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,11 +25,14 @@ import org.traccar.model.Device;
 import org.traccar.model.Event;
 import org.traccar.model.Position;
 
+import javax.inject.Inject;
+
 @ChannelHandler.Sharable
 public class IgnitionEventHandler extends BaseEventHandler {
 
     private final IdentityManager identityManager;
 
+    @Inject
     public IgnitionEventHandler(IdentityManager identityManager) {
         this.identityManager = identityManager;
     }
diff --git a/src/main/java/org/traccar/handler/events/MaintenanceEventHandler.java b/src/main/java/org/traccar/handler/events/MaintenanceEventHandler.java
index 0f960ad1f..5b9ce4316 100644
--- a/src/main/java/org/traccar/handler/events/MaintenanceEventHandler.java
+++ b/src/main/java/org/traccar/handler/events/MaintenanceEventHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2022 Anton Tananaev (anton@traccar.org)
  * Copyright 2016 - 2018 Andrey Kunitsyn (andrey@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,12 +26,15 @@ import org.traccar.model.Event;
 import org.traccar.model.Maintenance;
 import org.traccar.model.Position;
 
+import javax.inject.Inject;
+
 @ChannelHandler.Sharable
 public class MaintenanceEventHandler extends BaseEventHandler {
 
     private final IdentityManager identityManager;
     private final MaintenancesManager maintenancesManager;
 
+    @Inject
     public MaintenanceEventHandler(IdentityManager identityManager, MaintenancesManager maintenancesManager) {
         this.identityManager = identityManager;
         this.maintenancesManager = maintenancesManager;
diff --git a/src/main/java/org/traccar/handler/events/MotionEventHandler.java b/src/main/java/org/traccar/handler/events/MotionEventHandler.java
index db276f32b..23a39d070 100644
--- a/src/main/java/org/traccar/handler/events/MotionEventHandler.java
+++ b/src/main/java/org/traccar/handler/events/MotionEventHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2019 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2022 Anton Tananaev (anton@traccar.org)
  * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,6 +29,8 @@ import org.traccar.model.Position;
 import org.traccar.reports.ReportUtils;
 import org.traccar.reports.model.TripsConfig;
 
+import javax.inject.Inject;
+
 @ChannelHandler.Sharable
 public class MotionEventHandler extends BaseEventHandler {
 
@@ -36,6 +38,7 @@ public class MotionEventHandler extends BaseEventHandler {
     private final DeviceManager deviceManager;
     private final TripsConfig tripsConfig;
 
+    @Inject
     public MotionEventHandler(IdentityManager identityManager, DeviceManager deviceManager, TripsConfig tripsConfig) {
         this.identityManager = identityManager;
         this.deviceManager = deviceManager;
diff --git a/src/main/java/org/traccar/handler/events/OverspeedEventHandler.java b/src/main/java/org/traccar/handler/events/OverspeedEventHandler.java
index 347ad9005..102003c3c 100644
--- a/src/main/java/org/traccar/handler/events/OverspeedEventHandler.java
+++ b/src/main/java/org/traccar/handler/events/OverspeedEventHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2020 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2022 Anton Tananaev (anton@traccar.org)
  * Copyright 2018 Andrey Kunitsyn (andrey@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,6 +30,8 @@ import org.traccar.model.Event;
 import org.traccar.model.Geofence;
 import org.traccar.model.Position;
 
+import javax.inject.Inject;
+
 @ChannelHandler.Sharable
 public class OverspeedEventHandler extends BaseEventHandler {
 
@@ -43,6 +45,7 @@ public class OverspeedEventHandler extends BaseEventHandler {
     private final long minimalDuration;
     private final boolean preferLowest;
 
+    @Inject
     public OverspeedEventHandler(Config config, DeviceManager deviceManager, GeofenceManager geofenceManager) {
         this.deviceManager = deviceManager;
         this.geofenceManager = geofenceManager;
diff --git a/src/main/java/org/traccar/reports/model/TripsConfig.java b/src/main/java/org/traccar/reports/model/TripsConfig.java
index 0f0c615d3..34c445f8b 100644
--- a/src/main/java/org/traccar/reports/model/TripsConfig.java
+++ b/src/main/java/org/traccar/reports/model/TripsConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 - 2022 Anton Tananaev (anton@traccar.org)
  * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,9 +18,6 @@ package org.traccar.reports.model;
 
 public class TripsConfig {
 
-    public TripsConfig() {
-    }
-
     public TripsConfig(double minimalTripDistance, long minimalTripDuration, long minimalParkingDuration,
             long minimalNoDataDuration, boolean useIgnition, boolean processInvalidPositions, double speedThreshold) {
         this.minimalTripDistance = minimalTripDistance;
@@ -32,74 +29,46 @@ public class TripsConfig {
         this.speedThreshold = speedThreshold;
     }
 
-    private double minimalTripDistance;
+    private final double minimalTripDistance;
 
     public double getMinimalTripDistance() {
         return minimalTripDistance;
     }
 
-    public void setMinimalTripDistance(double minimalTripDistance) {
-        this.minimalTripDistance = minimalTripDistance;
-    }
-
-    private long minimalTripDuration;
+    private final long minimalTripDuration;
 
     public long getMinimalTripDuration() {
         return minimalTripDuration;
     }
 
-    public void setMinimalTripDuration(long minimalTripDuration) {
-        this.minimalTripDuration = minimalTripDuration;
-    }
-
-    private long minimalParkingDuration;
+    private final long minimalParkingDuration;
 
     public long getMinimalParkingDuration() {
         return minimalParkingDuration;
     }
 
-    public void setMinimalParkingDuration(long minimalParkingDuration) {
-        this.minimalParkingDuration = minimalParkingDuration;
-    }
-
-    private long minimalNoDataDuration;
+    private final long minimalNoDataDuration;
 
     public long getMinimalNoDataDuration() {
         return minimalNoDataDuration;
     }
 
-    public void setMinimalNoDataDuration(long minimalNoDataDuration) {
-        this.minimalNoDataDuration = minimalNoDataDuration;
-    }
-
-    private boolean useIgnition;
+    private final boolean useIgnition;
 
     public boolean getUseIgnition() {
         return useIgnition;
     }
 
-    public void setUseIgnition(boolean useIgnition) {
-        this.useIgnition = useIgnition;
-    }
-
-    private boolean processInvalidPositions;
+    private final boolean processInvalidPositions;
 
     public boolean getProcessInvalidPositions() {
         return processInvalidPositions;
     }
 
-    public void setProcessInvalidPositions(boolean processInvalidPositions) {
-        this.processInvalidPositions = processInvalidPositions;
-    }
-
-    private double speedThreshold;
+    private final double speedThreshold;
 
     public double getSpeedThreshold() {
         return speedThreshold;
     }
 
-    public void setSpeedThreshold(double speedThreshold) {
-        this.speedThreshold = speedThreshold;
-    }
-
 }
diff --git a/src/test/java/org/traccar/TestIdentityManager.java b/src/test/java/org/traccar/TestIdentityManager.java
index 7d2865e74..68d98db9a 100644
--- a/src/test/java/org/traccar/TestIdentityManager.java
+++ b/src/test/java/org/traccar/TestIdentityManager.java
@@ -53,9 +53,6 @@ public final class TestIdentityManager implements IdentityManager {
     @Override
     public String lookupAttributeString(
             long deviceId, String attributeName, String defaultValue, boolean lookupServer, boolean lookupConfig) {
-        if (attributeName.equals("filter.skipAttributes")) {
-            return "alarm,result";
-        }
         return defaultValue;
     }
 
diff --git a/src/test/java/org/traccar/handler/FilterHandlerTest.java b/src/test/java/org/traccar/handler/FilterHandlerTest.java
index ad8d244a6..49bbf70b5 100644
--- a/src/test/java/org/traccar/handler/FilterHandlerTest.java
+++ b/src/test/java/org/traccar/handler/FilterHandlerTest.java
@@ -5,70 +5,77 @@ import org.junit.Test;
 import org.traccar.BaseTest;
 import org.traccar.config.Config;
 import org.traccar.config.Keys;
+import org.traccar.database.DataManager;
+import org.traccar.database.IdentityManager;
+import org.traccar.model.Device;
 import org.traccar.model.Position;
-
 import java.util.Date;
-
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.mockito.Mockito.*;
 
 public class FilterHandlerTest extends BaseTest {
 
-    private FilterHandler passingHandler = new FilterHandler(new Config());
+    private FilterHandler passingHandler;
     private FilterHandler filteringHandler;
 
     @Before
-    public void before() {
-        Config config = new Config();
-        config.setString(Keys.FILTER_INVALID, String.valueOf(true));
-        config.setString(Keys.FILTER_ZERO, String.valueOf(true));
-        config.setString(Keys.FILTER_DUPLICATE, String.valueOf(true));
-        config.setString(Keys.FILTER_FUTURE, String.valueOf(5 * 60));
-        config.setString(Keys.FILTER_APPROXIMATE, String.valueOf(true));
-        config.setString(Keys.FILTER_STATIC, String.valueOf(true));
-        config.setString(Keys.FILTER_DISTANCE, String.valueOf(10));
-        config.setString(Keys.FILTER_MAX_SPEED, String.valueOf(500));
-        config.setString(Keys.FILTER_SKIP_LIMIT, String.valueOf(10));
-        config.setString(Keys.FILTER_SKIP_ATTRIBUTES_ENABLE, String.valueOf(true));
-        filteringHandler = new FilterHandler(config);
+    public void passingHandler() {
+        var config = mock(Config.class);
+        when(config.getBoolean(Keys.FILTER_ENABLE)).thenReturn(true);
+        var identityManager = mock(IdentityManager.class);
+        var dataManager = mock(DataManager.class);
+        passingHandler = new FilterHandler(config, identityManager, dataManager);
     }
 
-    private Position createPosition(
-            long deviceId,
-            Date time,
-            boolean valid,
-            double latitude,
-            double longitude,
-            double altitude,
-            double speed,
-            double course) {
+    @Before
+    public void filteringHandler() {
+        var config = mock(Config.class);
+        when(config.getBoolean(Keys.FILTER_ENABLE)).thenReturn(true);
+        when(config.getBoolean(Keys.FILTER_INVALID)).thenReturn(true);
+        when(config.getBoolean(Keys.FILTER_ZERO)).thenReturn(true);
+        when(config.getBoolean(Keys.FILTER_DUPLICATE)).thenReturn(true);
+        when(config.getLong(Keys.FILTER_FUTURE)).thenReturn(5 * 60L);
+        when(config.getBoolean(Keys.FILTER_APPROXIMATE)).thenReturn(true);
+        when(config.getBoolean(Keys.FILTER_STATIC)).thenReturn(true);
+        when(config.getInteger(Keys.FILTER_DISTANCE)).thenReturn(10);
+        when(config.getInteger(Keys.FILTER_MAX_SPEED)).thenReturn(500);
+        when(config.getLong(Keys.FILTER_SKIP_LIMIT)).thenReturn(10L);
+        when(config.getBoolean(Keys.FILTER_SKIP_ATTRIBUTES_ENABLE)).thenReturn(true);
+        var identityManager = mock(IdentityManager.class);
+        when(identityManager.lookupAttributeString(0, "filter.skipAttributes", "", false, true)).thenReturn("alarm,result");
+        when(identityManager.getById(0)).thenReturn(mock(Device.class));
+        var dataManager = mock(DataManager.class);
+        filteringHandler = new FilterHandler(config, identityManager, dataManager);
+    }
 
+    private Position createPosition(Date time, boolean valid, double speed) {
         Position position = new Position();
-        position.setDeviceId(deviceId);
+        position.setDeviceId(0);
         position.setTime(time);
         position.setValid(valid);
-        position.setLatitude(latitude);
-        position.setLongitude(longitude);
-        position.setAltitude(altitude);
+        position.setLatitude(10);
+        position.setLongitude(10);
+        position.setAltitude(10);
         position.setSpeed(speed);
-        position.setCourse(course);
+        position.setCourse(10);
         return position;
     }
 
     @Test
     public void testFilter() {
 
-        Position position = createPosition(0, new Date(), true, 10, 10, 10, 10, 10);
+        Position position = createPosition(new Date(), true, 10);
 
         assertNotNull(filteringHandler.handlePosition(position));
         assertNotNull(passingHandler.handlePosition(position));
 
-        position = createPosition(0, new Date(Long.MAX_VALUE), true, 10, 10, 10, 10, 10);
+        position = createPosition(new Date(Long.MAX_VALUE), true, 10);
 
         assertNull(filteringHandler.handlePosition(position));
         assertNotNull(passingHandler.handlePosition(position));
 
-        position = createPosition(0, new Date(), false, 10, 10, 10, 10, 10);
+        position = createPosition(new Date(), false, 10);
 
         assertNull(filteringHandler.handlePosition(position));
         assertNotNull(passingHandler.handlePosition(position));
@@ -78,7 +85,7 @@ public class FilterHandlerTest extends BaseTest {
     @Test
     public void testSkipAttributes() {
 
-        Position position = createPosition(0, new Date(), true, 10, 10, 10, 0, 10);
+        Position position = createPosition(new Date(), true, 0);
         position.set(Position.KEY_ALARM, Position.ALARM_GENERAL);
 
         assertNotNull(filteringHandler.handlePosition(position));
diff --git a/src/test/java/org/traccar/handler/MotionHandlerTest.java b/src/test/java/org/traccar/handler/MotionHandlerTest.java
index 9e0859664..fdbd48334 100644
--- a/src/test/java/org/traccar/handler/MotionHandlerTest.java
+++ b/src/test/java/org/traccar/handler/MotionHandlerTest.java
@@ -1,16 +1,21 @@
 package org.traccar.handler;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.*;
 
 import org.junit.Test;
 import org.traccar.model.Position;
+import org.traccar.reports.model.TripsConfig;
 
 public class MotionHandlerTest {
 
     @Test
     public void testCalculateMotion() {
 
-        MotionHandler motionHandler = new MotionHandler(0.01);
+        TripsConfig tripsConfig = mock(TripsConfig.class);
+        when(tripsConfig.getSpeedThreshold()).thenReturn(0.01);
+
+        MotionHandler motionHandler = new MotionHandler(tripsConfig);
 
         Position position = motionHandler.handlePosition(new Position());