diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-07-27 17:00:45 +1200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-27 17:00:45 +1200 |
commit | 495b2aa2d2b17bd1a5803ea0bd7dcc64bc81c598 (patch) | |
tree | 4b65fbe2d6081f31762a0d8aa790b9fcf81e81f7 /src/org/traccar/database/UsersManager.java | |
parent | 194263a9dc8040ebcbf62c80733aca5097eb3e36 (diff) | |
parent | 49fa4893269b1732806f7176c279742291e02edf (diff) | |
download | traccar-server-495b2aa2d2b17bd1a5803ea0bd7dcc64bc81c598.tar.gz traccar-server-495b2aa2d2b17bd1a5803ea0bd7dcc64bc81c598.tar.bz2 traccar-server-495b2aa2d2b17bd1a5803ea0bd7dcc64bc81c598.zip |
Merge pull request #3391 from Abyss777/refactor_drivers_groups
Split Drivers and Groups management
Diffstat (limited to 'src/org/traccar/database/UsersManager.java')
-rw-r--r-- | src/org/traccar/database/UsersManager.java | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/org/traccar/database/UsersManager.java b/src/org/traccar/database/UsersManager.java index 3c9c8b280..28e6a31b2 100644 --- a/src/org/traccar/database/UsersManager.java +++ b/src/org/traccar/database/UsersManager.java @@ -16,14 +16,14 @@ */ package org.traccar.database; +import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.traccar.model.BaseModel; import org.traccar.model.User; -public class UsersManager extends SimpleObjectManager { +public class UsersManager extends SimpleObjectManager<User> { private Map<String, Long> usersTokens; @@ -41,16 +41,15 @@ public class UsersManager extends SimpleObjectManager { } @Override - protected void addNewItem(BaseModel item) { - super.addNewItem(item); - putToken((User) item); + protected void addNewItem(User user) { + super.addNewItem(user); + putToken(user); } @Override - protected void updateCachedItem(BaseModel item) { - User user = (User) item; - User cachedUser = (User) getById(item.getId()); - super.updateCachedItem(item); + protected void updateCachedItem(User user) { + User cachedUser = getById(user.getId()); + super.updateCachedItem(user); if (user.getToken() != null) { usersTokens.put(user.getToken(), user.getId()); } @@ -61,7 +60,7 @@ public class UsersManager extends SimpleObjectManager { @Override protected void removeCachedItem(long userId) { - User cachedUser = (User) getById(userId); + User cachedUser = getById(userId); if (cachedUser != null) { String userToken = cachedUser.getToken(); super.removeCachedItem(userId); @@ -73,11 +72,14 @@ public class UsersManager extends SimpleObjectManager { @Override public Set<Long> getManagedItems(long userId) { - return getUserItems(userId); + Set<Long> result = new HashSet<>(); + result.addAll(getUserItems(userId)); + result.add(userId); + return result; } public User getUserByToken(String token) { - return (User) getById(usersTokens.get(token)); + return getById(usersTokens.get(token)); } } |