aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/database/DriversManager.java
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-07-26 17:52:27 +0500
committerAbyss777 <abyss@fox5.ru>2017-07-26 17:52:27 +0500
commitd31f68d80a8e3ae75fa0c2f02b9ca258486a3cad (patch)
treed44c13177de39aad1d0907a4150dfa6e440ab02f /src/org/traccar/database/DriversManager.java
parent82edf57e1b93d5a5ca34294dc62e3620889c2341 (diff)
downloadtrackermap-server-d31f68d80a8e3ae75fa0c2f02b9ca258486a3cad.tar.gz
trackermap-server-d31f68d80a8e3ae75fa0c2f02b9ca258486a3cad.tar.bz2
trackermap-server-d31f68d80a8e3ae75fa0c2f02b9ca258486a3cad.zip
- Implement base manager classes as generics
- Remame getDeviceById and getDeviceByUniqueId functions
Diffstat (limited to 'src/org/traccar/database/DriversManager.java')
-rw-r--r--src/org/traccar/database/DriversManager.java25
1 files changed, 9 insertions, 16 deletions
diff --git a/src/org/traccar/database/DriversManager.java b/src/org/traccar/database/DriversManager.java
index 420824dbb..d3866a5f0 100644
--- a/src/org/traccar/database/DriversManager.java
+++ b/src/org/traccar/database/DriversManager.java
@@ -20,37 +20,30 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.traccar.model.Driver;
-import org.traccar.model.BaseModel;
-public class DriversManager extends ExtendedObjectManager {
+public class DriversManager extends ExtendedObjectManager<Driver> {
- private Map<String, Driver> driversByUniqueId;
+ private Map<String, Long> driversByUniqueId;
public DriversManager(DataManager dataManager) {
super(dataManager, Driver.class);
}
- @Override
- public Driver getById(long driverId) {
- return (Driver) super.getById(driverId);
- }
-
private void putUniqueDriverId(Driver driver) {
if (driversByUniqueId == null) {
- driversByUniqueId = new ConcurrentHashMap<>();
+ driversByUniqueId = new ConcurrentHashMap<>(getAllItems().size());
}
- driversByUniqueId.put(driver.getUniqueId(), driver);
+ driversByUniqueId.put(driver.getUniqueId(), driver.getId());
}
@Override
- protected void addNewItem(BaseModel item) {
- super.addNewItem(item);
- putUniqueDriverId((Driver) item);
+ protected void addNewItem(Driver driver) {
+ super.addNewItem(driver);
+ putUniqueDriverId(driver);
}
@Override
- protected void updateCachedItem(BaseModel item) {
- Driver driver = (Driver) item;
+ protected void updateCachedItem(Driver driver) {
Driver cachedDriver = getById(driver.getId());
cachedDriver.setName(driver.getName());
if (!driver.getUniqueId().equals(cachedDriver.getUniqueId())) {
@@ -72,6 +65,6 @@ public class DriversManager extends ExtendedObjectManager {
}
public Driver getDriverByUniqueId(String uniqueId) {
- return driversByUniqueId.get(uniqueId);
+ return getById(driversByUniqueId.get(uniqueId));
}
}