From 9fa2fc7091041a5cffa9092318d5d2f5a1a367a2 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Sat, 18 Jun 2022 07:35:32 -0700
Subject: Migrate device resource

---
 .../java/org/traccar/database/DeviceManager.java   | 43 ++++++----------------
 .../org/traccar/database/PermissionsManager.java   | 11 ------
 2 files changed, 12 insertions(+), 42 deletions(-)

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

diff --git a/src/main/java/org/traccar/database/DeviceManager.java b/src/main/java/org/traccar/database/DeviceManager.java
index bd100245c..81043fd7a 100644
--- a/src/main/java/org/traccar/database/DeviceManager.java
+++ b/src/main/java/org/traccar/database/DeviceManager.java
@@ -15,32 +15,30 @@
  */
 package org.traccar.database;
 
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicLong;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.traccar.Main;
-import org.traccar.config.Config;
 import org.traccar.Context;
+import org.traccar.config.Config;
 import org.traccar.config.Keys;
 import org.traccar.model.Command;
 import org.traccar.model.Device;
-import org.traccar.session.ConnectionManager;
-import org.traccar.session.DeviceState;
-import org.traccar.model.DeviceAccumulators;
 import org.traccar.model.Group;
 import org.traccar.model.Position;
 import org.traccar.model.Server;
+import org.traccar.session.ConnectionManager;
+import org.traccar.session.DeviceState;
 import org.traccar.session.cache.CacheManager;
 import org.traccar.storage.StorageException;
 
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+
 public class DeviceManager extends BaseObjectManager<Device> implements IdentityManager {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DeviceManager.class);
@@ -378,23 +376,6 @@ public class DeviceManager extends BaseObjectManager<Device> implements Identity
         return result;
     }
 
-    public void resetDeviceAccumulators(DeviceAccumulators deviceAccumulators) throws StorageException {
-        Position last = positions.get(deviceAccumulators.getDeviceId());
-        if (last != null) {
-            if (deviceAccumulators.getTotalDistance() != null) {
-                last.getAttributes().put(Position.KEY_TOTAL_DISTANCE, deviceAccumulators.getTotalDistance());
-            }
-            if (deviceAccumulators.getHours() != null) {
-                last.getAttributes().put(Position.KEY_HOURS, deviceAccumulators.getHours());
-            }
-            getDataManager().addObject(last);
-            updateLatestPosition(last);
-            Main.getInjector().getInstance(CacheManager.class).updatePosition(last);
-        } else {
-            throw new IllegalArgumentException();
-        }
-    }
-
     public DeviceState getDeviceState(long deviceId) {
         DeviceState deviceState = deviceStates.get(deviceId);
         if (deviceState == null) {
diff --git a/src/main/java/org/traccar/database/PermissionsManager.java b/src/main/java/org/traccar/database/PermissionsManager.java
index 4ac27c717..9d1e5aadf 100644
--- a/src/main/java/org/traccar/database/PermissionsManager.java
+++ b/src/main/java/org/traccar/database/PermissionsManager.java
@@ -179,17 +179,6 @@ public class PermissionsManager {
         return user != null && user.getAdministrator();
     }
 
-    public boolean getUserManager(long userId) {
-        User user = getUser(userId);
-        return user != null && user.getUserLimit() != 0;
-    }
-
-    public void checkManager(long userId) throws SecurityException {
-        if (!getUserManager(userId)) {
-            throw new SecurityException("Manager access required");
-        }
-    }
-
     public void refreshPermissions(Permission permission) {
         if (permission.getOwnerClass().equals(User.class)) {
             if (permission.getPropertyClass().equals(Device.class)
-- 
cgit v1.2.3