Remove positions from manager

9 files changed, 49 insertions, 50 deletions

diff --git a/src/main/java/org/traccar/handler/DistanceHandler.java b/src/main/java/org/traccar/handler/DistanceHandler.java
index 08c8c068d..fb82b5d8e 100644
--- a/src/main/java/org/traccar/handler/DistanceHandler.java
+++ b/src/main/java/org/traccar/handler/DistanceHandler.java
@@ -20,9 +20,9 @@ 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.helper.DistanceCalculator;
 import org.traccar.model.Position;
+import org.traccar.session.cache.CacheManager;
 
 import javax.inject.Inject;
 import java.math.BigDecimal;
@@ -31,15 +31,15 @@ import java.math.RoundingMode;
 @ChannelHandler.Sharable
 public class DistanceHandler extends BaseDataHandler {
 
-    private final IdentityManager identityManager;
+    private final CacheManager cacheManager;
 
     private final boolean filter;
     private final int coordinatesMinError;
     private final int coordinatesMaxError;
 
     @Inject
-    public DistanceHandler(Config config, IdentityManager identityManager) {
-        this.identityManager = identityManager;
+    public DistanceHandler(Config config, CacheManager cacheManager) {
+        this.cacheManager = cacheManager;
         this.filter = config.getBoolean(Keys.COORDINATES_FILTER);
         this.coordinatesMinError = config.getInteger(Keys.COORDINATES_MIN_ERROR);
         this.coordinatesMaxError = config.getInteger(Keys.COORDINATES_MAX_ERROR);
@@ -54,7 +54,7 @@ public class DistanceHandler extends BaseDataHandler {
         }
         double totalDistance = 0.0;
 
-        Position last = identityManager != null ? identityManager.getLastPosition(position.getDeviceId()) : null;
+        Position last = cacheManager.getPosition(position.getDeviceId());
         if (last != null) {
             totalDistance = last.getDouble(Position.KEY_TOTAL_DISTANCE);
             if (!position.getAttributes().containsKey(Position.KEY_DISTANCE)) {
diff --git a/src/main/java/org/traccar/handler/EngineHoursHandler.java b/src/main/java/org/traccar/handler/EngineHoursHandler.java
index be2a46ade..bfffdcb0c 100644
--- a/src/main/java/org/traccar/handler/EngineHoursHandler.java
+++ b/src/main/java/org/traccar/handler/EngineHoursHandler.java
@@ -18,25 +18,25 @@ package org.traccar.handler;
 
 import io.netty.channel.ChannelHandler;
 import org.traccar.BaseDataHandler;
-import org.traccar.database.IdentityManager;
 import org.traccar.model.Position;
+import org.traccar.session.cache.CacheManager;
 
 import javax.inject.Inject;
 
 @ChannelHandler.Sharable
 public class EngineHoursHandler extends BaseDataHandler {
 
-    private final IdentityManager identityManager;
+    private final CacheManager cacheManager;
 
     @Inject
-    public EngineHoursHandler(IdentityManager identityManager) {
-        this.identityManager = identityManager;
+    public EngineHoursHandler(CacheManager cacheManager) {
+        this.cacheManager = cacheManager;
     }
 
     @Override
     protected Position handlePosition(Position position) {
         if (!position.getAttributes().containsKey(Position.KEY_HOURS)) {
-            Position last = identityManager.getLastPosition(position.getDeviceId());
+            Position last = cacheManager.getPosition(position.getDeviceId());
             if (last != null) {
                 long hours = last.getLong(Position.KEY_HOURS);
                 if (last.getBoolean(Position.KEY_IGNITION) && position.getBoolean(Position.KEY_IGNITION)) {
diff --git a/src/main/java/org/traccar/handler/GeocoderHandler.java b/src/main/java/org/traccar/handler/GeocoderHandler.java
index 075bdf815..0248fca05 100644
--- a/src/main/java/org/traccar/handler/GeocoderHandler.java
+++ b/src/main/java/org/traccar/handler/GeocoderHandler.java
@@ -22,9 +22,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.traccar.config.Config;
 import org.traccar.config.Keys;
-import org.traccar.database.IdentityManager;
 import org.traccar.geocoder.Geocoder;
 import org.traccar.model.Position;
+import org.traccar.session.cache.CacheManager;
 
 @ChannelHandler.Sharable
 public class GeocoderHandler extends ChannelInboundHandlerAdapter {
@@ -32,15 +32,14 @@ public class GeocoderHandler extends ChannelInboundHandlerAdapter {
     private static final Logger LOGGER = LoggerFactory.getLogger(GeocoderHandler.class);
 
     private final Geocoder geocoder;
-    private final IdentityManager identityManager;
+    private final CacheManager cacheManager;
     private final boolean ignorePositions;
     private final boolean processInvalidPositions;
     private final int geocoderReuseDistance;
 
-    public GeocoderHandler(
-            Config config, Geocoder geocoder, IdentityManager identityManager) {
+    public GeocoderHandler(Config config, Geocoder geocoder, CacheManager cacheManager) {
         this.geocoder = geocoder;
-        this.identityManager = identityManager;
+        this.cacheManager = cacheManager;
         ignorePositions = config.getBoolean(Keys.GEOCODER_IGNORE_POSITIONS);
         processInvalidPositions = config.getBoolean(Keys.GEOCODER_PROCESS_INVALID_POSITIONS);
         geocoderReuseDistance = config.getInteger(Keys.GEOCODER_REUSE_DISTANCE, 0);
@@ -52,7 +51,7 @@ public class GeocoderHandler extends ChannelInboundHandlerAdapter {
             final Position position = (Position) message;
             if (processInvalidPositions || position.getValid()) {
                 if (geocoderReuseDistance != 0) {
-                    Position lastPosition = identityManager.getLastPosition(position.getDeviceId());
+                    Position lastPosition = cacheManager.getPosition(position.getDeviceId());
                     if (lastPosition != null && lastPosition.getAddress() != null
                             && position.getDouble(Position.KEY_DISTANCE) <= geocoderReuseDistance) {
                         position.setAddress(lastPosition.getAddress());
diff --git a/src/main/java/org/traccar/handler/events/AlertEventHandler.java b/src/main/java/org/traccar/handler/events/AlertEventHandler.java
index 6e7b0b16e..75626ca6c 100644
--- a/src/main/java/org/traccar/handler/events/AlertEventHandler.java
+++ b/src/main/java/org/traccar/handler/events/AlertEventHandler.java
@@ -21,21 +21,21 @@ import java.util.Map;
 import io.netty.channel.ChannelHandler;
 import org.traccar.config.Config;
 import org.traccar.config.Keys;
-import org.traccar.database.IdentityManager;
 import org.traccar.model.Event;
 import org.traccar.model.Position;
+import org.traccar.session.cache.CacheManager;
 
 import javax.inject.Inject;
 
 @ChannelHandler.Sharable
 public class AlertEventHandler extends BaseEventHandler {
 
-    private final IdentityManager identityManager;
+    private final CacheManager cacheManager;
     private final boolean ignoreDuplicateAlerts;
 
     @Inject
-    public AlertEventHandler(Config config, IdentityManager identityManager) {
-        this.identityManager = identityManager;
+    public AlertEventHandler(Config config, CacheManager cacheManager) {
+        this.cacheManager = cacheManager;
         ignoreDuplicateAlerts = config.getBoolean(Keys.EVENT_IGNORE_DUPLICATE_ALERTS);
     }
 
@@ -45,7 +45,7 @@ public class AlertEventHandler extends BaseEventHandler {
         if (alarm != null) {
             boolean ignoreAlert = false;
             if (ignoreDuplicateAlerts) {
-                Position lastPosition = identityManager.getLastPosition(position.getDeviceId());
+                Position lastPosition = cacheManager.getPosition(position.getDeviceId());
                 if (lastPosition != null && alarm.equals(lastPosition.getAttributes().get(Position.KEY_ALARM))) {
                     ignoreAlert = true;
                 }
diff --git a/src/main/java/org/traccar/handler/events/BehaviorEventHandler.java b/src/main/java/org/traccar/handler/events/BehaviorEventHandler.java
index bbf749cdc..3c2fa6a97 100644
--- a/src/main/java/org/traccar/handler/events/BehaviorEventHandler.java
+++ b/src/main/java/org/traccar/handler/events/BehaviorEventHandler.java
@@ -18,10 +18,10 @@ package org.traccar.handler.events;
 import io.netty.channel.ChannelHandler;
 import org.traccar.config.Config;
 import org.traccar.config.Keys;
-import org.traccar.database.IdentityManager;
 import org.traccar.helper.UnitsConverter;
 import org.traccar.model.Event;
 import org.traccar.model.Position;
+import org.traccar.session.cache.CacheManager;
 
 import javax.inject.Inject;
 import java.util.Collections;
@@ -33,19 +33,19 @@ public class BehaviorEventHandler extends BaseEventHandler {
     private final double accelerationThreshold;
     private final double brakingThreshold;
 
-    private final IdentityManager identityManager;
+    private final CacheManager cacheManager;
 
     @Inject
-    public BehaviorEventHandler(Config config, IdentityManager identityManager) {
+    public BehaviorEventHandler(Config config, CacheManager cacheManager) {
         accelerationThreshold = config.getDouble(Keys.EVENT_BEHAVIOR_ACCELERATION_THRESHOLD);
         brakingThreshold = config.getDouble(Keys.EVENT_BEHAVIOR_BRAKING_THRESHOLD);
-        this.identityManager = identityManager;
+        this.cacheManager = cacheManager;
     }
 
     @Override
     protected Map<Event, Position> analyzePosition(Position position) {
 
-        Position lastPosition = identityManager.getLastPosition(position.getDeviceId());
+        Position lastPosition = cacheManager.getPosition(position.getDeviceId());
         if (lastPosition != null && position.getFixTime().equals(lastPosition.getFixTime())) {
             double acceleration = UnitsConverter.mpsFromKnots(position.getSpeed() - lastPosition.getSpeed()) * 1000
                     / (position.getFixTime().getTime() - lastPosition.getFixTime().getTime());
diff --git a/src/main/java/org/traccar/handler/events/DriverEventHandler.java b/src/main/java/org/traccar/handler/events/DriverEventHandler.java
index 510ac3465..1ad66ba64 100644
--- a/src/main/java/org/traccar/handler/events/DriverEventHandler.java
+++ b/src/main/java/org/traccar/handler/events/DriverEventHandler.java
@@ -16,35 +16,35 @@
  */
 package org.traccar.handler.events;
 
-import java.util.Collections;
-import java.util.Map;
-
 import io.netty.channel.ChannelHandler;
-import org.traccar.database.IdentityManager;
+import org.traccar.helper.model.PositionUtil;
 import org.traccar.model.Event;
 import org.traccar.model.Position;
+import org.traccar.session.cache.CacheManager;
 
 import javax.inject.Inject;
+import java.util.Collections;
+import java.util.Map;
 
 @ChannelHandler.Sharable
 public class DriverEventHandler extends BaseEventHandler {
 
-    private final IdentityManager identityManager;
+    private final CacheManager cacheManager;
 
     @Inject
-    public DriverEventHandler(IdentityManager identityManager) {
-        this.identityManager = identityManager;
+    public DriverEventHandler(CacheManager cacheManager) {
+        this.cacheManager = cacheManager;
     }
 
     @Override
     protected Map<Event, Position> analyzePosition(Position position) {
-        if (!identityManager.isLatestPosition(position)) {
+        if (!PositionUtil.isLatest(cacheManager, position)) {
             return null;
         }
         String driverUniqueId = position.getString(Position.KEY_DRIVER_UNIQUE_ID);
         if (driverUniqueId != null) {
             String oldDriverUniqueId = null;
-            Position lastPosition = identityManager.getLastPosition(position.getDeviceId());
+            Position lastPosition = cacheManager.getPosition(position.getDeviceId());
             if (lastPosition != null) {
                 oldDriverUniqueId = lastPosition.getString(Position.KEY_DRIVER_UNIQUE_ID);
             }
diff --git a/src/main/java/org/traccar/handler/events/IgnitionEventHandler.java b/src/main/java/org/traccar/handler/events/IgnitionEventHandler.java
index 9887c9db6..6e411539c 100644
--- a/src/main/java/org/traccar/handler/events/IgnitionEventHandler.java
+++ b/src/main/java/org/traccar/handler/events/IgnitionEventHandler.java
@@ -20,27 +20,28 @@ import java.util.Collections;
 import java.util.Map;
 
 import io.netty.channel.ChannelHandler;
-import org.traccar.database.IdentityManager;
+import org.traccar.helper.model.PositionUtil;
 import org.traccar.model.Device;
 import org.traccar.model.Event;
 import org.traccar.model.Position;
+import org.traccar.session.cache.CacheManager;
 
 import javax.inject.Inject;
 
 @ChannelHandler.Sharable
 public class IgnitionEventHandler extends BaseEventHandler {
 
-    private final IdentityManager identityManager;
+    private final CacheManager cacheManager;
 
     @Inject
-    public IgnitionEventHandler(IdentityManager identityManager) {
-        this.identityManager = identityManager;
+    public IgnitionEventHandler(CacheManager cacheManager) {
+        this.cacheManager = cacheManager;
     }
 
     @Override
     protected Map<Event, Position> analyzePosition(Position position) {
-        Device device = identityManager.getById(position.getDeviceId());
-        if (device == null || !identityManager.isLatestPosition(position)) {
+        Device device = cacheManager.getObject(Device.class, position.getDeviceId());
+        if (device == null || !PositionUtil.isLatest(cacheManager, position)) {
             return null;
         }
 
@@ -49,7 +50,7 @@ public class IgnitionEventHandler extends BaseEventHandler {
         if (position.getAttributes().containsKey(Position.KEY_IGNITION)) {
             boolean ignition = position.getBoolean(Position.KEY_IGNITION);
 
-            Position lastPosition = identityManager.getLastPosition(position.getDeviceId());
+            Position lastPosition = cacheManager.getPosition(position.getDeviceId());
             if (lastPosition != null && lastPosition.getAttributes().containsKey(Position.KEY_IGNITION)) {
                 boolean oldIgnition = lastPosition.getBoolean(Position.KEY_IGNITION);
 
diff --git a/src/main/java/org/traccar/handler/events/MaintenanceEventHandler.java b/src/main/java/org/traccar/handler/events/MaintenanceEventHandler.java
index f85aab043..be3e9bf8d 100644
--- a/src/main/java/org/traccar/handler/events/MaintenanceEventHandler.java
+++ b/src/main/java/org/traccar/handler/events/MaintenanceEventHandler.java
@@ -20,7 +20,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import io.netty.channel.ChannelHandler;
-import org.traccar.Context;
 import org.traccar.model.Event;
 import org.traccar.model.Maintenance;
 import org.traccar.model.Position;
@@ -40,7 +39,7 @@ public class MaintenanceEventHandler extends BaseEventHandler {
 
     @Override
     protected Map<Event, Position> analyzePosition(Position position) {
-        Position lastPosition = Context.getIdentityManager().getLastPosition(position.getDeviceId());
+        Position lastPosition = cacheManager.getPosition(position.getDeviceId());
         if (lastPosition == null || position.getFixTime().compareTo(lastPosition.getFixTime()) < 0) {
             return null;
         }
diff --git a/src/main/java/org/traccar/handler/events/MotionEventHandler.java b/src/main/java/org/traccar/handler/events/MotionEventHandler.java
index 2c381e530..724e9bf15 100644
--- a/src/main/java/org/traccar/handler/events/MotionEventHandler.java
+++ b/src/main/java/org/traccar/handler/events/MotionEventHandler.java
@@ -18,13 +18,13 @@ package org.traccar.handler.events;
 
 import io.netty.channel.ChannelHandler;
 import org.traccar.database.DeviceManager;
-import org.traccar.database.IdentityManager;
 import org.traccar.helper.model.PositionUtil;
 import org.traccar.model.Device;
 import org.traccar.model.Event;
 import org.traccar.model.Position;
 import org.traccar.reports.common.TripsConfig;
 import org.traccar.session.DeviceState;
+import org.traccar.session.cache.CacheManager;
 
 import javax.inject.Inject;
 import java.util.Collections;
@@ -33,13 +33,13 @@ import java.util.Map;
 @ChannelHandler.Sharable
 public class MotionEventHandler extends BaseEventHandler {
 
-    private final IdentityManager identityManager;
+    private final CacheManager cacheManager;
     private final DeviceManager deviceManager;
     private final TripsConfig tripsConfig;
 
     @Inject
-    public MotionEventHandler(IdentityManager identityManager, DeviceManager deviceManager, TripsConfig tripsConfig) {
-        this.identityManager = identityManager;
+    public MotionEventHandler(CacheManager cacheManager, DeviceManager deviceManager, TripsConfig tripsConfig) {
+        this.cacheManager = cacheManager;
         this.deviceManager = deviceManager;
         this.tripsConfig = tripsConfig;
     }
@@ -113,11 +113,11 @@ public class MotionEventHandler extends BaseEventHandler {
     protected Map<Event, Position> analyzePosition(Position position) {
 
         long deviceId = position.getDeviceId();
-        Device device = identityManager.getById(deviceId);
+        Device device = cacheManager.getObject(Device.class, deviceId);
         if (device == null) {
             return null;
         }
-        if (!identityManager.isLatestPosition(position)
+        if (!PositionUtil.isLatest(cacheManager, position)
                 || !tripsConfig.getProcessInvalidPositions() && !position.getValid()) {
             return null;
         }