From 21bf1014e55ab8049e18ee991c6ee80b23d1789c Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Tue, 23 Aug 2016 14:48:01 +0500
Subject: Implement cache for users objects

---
 src/org/traccar/api/resource/UserResource.java | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/org/traccar/api/resource/UserResource.java')

diff --git a/src/org/traccar/api/resource/UserResource.java b/src/org/traccar/api/resource/UserResource.java
index da72c7f47..2d187fe9d 100644
--- a/src/org/traccar/api/resource/UserResource.java
+++ b/src/org/traccar/api/resource/UserResource.java
@@ -41,7 +41,7 @@ public class UserResource extends BaseResource {
     @GET
     public Collection<User> get() throws SQLException {
         Context.getPermissionsManager().checkAdmin(getUserId());
-        return Context.getDataManager().getUsers();
+        return Context.getPermissionsManager().getUsers();
     }
 
     @PermitAll
@@ -50,8 +50,7 @@ public class UserResource extends BaseResource {
         if (!Context.getPermissionsManager().isAdmin(getUserId())) {
             Context.getPermissionsManager().checkRegistration(getUserId());
         }
-        Context.getDataManager().addUser(entity);
-        Context.getPermissionsManager().refresh();
+        Context.getPermissionsManager().addUser(entity);
         if (Context.getNotificationManager() != null) {
             Context.getNotificationManager().refresh();
         }
@@ -66,8 +65,7 @@ public class UserResource extends BaseResource {
         } else {
             Context.getPermissionsManager().checkUser(getUserId(), entity.getId());
         }
-        Context.getDataManager().updateUser(entity);
-        Context.getPermissionsManager().refresh();
+        Context.getPermissionsManager().updateUser(entity);
         if (Context.getNotificationManager() != null) {
             Context.getNotificationManager().refresh();
         }
@@ -78,8 +76,7 @@ public class UserResource extends BaseResource {
     @DELETE
     public Response remove(@PathParam("id") long id) throws SQLException {
         Context.getPermissionsManager().checkUser(getUserId(), id);
-        Context.getDataManager().removeUser(id);
-        Context.getPermissionsManager().refresh();
+        Context.getPermissionsManager().removeUser(id);
         if (Context.getGeofenceManager() != null) {
             Context.getGeofenceManager().refreshUserGeofences();
         }
-- 
cgit v1.2.3