From d6c7cdf1e103c977ed94b737dc838d7ac22b9fa7 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Mon, 24 Jul 2017 16:25:34 +0500
Subject: Optimize caching and class structure

---
 src/org/traccar/database/DriversManager.java | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

(limited to 'src/org/traccar/database/DriversManager.java')

diff --git a/src/org/traccar/database/DriversManager.java b/src/org/traccar/database/DriversManager.java
index 0dc2b102d..e3ae07a65 100644
--- a/src/org/traccar/database/DriversManager.java
+++ b/src/org/traccar/database/DriversManager.java
@@ -20,7 +20,6 @@ import java.sql.SQLException;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.traccar.helper.Log;
 import org.traccar.model.Driver;
 import org.traccar.model.BaseModel;
 
@@ -30,24 +29,6 @@ public class DriversManager extends ExtendedObjectManager {
 
     public DriversManager(DataManager dataManager) {
         super(dataManager, Driver.class);
-        refreshItems();
-        refreshExtendedPermissions();
-    }
-
-    @Override
-    public void refreshItems() {
-        if (getDataManager() != null) {
-            try {
-                clearItems();
-                for (BaseModel item : getDataManager().getObjects(getBaseClass())) {
-                    putItem(item.getId(), item);
-                    driversByUniqueId.put(((Driver) item).getUniqueId(), (Driver) item);
-                }
-            } catch (SQLException error) {
-                Log.warning(error);
-            }
-        }
-        refreshUserItems();
     }
 
     @Override
@@ -57,9 +38,8 @@ public class DriversManager extends ExtendedObjectManager {
     }
 
     @Override
-    public void updateItem(BaseModel item) throws SQLException {
+    protected void updateCachedItem(BaseModel item) {
         Driver driver = (Driver) item;
-        getDataManager().updateObject(driver);
         Driver cachedDriver = (Driver) getById(driver.getId());
         cachedDriver.setName(driver.getName());
         if (!driver.getUniqueId().equals(cachedDriver.getUniqueId())) {
@@ -71,16 +51,13 @@ public class DriversManager extends ExtendedObjectManager {
     }
 
     @Override
-    public void removeItem(long driverId) throws SQLException {
+    protected void removeCachedItem(long driverId) {
         Driver cachedDriver = (Driver) getById(driverId);
-        getDataManager().removeObject(Driver.class, driverId);
         if (cachedDriver != null) {
             String driverUniqueId = cachedDriver.getUniqueId();
             removeCachedItem(driverId);
             driversByUniqueId.remove(driverUniqueId);
         }
-        refreshUserItems();
-        refreshExtendedPermissions();
     }
 
     public Driver getDriverByUniqueId(String uniqueId) {
-- 
cgit v1.2.3