Refactor commands manager

1 files changed, 3 insertions, 10 deletions

diff --git a/src/main/java/org/traccar/database/DataManager.java b/src/main/java/org/traccar/database/DataManager.java
index b5966ca9e..1426daea3 100644
--- a/src/main/java/org/traccar/database/DataManager.java
+++ b/src/main/java/org/traccar/database/DataManager.java
@@ -50,8 +50,6 @@ import java.lang.reflect.Method;
 import java.net.URL;
 import java.util.Collection;
 import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
 
 public class DataManager {
 
@@ -205,14 +203,9 @@ public class DataManager {
     }
 
     public Collection<Position> getLatestPositions() throws StorageException {
-        List<Position> positions = new LinkedList<>();
-        List<Device> devices = storage.getObjects(Device.class, new Request(new Columns.Include("positionId")));
-        for (Device device : devices) {
-            positions.addAll(storage.getObjects(Position.class, new Request(
-                    new Columns.All(),
-                    new Condition.Equals("id", "id", device.getPositionId()))));
-        }
-        return positions;
+        return storage.getObjects(Position.class, new Request(
+                new Columns.All(),
+                new Condition.LatestPositions()));
     }
 
     public Server getServer() throws StorageException {