Refactor attribute lookup

4 files changed, 50 insertions, 38 deletions

diff --git a/src/main/java/org/traccar/handler/FilterHandler.java b/src/main/java/org/traccar/handler/FilterHandler.java
index 0511ec98b..00cbf92a0 100644
--- a/src/main/java/org/traccar/handler/FilterHandler.java
+++ b/src/main/java/org/traccar/handler/FilterHandler.java
@@ -21,11 +21,18 @@ import org.slf4j.LoggerFactory;
 import org.traccar.BaseDataHandler;
 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.helper.model.AttributeUtil;
+import org.traccar.model.Device;
 import org.traccar.model.Position;
+import org.traccar.session.cache.CacheManager;
+import org.traccar.storage.Storage;
 import org.traccar.storage.StorageException;
+import org.traccar.storage.query.Columns;
+import org.traccar.storage.query.Condition;
+import org.traccar.storage.query.Limit;
+import org.traccar.storage.query.Order;
+import org.traccar.storage.query.Request;
 
 import javax.inject.Inject;
 import java.util.Date;
@@ -50,11 +57,11 @@ public class FilterHandler extends BaseDataHandler {
     private final long skipLimit;
     private final boolean skipAttributes;
 
-    private final IdentityManager identityManager;
-    private final DataManager dataManager;
+    private final CacheManager cacheManager;
+    private final Storage storage;
 
     @Inject
-    public FilterHandler(Config config, IdentityManager identityManager, DataManager dataManager) {
+    public FilterHandler(Config config, CacheManager cacheManager, Storage storage) {
         enabled = config.getBoolean(Keys.FILTER_ENABLE);
         filterInvalid = config.getBoolean(Keys.FILTER_INVALID);
         filterZero = config.getBoolean(Keys.FILTER_ZERO);
@@ -69,8 +76,18 @@ public class FilterHandler extends BaseDataHandler {
         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;
+        this.cacheManager = cacheManager;
+        this.storage = storage;
+    }
+
+    private Position getPrecedingPosition(long deviceId, Date date) throws StorageException {
+        return storage.getObject(Position.class, new Request(
+                new Columns.All(),
+                new Condition.And(
+                        new Condition.Equals("deviceId", "deviceId", deviceId),
+                        new Condition.Compare("fixTime", "<=", "time", date)),
+                new Order(true, "fixTime"),
+                new Limit(1)));
     }
 
     private boolean filterInvalid(Position position) {
@@ -144,9 +161,8 @@ public class FilterHandler extends BaseDataHandler {
 
     private boolean skipAttributes(Position position) {
         if (skipAttributes) {
-            String attributesString = identityManager.lookupAttributeString(
-                    position.getDeviceId(), "filter.skipAttributes", "", false, true);
-            for (String attribute : attributesString.split("[ ,]")) {
+            String string = AttributeUtil.lookup(cacheManager, Keys.FILTER_SKIP_ATTRIBUTES, position.getDeviceId());
+            for (String attribute : string.split("[ ,]")) {
                 if (position.getAttributes().containsKey(attribute)) {
                     return true;
                 }
@@ -183,13 +199,13 @@ public class FilterHandler extends BaseDataHandler {
             if (filterRelative) {
                 try {
                     Date newFixTime = position.getFixTime();
-                    preceding = dataManager.getPrecedingPosition(deviceId, newFixTime);
+                    preceding = getPrecedingPosition(deviceId, newFixTime);
                 } catch (StorageException e) {
                     LOGGER.warn("Error retrieving preceding position; fallbacking to last received position.", e);
-                    preceding = getLastReceivedPosition(deviceId);
+                    preceding = cacheManager.getPosition(deviceId);
                 }
             } else {
-                preceding = getLastReceivedPosition(deviceId);
+                preceding = cacheManager.getPosition(deviceId);
             }
             if (filterDuplicate(position, preceding) && !skipLimit(position, preceding) && !skipAttributes(position)) {
                 filterType.append("Duplicate ");
@@ -209,7 +225,7 @@ public class FilterHandler extends BaseDataHandler {
         }
 
         if (filterType.length() > 0) {
-            String uniqueId = identityManager.getById(deviceId).getUniqueId();
+            String uniqueId = cacheManager.getObject(Device.class, deviceId).getUniqueId();
             LOGGER.info("Position filtered by {}filters from device: {}", filterType, uniqueId);
             return true;
         }
@@ -217,10 +233,6 @@ public class FilterHandler extends BaseDataHandler {
         return false;
     }
 
-    private Position getLastReceivedPosition(long deviceId) {
-        return identityManager.getLastPosition(deviceId);
-    }
-
     @Override
     protected Position handlePosition(Position position) {
         if (enabled && filter(position)) {
diff --git a/src/main/java/org/traccar/handler/HemisphereHandler.java b/src/main/java/org/traccar/handler/HemisphereHandler.java
index 2e3ed9d91..f760457a3 100644
--- a/src/main/java/org/traccar/handler/HemisphereHandler.java
+++ b/src/main/java/org/traccar/handler/HemisphereHandler.java
@@ -39,7 +39,7 @@ public class HemisphereHandler extends BaseDataHandler {
                 latitudeFactor = -1;
             }
         }
-        String longitudeHemisphere = config.getString(Keys.LOCATION_LATITUDE_HEMISPHERE);
+        String longitudeHemisphere = config.getString(Keys.LOCATION_LONGITUDE_HEMISPHERE);
         if (longitudeHemisphere != null) {
             if (longitudeHemisphere.equalsIgnoreCase("E")) {
                 longitudeFactor = 1;
diff --git a/src/main/java/org/traccar/handler/events/FuelDropEventHandler.java b/src/main/java/org/traccar/handler/events/FuelDropEventHandler.java
index 7849abff9..2d105af3e 100644
--- a/src/main/java/org/traccar/handler/events/FuelDropEventHandler.java
+++ b/src/main/java/org/traccar/handler/events/FuelDropEventHandler.java
@@ -16,10 +16,13 @@
 package org.traccar.handler.events;
 
 import io.netty.channel.ChannelHandler;
-import org.traccar.database.IdentityManager;
+import org.traccar.config.Keys;
+import org.traccar.helper.model.AttributeUtil;
+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;
 import java.util.Collections;
@@ -28,31 +31,28 @@ import java.util.Map;
 @ChannelHandler.Sharable
 public class FuelDropEventHandler extends BaseEventHandler {
 
-    public static final String ATTRIBUTE_FUEL_DROP_THRESHOLD = "fuelDropThreshold";
-
-    private final IdentityManager identityManager;
+    private final CacheManager cacheManager;
 
     @Inject
-    public FuelDropEventHandler(IdentityManager identityManager) {
-        this.identityManager = identityManager;
+    public FuelDropEventHandler(CacheManager cacheManager) {
+        this.cacheManager = cacheManager;
     }
 
     @Override
     protected Map<Event, Position> analyzePosition(Position position) {
 
-        Device device = identityManager.getById(position.getDeviceId());
+        Device device = cacheManager.getObject(Device.class, position.getDeviceId());
         if (device == null) {
             return null;
         }
-        if (!identityManager.isLatestPosition(position)) {
+        if (!PositionUtil.isLatest(cacheManager, position)) {
             return null;
         }
 
-        double fuelDropThreshold = identityManager
-                .lookupAttributeDouble(device.getId(), ATTRIBUTE_FUEL_DROP_THRESHOLD, 0, true, false);
-
+        double fuelDropThreshold = AttributeUtil.lookup(
+                cacheManager, Keys.EVENT_FUEL_DROP_THRESHOLD, position.getDeviceId());
         if (fuelDropThreshold > 0) {
-            Position lastPosition = identityManager.getLastPosition(position.getDeviceId());
+            Position lastPosition = cacheManager.getPosition(position.getDeviceId());
             if (position.getAttributes().containsKey(Position.KEY_FUEL_LEVEL)
                     && lastPosition != null && lastPosition.getAttributes().containsKey(Position.KEY_FUEL_LEVEL)) {
 
@@ -60,7 +60,6 @@ public class FuelDropEventHandler extends BaseEventHandler {
                         - position.getDouble(Position.KEY_FUEL_LEVEL);
                 if (drop >= fuelDropThreshold) {
                     Event event = new Event(Event.TYPE_DEVICE_FUEL_DROP, position);
-                    event.set(ATTRIBUTE_FUEL_DROP_THRESHOLD, fuelDropThreshold);
                     return Collections.singletonMap(event, position);
                 }
             }
diff --git a/src/main/java/org/traccar/handler/events/OverspeedEventHandler.java b/src/main/java/org/traccar/handler/events/OverspeedEventHandler.java
index 45bb13be5..6de56d11e 100644
--- a/src/main/java/org/traccar/handler/events/OverspeedEventHandler.java
+++ b/src/main/java/org/traccar/handler/events/OverspeedEventHandler.java
@@ -23,6 +23,8 @@ import io.netty.channel.ChannelHandler;
 import org.traccar.config.Config;
 import org.traccar.config.Keys;
 import org.traccar.database.DeviceManager;
+import org.traccar.helper.model.AttributeUtil;
+import org.traccar.helper.model.PositionUtil;
 import org.traccar.model.Device;
 import org.traccar.session.DeviceState;
 import org.traccar.model.Event;
@@ -36,7 +38,6 @@ import javax.inject.Inject;
 public class OverspeedEventHandler extends BaseEventHandler {
 
     public static final String ATTRIBUTE_SPEED = "speed";
-    public static final String ATTRIBUTE_SPEED_LIMIT = "speedLimit";
 
     private final DeviceManager deviceManager;
     private final CacheManager cacheManager;
@@ -58,7 +59,7 @@ public class OverspeedEventHandler extends BaseEventHandler {
         Position position = deviceState.getOverspeedPosition();
         Event event = new Event(Event.TYPE_DEVICE_OVERSPEED, position);
         event.set(ATTRIBUTE_SPEED, deviceState.getOverspeedPosition().getSpeed());
-        event.set(ATTRIBUTE_SPEED_LIMIT, speedLimit);
+        event.set(Position.KEY_SPEED_LIMIT, speedLimit);
         event.setGeofenceId(deviceState.getOverspeedGeofenceId());
         deviceState.setOverspeedState(notRepeat);
         deviceState.setOverspeedPosition(null);
@@ -115,15 +116,15 @@ public class OverspeedEventHandler extends BaseEventHandler {
     protected Map<Event, Position> analyzePosition(Position position) {
 
         long deviceId = position.getDeviceId();
-        Device device = deviceManager.getById(deviceId);
+        Device device = cacheManager.getObject(Device.class, position.getDeviceId());
         if (device == null) {
             return null;
         }
-        if (!deviceManager.isLatestPosition(position) || !position.getValid()) {
+        if (!PositionUtil.isLatest(cacheManager, position) || !position.getValid()) {
             return null;
         }
 
-        double speedLimit = deviceManager.lookupAttributeDouble(deviceId, ATTRIBUTE_SPEED_LIMIT, 0, true, false);
+        double speedLimit = AttributeUtil.lookup(cacheManager, Keys.EVENT_OVERSPEED_LIMIT, deviceId);
 
         double positionSpeedLimit = position.getDouble(Position.KEY_SPEED_LIMIT);
         if (positionSpeedLimit > 0) {
@@ -137,7 +138,7 @@ public class OverspeedEventHandler extends BaseEventHandler {
             for (long geofenceId : device.getGeofenceIds()) {
                 Geofence geofence = cacheManager.getObject(Geofence.class, geofenceId);
                 if (geofence != null) {
-                    double currentSpeedLimit = geofence.getDouble(ATTRIBUTE_SPEED_LIMIT);
+                    double currentSpeedLimit = geofence.getDouble(Keys.EVENT_OVERSPEED_LIMIT.getKey());
                     if (currentSpeedLimit > 0 && geofenceSpeedLimit == 0
                             || preferLowest && currentSpeedLimit < geofenceSpeedLimit
                             || !preferLowest && currentSpeedLimit > geofenceSpeedLimit) {