Remove device manager

6 files changed, 5 insertions, 329 deletions

diff --git a/src/main/java/org/traccar/Context.java b/src/main/java/org/traccar/Context.java
index c89d39f4c..583ee460b 100644
--- a/src/main/java/org/traccar/Context.java
+++ b/src/main/java/org/traccar/Context.java
@@ -16,12 +16,7 @@
 package org.traccar;
 
 import org.traccar.config.Config;
-import org.traccar.database.BaseObjectManager;
-import org.traccar.database.DataManager;
-import org.traccar.database.DeviceManager;
 import org.traccar.helper.Log;
-import org.traccar.model.BaseModel;
-import org.traccar.model.Device;
 
 public final class Context {
 
@@ -34,12 +29,6 @@ public final class Context {
         return config;
     }
 
-    private static DeviceManager deviceManager;
-
-    public static DeviceManager getDeviceManager() {
-        return deviceManager;
-    }
-
     public static void init(String configFile) throws Exception {
 
         try {
@@ -51,15 +40,6 @@ public final class Context {
             throw e;
         }
 
-        deviceManager = new DeviceManager(Main.getInjector().getInstance(DataManager.class));
-
-    }
-
-    public static <T extends BaseModel> BaseObjectManager<T> getManager(Class<T> clazz) {
-        if (clazz.equals(Device.class)) {
-            return (BaseObjectManager<T>) deviceManager;
-        }
-        return null;
     }
 
 }
diff --git a/src/main/java/org/traccar/MainModule.java b/src/main/java/org/traccar/MainModule.java
index d57ee5d38..439dcd1d9 100644
--- a/src/main/java/org/traccar/MainModule.java
+++ b/src/main/java/org/traccar/MainModule.java
@@ -30,7 +30,6 @@ import org.eclipse.jetty.util.URIUtil;
 import org.traccar.broadcast.BroadcastService;
 import org.traccar.config.Config;
 import org.traccar.config.Keys;
-import org.traccar.database.DeviceManager;
 import org.traccar.database.LdapProvider;
 import org.traccar.database.StatisticsManager;
 import org.traccar.geocoder.AddressFormat;
@@ -113,11 +112,6 @@ public class MainModule extends AbstractModule {
                 (ContextResolver<ObjectMapper>) clazz -> Main.getInjector().getInstance(ObjectMapper.class));
     }
 
-    @Provides
-    public static DeviceManager provideDeviceManager() {
-        return Context.getDeviceManager();
-    }
-
     @Singleton
     @Provides
     public static SmsManager provideSmsManager(Config config, Client client) {
diff --git a/src/main/java/org/traccar/api/BaseObjectResource.java b/src/main/java/org/traccar/api/BaseObjectResource.java
index abfed9682..35ff04bf3 100644
--- a/src/main/java/org/traccar/api/BaseObjectResource.java
+++ b/src/main/java/org/traccar/api/BaseObjectResource.java
@@ -16,11 +16,8 @@
  */
 package org.traccar.api;
 
-import org.traccar.Context;
-import org.traccar.database.BaseObjectManager;
 import org.traccar.helper.LogAction;
 import org.traccar.model.BaseModel;
-import org.traccar.model.Device;
 import org.traccar.model.Group;
 import org.traccar.model.Permission;
 import org.traccar.model.User;
@@ -67,15 +64,8 @@ public abstract class BaseObjectResource<T extends BaseModel> extends BaseResour
     public Response add(T entity) throws StorageException {
         permissionsService.checkEdit(getUserId(), entity, true);
 
-        BaseObjectManager<T> manager = Context.getManager(baseClass);
-        if (manager != null) {
-            manager.addItem(entity);
-        } else {
-            entity.setId(storage.addObject(entity, new Request(new Columns.Exclude("id"))));
-        }
-
+        entity.setId(storage.addObject(entity, new Request(new Columns.Exclude("id"))));
         LogAction.create(getUserId(), entity);
-
         storage.addPermission(new Permission(User.class, getUserId(), baseClass, entity.getId()));
         cacheManager.invalidate(User.class, getUserId(), baseClass, entity.getId());
         LogAction.link(getUserId(), User.class, getUserId(), baseClass, entity.getId());
@@ -100,16 +90,10 @@ public abstract class BaseObjectResource<T extends BaseModel> extends BaseResour
             }
         }
 
-        BaseObjectManager<T> manager = Context.getManager(baseClass);
-        if (manager != null) {
-            manager.updateItem(entity);
-        } else {
-            storage.updateObject(entity, new Request(
-                    new Columns.Exclude("id"),
-                    new Condition.Equals("id", "id")));
-        }
+        storage.updateObject(entity, new Request(
+                new Columns.Exclude("id"),
+                new Condition.Equals("id", "id")));
         cacheManager.updateOrInvalidate(entity);
-
         LogAction.edit(getUserId(), entity);
 
         return Response.ok(entity).build();
@@ -121,21 +105,11 @@ public abstract class BaseObjectResource<T extends BaseModel> extends BaseResour
         permissionsService.checkEdit(getUserId(), baseClass, false);
         permissionsService.checkPermission(baseClass, getUserId(), id);
 
-        BaseObjectManager<T> manager = Context.getManager(baseClass);
-        if (manager != null) {
-            manager.removeItem(id);
-        } else {
-            storage.removeObject(baseClass, new Request(new Condition.Equals("id", "id", id)));
-        }
+        storage.removeObject(baseClass, new Request(new Condition.Equals("id", "id", id)));
         cacheManager.invalidate(baseClass, id);
 
         LogAction.remove(getUserId(), baseClass, id);
 
-        if (baseClass.equals(Group.class) || baseClass.equals(Device.class) || baseClass.equals(User.class)) {
-            if (baseClass.equals(Group.class)) {
-                Context.getDeviceManager().updateDeviceCache(true);
-            }
-        }
         return Response.noContent().build();
     }
 
diff --git a/src/main/java/org/traccar/database/BaseObjectManager.java b/src/main/java/org/traccar/database/BaseObjectManager.java
deleted file mode 100644
index c94053985..000000000
--- a/src/main/java/org/traccar/database/BaseObjectManager.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright 2017 - 2020 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.database;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.traccar.model.BaseModel;
-import org.traccar.storage.StorageException;
-
-public class BaseObjectManager<T extends BaseModel> {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(BaseObjectManager.class);
-
-    private final ReadWriteLock lock = new ReentrantReadWriteLock();
-
-    private final DataManager dataManager;
-
-    private final Class<T> baseClass;
-    private Map<Long, T> items;
-
-    protected BaseObjectManager(DataManager dataManager, Class<T> baseClass) {
-        this.dataManager = dataManager;
-        this.baseClass = baseClass;
-        refreshItems();
-    }
-
-    protected final void readLock() {
-        lock.readLock().lock();
-    }
-
-    protected final void readUnlock() {
-        lock.readLock().unlock();
-    }
-
-    protected final void writeLock() {
-        lock.writeLock().lock();
-    }
-
-    protected final void writeUnlock() {
-        lock.writeLock().unlock();
-    }
-
-    protected final DataManager getDataManager() {
-        return dataManager;
-    }
-
-    public T getById(long itemId) {
-        try {
-            readLock();
-            return items.get(itemId);
-        } finally {
-            readUnlock();
-        }
-    }
-
-    public void refreshItems() {
-        if (dataManager != null) {
-            try {
-                writeLock();
-                Collection<T> databaseItems = dataManager.getObjects(baseClass);
-                if (items == null) {
-                    items = new ConcurrentHashMap<>(databaseItems.size());
-                }
-                Set<Long> databaseItemIds = new HashSet<>();
-                for (T item : databaseItems) {
-                    databaseItemIds.add(item.getId());
-                    if (items.containsKey(item.getId())) {
-                        updateCachedItem(item);
-                    } else {
-                        addNewItem(item);
-                    }
-                }
-                for (Long cachedItemId : items.keySet()) {
-                    if (!databaseItemIds.contains(cachedItemId)) {
-                        removeCachedItem(cachedItemId);
-                    }
-                }
-            } catch (StorageException error) {
-                LOGGER.warn("Error refreshing items", error);
-            } finally {
-                writeUnlock();
-            }
-        }
-    }
-
-    protected void addNewItem(T item) {
-        try {
-            writeLock();
-            items.put(item.getId(), item);
-        } finally {
-            writeUnlock();
-        }
-    }
-
-    public void addItem(T item) throws StorageException {
-        dataManager.addObject(item);
-        addNewItem(item);
-    }
-
-    protected void updateCachedItem(T item) {
-        try {
-            writeLock();
-            items.put(item.getId(), item);
-        } finally {
-            writeUnlock();
-        }
-    }
-
-    public void updateItem(T item) throws StorageException {
-        dataManager.updateObject(item);
-        updateCachedItem(item);
-    }
-
-    protected void removeCachedItem(long itemId) {
-        try {
-            writeLock();
-            items.remove(itemId);
-        } finally {
-            writeUnlock();
-        }
-    }
-
-    public void removeItem(long itemId) throws StorageException {
-        BaseModel item = getById(itemId);
-        if (item != null) {
-            dataManager.removeObject(baseClass, itemId);
-            removeCachedItem(itemId);
-        }
-    }
-
-    public final Collection<T> getItems(Set<Long> itemIds) {
-        Collection<T> result = new LinkedList<>();
-        for (long itemId : itemIds) {
-            T item = getById(itemId);
-            if (item != null) {
-                result.add(item);
-            }
-        }
-        return result;
-    }
-
-    public Set<Long> getAllItems() {
-        try {
-            readLock();
-            return items.keySet();
-        } finally {
-            readUnlock();
-        }
-    }
-
-}
diff --git a/src/main/java/org/traccar/database/DeviceManager.java b/src/main/java/org/traccar/database/DeviceManager.java
deleted file mode 100644
index 7a472c2d4..000000000
--- a/src/main/java/org/traccar/database/DeviceManager.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2016 - 2022 Anton Tananaev (anton@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.database;
-
-import org.traccar.model.Device;
-
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicLong;
-
-public class DeviceManager extends BaseObjectManager<Device> {
-
-    private final AtomicLong devicesLastUpdate = new AtomicLong();
-
-    public DeviceManager(DataManager dataManager) {
-        super(dataManager, Device.class);
-    }
-
-    public void updateDeviceCache(boolean force) {
-        long lastUpdate = devicesLastUpdate.get();
-        if ((force || System.currentTimeMillis() - lastUpdate > 300000L)
-                && devicesLastUpdate.compareAndSet(lastUpdate, System.currentTimeMillis())) {
-            refreshItems();
-        }
-    }
-
-    @Override
-    public Set<Long> getAllItems() {
-        Set<Long> result = super.getAllItems();
-        if (result.isEmpty()) {
-            updateDeviceCache(true);
-            result = super.getAllItems();
-        }
-        return result;
-    }
-
-    @Override
-    protected void updateCachedItem(Device device) {
-        Device cachedDevice = getById(device.getId());
-        cachedDevice.setName(device.getName());
-        cachedDevice.setGroupId(device.getGroupId());
-        cachedDevice.setCategory(device.getCategory());
-        cachedDevice.setContact(device.getContact());
-        cachedDevice.setPhone(device.getPhone());
-        cachedDevice.setModel(device.getModel());
-        cachedDevice.setDisabled(device.getDisabled());
-        cachedDevice.setAttributes(device.getAttributes());
-        cachedDevice.setUniqueId(device.getUniqueId());
-    }
-
-    @Override
-    protected void removeCachedItem(long deviceId) {
-        Device cachedDevice = getById(deviceId);
-        if (cachedDevice != null) {
-            super.removeCachedItem(deviceId);
-        }
-    }
-
-}
diff --git a/src/main/java/org/traccar/database/SimpleObjectManager.java b/src/main/java/org/traccar/database/SimpleObjectManager.java
deleted file mode 100644
index 8bb22b8a8..000000000
--- a/src/main/java/org/traccar/database/SimpleObjectManager.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2017 - 2020 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.database;
-
-import org.traccar.model.BaseModel;
-
-public abstract class SimpleObjectManager<T extends BaseModel> extends BaseObjectManager<T> {
-
-    protected SimpleObjectManager(DataManager dataManager, Class<T> baseClass) {
-        super(dataManager, baseClass);
-    }
-
-}