From 30f10f12d32915d74e36b4bf336e4e2d7ac3aada Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 16 Apr 2016 11:24:54 +1200
Subject: Remove old web API service

---
 src/org/traccar/database/DataManager.java | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

(limited to 'src/org/traccar/database')

diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index e073f8948..99f6613f4 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -49,7 +49,6 @@ import org.traccar.model.DevicePermission;
 import org.traccar.model.Position;
 import org.traccar.model.Server;
 import org.traccar.model.User;
-import org.traccar.web.AsyncServlet;
 
 public class DataManager implements IdentityManager {
 
@@ -310,13 +309,6 @@ public class DataManager implements IdentityManager {
         }
     }
 
-    @Deprecated
-    public void removeUser(User user) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.deleteUser"))
-                .setObject(user)
-                .executeUpdate();
-    }
-
     public void removeUser(long userId) throws SQLException {
         QueryBuilder.create(dataSource, getQuery("database.deleteUser"))
                 .setLong("id", userId)
@@ -366,19 +358,11 @@ public class DataManager implements IdentityManager {
                 .executeUpdate();
     }
 
-    @Deprecated
-    public void removeDevice(Device device) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.deleteDevice"))
-                .setObject(device)
-                .executeUpdate();
-        AsyncServlet.sessionRefreshDevice(device.getId());
-    }
-
     public void removeDevice(long deviceId) throws SQLException {
         QueryBuilder.create(dataSource, getQuery("database.deleteDevice"))
                 .setLong("id", deviceId)
                 .executeUpdate();
-        AsyncServlet.sessionRefreshDevice(deviceId);
+        updateDeviceCache(true);
     }
 
     public void linkDevice(long userId, long deviceId) throws SQLException {
@@ -386,7 +370,6 @@ public class DataManager implements IdentityManager {
                 .setLong("userId", userId)
                 .setLong("deviceId", deviceId)
                 .executeUpdate();
-        AsyncServlet.sessionRefreshUser(userId);
     }
 
     public void unlinkDevice(long userId, long deviceId) throws SQLException {
@@ -394,7 +377,6 @@ public class DataManager implements IdentityManager {
                 .setLong("userId", userId)
                 .setLong("deviceId", deviceId)
                 .executeUpdate();
-        AsyncServlet.sessionRefreshUser(userId);
     }
 
     public Collection<Group> getAllGroups() throws SQLException {
-- 
cgit v1.2.3