From 6fe1f8ed83680204fe7ec50382588dbe82fec1ba Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Sat, 18 Jun 2022 13:26:15 -0700
Subject: Remove data manager

---
 src/main/java/org/traccar/handler/DefaultDataHandler.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/main/java/org/traccar/handler/DefaultDataHandler.java')

diff --git a/src/main/java/org/traccar/handler/DefaultDataHandler.java b/src/main/java/org/traccar/handler/DefaultDataHandler.java
index c2adfd799..f6a20628b 100644
--- a/src/main/java/org/traccar/handler/DefaultDataHandler.java
+++ b/src/main/java/org/traccar/handler/DefaultDataHandler.java
@@ -19,8 +19,10 @@ import io.netty.channel.ChannelHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.traccar.BaseDataHandler;
-import org.traccar.database.DataManager;
 import org.traccar.model.Position;
+import org.traccar.storage.Storage;
+import org.traccar.storage.query.Columns;
+import org.traccar.storage.query.Request;
 
 import javax.inject.Inject;
 
@@ -29,18 +31,18 @@ public class DefaultDataHandler extends BaseDataHandler {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DefaultDataHandler.class);
 
-    private final DataManager dataManager;
+    private final Storage storage;
 
     @Inject
-    public DefaultDataHandler(DataManager dataManager) {
-        this.dataManager = dataManager;
+    public DefaultDataHandler(Storage storage) {
+        this.storage = storage;
     }
 
     @Override
     protected Position handlePosition(Position position) {
 
         try {
-            dataManager.addObject(position);
+            position.setId(storage.addObject(position, new Request(new Columns.Exclude("id"))));
         } catch (Exception error) {
             LOGGER.warn("Failed to store position", error);
         }
-- 
cgit v1.2.3