From 2f11883528f4bfb5210259f735531e216b40fb7d Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Wed, 12 Jul 2017 09:02:49 +0500
Subject: Add database requests

---
 setup/default.xml | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

(limited to 'setup')

diff --git a/setup/default.xml b/setup/default.xml
index 2fc6c3cf0..9533c3a9b 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -431,6 +431,63 @@
         DELETE FROM device_attribute WHERE deviceId = :deviceId AND attributeId = :attributeId
     </entry>
 
+    <entry key='database.selectDrivers'>
+        SELECT * FROM drivers
+    </entry>
+
+    <entry key='database.insertDriver'>
+        INSERT INTO drivers (name, uniqueId, attributes)
+        VALUES (:name, :uniqueId, :attributes)
+    </entry>
+
+    <entry key='database.updateDriver'>
+        UPDATE drivers SET
+        name = :name,
+        uniqueId = :uniqueId
+        attributes = :attributes
+        WHERE id = :id
+    </entry>
+
+    <entry key='database.deleteDriver'>
+        DELETE FROM drivers WHERE id = :id
+    </entry>
+    
+        <entry key='database.selectDriverPermissions'>
+        SELECT userId, driverId FROM user_driver
+    </entry>
+
+    <entry key='database.linkDriver'>
+        INSERT INTO user_driver (userId, driverId) VALUES (:userId, :driverId)
+    </entry>
+
+    <entry key='database.unlinkDriver'>
+        DELETE FROM user_attribute WHERE userId = :userId AND driverId = :driverId
+    </entry>
+
+    <entry key='database.selectGroupDrivers'>
+        SELECT groupId, driverId FROM group_driver
+    </entry>
+
+    <entry key='database.linkGroupDriver'>
+        INSERT INTO group_driver (groupId, driverId) VALUES (:groupId, :driverId)
+    </entry>
+
+    <entry key='database.unlinkGroupDriver'>
+        DELETE FROM group_driver WHERE groupId = :groupId AND driverId = :driverId
+    </entry>
+
+    <entry key='database.selectDeviceDrivers'>
+        SELECT deviceId, driverId FROM device_driver
+    </entry>
+
+    <entry key='database.linkDeviceDriver'>
+        INSERT INTO device_driver (deviceId, driverId) VALUES (:deviceId, :driverId)
+    </entry>
+
+    <entry key='database.unlinkDeviceDriver'>
+        DELETE FROM device_driver WHERE deviceId = :deviceId AND driverId = :driverId
+    </entry>
+
     <!-- PROTOCOL CONFIG -->
 
     <entry key='gps103.port'>5001</entry>
-- 
cgit v1.2.3


From 4f3830d844dd0542e9e7b09e7a6c17ffbb796264 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Wed, 12 Jul 2017 12:21:35 +0500
Subject: Fix copy/past issues

---
 setup/default.xml                                | 4 ++--
 src/org/traccar/api/resource/DriverResource.java | 4 ++--
 src/org/traccar/database/DriversManager.java     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'setup')

diff --git a/setup/default.xml b/setup/default.xml
index 9533c3a9b..4a408bf30 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -443,7 +443,7 @@
     <entry key='database.updateDriver'>
         UPDATE drivers SET
         name = :name,
-        uniqueId = :uniqueId
+        uniqueId = :uniqueId,
         attributes = :attributes
         WHERE id = :id
     </entry>
@@ -461,7 +461,7 @@
     </entry>
 
     <entry key='database.unlinkDriver'>
-        DELETE FROM user_attribute WHERE userId = :userId AND driverId = :driverId
+        DELETE FROM user_driver WHERE userId = :userId AND driverId = :driverId
     </entry>
 
     <entry key='database.selectGroupDrivers'>
diff --git a/src/org/traccar/api/resource/DriverResource.java b/src/org/traccar/api/resource/DriverResource.java
index 4ccd11182..7fe0af473 100644
--- a/src/org/traccar/api/resource/DriverResource.java
+++ b/src/org/traccar/api/resource/DriverResource.java
@@ -86,8 +86,8 @@ public class DriverResource extends BaseResource {
     public Response add(Driver entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getDriversManager().addDriver(entity);
-        Context.getDataManager().linkAttribute(getUserId(), entity.getId());
-        Context.getAttributesManager().refreshUserAttributes();
+        Context.getDataManager().linkDriver(getUserId(), entity.getId());
+        Context.getDriversManager().refreshUserDrivers();
         return Response.ok(entity).build();
     }
 
diff --git a/src/org/traccar/database/DriversManager.java b/src/org/traccar/database/DriversManager.java
index 8df06d972..e89d59311 100644
--- a/src/org/traccar/database/DriversManager.java
+++ b/src/org/traccar/database/DriversManager.java
@@ -168,7 +168,7 @@ public class DriversManager {
     }
 
     public void removeDriver(long driverId) throws SQLException {
-        dataManager.removeAttribute(driverId);
+        dataManager.removeDriver(driverId);
         if (drivers.containsKey(driverId)) {
             String driverUniqueId = drivers.get(driverId).getUniqueId();
             drivers.remove(driverId);
-- 
cgit v1.2.3


From c0cbde51aa75a5b2df58b11e76527ee703289541 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Fri, 14 Jul 2017 11:59:31 +0500
Subject: Implement driverChanged event instead of driverUnauthorized

---
 setup/default.xml                              |  2 +-
 src/org/traccar/database/DriversManager.java   | 16 ----------------
 src/org/traccar/events/DriverEventHandler.java | 19 +++++--------------
 src/org/traccar/model/Event.java               |  2 +-
 templates/mail/driverChanged.vm                | 10 ++++++++++
 templates/mail/driverUnauthorized.vm           | 10 ----------
 templates/sms/driverChanged.vm                 |  6 ++++++
 templates/sms/driverUnauthorized.vm            |  6 ------
 8 files changed, 23 insertions(+), 48 deletions(-)
 create mode 100644 templates/mail/driverChanged.vm
 delete mode 100644 templates/mail/driverUnauthorized.vm
 create mode 100644 templates/sms/driverChanged.vm
 delete mode 100644 templates/sms/driverUnauthorized.vm

(limited to 'setup')

diff --git a/setup/default.xml b/setup/default.xml
index 4a408bf30..04530104a 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -452,7 +452,7 @@
         DELETE FROM drivers WHERE id = :id
     </entry>
     
-        <entry key='database.selectDriverPermissions'>
+    <entry key='database.selectDriverPermissions'>
         SELECT userId, driverId FROM user_driver
     </entry>
 
diff --git a/src/org/traccar/database/DriversManager.java b/src/org/traccar/database/DriversManager.java
index cba2e14c1..e89d59311 100644
--- a/src/org/traccar/database/DriversManager.java
+++ b/src/org/traccar/database/DriversManager.java
@@ -210,20 +210,4 @@ public class DriversManager {
         }
         return drivers;
     }
-
-    public final boolean authorizeDriverByUniqueId(String driverUniqueId, long deviceId) {
-        if (driversByUniqueId.containsKey(driverUniqueId)) {
-            long chekingDriverId = getDriverByUniqueId(driverUniqueId).getId();
-            Set<Long> deviceDrivers = getAllDeviceDrivers(deviceId);
-            if (deviceDrivers.isEmpty()) {
-                return true;
-            }
-            for (long driverId : deviceDrivers) {
-                if (chekingDriverId == driverId) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
 }
diff --git a/src/org/traccar/events/DriverEventHandler.java b/src/org/traccar/events/DriverEventHandler.java
index 9109373c7..eb5f2a301 100644
--- a/src/org/traccar/events/DriverEventHandler.java
+++ b/src/org/traccar/events/DriverEventHandler.java
@@ -26,12 +26,6 @@ import org.traccar.model.Position;
 
 public class DriverEventHandler extends BaseEventHandler {
 
-    private boolean notRepeat;
-
-    public DriverEventHandler() {
-        notRepeat = Context.getConfig().getBoolean("event.driver.notRepeat");
-    }
-
     @Override
     protected Collection<Event> analyzePosition(Position position) {
         if (!Context.getIdentityManager().isLatestPosition(position)) {
@@ -40,15 +34,12 @@ public class DriverEventHandler extends BaseEventHandler {
         String driverUniqueId = position.getString(Position.KEY_DRIVER_UNIQUE_ID);
         if (driverUniqueId != null) {
             String oldDriverUniqueId = null;
-            if (notRepeat) {
-                Position lastPosition = Context.getIdentityManager().getLastPosition(position.getDeviceId());
-                if (lastPosition != null) {
-                    oldDriverUniqueId = lastPosition.getString(Position.KEY_DRIVER_UNIQUE_ID);
-                }
+            Position lastPosition = Context.getIdentityManager().getLastPosition(position.getDeviceId());
+            if (lastPosition != null) {
+                oldDriverUniqueId = lastPosition.getString(Position.KEY_DRIVER_UNIQUE_ID);
             }
-            if (!driverUniqueId.equals(oldDriverUniqueId)
-                    && !Context.getDriversManager().authorizeDriverByUniqueId(driverUniqueId, position.getDeviceId())) {
-                Event event = new Event(Event.TYPE_DRIVER_UNAUTHORIZED, position.getDeviceId(), position.getId());
+            if (!driverUniqueId.equals(oldDriverUniqueId)) {
+                Event event = new Event(Event.TYPE_DRIVER_CHANGED, position.getDeviceId(), position.getId());
                 event.set(Position.KEY_DRIVER_UNIQUE_ID, driverUniqueId);
                 return Collections.singleton(event);
             }
diff --git a/src/org/traccar/model/Event.java b/src/org/traccar/model/Event.java
index dd5358f75..2d836abeb 100644
--- a/src/org/traccar/model/Event.java
+++ b/src/org/traccar/model/Event.java
@@ -61,7 +61,7 @@ public class Event extends Message {
 
     public static final String TYPE_TEXT_MESSAGE = "textMessage";
 
-    public static final String TYPE_DRIVER_UNAUTHORIZED = "driverUnauthorized";
+    public static final String TYPE_DRIVER_CHANGED = "driverChanged";
 
     private Date serverTime;
 
diff --git a/templates/mail/driverChanged.vm b/templates/mail/driverChanged.vm
new file mode 100644
index 000000000..ba1e68661
--- /dev/null
+++ b/templates/mail/driverChanged.vm
@@ -0,0 +1,10 @@
+#set($subject = "$device.name: driver has changed")
+<!DOCTYPE html>
+<html>
+<body>
+Device: $device.name<br>
+Time: $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.serverTime, $locale, $timezone)<br>
+Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude&deg;, $position.longitude&deg;#{end}</a><br>
+Driver: #{if}($driver)$driver.name#{else}$event.getString("driverUniqueId")#{end}
+</body>
+</html>  
diff --git a/templates/mail/driverUnauthorized.vm b/templates/mail/driverUnauthorized.vm
deleted file mode 100644
index 3d28266cd..000000000
--- a/templates/mail/driverUnauthorized.vm
+++ /dev/null
@@ -1,10 +0,0 @@
-#set($subject = "$device.name: driver unauthorized")
-<!DOCTYPE html>
-<html>
-<body>
-Device: $device.name<br>
-Time: $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.serverTime, $locale, $timezone)<br>
-Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude&deg;, $position.longitude&deg;#{end}</a><br>
-Driver: #{if}($driver)$driver.name#{else}$event.getString("driverUniqueId")#{end}
-</body>
-</html>  
diff --git a/templates/sms/driverChanged.vm b/templates/sms/driverChanged.vm
new file mode 100644
index 000000000..50849df7c
--- /dev/null
+++ b/templates/sms/driverChanged.vm
@@ -0,0 +1,6 @@
+#if($driver)
+#set($driverName = $driver.name)
+#else
+#set($driverName = $event.getString("driverUniqueId"))
+#end
+Driver $driverName has changed in $device.name at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.serverTime, $locale, $timezone)
diff --git a/templates/sms/driverUnauthorized.vm b/templates/sms/driverUnauthorized.vm
deleted file mode 100644
index 52c819eb8..000000000
--- a/templates/sms/driverUnauthorized.vm
+++ /dev/null
@@ -1,6 +0,0 @@
-#if($driver)
-#set($driverName = $driver.name)
-#else
-#set($driverName = $event.getString("driverUniqueId"))
-#end
-$driverName is unauthorized for $device.name at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.serverTime, $locale, $timezone)
-- 
cgit v1.2.3


From a9478ded48de140d47d17def1ee5329267fe6088 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Wed, 19 Jul 2017 15:24:55 +0500
Subject: Refactored four managers

---
 setup/default.xml                                  |   4 +-
 .../api/resource/AttributePermissionResource.java  |   8 +-
 .../traccar/api/resource/AttributeResource.java    |  26 +-
 .../api/resource/CalendarPermissionResource.java   |   8 +-
 src/org/traccar/api/resource/CalendarResource.java |  20 +-
 .../api/resource/DeviceAttributeResource.java      |   4 +-
 .../traccar/api/resource/DeviceDriverResource.java |   4 +-
 .../api/resource/DeviceGeofenceResource.java       |   4 +-
 .../api/resource/DriverPermissionResource.java     |   8 +-
 src/org/traccar/api/resource/DriverResource.java   |  26 +-
 src/org/traccar/api/resource/EventResource.java    |   2 +-
 .../api/resource/GeofencePermissionResource.java   |   8 +-
 src/org/traccar/api/resource/GeofenceResource.java |  27 +-
 .../api/resource/GroupAttributeResource.java       |   4 +-
 .../traccar/api/resource/GroupDriverResource.java  |   4 +-
 .../api/resource/GroupGeofenceResource.java        |   4 +-
 src/org/traccar/api/resource/UserResource.java     |   2 +-
 src/org/traccar/database/AttributesManager.java    | 171 +------------
 src/org/traccar/database/CalendarManager.java      |  99 +------
 src/org/traccar/database/DataManager.java          | 183 ++-----------
 src/org/traccar/database/DriversManager.java       | 179 +++----------
 .../traccar/database/ExtendedObjectManager.java    | 129 ++++++++++
 src/org/traccar/database/GeofenceManager.java      | 284 ++-------------------
 src/org/traccar/database/NotificationManager.java  |   2 +-
 src/org/traccar/database/PermissionsManager.java   |  73 +++---
 src/org/traccar/database/SimpleObjectManager.java  | 164 ++++++++++++
 src/org/traccar/events/GeofenceEventHandler.java   |  16 +-
 src/org/traccar/model/Attribute.java               |  12 +-
 src/org/traccar/model/AttributeAlias.java          |  12 +-
 src/org/traccar/model/AttributePermission.java     |  17 +-
 src/org/traccar/model/BaseDevicePermission.java    |  31 +++
 src/org/traccar/model/BaseGroupPermission.java     |  31 +++
 src/org/traccar/model/BasePermission.java          |  23 ++
 src/org/traccar/model/BaseUserPermission.java      |  31 +++
 src/org/traccar/model/CalendarPermission.java      |  17 +-
 src/org/traccar/model/DeviceAttribute.java         |  17 +-
 src/org/traccar/model/DeviceDriver.java            |  17 +-
 src/org/traccar/model/DeviceGeofence.java          |  17 +-
 src/org/traccar/model/DriverPermission.java        |  17 +-
 src/org/traccar/model/Extensible.java              |  12 +-
 src/org/traccar/model/GeofencePermission.java      |  17 +-
 src/org/traccar/model/GroupAttribute.java          |  17 +-
 src/org/traccar/model/GroupDriver.java             |  17 +-
 src/org/traccar/model/GroupGeofence.java           |  17 +-
 src/org/traccar/model/Identifiable.java            |  31 +++
 src/org/traccar/notification/EventForwarder.java   |   2 +-
 .../notification/NotificationFormatter.java        |   2 +-
 .../processing/ComputedAttributesHandler.java      |   4 +-
 src/org/traccar/reports/Events.java                |   6 +-
 49 files changed, 725 insertions(+), 1105 deletions(-)
 create mode 100644 src/org/traccar/database/ExtendedObjectManager.java
 create mode 100644 src/org/traccar/database/SimpleObjectManager.java
 create mode 100644 src/org/traccar/model/BaseDevicePermission.java
 create mode 100644 src/org/traccar/model/BaseGroupPermission.java
 create mode 100644 src/org/traccar/model/BasePermission.java
 create mode 100644 src/org/traccar/model/BaseUserPermission.java
 create mode 100644 src/org/traccar/model/Identifiable.java

(limited to 'setup')

diff --git a/setup/default.xml b/setup/default.xml
index 04530104a..d3651b9f0 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -207,7 +207,7 @@
         SELECT * FROM events WHERE deviceId = :deviceId AND serverTime BETWEEN :from AND :to ORDER BY serverTime
     </entry>
 
-    <entry key='database.selectGeofencesAll'>
+    <entry key='database.selectGeofences'>
         SELECT * FROM geofences
     </entry>
 
@@ -328,7 +328,7 @@
         VALUES (:captureTime, :activeUsers, :activeDevices, :requests, :messagesReceived, :messagesStored, :mailSent, :smsSent, :geocoderRequests, :geolocationRequests, :attributes)
     </entry>
     
-    <entry key='database.selectCalendarsAll'>
+    <entry key='database.selectCalendars'>
         SELECT * FROM calendars
     </entry>
 
diff --git a/src/org/traccar/api/resource/AttributePermissionResource.java b/src/org/traccar/api/resource/AttributePermissionResource.java
index 1924bcdf1..37e50e371 100644
--- a/src/org/traccar/api/resource/AttributePermissionResource.java
+++ b/src/org/traccar/api/resource/AttributePermissionResource.java
@@ -39,9 +39,9 @@ public class AttributePermissionResource extends BaseResource {
     public Response add(AttributePermission entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId());
-        Context.getPermissionsManager().checkAttribute(getUserId(), entity.getAttributeId());
+        Context.getPermissionsManager().checkPermission("attribute", getUserId(), entity.getAttributeId());
         Context.getDataManager().linkAttribute(entity.getUserId(), entity.getAttributeId());
-        Context.getAttributesManager().refreshUserAttributes();
+        Context.getAttributesManager().refreshUserItems();
         return Response.ok(entity).build();
     }
 
@@ -49,9 +49,9 @@ public class AttributePermissionResource extends BaseResource {
     public Response remove(AttributePermission entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId());
-        Context.getPermissionsManager().checkAttribute(getUserId(), entity.getAttributeId());
+        Context.getPermissionsManager().checkPermission("attribute", getUserId(), entity.getAttributeId());
         Context.getDataManager().unlinkAttribute(entity.getUserId(), entity.getAttributeId());
-        Context.getAttributesManager().refreshUserAttributes();
+        Context.getAttributesManager().refreshUserItems();
         return Response.noContent().build();
     }
 
diff --git a/src/org/traccar/api/resource/AttributeResource.java b/src/org/traccar/api/resource/AttributeResource.java
index 4d326779b..c67d9cafe 100644
--- a/src/org/traccar/api/resource/AttributeResource.java
+++ b/src/org/traccar/api/resource/AttributeResource.java
@@ -52,42 +52,42 @@ public class AttributeResource extends BaseResource {
 
         AttributesManager attributesManager = Context.getAttributesManager();
         if (refresh) {
-            attributesManager.refreshAttributes();
+            attributesManager.refreshItems();
         }
 
         Set<Long> result = new HashSet<>();
         if (all) {
             if (Context.getPermissionsManager().isAdmin(getUserId())) {
-                result.addAll(attributesManager.getAllAttributes());
+                result.addAll(attributesManager.getAllItems());
             } else {
                 Context.getPermissionsManager().checkManager(getUserId());
-                result.addAll(attributesManager.getManagedAttributes(getUserId()));
+                result.addAll(attributesManager.getManagedItems(getUserId()));
             }
         } else {
             if (userId == 0) {
                 userId = getUserId();
             }
             Context.getPermissionsManager().checkUser(getUserId(), userId);
-            result.addAll(attributesManager.getUserAttributes(userId));
+            result.addAll(attributesManager.getUserItems(userId));
         }
 
         if (groupId != 0) {
             Context.getPermissionsManager().checkGroup(getUserId(), groupId);
-            result.retainAll(attributesManager.getGroupAttributes(groupId));
+            result.retainAll(attributesManager.getGroupItems(groupId));
         }
 
         if (deviceId != 0) {
             Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
-            result.retainAll(attributesManager.getDeviceAttributes(deviceId));
+            result.retainAll(attributesManager.getDeviceItems(deviceId));
         }
-        return attributesManager.getAttributes(result);
+        return attributesManager.getItems(Attribute.class, result);
 
     }
 
     private Response add(Attribute entity) throws SQLException {
-        Context.getAttributesManager().addAttribute(entity);
+        Context.getAttributesManager().addItem(entity);
         Context.getDataManager().linkAttribute(getUserId(), entity.getId());
-        Context.getAttributesManager().refreshUserAttributes();
+        Context.getAttributesManager().refreshUserItems();
         return Response.ok(entity).build();
     }
 
@@ -127,8 +127,8 @@ public class AttributeResource extends BaseResource {
     @PUT
     public Response update(Attribute entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkAttribute(getUserId(), entity.getId());
-        Context.getAttributesManager().updateAttribute(entity);
+        Context.getPermissionsManager().checkPermission("attribute", getUserId(), entity.getId());
+        Context.getAttributesManager().updateItem(entity);
         return Response.ok(entity).build();
     }
 
@@ -136,8 +136,8 @@ public class AttributeResource extends BaseResource {
     @DELETE
     public Response remove(@PathParam("id") long id) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkAttribute(getUserId(), id);
-        Context.getAttributesManager().removeAttribute(id);
+        Context.getPermissionsManager().checkPermission("attribute", getUserId(), id);
+        Context.getAttributesManager().removeItem(id);
         return Response.noContent().build();
     }
 
diff --git a/src/org/traccar/api/resource/CalendarPermissionResource.java b/src/org/traccar/api/resource/CalendarPermissionResource.java
index a49254b6b..3936bcaf3 100644
--- a/src/org/traccar/api/resource/CalendarPermissionResource.java
+++ b/src/org/traccar/api/resource/CalendarPermissionResource.java
@@ -39,9 +39,9 @@ public class CalendarPermissionResource extends BaseResource {
     public Response add(CalendarPermission entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId());
-        Context.getPermissionsManager().checkCalendar(getUserId(), entity.getCalendarId());
+        Context.getPermissionsManager().checkPermission("calendar", getUserId(), entity.getCalendarId());
         Context.getDataManager().linkCalendar(entity.getUserId(), entity.getCalendarId());
-        Context.getCalendarManager().refreshUserCalendars();
+        Context.getCalendarManager().refreshUserItems();
         return Response.ok(entity).build();
     }
 
@@ -49,9 +49,9 @@ public class CalendarPermissionResource extends BaseResource {
     public Response remove(CalendarPermission entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId());
-        Context.getPermissionsManager().checkCalendar(getUserId(), entity.getCalendarId());
+        Context.getPermissionsManager().checkPermission("calendar", getUserId(), entity.getCalendarId());
         Context.getDataManager().unlinkCalendar(entity.getUserId(), entity.getCalendarId());
-        Context.getCalendarManager().refreshUserCalendars();
+        Context.getCalendarManager().refreshUserItems();
         return Response.noContent().build();
     }
 }
diff --git a/src/org/traccar/api/resource/CalendarResource.java b/src/org/traccar/api/resource/CalendarResource.java
index 641d3b4b5..be675fc79 100644
--- a/src/org/traccar/api/resource/CalendarResource.java
+++ b/src/org/traccar/api/resource/CalendarResource.java
@@ -33,6 +33,7 @@ import javax.ws.rs.core.Response;
 
 import org.traccar.Context;
 import org.traccar.api.BaseResource;
+import org.traccar.database.CalendarManager;
 import org.traccar.model.Calendar;
 
 @Path("calendars")
@@ -44,28 +45,29 @@ public class CalendarResource extends BaseResource {
     public Collection<Calendar> get(
             @QueryParam("all") boolean all, @QueryParam("userId") long userId) throws SQLException {
 
+        CalendarManager calendarManager = Context.getCalendarManager();
         if (all) {
             if (Context.getPermissionsManager().isAdmin(getUserId())) {
-                return Context.getCalendarManager().getAllCalendars();
+                return calendarManager.getItems(Calendar.class, calendarManager.getAllItems());
             } else {
                 Context.getPermissionsManager().checkManager(getUserId());
-                return Context.getCalendarManager().getManagedCalendars(getUserId());
+                return calendarManager.getItems(Calendar.class, calendarManager.getManagedItems(getUserId()));
             }
         } else {
             if (userId == 0) {
                 userId = getUserId();
             }
             Context.getPermissionsManager().checkUser(getUserId(), userId);
-            return Context.getCalendarManager().getUserCalendars(userId);
+            return calendarManager.getItems(Calendar.class, calendarManager.getUserItems(userId));
         }
     }
 
     @POST
     public Response add(Calendar entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getCalendarManager().addCalendar(entity);
+        Context.getCalendarManager().addItem(entity);
         Context.getDataManager().linkCalendar(getUserId(), entity.getId());
-        Context.getCalendarManager().refreshUserCalendars();
+        Context.getCalendarManager().refreshUserItems();
         return Response.ok(entity).build();
     }
 
@@ -73,8 +75,8 @@ public class CalendarResource extends BaseResource {
     @PUT
     public Response update(Calendar entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkCalendar(getUserId(), entity.getId());
-        Context.getCalendarManager().updateCalendar(entity);
+        Context.getPermissionsManager().checkPermission("calendar", getUserId(), entity.getId());
+        Context.getCalendarManager().updateItem(entity);
         return Response.ok(entity).build();
     }
 
@@ -82,8 +84,8 @@ public class CalendarResource extends BaseResource {
     @DELETE
     public Response remove(@PathParam("id") long id) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkCalendar(getUserId(), id);
-        Context.getCalendarManager().removeCalendar(id);
+        Context.getPermissionsManager().checkPermission("calendar", getUserId(), id);
+        Context.getCalendarManager().removeItem(id);
         return Response.noContent().build();
     }
 }
diff --git a/src/org/traccar/api/resource/DeviceAttributeResource.java b/src/org/traccar/api/resource/DeviceAttributeResource.java
index 82d17bcc6..bb833d4db 100644
--- a/src/org/traccar/api/resource/DeviceAttributeResource.java
+++ b/src/org/traccar/api/resource/DeviceAttributeResource.java
@@ -39,7 +39,7 @@ public class DeviceAttributeResource extends BaseResource {
     public Response add(DeviceAttribute entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId());
-        Context.getPermissionsManager().checkAttribute(getUserId(), entity.getAttributeId());
+        Context.getPermissionsManager().checkPermission("attribute", getUserId(), entity.getAttributeId());
         Context.getDataManager().linkDeviceAttribute(entity.getDeviceId(), entity.getAttributeId());
         Context.getAttributesManager().refresh();
         return Response.ok(entity).build();
@@ -49,7 +49,7 @@ public class DeviceAttributeResource extends BaseResource {
     public Response remove(DeviceAttribute entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId());
-        Context.getPermissionsManager().checkAttribute(getUserId(), entity.getAttributeId());
+        Context.getPermissionsManager().checkPermission("attribute", getUserId(), entity.getAttributeId());
         Context.getDataManager().unlinkDeviceAttribute(entity.getDeviceId(), entity.getAttributeId());
         Context.getAttributesManager().refresh();
         return Response.noContent().build();
diff --git a/src/org/traccar/api/resource/DeviceDriverResource.java b/src/org/traccar/api/resource/DeviceDriverResource.java
index 341c50909..286f2223f 100644
--- a/src/org/traccar/api/resource/DeviceDriverResource.java
+++ b/src/org/traccar/api/resource/DeviceDriverResource.java
@@ -39,7 +39,7 @@ public class DeviceDriverResource extends BaseResource {
     public Response add(DeviceDriver entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId());
-        Context.getPermissionsManager().checkDriver(getUserId(), entity.getDriverId());
+        Context.getPermissionsManager().checkPermission("driver", getUserId(), entity.getDriverId());
         Context.getDataManager().linkDeviceDriver(entity.getDeviceId(), entity.getDriverId());
         Context.getDriversManager().refresh();
         return Response.ok(entity).build();
@@ -49,7 +49,7 @@ public class DeviceDriverResource extends BaseResource {
     public Response remove(DeviceDriver entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId());
-        Context.getPermissionsManager().checkDriver(getUserId(), entity.getDriverId());
+        Context.getPermissionsManager().checkPermission("driver", getUserId(), entity.getDriverId());
         Context.getDataManager().unlinkDeviceDriver(entity.getDeviceId(), entity.getDriverId());
         Context.getDriversManager().refresh();
         return Response.noContent().build();
diff --git a/src/org/traccar/api/resource/DeviceGeofenceResource.java b/src/org/traccar/api/resource/DeviceGeofenceResource.java
index 6254fe3cf..8034e2168 100644
--- a/src/org/traccar/api/resource/DeviceGeofenceResource.java
+++ b/src/org/traccar/api/resource/DeviceGeofenceResource.java
@@ -38,7 +38,7 @@ public class DeviceGeofenceResource extends BaseResource {
     public Response add(DeviceGeofence entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId());
-        Context.getPermissionsManager().checkGeofence(getUserId(), entity.getGeofenceId());
+        Context.getPermissionsManager().checkPermission("geofence", getUserId(), entity.getGeofenceId());
         Context.getDataManager().linkDeviceGeofence(entity.getDeviceId(), entity.getGeofenceId());
         Context.getGeofenceManager().refresh();
         return Response.ok(entity).build();
@@ -48,7 +48,7 @@ public class DeviceGeofenceResource extends BaseResource {
     public Response remove(DeviceGeofence entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId());
-        Context.getPermissionsManager().checkGeofence(getUserId(), entity.getGeofenceId());
+        Context.getPermissionsManager().checkPermission("geofence", getUserId(), entity.getGeofenceId());
         Context.getDataManager().unlinkDeviceGeofence(entity.getDeviceId(), entity.getGeofenceId());
         Context.getGeofenceManager().refresh();
         return Response.noContent().build();
diff --git a/src/org/traccar/api/resource/DriverPermissionResource.java b/src/org/traccar/api/resource/DriverPermissionResource.java
index fd1ca7c6d..4d890cae9 100644
--- a/src/org/traccar/api/resource/DriverPermissionResource.java
+++ b/src/org/traccar/api/resource/DriverPermissionResource.java
@@ -40,9 +40,9 @@ public class DriverPermissionResource extends BaseResource {
     public Response add(DriverPermission entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId());
-        Context.getPermissionsManager().checkDriver(getUserId(), entity.getDriverId());
+        Context.getPermissionsManager().checkPermission("driver", getUserId(), entity.getDriverId());
         Context.getDataManager().linkDriver(entity.getUserId(), entity.getDriverId());
-        Context.getDriversManager().refreshUserDrivers();
+        Context.getDriversManager().refreshUserItems();
         return Response.ok(entity).build();
     }
 
@@ -50,9 +50,9 @@ public class DriverPermissionResource extends BaseResource {
     public Response remove(DriverPermission entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId());
-        Context.getPermissionsManager().checkDriver(getUserId(), entity.getDriverId());
+        Context.getPermissionsManager().checkPermission("driver", getUserId(), entity.getDriverId());
         Context.getDataManager().unlinkDriver(entity.getUserId(), entity.getDriverId());
-        Context.getDriversManager().refreshUserDrivers();
+        Context.getDriversManager().refreshUserItems();
         return Response.noContent().build();
     }
 
diff --git a/src/org/traccar/api/resource/DriverResource.java b/src/org/traccar/api/resource/DriverResource.java
index 7fe0af473..3d6a12795 100644
--- a/src/org/traccar/api/resource/DriverResource.java
+++ b/src/org/traccar/api/resource/DriverResource.java
@@ -50,44 +50,44 @@ public class DriverResource extends BaseResource {
 
         DriversManager driversManager = Context.getDriversManager();
         if (refresh) {
-            driversManager.refreshDrivers();
+            driversManager.refreshItems();
         }
 
         Set<Long> result = new HashSet<>();
         if (all) {
             if (Context.getPermissionsManager().isAdmin(getUserId())) {
-                result.addAll(driversManager.getAllDrivers());
+                result.addAll(driversManager.getAllItems());
             } else {
                 Context.getPermissionsManager().checkManager(getUserId());
-                result.addAll(driversManager.getManagedDrivers(getUserId()));
+                result.addAll(driversManager.getManagedItems(getUserId()));
             }
         } else {
             if (userId == 0) {
                 userId = getUserId();
             }
             Context.getPermissionsManager().checkUser(getUserId(), userId);
-            result.addAll(driversManager.getUserDrivers(userId));
+            result.addAll(driversManager.getUserItems(userId));
         }
 
         if (groupId != 0) {
             Context.getPermissionsManager().checkGroup(getUserId(), groupId);
-            result.retainAll(driversManager.getGroupDrivers(groupId));
+            result.retainAll(driversManager.getGroupItems(groupId));
         }
 
         if (deviceId != 0) {
             Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
-            result.retainAll(driversManager.getDeviceDrivers(deviceId));
+            result.retainAll(driversManager.getDeviceItems(deviceId));
         }
-        return driversManager.getDrivers(result);
+        return driversManager.getItems(Driver.class, result);
 
     }
 
     @POST
     public Response add(Driver entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getDriversManager().addDriver(entity);
+        Context.getDriversManager().addItem(entity);
         Context.getDataManager().linkDriver(getUserId(), entity.getId());
-        Context.getDriversManager().refreshUserDrivers();
+        Context.getDriversManager().refreshUserItems();
         return Response.ok(entity).build();
     }
 
@@ -95,8 +95,8 @@ public class DriverResource extends BaseResource {
     @PUT
     public Response update(Driver entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkDriver(getUserId(), entity.getId());
-        Context.getDriversManager().updateDriver(entity);
+        Context.getPermissionsManager().checkPermission("driver", getUserId(), entity.getId());
+        Context.getDriversManager().updateItem(entity);
         return Response.ok(entity).build();
     }
 
@@ -104,8 +104,8 @@ public class DriverResource extends BaseResource {
     @DELETE
     public Response remove(@PathParam("id") long id) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkDriver(getUserId(), id);
-        Context.getDriversManager().removeDriver(id);
+        Context.getPermissionsManager().checkPermission("driver", getUserId(), id);
+        Context.getDriversManager().removeItem(id);
         return Response.noContent().build();
     }
 
diff --git a/src/org/traccar/api/resource/EventResource.java b/src/org/traccar/api/resource/EventResource.java
index 0ef5456af..9b43bf4b0 100644
--- a/src/org/traccar/api/resource/EventResource.java
+++ b/src/org/traccar/api/resource/EventResource.java
@@ -25,7 +25,7 @@ public class EventResource extends BaseResource {
         Event event = Context.getDataManager().getEvent(id);
         Context.getPermissionsManager().checkDevice(getUserId(), event.getDeviceId());
         if (event.getGeofenceId() != 0) {
-            Context.getPermissionsManager().checkGeofence(getUserId(), event.getGeofenceId());
+            Context.getPermissionsManager().checkPermission("geofence", getUserId(), event.getGeofenceId());
         }
         return event;
     }
diff --git a/src/org/traccar/api/resource/GeofencePermissionResource.java b/src/org/traccar/api/resource/GeofencePermissionResource.java
index 8faa63d85..a569e56fd 100644
--- a/src/org/traccar/api/resource/GeofencePermissionResource.java
+++ b/src/org/traccar/api/resource/GeofencePermissionResource.java
@@ -37,9 +37,9 @@ public class GeofencePermissionResource extends BaseResource {
     public Response add(GeofencePermission entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId());
-        Context.getPermissionsManager().checkGeofence(getUserId(), entity.getGeofenceId());
+        Context.getPermissionsManager().checkPermission("geofence", getUserId(), entity.getGeofenceId());
         Context.getDataManager().linkGeofence(entity.getUserId(), entity.getGeofenceId());
-        Context.getGeofenceManager().refreshUserGeofences();
+        Context.getGeofenceManager().refreshUserItems();
         return Response.ok(entity).build();
     }
 
@@ -47,9 +47,9 @@ public class GeofencePermissionResource extends BaseResource {
     public Response remove(GeofencePermission entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId());
-        Context.getPermissionsManager().checkGeofence(getUserId(), entity.getGeofenceId());
+        Context.getPermissionsManager().checkPermission("geofence", getUserId(), entity.getGeofenceId());
         Context.getDataManager().unlinkGeofence(entity.getUserId(), entity.getGeofenceId());
-        Context.getGeofenceManager().refreshUserGeofences();
+        Context.getGeofenceManager().refreshUserItems();
         return Response.noContent().build();
     }
 
diff --git a/src/org/traccar/api/resource/GeofenceResource.java b/src/org/traccar/api/resource/GeofenceResource.java
index d5acf106a..4a52822cc 100644
--- a/src/org/traccar/api/resource/GeofenceResource.java
+++ b/src/org/traccar/api/resource/GeofenceResource.java
@@ -49,44 +49,44 @@ public class GeofenceResource extends BaseResource {
 
         GeofenceManager geofenceManager = Context.getGeofenceManager();
         if (refresh) {
-            geofenceManager.refreshGeofences();
+            geofenceManager.refreshItems();
         }
 
         Set<Long> result = new HashSet<>();
         if (all) {
             if (Context.getPermissionsManager().isAdmin(getUserId())) {
-                result.addAll(geofenceManager.getAllGeofencesIds());
+                result.addAll(geofenceManager.getAllItems());
             } else {
                 Context.getPermissionsManager().checkManager(getUserId());
-                result.addAll(geofenceManager.getManagedGeofencesIds(getUserId()));
+                result.addAll(geofenceManager.getManagedItems(getUserId()));
             }
         } else {
             if (userId == 0) {
                 userId = getUserId();
             }
             Context.getPermissionsManager().checkUser(getUserId(), userId);
-            result.addAll(geofenceManager.getUserGeofencesIds(userId));
+            result.addAll(geofenceManager.getUserItems(userId));
         }
 
         if (groupId != 0) {
             Context.getPermissionsManager().checkGroup(getUserId(), groupId);
-            result.retainAll(geofenceManager.getGroupGeofencesIds(groupId));
+            result.retainAll(geofenceManager.getGroupItems(groupId));
         }
 
         if (deviceId != 0) {
             Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
-            result.retainAll(geofenceManager.getDeviceGeofencesIds(deviceId));
+            result.retainAll(geofenceManager.getDeviceItems(deviceId));
         }
-        return geofenceManager.getGeofences(result);
+        return geofenceManager.getItems(Geofence.class, result);
 
     }
 
     @POST
     public Response add(Geofence entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getDataManager().addGeofence(entity);
+        Context.getGeofenceManager().addItem(entity);
         Context.getDataManager().linkGeofence(getUserId(), entity.getId());
-        Context.getGeofenceManager().refreshGeofences();
+        Context.getGeofenceManager().refreshUserItems();
         return Response.ok(entity).build();
     }
 
@@ -94,8 +94,8 @@ public class GeofenceResource extends BaseResource {
     @PUT
     public Response update(Geofence entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkGeofence(getUserId(), entity.getId());
-        Context.getGeofenceManager().updateGeofence(entity);
+        Context.getPermissionsManager().checkPermission("geofence", getUserId(), entity.getId());
+        Context.getGeofenceManager().updateItem(entity);
         return Response.ok(entity).build();
     }
 
@@ -103,9 +103,8 @@ public class GeofenceResource extends BaseResource {
     @DELETE
     public Response remove(@PathParam("id") long id) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkGeofence(getUserId(), id);
-        Context.getDataManager().removeGeofence(id);
-        Context.getGeofenceManager().refreshGeofences();
+        Context.getPermissionsManager().checkPermission("geofence", getUserId(), id);
+        Context.getGeofenceManager().removeItem(id);
         return Response.noContent().build();
     }
 
diff --git a/src/org/traccar/api/resource/GroupAttributeResource.java b/src/org/traccar/api/resource/GroupAttributeResource.java
index d8b8b58c9..5df63194e 100644
--- a/src/org/traccar/api/resource/GroupAttributeResource.java
+++ b/src/org/traccar/api/resource/GroupAttributeResource.java
@@ -39,7 +39,7 @@ public class GroupAttributeResource extends BaseResource {
     public Response add(GroupAttribute entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getPermissionsManager().checkGroup(getUserId(), entity.getGroupId());
-        Context.getPermissionsManager().checkAttribute(getUserId(), entity.getAttributeId());
+        Context.getPermissionsManager().checkPermission("attribute", getUserId(), entity.getAttributeId());
         Context.getDataManager().linkGroupAttribute(entity.getGroupId(), entity.getAttributeId());
         Context.getAttributesManager().refresh();
         return Response.ok(entity).build();
@@ -49,7 +49,7 @@ public class GroupAttributeResource extends BaseResource {
     public Response remove(GroupAttribute entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getPermissionsManager().checkGroup(getUserId(), entity.getGroupId());
-        Context.getPermissionsManager().checkAttribute(getUserId(), entity.getAttributeId());
+        Context.getPermissionsManager().checkPermission("attribute", getUserId(), entity.getAttributeId());
         Context.getDataManager().unlinkGroupAttribute(entity.getGroupId(), entity.getAttributeId());
         Context.getAttributesManager().refresh();
         return Response.noContent().build();
diff --git a/src/org/traccar/api/resource/GroupDriverResource.java b/src/org/traccar/api/resource/GroupDriverResource.java
index 76fc2892c..71c1aca29 100644
--- a/src/org/traccar/api/resource/GroupDriverResource.java
+++ b/src/org/traccar/api/resource/GroupDriverResource.java
@@ -39,7 +39,7 @@ public class GroupDriverResource extends BaseResource {
     public Response add(GroupDriver entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getPermissionsManager().checkGroup(getUserId(), entity.getGroupId());
-        Context.getPermissionsManager().checkDriver(getUserId(), entity.getDriverId());
+        Context.getPermissionsManager().checkPermission("driver", getUserId(), entity.getDriverId());
         Context.getDataManager().linkGroupDriver(entity.getGroupId(), entity.getDriverId());
         Context.getDriversManager().refresh();
         return Response.ok(entity).build();
@@ -49,7 +49,7 @@ public class GroupDriverResource extends BaseResource {
     public Response remove(GroupDriver entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getPermissionsManager().checkGroup(getUserId(), entity.getGroupId());
-        Context.getPermissionsManager().checkDriver(getUserId(), entity.getDriverId());
+        Context.getPermissionsManager().checkPermission("driver", getUserId(), entity.getDriverId());
         Context.getDataManager().unlinkGroupDriver(entity.getGroupId(), entity.getDriverId());
         Context.getDriversManager().refresh();
         return Response.noContent().build();
diff --git a/src/org/traccar/api/resource/GroupGeofenceResource.java b/src/org/traccar/api/resource/GroupGeofenceResource.java
index 81fd4e45f..14000c4b5 100644
--- a/src/org/traccar/api/resource/GroupGeofenceResource.java
+++ b/src/org/traccar/api/resource/GroupGeofenceResource.java
@@ -37,7 +37,7 @@ public class GroupGeofenceResource extends BaseResource {
     public Response add(GroupGeofence entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getPermissionsManager().checkGroup(getUserId(), entity.getGroupId());
-        Context.getPermissionsManager().checkGeofence(getUserId(), entity.getGeofenceId());
+        Context.getPermissionsManager().checkPermission("geofence", getUserId(), entity.getGeofenceId());
         Context.getDataManager().linkGroupGeofence(entity.getGroupId(), entity.getGeofenceId());
         Context.getGeofenceManager().refresh();
         return Response.ok(entity).build();
@@ -47,7 +47,7 @@ public class GroupGeofenceResource extends BaseResource {
     public Response remove(GroupGeofence entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getPermissionsManager().checkGroup(getUserId(), entity.getGroupId());
-        Context.getPermissionsManager().checkGeofence(getUserId(), entity.getGeofenceId());
+        Context.getPermissionsManager().checkPermission("geofence", getUserId(), entity.getGeofenceId());
         Context.getDataManager().unlinkGroupGeofence(entity.getGroupId(), entity.getGeofenceId());
         Context.getGeofenceManager().refresh();
         return Response.noContent().build();
diff --git a/src/org/traccar/api/resource/UserResource.java b/src/org/traccar/api/resource/UserResource.java
index 4d8a8b3a4..b9187fdbb 100644
--- a/src/org/traccar/api/resource/UserResource.java
+++ b/src/org/traccar/api/resource/UserResource.java
@@ -104,7 +104,7 @@ public class UserResource extends BaseResource {
         Context.getPermissionsManager().checkUser(getUserId(), id);
         Context.getPermissionsManager().removeUser(id);
         if (Context.getGeofenceManager() != null) {
-            Context.getGeofenceManager().refreshUserGeofences();
+            Context.getGeofenceManager().refreshUserItems();
         }
         if (Context.getNotificationManager() != null) {
             Context.getNotificationManager().refresh();
diff --git a/src/org/traccar/database/AttributesManager.java b/src/org/traccar/database/AttributesManager.java
index 362d6130f..88bedfba4 100644
--- a/src/org/traccar/database/AttributesManager.java
+++ b/src/org/traccar/database/AttributesManager.java
@@ -17,183 +17,30 @@
 package org.traccar.database;
 
 import java.sql.SQLException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 
-import org.traccar.Context;
-import org.traccar.helper.Log;
 import org.traccar.model.AttributePermission;
 import org.traccar.model.Attribute;
-import org.traccar.model.Device;
 import org.traccar.model.DeviceAttribute;
 import org.traccar.model.GroupAttribute;
+import org.traccar.model.Identifiable;
 
-public class AttributesManager {
-
-    private final DataManager dataManager;
-
-    private final Map<Long, Attribute> attributes = new ConcurrentHashMap<>();
-    private final Map<Long, Set<Long>> deviceAttributes = new ConcurrentHashMap<>();
-    private final Map<Long, Set<Long>> deviceAttributesWithGroups = new ConcurrentHashMap<>();
-    private final Map<Long, Set<Long>> groupAttributes = new ConcurrentHashMap<>();
-    private final Map<Long, Set<Long>> userAttributes = new ConcurrentHashMap<>();
+public class AttributesManager extends ExtendedObjectManager {
 
     public AttributesManager(DataManager dataManager) {
-        this.dataManager = dataManager;
-        refreshAttributes();
-    }
-
-    public Set<Long> getUserAttributes(long userId) {
-        if (!userAttributes.containsKey(userId)) {
-            userAttributes.put(userId, new HashSet<Long>());
-        }
-        return userAttributes.get(userId);
-    }
-
-    public Set<Long> getGroupAttributes(long groupId) {
-        if (!groupAttributes.containsKey(groupId)) {
-            groupAttributes.put(groupId, new HashSet<Long>());
-        }
-        return groupAttributes.get(groupId);
-    }
-
-    public Set<Long> getDeviceAttributes(long deviceId) {
-        return getDeviceAttributes(deviceAttributes, deviceId);
-    }
-
-    public Set<Long> getAllDeviceAttributes(long deviceId) {
-        return getDeviceAttributes(deviceAttributesWithGroups, deviceId);
-    }
-
-    private Set<Long> getDeviceAttributes(Map<Long, Set<Long>> deviceAttributes, long deviceId) {
-        if (!deviceAttributes.containsKey(deviceId)) {
-            deviceAttributes.put(deviceId, new HashSet<Long>());
-        }
-        return deviceAttributes.get(deviceId);
-    }
-
-    public final void refreshAttributes() {
-        if (dataManager != null) {
-            try {
-                attributes.clear();
-                for (Attribute attribute : dataManager.getAttributes()) {
-                    attributes.put(attribute.getId(), attribute);
-                }
-            } catch (SQLException error) {
-                Log.warning(error);
-            }
-        }
-        refreshUserAttributes();
+        super(dataManager, Attribute.class, AttributePermission.class, DeviceAttribute.class, GroupAttribute.class);
+        refreshItems();
         refresh();
     }
 
-    public final void refreshUserAttributes() {
-        if (dataManager != null) {
-            try {
-                userAttributes.clear();
-                for (AttributePermission attributePermission : dataManager.getAttributePermissions()) {
-                    getUserAttributes(attributePermission.getUserId()).add(attributePermission.getAttributeId());
-                }
-            } catch (SQLException error) {
-                Log.warning(error);
-            }
-        }
-    }
-
-    public final void refresh() {
-        if (dataManager != null) {
-            try {
-
-                Collection<GroupAttribute> databaseGroupAttributes = dataManager.getGroupAttributes();
-
-                groupAttributes.clear();
-                for (GroupAttribute groupAttribute : databaseGroupAttributes) {
-                    getGroupAttributes(groupAttribute.getGroupId()).add(groupAttribute.getAttributeId());
-                }
-
-                Collection<DeviceAttribute> databaseDeviceAttributes = dataManager.getDeviceAttributes();
-                Collection<Device> allDevices = Context.getDeviceManager().getAllDevices();
-
-                deviceAttributes.clear();
-                deviceAttributesWithGroups.clear();
-
-                for (DeviceAttribute deviceAttribute : databaseDeviceAttributes) {
-                    getDeviceAttributes(deviceAttribute.getDeviceId())
-                        .add(deviceAttribute.getAttributeId());
-                    getAllDeviceAttributes(deviceAttribute.getDeviceId())
-                        .add(deviceAttribute.getAttributeId());
-                }
-
-                for (Device device : allDevices) {
-                    long groupId = device.getGroupId();
-                    while (groupId != 0) {
-                        getAllDeviceAttributes(device.getId()).addAll(getGroupAttributes(groupId));
-                        if (Context.getDeviceManager().getGroupById(groupId) != null) {
-                            groupId = Context.getDeviceManager().getGroupById(groupId).getGroupId();
-                        } else {
-                            groupId = 0;
-                        }
-                    }
-                }
-
-            } catch (SQLException error) {
-                Log.warning(error);
-            }
-        }
-    }
-
-    public void addAttribute(Attribute attribute) throws SQLException {
-        dataManager.addAttribute(attribute);
-        attributes.put(attribute.getId(), attribute);
-    }
-
-    public void updateAttribute(Attribute attribute) throws SQLException {
-        dataManager.updateAttribute(attribute);
-        Attribute cachedAttribute = attributes.get(attribute.getId());
+    @Override
+    public void updateItem(Identifiable item) throws SQLException {
+        Attribute attribute = (Attribute) item;
+        getDataManager().updateObject(attribute);
+        Attribute cachedAttribute = (Attribute) getById(item.getId());
         cachedAttribute.setDescription(attribute.getDescription());
         cachedAttribute.setAttribute(attribute.getAttribute());
         cachedAttribute.setExpression(attribute.getExpression());
         cachedAttribute.setType(attribute.getType());
     }
 
-    public void removeAttribute(long computedAttributeId) throws SQLException {
-        dataManager.removeAttribute(computedAttributeId);
-        attributes.remove(computedAttributeId);
-        refreshUserAttributes();
-        refresh();
-    }
-
-    public boolean checkAttribute(long userId, long attributeId) {
-        return getUserAttributes(userId).contains(attributeId);
-    }
-
-    public Attribute getAttribute(long id) {
-        return attributes.get(id);
-    }
-
-    public final Collection<Attribute> getAttributes(Set<Long> attributeIds) {
-        Collection<Attribute> result = new LinkedList<>();
-        for (long attributeId : attributeIds) {
-            result.add(getAttribute(attributeId));
-        }
-        return result;
-    }
-
-    public final Set<Long> getAllAttributes() {
-        return attributes.keySet();
-    }
-
-    public final Set<Long> getManagedAttributes(long userId) {
-        Set<Long> attributes = new HashSet<>();
-        attributes.addAll(getUserAttributes(userId));
-        for (long managedUserId : Context.getPermissionsManager().getUserPermissions(userId)) {
-            attributes.addAll(getUserAttributes(managedUserId));
-        }
-        return attributes;
-    }
-
 }
diff --git a/src/org/traccar/database/CalendarManager.java b/src/org/traccar/database/CalendarManager.java
index 31d484327..e00b4faa6 100644
--- a/src/org/traccar/database/CalendarManager.java
+++ b/src/org/traccar/database/CalendarManager.java
@@ -16,107 +16,14 @@
  */
 package org.traccar.database;
 
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.traccar.Context;
-import org.traccar.helper.Log;
 import org.traccar.model.Calendar;
 import org.traccar.model.CalendarPermission;
 
-public class CalendarManager {
-
-    private final DataManager dataManager;
-
-    private final Map<Long, Calendar> calendars = new ConcurrentHashMap<>();
-    private final Map<Long, Set<Long>> userCalendars = new ConcurrentHashMap<>();
+public class CalendarManager extends SimpleObjectManager {
 
     public CalendarManager(DataManager dataManager) {
-        this.dataManager = dataManager;
-        refreshCalendars();
-    }
-
-    public final void refreshCalendars() {
-        if (dataManager != null) {
-            try {
-                calendars.clear();
-                for (Calendar calendar : dataManager.getCalendars()) {
-                    calendars.put(calendar.getId(), calendar);
-                }
-            } catch (SQLException error) {
-                Log.warning(error);
-            }
-        }
-        refreshUserCalendars();
-    }
-
-    private Set<Long> getUserCalendarIds(long userId) {
-        if (!userCalendars.containsKey(userId)) {
-            userCalendars.put(userId, new HashSet<Long>());
-        }
-        return userCalendars.get(userId);
-    }
-
-    public Collection<Calendar> getUserCalendars(long userId) {
-        ArrayList<Calendar> result = new ArrayList<>();
-        for (long calendarId : getUserCalendarIds(userId)) {
-            result.add(calendars.get(calendarId));
-        }
-        return result;
-    }
-
-    public Collection<Calendar> getManagedCalendars(long userId) {
-        ArrayList<Calendar> result = new ArrayList<>();
-        result.addAll(getUserCalendars(userId));
-        for (long managedUserId : Context.getPermissionsManager().getUserPermissions(userId)) {
-            result.addAll(getUserCalendars(managedUserId));
-        }
-        return result;
-    }
-
-    public final void refreshUserCalendars() {
-        if (dataManager != null) {
-            try {
-                userCalendars.clear();
-                for (CalendarPermission calendarsPermission : dataManager.getCalendarPermissions()) {
-                    getUserCalendarIds(calendarsPermission.getUserId()).add(calendarsPermission.getCalendarId());
-                }
-            } catch (SQLException error) {
-                Log.warning(error);
-            }
-        }
-    }
-
-    public Calendar getCalendar(long calendarId) {
-        return calendars.get(calendarId);
-    }
-
-    public final void addCalendar(Calendar calendar) throws SQLException {
-        dataManager.addCalendar(calendar);
-        calendars.put(calendar.getId(), calendar);
-    }
-
-    public final void updateCalendar(Calendar calendar) throws SQLException {
-        dataManager.updateCalendar(calendar);
-        calendars.put(calendar.getId(), calendar);
-    }
-
-    public final void removeCalendar(long calendarId) throws SQLException {
-        dataManager.removeCalendar(calendarId);
-        calendars.remove(calendarId);
-        refreshUserCalendars();
+        super(dataManager, Calendar.class, CalendarPermission.class);
+        refreshItems();
     }
 
-    public Collection<Calendar> getAllCalendars() {
-        return calendars.values();
-    }
-
-    public boolean checkCalendar(long userId, long calendarId) {
-        return getUserCalendarIds(userId).contains(calendarId);
-    }
 }
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index 1c2a66bcf..4bf4b1b9a 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -38,31 +38,18 @@ import liquibase.resource.ResourceAccessor;
 import org.traccar.Config;
 import org.traccar.helper.Log;
 import org.traccar.model.AttributeAlias;
-import org.traccar.model.AttributePermission;
-import org.traccar.model.Calendar;
-import org.traccar.model.CalendarPermission;
-import org.traccar.model.Attribute;
 import org.traccar.model.Device;
-import org.traccar.model.DeviceAttribute;
-import org.traccar.model.DeviceDriver;
 import org.traccar.model.DevicePermission;
-import org.traccar.model.Driver;
-import org.traccar.model.DriverPermission;
 import org.traccar.model.Event;
-import org.traccar.model.Geofence;
 import org.traccar.model.Group;
-import org.traccar.model.GroupAttribute;
-import org.traccar.model.GroupDriver;
-import org.traccar.model.GroupGeofence;
 import org.traccar.model.GroupPermission;
+import org.traccar.model.Identifiable;
 import org.traccar.model.Notification;
 import org.traccar.model.Position;
 import org.traccar.model.Server;
 import org.traccar.model.Statistics;
 import org.traccar.model.User;
 import org.traccar.model.UserPermission;
-import org.traccar.model.DeviceGeofence;
-import org.traccar.model.GeofencePermission;
 
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
@@ -362,34 +349,6 @@ public class DataManager {
                 .executeQuery(Event.class);
     }
 
-    public Collection<Geofence> getGeofences() throws SQLException {
-        return QueryBuilder.create(dataSource, getQuery("database.selectGeofencesAll"))
-                .executeQuery(Geofence.class);
-    }
-
-    public void addGeofence(Geofence geofence) throws SQLException {
-        geofence.setId(QueryBuilder.create(dataSource, getQuery("database.insertGeofence"), true)
-                .setObject(geofence)
-                .executeUpdate());
-    }
-
-    public void updateGeofence(Geofence geofence) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.updateGeofence"))
-                .setObject(geofence)
-                .executeUpdate();
-    }
-
-    public void removeGeofence(long geofenceId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.deleteGeofence"))
-                .setLong("id", geofenceId)
-                .executeUpdate();
-    }
-
-    public Collection<GeofencePermission> getGeofencePermissions() throws SQLException {
-        return QueryBuilder.create(dataSource, getQuery("database.selectGeofencePermissions"))
-                .executeQuery(GeofencePermission.class);
-    }
-
     public void linkGeofence(long userId, long geofenceId) throws SQLException {
         QueryBuilder.create(dataSource, getQuery("database.linkGeofence"))
                 .setLong("userId", userId)
@@ -404,11 +363,6 @@ public class DataManager {
                 .executeUpdate();
     }
 
-    public Collection<GroupGeofence> getGroupGeofences() throws SQLException {
-        return QueryBuilder.create(dataSource, getQuery("database.selectGroupGeofences"))
-                .executeQuery(GroupGeofence.class);
-    }
-
     public void linkGroupGeofence(long groupId, long geofenceId) throws SQLException {
         QueryBuilder.create(dataSource, getQuery("database.linkGroupGeofence"))
                 .setLong("groupId", groupId)
@@ -423,11 +377,6 @@ public class DataManager {
                 .executeUpdate();
     }
 
-    public Collection<DeviceGeofence> getDeviceGeofences() throws SQLException {
-        return QueryBuilder.create(dataSource, getQuery("database.selectDeviceGeofences"))
-                .executeQuery(DeviceGeofence.class);
-    }
-
     public void linkDeviceGeofence(long deviceId, long geofenceId) throws SQLException {
         QueryBuilder.create(dataSource, getQuery("database.linkDeviceGeofence"))
                 .setLong("deviceId", deviceId)
@@ -501,34 +450,6 @@ public class DataManager {
                 .executeUpdate());
     }
 
-    public Collection<Calendar> getCalendars() throws SQLException {
-        return QueryBuilder.create(dataSource, getQuery("database.selectCalendarsAll"))
-                .executeQuery(Calendar.class);
-    }
-
-    public void addCalendar(Calendar calendar) throws SQLException {
-        calendar.setId(QueryBuilder.create(dataSource, getQuery("database.insertCalendar"), true)
-                .setObject(calendar)
-                .executeUpdate());
-    }
-
-    public void updateCalendar(Calendar calendar) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.updateCalendar"))
-                .setObject(calendar)
-                .executeUpdate();
-    }
-
-    public void removeCalendar(long calendarId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.deleteCalendar"))
-                .setLong("id", calendarId)
-                .executeUpdate();
-    }
-
-    public Collection<CalendarPermission> getCalendarPermissions() throws SQLException {
-        return QueryBuilder.create(dataSource, getQuery("database.selectCalendarPermissions"))
-                .executeQuery(CalendarPermission.class);
-    }
-
     public void linkCalendar(long userId, long calendarId) throws SQLException {
         QueryBuilder.create(dataSource, getQuery("database.linkCalendar"))
                 .setLong("userId", userId)
@@ -562,34 +483,6 @@ public class DataManager {
                 .executeUpdate();
     }
 
-    public Collection<Attribute> getAttributes() throws SQLException {
-        return QueryBuilder.create(dataSource, getQuery("database.selectAttributes"))
-                .executeQuery(Attribute.class);
-    }
-
-    public void addAttribute(Attribute attribute) throws SQLException {
-        attribute.setId(QueryBuilder.create(dataSource, getQuery("database.insertAttribute"), true)
-                .setObject(attribute)
-                .executeUpdate());
-    }
-
-    public void updateAttribute(Attribute attribute) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.updateAttribute"))
-                .setObject(attribute)
-                .executeUpdate();
-    }
-
-    public void removeAttribute(long computedAttributeId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.deleteAttribute"))
-                .setLong("id", computedAttributeId)
-                .executeUpdate();
-    }
-
-    public Collection<AttributePermission> getAttributePermissions() throws SQLException {
-        return QueryBuilder.create(dataSource, getQuery("database.selectAttributePermissions"))
-                .executeQuery(AttributePermission.class);
-    }
-
     public void linkAttribute(long userId, long attributeId) throws SQLException {
         QueryBuilder.create(dataSource, getQuery("database.linkAttribute"))
                 .setLong("userId", userId)
@@ -604,11 +497,6 @@ public class DataManager {
                 .executeUpdate();
     }
 
-    public Collection<GroupAttribute> getGroupAttributes() throws SQLException {
-        return QueryBuilder.create(dataSource, getQuery("database.selectGroupAttributes"))
-                .executeQuery(GroupAttribute.class);
-    }
-
     public void linkGroupAttribute(long groupId, long attributeId) throws SQLException {
         QueryBuilder.create(dataSource, getQuery("database.linkGroupAttribute"))
                 .setLong("groupId", groupId)
@@ -623,11 +511,6 @@ public class DataManager {
                 .executeUpdate();
     }
 
-    public Collection<DeviceAttribute> getDeviceAttributes() throws SQLException {
-        return QueryBuilder.create(dataSource, getQuery("database.selectDeviceAttributes"))
-                .executeQuery(DeviceAttribute.class);
-    }
-
     public void linkDeviceAttribute(long deviceId, long attributeId) throws SQLException {
         QueryBuilder.create(dataSource, getQuery("database.linkDeviceAttribute"))
                 .setLong("deviceId", deviceId)
@@ -642,34 +525,6 @@ public class DataManager {
                 .executeUpdate();
     }
 
-    public Collection<Driver> getDrivers() throws SQLException {
-        return QueryBuilder.create(dataSource, getQuery("database.selectDrivers"))
-                .executeQuery(Driver.class);
-    }
-
-    public void addDriver(Driver driver) throws SQLException {
-        driver.setId(QueryBuilder.create(dataSource, getQuery("database.insertDriver"), true)
-                .setObject(driver)
-                .executeUpdate());
-    }
-
-    public void updateDriver(Driver driver) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.updateDriver"))
-                .setObject(driver)
-                .executeUpdate();
-    }
-
-    public void removeDriver(long driverId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.deleteDriver"))
-                .setLong("id", driverId)
-                .executeUpdate();
-    }
-
-    public Collection<DriverPermission> getDriverPermissions() throws SQLException {
-        return QueryBuilder.create(dataSource, getQuery("database.selectDriverPermissions"))
-                .executeQuery(DriverPermission.class);
-    }
-
     public void linkDriver(long userId, long driverId) throws SQLException {
         QueryBuilder.create(dataSource, getQuery("database.linkDriver"))
                 .setLong("userId", userId)
@@ -684,11 +539,6 @@ public class DataManager {
                 .executeUpdate();
     }
 
-    public Collection<GroupDriver> getGroupDrivers() throws SQLException {
-        return QueryBuilder.create(dataSource, getQuery("database.selectGroupDrivers"))
-                .executeQuery(GroupDriver.class);
-    }
-
     public void linkGroupDriver(long groupId, long driverId) throws SQLException {
         QueryBuilder.create(dataSource, getQuery("database.linkGroupDriver"))
                 .setLong("groupId", groupId)
@@ -703,11 +553,6 @@ public class DataManager {
                 .executeUpdate();
     }
 
-    public Collection<DeviceDriver> getDeviceDrivers() throws SQLException {
-        return QueryBuilder.create(dataSource, getQuery("database.selectDeviceDrivers"))
-                .executeQuery(DeviceDriver.class);
-    }
-
     public void linkDeviceDriver(long deviceId, long driverId) throws SQLException {
         QueryBuilder.create(dataSource, getQuery("database.linkDeviceDriver"))
                 .setLong("deviceId", deviceId)
@@ -722,4 +567,30 @@ public class DataManager {
                 .executeUpdate();
     }
 
+    public <T> Collection<T> getObjects(Class<T> clazz) throws SQLException {
+        String query = "database.select" + clazz.getSimpleName() + "s";
+        return QueryBuilder.create(dataSource, getQuery(query)).executeQuery(clazz);
+    }
+
+    public void addObject(Identifiable entity) throws SQLException {
+        String query = "database.insert" + entity.getClass().getSimpleName();
+        entity.setId(QueryBuilder.create(dataSource, getQuery(query), true)
+                .setObject(entity)
+                .executeUpdate());
+    }
+
+    public void updateObject(Identifiable entity) throws SQLException {
+        String query = "database.update" + entity.getClass().getSimpleName();
+        QueryBuilder.create(dataSource, getQuery(query))
+                .setObject(entity)
+                .executeUpdate();
+    }
+
+    public void removeObject(Class<? extends Identifiable> clazz, long entityId) throws SQLException {
+        String query = "database.delete" + clazz.getSimpleName();
+        QueryBuilder.create(dataSource, getQuery(query))
+                .setLong("id", entityId)
+                .executeUpdate();
+    }
+
 }
diff --git a/src/org/traccar/database/DriversManager.java b/src/org/traccar/database/DriversManager.java
index e89d59311..391708f64 100644
--- a/src/org/traccar/database/DriversManager.java
+++ b/src/org/traccar/database/DriversManager.java
@@ -17,147 +17,53 @@
 package org.traccar.database;
 
 import java.sql.SQLException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.traccar.Context;
 import org.traccar.helper.Log;
-import org.traccar.model.Device;
 import org.traccar.model.DeviceDriver;
 import org.traccar.model.Driver;
 import org.traccar.model.DriverPermission;
 import org.traccar.model.GroupDriver;
+import org.traccar.model.Identifiable;
 
-public class DriversManager {
+public class DriversManager extends ExtendedObjectManager {
 
-    private final DataManager dataManager;
-
-    private final Map<Long, Driver> drivers = new ConcurrentHashMap<>();
     private final Map<String, Driver> driversByUniqueId = new ConcurrentHashMap<>();
-    private final Map<Long, Set<Long>> deviceDrivers = new ConcurrentHashMap<>();
-    private final Map<Long, Set<Long>> deviceDriversWithGroups = new ConcurrentHashMap<>();
-    private final Map<Long, Set<Long>> groupDrivers = new ConcurrentHashMap<>();
-    private final Map<Long, Set<Long>> userDrivers = new ConcurrentHashMap<>();
 
     public DriversManager(DataManager dataManager) {
-        this.dataManager = dataManager;
-        refreshDrivers();
-    }
-
-    public Set<Long> getUserDrivers(long userId) {
-        if (!userDrivers.containsKey(userId)) {
-            userDrivers.put(userId, new HashSet<Long>());
-        }
-        return userDrivers.get(userId);
-    }
-
-    public Set<Long> getGroupDrivers(long groupId) {
-        if (!groupDrivers.containsKey(groupId)) {
-            groupDrivers.put(groupId, new HashSet<Long>());
-        }
-        return groupDrivers.get(groupId);
-    }
-
-    public Set<Long> getDeviceDrivers(long deviceId) {
-        return getDeviceDrivers(deviceDrivers, deviceId);
-    }
-
-    public Set<Long> getAllDeviceDrivers(long deviceId) {
-        return getDeviceDrivers(deviceDriversWithGroups, deviceId);
-    }
-
-    private Set<Long> getDeviceDrivers(Map<Long, Set<Long>> deviceDrivers, long deviceId) {
-        if (!deviceDrivers.containsKey(deviceId)) {
-            deviceDrivers.put(deviceId, new HashSet<Long>());
-        }
-        return deviceDrivers.get(deviceId);
-    }
-
-    public final void refreshDrivers() {
-        if (dataManager != null) {
-            try {
-                drivers.clear();
-                driversByUniqueId.clear();
-                for (Driver driver : dataManager.getDrivers()) {
-                    drivers.put(driver.getId(), driver);
-                    driversByUniqueId.put(driver.getUniqueId(), driver);
-                }
-            } catch (SQLException error) {
-                Log.warning(error);
-            }
-        }
-        refreshUserDrivers();
+        super(dataManager, Driver.class, DriverPermission.class, DeviceDriver.class, GroupDriver.class);
+        refreshItems();
         refresh();
     }
 
-    public final void refreshUserDrivers() {
-        if (dataManager != null) {
+    @Override
+    public void refreshItems() {
+        if (getDataManager() != null) {
             try {
-                userDrivers.clear();
-                for (DriverPermission driverPermission : dataManager.getDriverPermissions()) {
-                    getUserDrivers(driverPermission.getUserId()).add(driverPermission.getDriverId());
+                clearItems();
+                for (Identifiable item : getDataManager().getObjects(getBaseClass())) {
+                    putItem(item.getId(), item);
+                    driversByUniqueId.put(((Driver) item).getUniqueId(), (Driver) item);
                 }
             } catch (SQLException error) {
                 Log.warning(error);
             }
         }
+        refreshUserItems();
     }
 
-    public final void refresh() {
-        if (dataManager != null) {
-            try {
-
-                Collection<GroupDriver> databaseGroupDrivers = dataManager.getGroupDrivers();
-
-                groupDrivers.clear();
-                for (GroupDriver groupDriver : databaseGroupDrivers) {
-                    getGroupDrivers(groupDriver.getGroupId()).add(groupDriver.getDriverId());
-                }
-
-                Collection<DeviceDriver> databaseDeviceDrivers = dataManager.getDeviceDrivers();
-                Collection<Device> allDevices = Context.getDeviceManager().getAllDevices();
-
-                deviceDrivers.clear();
-                deviceDriversWithGroups.clear();
-
-                for (DeviceDriver deviceAttribute : databaseDeviceDrivers) {
-                    getDeviceDrivers(deviceAttribute.getDeviceId())
-                        .add(deviceAttribute.getDriverId());
-                    getAllDeviceDrivers(deviceAttribute.getDeviceId())
-                        .add(deviceAttribute.getDriverId());
-                }
-
-                for (Device device : allDevices) {
-                    long groupId = device.getGroupId();
-                    while (groupId != 0) {
-                        getAllDeviceDrivers(device.getId()).addAll(getGroupDrivers(groupId));
-                        if (Context.getDeviceManager().getGroupById(groupId) != null) {
-                            groupId = Context.getDeviceManager().getGroupById(groupId).getGroupId();
-                        } else {
-                            groupId = 0;
-                        }
-                    }
-                }
-
-            } catch (SQLException error) {
-                Log.warning(error);
-            }
-        }
-    }
-
-    public void addDriver(Driver driver) throws SQLException {
-        dataManager.addDriver(driver);
-        drivers.put(driver.getId(), driver);
-        driversByUniqueId.put(driver.getUniqueId(), driver);
+    @Override
+    public void addItem(Identifiable item) throws SQLException {
+        super.addItem(item);
+        driversByUniqueId.put(((Driver) item).getUniqueId(), (Driver) item);
     }
 
-    public void updateDriver(Driver driver) throws SQLException {
-        dataManager.updateDriver(driver);
-        Driver cachedDriver = drivers.get(driver.getId());
+    @Override
+    public void updateItem(Identifiable item) throws SQLException {
+        Driver driver = (Driver) item;
+        getDataManager().updateObject(driver);
+        Driver cachedDriver = (Driver) getById(driver.getId());
         cachedDriver.setName(driver.getName());
         if (!driver.getUniqueId().equals(cachedDriver.getUniqueId())) {
             driversByUniqueId.remove(cachedDriver.getUniqueId());
@@ -167,47 +73,20 @@ public class DriversManager {
         cachedDriver.setAttributes(driver.getAttributes());
     }
 
-    public void removeDriver(long driverId) throws SQLException {
-        dataManager.removeDriver(driverId);
-        if (drivers.containsKey(driverId)) {
-            String driverUniqueId = drivers.get(driverId).getUniqueId();
-            drivers.remove(driverId);
+    @Override
+    public void removeItem(long driverId) throws SQLException {
+        Driver cachedDriver = (Driver) getById(driverId);
+        getDataManager().removeObject(cachedDriver.getClass(), driverId);
+        if (cachedDriver != null) {
+            String driverUniqueId = cachedDriver.getUniqueId();
+            removeCachedItem(driverId);
             driversByUniqueId.remove(driverUniqueId);
         }
-        refreshUserDrivers();
+        refreshUserItems();
         refresh();
     }
 
-    public boolean checkDriver(long userId, long driverId) {
-        return getUserDrivers(userId).contains(driverId);
-    }
-
-    public Driver getDriver(long id) {
-        return drivers.get(id);
-    }
-
     public Driver getDriverByUniqueId(String uniqueId) {
         return driversByUniqueId.get(uniqueId);
     }
-
-    public final Collection<Driver> getDrivers(Set<Long> driverIds) {
-        Collection<Driver> result = new LinkedList<>();
-        for (long driverId : driverIds) {
-            result.add(getDriver(driverId));
-        }
-        return result;
-    }
-
-    public final Set<Long> getAllDrivers() {
-        return drivers.keySet();
-    }
-
-    public final Set<Long> getManagedDrivers(long userId) {
-        Set<Long> drivers = new HashSet<>();
-        drivers.addAll(getUserDrivers(userId));
-        for (long managedUserId : Context.getPermissionsManager().getUserPermissions(userId)) {
-            drivers.addAll(getUserDrivers(managedUserId));
-        }
-        return drivers;
-    }
 }
diff --git a/src/org/traccar/database/ExtendedObjectManager.java b/src/org/traccar/database/ExtendedObjectManager.java
new file mode 100644
index 000000000..5147b9f9f
--- /dev/null
+++ b/src/org/traccar/database/ExtendedObjectManager.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.database;
+
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.traccar.Context;
+import org.traccar.helper.Log;
+import org.traccar.model.BaseDevicePermission;
+import org.traccar.model.BaseGroupPermission;
+import org.traccar.model.BaseUserPermission;
+import org.traccar.model.Device;
+import org.traccar.model.Identifiable;
+
+public abstract class ExtendedObjectManager extends SimpleObjectManager {
+
+    private final Map<Long, Set<Long>> deviceItems = new ConcurrentHashMap<>();
+    private final Map<Long, Set<Long>> deviceItemsWithGroups = new ConcurrentHashMap<>();
+    private final Map<Long, Set<Long>> groupItems = new ConcurrentHashMap<>();
+
+    private Class<? extends BaseDevicePermission> devicePermissionClass;
+    private Class<? extends BaseGroupPermission> groupPermissionClass;
+
+    protected ExtendedObjectManager(DataManager dataManager,
+            Class<? extends Identifiable> baseClass,
+            Class<? extends BaseUserPermission> permissionClass,
+            Class<? extends BaseDevicePermission> devicePermissionClass,
+            Class<? extends BaseGroupPermission> groupPermissionClass) {
+        super(dataManager, baseClass, permissionClass);
+        this.devicePermissionClass = devicePermissionClass;
+        this.groupPermissionClass = groupPermissionClass;
+    }
+
+    public final Set<Long> getGroupItems(long groupId) {
+        if (!groupItems.containsKey(groupId)) {
+            groupItems.put(groupId, new HashSet<Long>());
+        }
+        return groupItems.get(groupId);
+    }
+
+    protected final void clearGroupItems() {
+        groupItems.clear();
+    }
+
+    public final Set<Long> getDeviceItems(long deviceId) {
+        if (!deviceItems.containsKey(deviceId)) {
+            deviceItems.put(deviceId, new HashSet<Long>());
+        }
+        return deviceItems.get(deviceId);
+    }
+
+    protected final void clearDeviceItems() {
+        deviceItems.clear();
+    }
+
+    public Set<Long> getAllDeviceItems(long deviceId) {
+        if (!deviceItemsWithGroups.containsKey(deviceId)) {
+            deviceItemsWithGroups.put(deviceId, new HashSet<Long>());
+        }
+        return deviceItemsWithGroups.get(deviceId);
+    }
+
+    @Override
+    public void removeItem(long itemId) throws SQLException {
+        super.removeItem(itemId);
+        refresh();
+    }
+
+    public void refresh() {
+        if (getDataManager() != null) {
+            try {
+
+                Collection<? extends BaseGroupPermission> databaseGroupPermissions =
+                        getDataManager().getObjects(groupPermissionClass);
+
+                clearGroupItems();
+                for (BaseGroupPermission groupPermission : databaseGroupPermissions) {
+                    getGroupItems(groupPermission.getGroupId()).add(groupPermission.getSlaveId());
+                }
+
+                Collection<? extends BaseDevicePermission> databaseDevicePermissions =
+                        getDataManager().getObjects(devicePermissionClass);
+                Collection<Device> allDevices = Context.getDeviceManager().getAllDevices();
+
+                clearDeviceItems();
+                deviceItemsWithGroups.clear();
+
+                for (BaseDevicePermission devicePermission : databaseDevicePermissions) {
+                    getDeviceItems(devicePermission.getDeviceId()).add(devicePermission.getSlaveId());
+                    getAllDeviceItems(devicePermission.getDeviceId()).add(devicePermission.getSlaveId());
+                }
+
+                for (Device device : allDevices) {
+                    long groupId = device.getGroupId();
+                    while (groupId != 0) {
+                        getAllDeviceItems(device.getId()).addAll(getGroupItems(groupId));
+                        if (Context.getDeviceManager().getGroupById(groupId) != null) {
+                            groupId = Context.getDeviceManager().getGroupById(groupId).getGroupId();
+                        } else {
+                            groupId = 0;
+                        }
+                    }
+                }
+
+            } catch (SQLException error) {
+                Log.warning(error);
+            }
+        }
+    }
+}
diff --git a/src/org/traccar/database/GeofenceManager.java b/src/org/traccar/database/GeofenceManager.java
index b8e6a5d73..868804d8f 100644
--- a/src/org/traccar/database/GeofenceManager.java
+++ b/src/org/traccar/database/GeofenceManager.java
@@ -15,20 +15,10 @@
  */
 package org.traccar.database;
 
-import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import org.traccar.Context;
-import org.traccar.helper.Log;
 import org.traccar.model.Device;
 import org.traccar.model.DeviceGeofence;
 import org.traccar.model.Geofence;
@@ -36,269 +26,45 @@ import org.traccar.model.GeofencePermission;
 import org.traccar.model.GroupGeofence;
 import org.traccar.model.Position;
 
-public class GeofenceManager {
-
-    private final DataManager dataManager;
-
-    private final Map<Long, Geofence> geofences = new HashMap<>();
-    private final Map<Long, Set<Long>> userGeofences = new HashMap<>();
-    private final Map<Long, Set<Long>> groupGeofences = new HashMap<>();
-
-    private final Map<Long, Set<Long>> deviceGeofencesWithGroups = new HashMap<>();
-    private final Map<Long, Set<Long>> deviceGeofences = new HashMap<>();
-
-    private final ReadWriteLock deviceGeofencesLock = new ReentrantReadWriteLock();
-    private final ReadWriteLock geofencesLock = new ReentrantReadWriteLock();
-    private final ReadWriteLock groupGeofencesLock = new ReentrantReadWriteLock();
-    private final ReadWriteLock userGeofencesLock = new ReentrantReadWriteLock();
+public class GeofenceManager extends ExtendedObjectManager {
 
     public GeofenceManager(DataManager dataManager) {
-        this.dataManager = dataManager;
-        refreshGeofences();
-    }
-
-    private Set<Long> getUserGeofences(long userId) {
-        if (!userGeofences.containsKey(userId)) {
-            userGeofences.put(userId, new HashSet<Long>());
-        }
-        return userGeofences.get(userId);
-    }
-
-    public Set<Long> getUserGeofencesIds(long userId) {
-        userGeofencesLock.readLock().lock();
-        try {
-            return getUserGeofences(userId);
-        } finally {
-            userGeofencesLock.readLock().unlock();
-        }
-    }
-
-    private Set<Long> getGroupGeofences(long groupId) {
-        if (!groupGeofences.containsKey(groupId)) {
-            groupGeofences.put(groupId, new HashSet<Long>());
-        }
-        return groupGeofences.get(groupId);
-    }
-
-    public Set<Long> getGroupGeofencesIds(long groupId) {
-        groupGeofencesLock.readLock().lock();
-        try {
-            return getGroupGeofences(groupId);
-        } finally {
-            groupGeofencesLock.readLock().unlock();
-        }
-    }
-
-    public Set<Long> getAllDeviceGeofences(long deviceId) {
-        deviceGeofencesLock.readLock().lock();
-        try {
-            return getDeviceGeofences(deviceGeofencesWithGroups, deviceId);
-        } finally {
-            deviceGeofencesLock.readLock().unlock();
-        }
-    }
-
-    public Set<Long> getDeviceGeofencesIds(long deviceId) {
-        deviceGeofencesLock.readLock().lock();
-        try {
-            return getDeviceGeofences(deviceGeofences, deviceId);
-        } finally {
-            deviceGeofencesLock.readLock().unlock();
-        }
-    }
-
-    private Set<Long> getDeviceGeofences(Map<Long, Set<Long>> deviceGeofences, long deviceId) {
-        if (!deviceGeofences.containsKey(deviceId)) {
-            deviceGeofences.put(deviceId, new HashSet<Long>());
-        }
-        return deviceGeofences.get(deviceId);
-    }
-
-    public final void refreshGeofences() {
-        if (dataManager != null) {
-            try {
-                geofencesLock.writeLock().lock();
-                try {
-                    geofences.clear();
-                    for (Geofence geofence : dataManager.getGeofences()) {
-                        geofences.put(geofence.getId(), geofence);
-                    }
-                } finally {
-                    geofencesLock.writeLock().unlock();
-                }
-            } catch (SQLException error) {
-                Log.warning(error);
-            }
-        }
-        refreshUserGeofences();
+        super(dataManager, Geofence.class, GeofencePermission.class, DeviceGeofence.class, GroupGeofence.class);
+        refreshItems();
         refresh();
     }
 
-    public final void refreshUserGeofences() {
-        if (dataManager != null) {
-            try {
-                userGeofencesLock.writeLock().lock();
-                try {
-                    userGeofences.clear();
-                    for (GeofencePermission geofencePermission : dataManager.getGeofencePermissions()) {
-                        getUserGeofences(geofencePermission.getUserId()).add(geofencePermission.getGeofenceId());
-                    }
-                } finally {
-                    userGeofencesLock.writeLock().unlock();
-                }
-            } catch (SQLException error) {
-                Log.warning(error);
-            }
-        }
-    }
-
     public final void refresh() {
-        if (dataManager != null) {
-            try {
-
-                Collection<GroupGeofence> databaseGroupGeofences = dataManager.getGroupGeofences();
-                groupGeofencesLock.writeLock().lock();
-                try {
-                    groupGeofences.clear();
-                    for (GroupGeofence groupGeofence : databaseGroupGeofences) {
-                        getGroupGeofences(groupGeofence.getGroupId()).add(groupGeofence.getGeofenceId());
-                    }
-                } finally {
-                    groupGeofencesLock.writeLock().unlock();
-                }
-
-                Collection<DeviceGeofence> databaseDeviceGeofences = dataManager.getDeviceGeofences();
-                Collection<Device> allDevices = Context.getDeviceManager().getAllDevices();
-
-                groupGeofencesLock.readLock().lock();
-                deviceGeofencesLock.writeLock().lock();
-                try {
-                    deviceGeofences.clear();
-                    deviceGeofencesWithGroups.clear();
-
-                    for (DeviceGeofence deviceGeofence : databaseDeviceGeofences) {
-                        getDeviceGeofences(deviceGeofences, deviceGeofence.getDeviceId())
-                            .add(deviceGeofence.getGeofenceId());
-                        getDeviceGeofences(deviceGeofencesWithGroups, deviceGeofence.getDeviceId())
-                            .add(deviceGeofence.getGeofenceId());
-                    }
-
-                    for (Device device : allDevices) {
-                        long groupId = device.getGroupId();
-                        while (groupId != 0) {
-                            getDeviceGeofences(deviceGeofencesWithGroups,
-                                    device.getId()).addAll(getGroupGeofences(groupId));
-                            if (Context.getDeviceManager().getGroupById(groupId) != null) {
-                                groupId = Context.getDeviceManager().getGroupById(groupId).getGroupId();
-                            } else {
-                                groupId = 0;
-                            }
-                        }
-                        List<Long> deviceGeofenceIds = device.getGeofenceIds();
-                        if (deviceGeofenceIds == null) {
-                            deviceGeofenceIds = new ArrayList<>();
-                        } else {
-                            deviceGeofenceIds.clear();
-                        }
-                        Position lastPosition = Context.getIdentityManager().getLastPosition(device.getId());
-                        if (lastPosition != null && deviceGeofencesWithGroups.containsKey(device.getId())) {
-                            for (long geofenceId : deviceGeofencesWithGroups.get(device.getId())) {
-                                Geofence geofence = getGeofence(geofenceId);
-                                if (geofence != null && geofence.getGeometry()
-                                        .containsPoint(lastPosition.getLatitude(), lastPosition.getLongitude())) {
-                                    deviceGeofenceIds.add(geofenceId);
-                                }
-                            }
-                        }
-                        device.setGeofenceIds(deviceGeofenceIds);
-                    }
-
-                } finally {
-                    deviceGeofencesLock.writeLock().unlock();
-                    groupGeofencesLock.readLock().unlock();
-                }
-
-            } catch (SQLException error) {
-                Log.warning(error);
-            }
-        }
-    }
-
-    public final Collection<Geofence> getAllGeofences() {
-        geofencesLock.readLock().lock();
-        try {
-            return geofences.values();
-        } finally {
-            geofencesLock.readLock().unlock();
-        }
-    }
-
-    public final Set<Long> getAllGeofencesIds() {
-        geofencesLock.readLock().lock();
-        try {
-            return geofences.keySet();
-        } finally {
-            geofencesLock.readLock().unlock();
-        }
-    }
-
-    public final Set<Long> getManagedGeofencesIds(long userId) {
-        Set<Long> geofences = new HashSet<>();
-        geofences.addAll(getUserGeofencesIds(userId));
-        for (long managedUserId : Context.getPermissionsManager().getUserPermissions(userId)) {
-            geofences.addAll(getUserGeofencesIds(managedUserId));
-        }
-        return geofences;
-    }
-
-    public final Collection<Geofence> getGeofences(Set<Long> geofencesIds) {
-        geofencesLock.readLock().lock();
-        try {
-            Collection<Geofence> result = new LinkedList<>();
-            for (long geofenceId : geofencesIds) {
-                result.add(getGeofence(geofenceId));
-            }
-            return result;
-        } finally {
-            geofencesLock.readLock().unlock();
-        }
-    }
-
-    public final Geofence getGeofence(long geofenceId) {
-        geofencesLock.readLock().lock();
-        try {
-            return geofences.get(geofenceId);
-        } finally {
-            geofencesLock.readLock().unlock();
-        }
-    }
-
-    public final void updateGeofence(Geofence geofence) {
-        geofencesLock.writeLock().lock();
-        try {
-            geofences.put(geofence.getId(), geofence);
-        } finally {
-            geofencesLock.writeLock().unlock();
-        }
-        try {
-            dataManager.updateGeofence(geofence);
-        } catch (SQLException error) {
-            Log.warning(error);
-        }
-    }
-
-    public boolean checkGeofence(long userId, long geofenceId) {
-        return getUserGeofencesIds(userId).contains(geofenceId);
+        super.refresh();
+        recalculateDevicesGeofences();
     }
 
     public List<Long> getCurrentDeviceGeofences(Position position) {
         List<Long> result = new ArrayList<>();
-        for (long geofenceId : getAllDeviceGeofences(position.getDeviceId())) {
-            if (getGeofence(geofenceId).getGeometry().containsPoint(position.getLatitude(), position.getLongitude())) {
+        for (long geofenceId : getAllDeviceItems(position.getDeviceId())) {
+            Geofence geofence = (Geofence) getById(geofenceId);
+            if (geofence != null && geofence.getGeometry()
+                    .containsPoint(position.getLatitude(), position.getLongitude())) {
                 result.add(geofenceId);
             }
         }
         return result;
     }
 
+    public void recalculateDevicesGeofences() {
+        for (Device device : Context.getDeviceManager().getAllDevices()) {
+            List<Long> deviceGeofenceIds = device.getGeofenceIds();
+            if (deviceGeofenceIds == null) {
+                deviceGeofenceIds = new ArrayList<>();
+            } else {
+                deviceGeofenceIds.clear();
+            }
+            Position lastPosition = Context.getIdentityManager().getLastPosition(device.getId());
+            if (lastPosition != null && getAllDeviceItems(device.getId()) != null) {
+                deviceGeofenceIds.addAll(getCurrentDeviceGeofences(lastPosition));
+            }
+            device.setGeofenceIds(deviceGeofenceIds);
+        }
+    }
+
 }
diff --git a/src/org/traccar/database/NotificationManager.java b/src/org/traccar/database/NotificationManager.java
index 48caa615c..11d5a9aca 100644
--- a/src/org/traccar/database/NotificationManager.java
+++ b/src/org/traccar/database/NotificationManager.java
@@ -57,7 +57,7 @@ public class NotificationManager {
         Set<Long> users = Context.getPermissionsManager().getDeviceUsers(event.getDeviceId());
         for (long userId : users) {
             if (event.getGeofenceId() == 0 || Context.getGeofenceManager() != null
-                    && Context.getGeofenceManager().checkGeofence(userId, event.getGeofenceId())) {
+                    && Context.getGeofenceManager().checkItemPermission(userId, event.getGeofenceId())) {
                 Notification notification = getUserNotificationByType(userId, event.getType());
                 if (notification != null) {
                     if (notification.getWeb()) {
diff --git a/src/org/traccar/database/PermissionsManager.java b/src/org/traccar/database/PermissionsManager.java
index 82ca6af49..f88e14bfe 100644
--- a/src/org/traccar/database/PermissionsManager.java
+++ b/src/org/traccar/database/PermissionsManager.java
@@ -298,52 +298,37 @@ public class PermissionsManager {
         }
     }
 
-    public void checkGeofence(long userId, long geofenceId) throws SecurityException {
-        if (!Context.getGeofenceManager().checkGeofence(userId, geofenceId) && !isAdmin(userId)) {
-            checkManager(userId);
-            for (long managedUserId : getUserPermissions(userId)) {
-                if (Context.getGeofenceManager().checkGeofence(managedUserId, geofenceId)) {
-                    return;
-                }
-            }
-            throw new SecurityException("Geofence access denied");
-        }
-    }
-
-    public void checkAttribute(long userId, long attributeId) throws SecurityException {
-        if (!Context.getAttributesManager().checkAttribute(userId, attributeId) && !isAdmin(userId)) {
-            checkManager(userId);
-            for (long managedUserId : getUserPermissions(userId)) {
-                if (Context.getAttributesManager().checkAttribute(managedUserId, attributeId)) {
-                    return;
-                }
-            }
-            throw new SecurityException("Attribute access denied");
-        }
-    }
-
-    public void checkDriver(long userId, long driverId) throws SecurityException {
-        if (!Context.getDriversManager().checkDriver(userId, driverId) && !isAdmin(userId)) {
-            checkManager(userId);
-            for (long managedUserId : getUserPermissions(userId)) {
-                if (Context.getDriversManager().checkDriver(managedUserId, driverId)) {
-                    return;
-                }
-            }
-            throw new SecurityException("Driver access denied");
-        }
-    }
-
-
-    public void checkCalendar(long userId, long calendarId) throws SecurityException {
-        if (!Context.getCalendarManager().checkCalendar(userId, calendarId) && !isAdmin(userId)) {
-            checkManager(userId);
-            for (long managedUserId : getUserPermissions(userId)) {
-                if (Context.getCalendarManager().checkCalendar(managedUserId, calendarId)) {
-                    return;
+    public void checkPermission(String object, long userId, long objectId) throws SecurityException {
+        SimpleObjectManager manager = null;
+
+        switch (object) {
+            case "geofence":
+                manager = Context.getGeofenceManager();
+                break;
+            case "attribute":
+                manager = Context.getAttributesManager();
+                break;
+            case "driver":
+                manager = Context.getDriversManager();
+                break;
+            case "calendar":
+                manager = Context.getCalendarManager();
+                break;
+            default:
+                throw new IllegalArgumentException("Unknown object type");
+        }
+
+        if (manager != null) {
+            if (manager.checkItemPermission(userId, objectId) && !isAdmin(userId)) {
+                checkManager(userId);
+                for (long managedUserId : getUserPermissions(userId)) {
+                    if (manager.checkItemPermission(managedUserId, objectId)) {
+                        return;
+                    }
                 }
+                throw new SecurityException(object.substring(0, 1).toUpperCase() + object.substring(1)
+                         + " access denied");
             }
-            throw new SecurityException("Calendar access denied");
         }
     }
 
diff --git a/src/org/traccar/database/SimpleObjectManager.java b/src/org/traccar/database/SimpleObjectManager.java
new file mode 100644
index 000000000..84d41a84f
--- /dev/null
+++ b/src/org/traccar/database/SimpleObjectManager.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.database;
+
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.traccar.Context;
+import org.traccar.helper.Log;
+import org.traccar.model.BaseUserPermission;
+import org.traccar.model.Identifiable;
+
+public abstract class SimpleObjectManager {
+
+    private final DataManager dataManager;
+
+    private final Map<Long, Identifiable> items = new ConcurrentHashMap<>();
+    private final Map<Long, Set<Long>> userItems = new ConcurrentHashMap<>();
+
+    private Class<? extends Identifiable> baseClass;
+    private Class<? extends BaseUserPermission> permissionClass;
+
+    protected SimpleObjectManager(DataManager dataManager,
+            Class<? extends Identifiable> baseClass,
+            Class<? extends BaseUserPermission> permissionClass) {
+        this.dataManager = dataManager;
+        this.baseClass = baseClass;
+        this.permissionClass = permissionClass;
+    }
+
+    protected final DataManager getDataManager() {
+        return dataManager;
+    }
+
+    protected final Class<? extends Identifiable> getBaseClass() {
+        return baseClass;
+    }
+
+    public final Identifiable getById(long itemId) {
+        return items.get(itemId);
+    }
+
+    protected final void clearItems() {
+        items.clear();
+    }
+
+    protected final void putItem(long itemId, Identifiable item) {
+        items.put(itemId, item);
+    }
+
+    protected final void removeCachedItem(long itemId) {
+        items.remove(itemId);
+    }
+
+    public final Set<Long> getUserItems(long userId) {
+        if (!userItems.containsKey(userId)) {
+            userItems.put(userId, new HashSet<Long>());
+        }
+        return userItems.get(userId);
+    }
+
+    protected final void clearUserItems() {
+        userItems.clear();
+    }
+
+    public final boolean checkItemPermission(long userId, long itemId) {
+        return getUserItems(userId).contains(itemId);
+    }
+
+    public void refreshItems() {
+        if (dataManager != null) {
+            try {
+                clearItems();
+                for (Identifiable item : dataManager.getObjects(this.baseClass)) {
+                    putItem(item.getId(), item);
+                }
+            } catch (SQLException error) {
+                Log.warning(error);
+            }
+        }
+        refreshUserItems();
+    }
+
+    public final void refreshUserItems() {
+        if (dataManager != null) {
+            try {
+                clearUserItems();
+                for (BaseUserPermission permission : dataManager.getObjects(this.permissionClass)) {
+                    getUserItems(permission.getUserId()).add(permission.getSlaveId());
+                }
+            } catch (SQLException error) {
+                Log.warning(error);
+            }
+        }
+    }
+
+    public void addItem(Identifiable item) throws SQLException {
+        dataManager.addObject(item);
+        putItem(item.getId(), item);
+    }
+
+    public void updateItem(Identifiable item) throws SQLException {
+        dataManager.updateObject(item);
+        putItem(item.getId(), item);
+    }
+
+    public void removeItem(long itemId) throws SQLException {
+        Identifiable item = getById(itemId);
+        if (item != null) {
+            dataManager.removeObject(item.getClass(), itemId);
+            removeCachedItem(itemId);
+        }
+        refreshUserItems();
+    }
+
+//    public final Collection<? extends Identifiable> getItems(Set<Long> itemIds) {
+//        Collection<Identifiable> result = new LinkedList<>();
+//        for (long itemId : itemIds) {
+//            result.add(getById(itemId));
+//        }
+//        return result;
+//    }
+
+    public final <T> Collection<T> getItems(Class<T> clazz, Set<Long> itemIds) {
+        Collection<T> result = new LinkedList<>();
+        for (long itemId : itemIds) {
+            result.add((T) getById(itemId));
+        }
+        return result;
+    }
+
+    public final Set<Long> getAllItems() {
+        return items.keySet();
+    }
+
+    public final Set<Long> getManagedItems(long userId) {
+        Set<Long> result = new HashSet<>();
+        result.addAll(getUserItems(userId));
+        for (long managedUserId : Context.getPermissionsManager().getUserPermissions(userId)) {
+            result.addAll(getUserItems(managedUserId));
+        }
+        return result;
+    }
+
+}
diff --git a/src/org/traccar/events/GeofenceEventHandler.java b/src/org/traccar/events/GeofenceEventHandler.java
index fbec932b1..cdac7993f 100644
--- a/src/org/traccar/events/GeofenceEventHandler.java
+++ b/src/org/traccar/events/GeofenceEventHandler.java
@@ -22,8 +22,10 @@ import java.util.List;
 import org.traccar.BaseEventHandler;
 import org.traccar.Context;
 import org.traccar.database.GeofenceManager;
+import org.traccar.model.Calendar;
 import org.traccar.model.Device;
 import org.traccar.model.Event;
+import org.traccar.model.Geofence;
 import org.traccar.model.Position;
 
 public class GeofenceEventHandler extends BaseEventHandler {
@@ -57,18 +59,20 @@ public class GeofenceEventHandler extends BaseEventHandler {
 
         Collection<Event> events = new ArrayList<>();
         for (long geofenceId : newGeofences) {
-            long calendarId = geofenceManager.getGeofence(geofenceId).getCalendarId();
-            if (calendarId == 0 || Context.getCalendarManager().getCalendar(calendarId) == null
-                    || Context.getCalendarManager().getCalendar(calendarId).checkMoment(position.getFixTime())) {
+            long calendarId = ((Geofence) geofenceManager.getById(geofenceId)).getCalendarId();
+            if (calendarId == 0 || Context.getCalendarManager().getById(calendarId) == null
+                    || ((Calendar) Context.getCalendarManager().getById(calendarId))
+                    .checkMoment(position.getFixTime())) {
                 Event event = new Event(Event.TYPE_GEOFENCE_ENTER, position.getDeviceId(), position.getId());
                 event.setGeofenceId(geofenceId);
                 events.add(event);
             }
         }
         for (long geofenceId : oldGeofences) {
-            long calendarId = geofenceManager.getGeofence(geofenceId).getCalendarId();
-            if (calendarId == 0 || Context.getCalendarManager().getCalendar(calendarId) == null
-                    || Context.getCalendarManager().getCalendar(calendarId).checkMoment(position.getFixTime())) {
+            long calendarId = ((Geofence) geofenceManager.getById(geofenceId)).getCalendarId();
+            if (calendarId == 0 || Context.getCalendarManager().getById(calendarId) == null
+                    || ((Calendar) Context.getCalendarManager().getById(calendarId))
+                    .checkMoment(position.getFixTime())) {
                 Event event = new Event(Event.TYPE_GEOFENCE_EXIT, position.getDeviceId(), position.getId());
                 event.setGeofenceId(geofenceId);
                 events.add(event);
diff --git a/src/org/traccar/model/Attribute.java b/src/org/traccar/model/Attribute.java
index 9c3b5e43b..ab12cd2c4 100644
--- a/src/org/traccar/model/Attribute.java
+++ b/src/org/traccar/model/Attribute.java
@@ -16,17 +16,7 @@
  */
 package org.traccar.model;
 
-public class Attribute {
-
-    private long id;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
+public class Attribute extends Identifiable {
 
     private String description;
 
diff --git a/src/org/traccar/model/AttributeAlias.java b/src/org/traccar/model/AttributeAlias.java
index 2835c0558..5aa8a5122 100644
--- a/src/org/traccar/model/AttributeAlias.java
+++ b/src/org/traccar/model/AttributeAlias.java
@@ -16,17 +16,7 @@
  */
 package org.traccar.model;
 
-public class AttributeAlias {
-
-    private long id;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
+public class AttributeAlias extends Identifiable {
 
     private long deviceId;
 
diff --git a/src/org/traccar/model/AttributePermission.java b/src/org/traccar/model/AttributePermission.java
index fe2fe7b6e..e6bbb0f91 100644
--- a/src/org/traccar/model/AttributePermission.java
+++ b/src/org/traccar/model/AttributePermission.java
@@ -16,17 +16,7 @@
  */
 package org.traccar.model;
 
-public class AttributePermission {
-
-    private long userId;
-
-    public long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(long userId) {
-        this.userId = userId;
-    }
+public class AttributePermission extends BaseUserPermission {
 
     private long attributeId;
 
@@ -38,4 +28,9 @@ public class AttributePermission {
         this.attributeId = attributeId;
     }
 
+    @Override
+    public long getSlaveId() {
+        return attributeId;
+    }
+
 }
diff --git a/src/org/traccar/model/BaseDevicePermission.java b/src/org/traccar/model/BaseDevicePermission.java
new file mode 100644
index 000000000..6eda15d0e
--- /dev/null
+++ b/src/org/traccar/model/BaseDevicePermission.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.model;
+
+public abstract class BaseDevicePermission implements BasePermission {
+
+    private long deviceId;
+
+    public long getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(long deviceId) {
+        this.deviceId = deviceId;
+    }
+
+}
diff --git a/src/org/traccar/model/BaseGroupPermission.java b/src/org/traccar/model/BaseGroupPermission.java
new file mode 100644
index 000000000..5a289cad2
--- /dev/null
+++ b/src/org/traccar/model/BaseGroupPermission.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.model;
+
+public abstract class BaseGroupPermission implements BasePermission {
+
+    private long groupId;
+
+    public long getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(long groupId) {
+        this.groupId = groupId;
+    }
+
+}
diff --git a/src/org/traccar/model/BasePermission.java b/src/org/traccar/model/BasePermission.java
new file mode 100644
index 000000000..6f1baffdc
--- /dev/null
+++ b/src/org/traccar/model/BasePermission.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.model;
+
+public interface BasePermission {
+
+    long getSlaveId();
+
+}
diff --git a/src/org/traccar/model/BaseUserPermission.java b/src/org/traccar/model/BaseUserPermission.java
new file mode 100644
index 000000000..64a7be82a
--- /dev/null
+++ b/src/org/traccar/model/BaseUserPermission.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.model;
+
+public abstract class BaseUserPermission implements BasePermission {
+
+    private long userId;
+
+    public long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(long userId) {
+        this.userId = userId;
+    }
+
+}
diff --git a/src/org/traccar/model/CalendarPermission.java b/src/org/traccar/model/CalendarPermission.java
index 59f54e07b..d95e51b0e 100644
--- a/src/org/traccar/model/CalendarPermission.java
+++ b/src/org/traccar/model/CalendarPermission.java
@@ -16,17 +16,7 @@
  */
 package org.traccar.model;
 
-public class CalendarPermission {
-
-    private long userId;
-
-    public long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(long userId) {
-        this.userId = userId;
-    }
+public class CalendarPermission extends BaseUserPermission {
 
     private long calendarId;
 
@@ -37,4 +27,9 @@ public class CalendarPermission {
     public void setCalendarId(long calendarId) {
         this.calendarId = calendarId;
     }
+
+    @Override
+    public long getSlaveId() {
+        return calendarId;
+    }
 }
diff --git a/src/org/traccar/model/DeviceAttribute.java b/src/org/traccar/model/DeviceAttribute.java
index e0ac6dd98..bfcd873fa 100644
--- a/src/org/traccar/model/DeviceAttribute.java
+++ b/src/org/traccar/model/DeviceAttribute.java
@@ -16,17 +16,7 @@
  */
 package org.traccar.model;
 
-public class DeviceAttribute {
-
-    private long deviceId;
-
-    public long getDeviceId() {
-        return deviceId;
-    }
-
-    public void setDeviceId(long deviceId) {
-        this.deviceId = deviceId;
-    }
+public class DeviceAttribute extends BaseDevicePermission {
 
     private long attributeId;
 
@@ -37,4 +27,9 @@ public class DeviceAttribute {
     public void setAttributeId(long attributeId) {
         this.attributeId = attributeId;
     }
+
+    @Override
+    public long getSlaveId() {
+        return attributeId;
+    }
 }
diff --git a/src/org/traccar/model/DeviceDriver.java b/src/org/traccar/model/DeviceDriver.java
index 2008aaddf..f5257531d 100644
--- a/src/org/traccar/model/DeviceDriver.java
+++ b/src/org/traccar/model/DeviceDriver.java
@@ -16,17 +16,7 @@
  */
 package org.traccar.model;
 
-public class DeviceDriver {
-
-    private long deviceId;
-
-    public long getDeviceId() {
-        return deviceId;
-    }
-
-    public void setDeviceId(long deviceId) {
-        this.deviceId = deviceId;
-    }
+public class DeviceDriver extends BaseDevicePermission {
 
     private long driverId;
 
@@ -38,4 +28,9 @@ public class DeviceDriver {
         this.driverId = driverId;
     }
 
+    @Override
+    public long getSlaveId() {
+        return driverId;
+    }
+
 }
diff --git a/src/org/traccar/model/DeviceGeofence.java b/src/org/traccar/model/DeviceGeofence.java
index 00c99add6..7ea4d3bea 100644
--- a/src/org/traccar/model/DeviceGeofence.java
+++ b/src/org/traccar/model/DeviceGeofence.java
@@ -15,17 +15,7 @@
  */
 package org.traccar.model;
 
-public class DeviceGeofence {
-
-    private long deviceId;
-
-    public long getDeviceId() {
-        return deviceId;
-    }
-
-    public void setDeviceId(long deviceId) {
-        this.deviceId = deviceId;
-    }
+public class DeviceGeofence extends BaseDevicePermission {
 
     private long geofenceId;
 
@@ -37,4 +27,9 @@ public class DeviceGeofence {
         this.geofenceId = geofenceId;
     }
 
+    @Override
+    public long getSlaveId() {
+        return geofenceId;
+    }
+
 }
diff --git a/src/org/traccar/model/DriverPermission.java b/src/org/traccar/model/DriverPermission.java
index cdbcc4a50..44f34c8e6 100644
--- a/src/org/traccar/model/DriverPermission.java
+++ b/src/org/traccar/model/DriverPermission.java
@@ -16,17 +16,7 @@
  */
 package org.traccar.model;
 
-public class DriverPermission {
-
-    private long userId;
-
-    public long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(long userId) {
-        this.userId = userId;
-    }
+public class DriverPermission extends BaseUserPermission {
 
     private long driverId;
 
@@ -37,4 +27,9 @@ public class DriverPermission {
     public void setDriverId(long driverId) {
         this.driverId = driverId;
     }
+
+    @Override
+    public long getSlaveId() {
+        return driverId;
+    }
 }
diff --git a/src/org/traccar/model/Extensible.java b/src/org/traccar/model/Extensible.java
index b7953d8a6..3b382838e 100644
--- a/src/org/traccar/model/Extensible.java
+++ b/src/org/traccar/model/Extensible.java
@@ -18,17 +18,7 @@ package org.traccar.model;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-public class Extensible {
-
-    private long id;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
+public class Extensible extends Identifiable {
 
     private Map<String, Object> attributes = new LinkedHashMap<>();
 
diff --git a/src/org/traccar/model/GeofencePermission.java b/src/org/traccar/model/GeofencePermission.java
index 464f4e9eb..8606cc3e7 100644
--- a/src/org/traccar/model/GeofencePermission.java
+++ b/src/org/traccar/model/GeofencePermission.java
@@ -15,17 +15,7 @@
  */
 package org.traccar.model;
 
-public class GeofencePermission {
-
-    private long userId;
-
-    public long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(long userId) {
-        this.userId = userId;
-    }
+public class GeofencePermission extends BaseUserPermission {
 
     private long geofenceId;
 
@@ -37,4 +27,9 @@ public class GeofencePermission {
         this.geofenceId = geofenceId;
     }
 
+    @Override
+    public long getSlaveId() {
+        return geofenceId;
+    }
+
 }
diff --git a/src/org/traccar/model/GroupAttribute.java b/src/org/traccar/model/GroupAttribute.java
index a7e8a80bc..cfaf9cc2f 100644
--- a/src/org/traccar/model/GroupAttribute.java
+++ b/src/org/traccar/model/GroupAttribute.java
@@ -16,17 +16,7 @@
  */
 package org.traccar.model;
 
-public class GroupAttribute {
-
-    private long groupId;
-
-    public long getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(long groupId) {
-        this.groupId = groupId;
-    }
+public class GroupAttribute extends BaseGroupPermission {
 
     private long attributeId;
 
@@ -37,4 +27,9 @@ public class GroupAttribute {
     public void setAttributeId(long attributeId) {
         this.attributeId = attributeId;
     }
+
+    @Override
+    public long getSlaveId() {
+        return attributeId;
+    }
 }
diff --git a/src/org/traccar/model/GroupDriver.java b/src/org/traccar/model/GroupDriver.java
index 91b205923..9bf74c214 100644
--- a/src/org/traccar/model/GroupDriver.java
+++ b/src/org/traccar/model/GroupDriver.java
@@ -16,17 +16,7 @@
  */
 package org.traccar.model;
 
-public class GroupDriver {
-
-    private long groupId;
-
-    public long getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(long groupId) {
-        this.groupId = groupId;
-    }
+public class GroupDriver extends BaseGroupPermission {
 
     private long driverId;
 
@@ -38,4 +28,9 @@ public class GroupDriver {
         this.driverId = driverId;
     }
 
+    @Override
+    public long getSlaveId() {
+        return driverId;
+    }
+
 }
diff --git a/src/org/traccar/model/GroupGeofence.java b/src/org/traccar/model/GroupGeofence.java
index 736e6c704..89830324d 100644
--- a/src/org/traccar/model/GroupGeofence.java
+++ b/src/org/traccar/model/GroupGeofence.java
@@ -15,17 +15,7 @@
  */
 package org.traccar.model;
 
-public class GroupGeofence {
-
-    private long groupId;
-
-    public long getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(long groupId) {
-        this.groupId = groupId;
-    }
+public class GroupGeofence extends BaseGroupPermission {
 
     private long geofenceId;
 
@@ -37,4 +27,9 @@ public class GroupGeofence {
         this.geofenceId = geofenceId;
     }
 
+    @Override
+    public long getSlaveId() {
+        return geofenceId;
+    }
+
 }
diff --git a/src/org/traccar/model/Identifiable.java b/src/org/traccar/model/Identifiable.java
new file mode 100644
index 000000000..f22cfe800
--- /dev/null
+++ b/src/org/traccar/model/Identifiable.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.model;
+
+public class Identifiable {
+
+    private long id;
+
+    public final long getId() {
+        return id;
+    }
+
+    public final void setId(long id) {
+        this.id = id;
+    }
+
+}
diff --git a/src/org/traccar/notification/EventForwarder.java b/src/org/traccar/notification/EventForwarder.java
index bd7cfc0c5..08f55df75 100644
--- a/src/org/traccar/notification/EventForwarder.java
+++ b/src/org/traccar/notification/EventForwarder.java
@@ -75,7 +75,7 @@ public final class EventForwarder {
             }
         }
         if (event.getGeofenceId() != 0) {
-            Geofence geofence = Context.getGeofenceManager().getGeofence(event.getGeofenceId());
+            Geofence geofence = (Geofence) Context.getGeofenceManager().getById(event.getGeofenceId());
             if (geofence != null) {
                 data.put(KEY_GEOFENCE, geofence);
             }
diff --git a/src/org/traccar/notification/NotificationFormatter.java b/src/org/traccar/notification/NotificationFormatter.java
index a30023fdc..cd9959671 100644
--- a/src/org/traccar/notification/NotificationFormatter.java
+++ b/src/org/traccar/notification/NotificationFormatter.java
@@ -51,7 +51,7 @@ public final class NotificationFormatter {
             velocityContext.put("speedUnits", ReportUtils.getSpeedUnit(userId));
         }
         if (event.getGeofenceId() != 0) {
-            velocityContext.put("geofence", Context.getGeofenceManager().getGeofence(event.getGeofenceId()));
+            velocityContext.put("geofence", Context.getGeofenceManager().getById(event.getGeofenceId()));
         }
         String driverUniqueId = event.getString(Position.KEY_DRIVER_UNIQUE_ID);
         if (driverUniqueId != null) {
diff --git a/src/org/traccar/processing/ComputedAttributesHandler.java b/src/org/traccar/processing/ComputedAttributesHandler.java
index 536e39ec4..d6a762535 100644
--- a/src/org/traccar/processing/ComputedAttributesHandler.java
+++ b/src/org/traccar/processing/ComputedAttributesHandler.java
@@ -86,8 +86,8 @@ public class ComputedAttributesHandler extends BaseDataHandler {
 
     @Override
     protected Position handlePosition(Position position) {
-        Collection<Attribute> attributes = Context.getAttributesManager().getAttributes(
-                Context.getAttributesManager().getAllDeviceAttributes(position.getDeviceId()));
+        Collection<Attribute> attributes = Context.getAttributesManager().getItems(Attribute.class,
+                Context.getAttributesManager().getAllDeviceItems(position.getDeviceId()));
         for (Attribute attribute : attributes) {
             if (attribute.getAttribute() != null) {
                 Object result = null;
diff --git a/src/org/traccar/reports/Events.java b/src/org/traccar/reports/Events.java
index 0706f1382..3a111944c 100644
--- a/src/org/traccar/reports/Events.java
+++ b/src/org/traccar/reports/Events.java
@@ -50,7 +50,7 @@ public final class Events {
             for (Event event : events) {
                 if (all || types.contains(event.getType())) {
                     long geofenceId = event.getGeofenceId();
-                    if (geofenceId == 0 || Context.getGeofenceManager().checkGeofence(userId, geofenceId)) {
+                    if (geofenceId == 0 || Context.getGeofenceManager().checkItemPermission(userId, geofenceId)) {
                        result.add(event);
                     }
                 }
@@ -74,8 +74,8 @@ public final class Events {
                 if (all || types.contains(event.getType())) {
                     long geofenceId = event.getGeofenceId();
                     if (geofenceId != 0) {
-                        if (Context.getGeofenceManager().checkGeofence(userId, geofenceId)) {
-                            Geofence geofence = Context.getGeofenceManager().getGeofence(geofenceId);
+                        if (Context.getGeofenceManager().checkItemPermission(userId, geofenceId)) {
+                            Geofence geofence = (Geofence) Context.getGeofenceManager().getById(geofenceId);
                             if (geofence != null) {
                                 geofenceNames.put(geofenceId, geofence.getName());
                             }
-- 
cgit v1.2.3


From afb9a199f57824ec06c993b6028c35b616f64885 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Thu, 20 Jul 2017 08:56:29 +0500
Subject: Combine permission resources and reuse common database functions

---
 setup/default.xml                                  |  34 +--
 src/org/traccar/BaseProtocolDecoder.java           |   4 +-
 .../api/resource/AttributePermissionResource.java  |  58 ----
 .../traccar/api/resource/AttributeResource.java    |   6 +-
 .../api/resource/CalendarPermissionResource.java   |  57 ----
 src/org/traccar/api/resource/CalendarResource.java |   6 +-
 .../api/resource/DeviceAttributeResource.java      |  58 ----
 .../traccar/api/resource/DeviceDriverResource.java |  58 ----
 .../api/resource/DeviceGeofenceResource.java       |  57 ----
 .../api/resource/DevicePermissionResource.java     |  66 -----
 src/org/traccar/api/resource/DeviceResource.java   |  45 ++-
 .../api/resource/DriverPermissionResource.java     |  59 ----
 src/org/traccar/api/resource/DriverResource.java   |   6 +-
 .../api/resource/GeofencePermissionResource.java   |  56 ----
 src/org/traccar/api/resource/GeofenceResource.java |   6 +-
 .../api/resource/GroupAttributeResource.java       |  58 ----
 .../traccar/api/resource/GroupDriverResource.java  |  58 ----
 .../api/resource/GroupGeofenceResource.java        |  56 ----
 .../api/resource/GroupPermissionResource.java      |  62 -----
 src/org/traccar/api/resource/GroupResource.java    |  43 ++-
 .../traccar/api/resource/PermissionsResource.java  |  62 +++++
 .../api/resource/UserPermissionResource.java       |  56 ----
 src/org/traccar/api/resource/UserResource.java     |   6 +-
 src/org/traccar/database/AttributesManager.java    |   2 +-
 src/org/traccar/database/DataManager.java          | 309 +--------------------
 src/org/traccar/database/DeviceManager.java        |  16 +-
 src/org/traccar/database/DriversManager.java       |   4 +-
 .../traccar/database/ExtendedObjectManager.java    |   4 +-
 src/org/traccar/database/GeofenceManager.java      |   7 +-
 src/org/traccar/database/NotificationManager.java  |  10 +-
 src/org/traccar/database/PermissionsManager.java   |  62 ++++-
 src/org/traccar/database/SimpleObjectManager.java  |   8 -
 32 files changed, 260 insertions(+), 1139 deletions(-)
 delete mode 100644 src/org/traccar/api/resource/AttributePermissionResource.java
 delete mode 100644 src/org/traccar/api/resource/CalendarPermissionResource.java
 delete mode 100644 src/org/traccar/api/resource/DeviceAttributeResource.java
 delete mode 100644 src/org/traccar/api/resource/DeviceDriverResource.java
 delete mode 100644 src/org/traccar/api/resource/DeviceGeofenceResource.java
 delete mode 100644 src/org/traccar/api/resource/DevicePermissionResource.java
 delete mode 100644 src/org/traccar/api/resource/DriverPermissionResource.java
 delete mode 100644 src/org/traccar/api/resource/GeofencePermissionResource.java
 delete mode 100644 src/org/traccar/api/resource/GroupAttributeResource.java
 delete mode 100644 src/org/traccar/api/resource/GroupDriverResource.java
 delete mode 100644 src/org/traccar/api/resource/GroupGeofenceResource.java
 delete mode 100644 src/org/traccar/api/resource/GroupPermissionResource.java
 create mode 100644 src/org/traccar/api/resource/PermissionsResource.java
 delete mode 100644 src/org/traccar/api/resource/UserPermissionResource.java

(limited to 'setup')

diff --git a/setup/default.xml b/setup/default.xml
index d3651b9f0..dcf995af0 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -60,7 +60,7 @@
         WHERE email = :email
     </entry>
 
-    <entry key='database.selectUsersAll'>
+    <entry key='database.selectUsers'>
         SELECT * FROM users
     </entry>
 
@@ -111,7 +111,7 @@
         SELECT userId, groupId FROM user_group
     </entry>
 
-    <entry key='database.selectDevicesAll'>
+    <entry key='database.selectDevices'>
         SELECT * FROM devices
     </entry>
 
@@ -141,15 +141,15 @@
         DELETE FROM devices WHERE id = :id
     </entry>
 
-    <entry key='database.linkDevice'>
+    <entry key='database.linkUserDevice'>
         INSERT INTO user_device (userId, deviceId) VALUES (:userId, :deviceId)
     </entry>
 
-    <entry key='database.unlinkDevice'>
+    <entry key='database.unlinkUserDevice'>
         DELETE FROM user_device WHERE userId = :userId AND deviceId = :deviceId
     </entry>
 
-    <entry key='database.selectGroupsAll'>
+    <entry key='database.selectGroups'>
         SELECT * FROM groups
     </entry>
 
@@ -165,11 +165,11 @@
         DELETE FROM groups WHERE id = :id
     </entry>
 
-    <entry key='database.linkGroup'>
+    <entry key='database.linkUserGroup'>
         INSERT INTO user_group (userId, groupId) VALUES (:userId, :groupId)
     </entry>
 
-    <entry key='database.unlinkGroup'>
+    <entry key='database.unlinkUserGroup'>
         DELETE FROM user_group WHERE userId = :userId AND groupId = :groupId
     </entry>
 
@@ -234,11 +234,11 @@
         SELECT userId, geofenceId FROM user_geofence
     </entry>
 
-    <entry key='database.linkGeofence'>
+    <entry key='database.linkUserGeofence'>
         INSERT INTO user_geofence (userId, geofenceId) VALUES (:userId, :geofenceId)
     </entry>
 
-    <entry key='database.unlinkGeofence'>
+    <entry key='database.unlinkUserGeofence'>
         DELETE FROM user_geofence WHERE userId = :userId AND geofenceId = :geofenceId
     </entry>
 
@@ -353,11 +353,11 @@
         SELECT userId, calendarId FROM user_calendar
     </entry>
 
-    <entry key='database.linkCalendar'>
+    <entry key='database.linkUserCalendar'>
         INSERT INTO user_calendar (userId, calendarId) VALUES (:userId, :calendarId)
     </entry>
 
-    <entry key='database.unlinkCalendar'>
+    <entry key='database.unlinkUserCalendar'>
         DELETE FROM user_calendar WHERE userId = :userId AND calendarId = :calendarId
     </entry>
     
@@ -365,11 +365,11 @@
         SELECT userId, managedUserId FROM user_user
     </entry>
 
-    <entry key='database.linkUser'>
+    <entry key='database.linkUserManagedUser'>
         INSERT INTO user_user (userId, managedUserId) VALUES (:userId, :managedUserId)
     </entry>
 
-    <entry key='database.unlinkUser'>
+    <entry key='database.unlinkUserManagedUser'>
         DELETE FROM user_user WHERE userId = :userId AND managedUserId = :managedUserId
     </entry>
 
@@ -399,11 +399,11 @@
         SELECT userId, attributeId FROM user_attribute
     </entry>
 
-    <entry key='database.linkAttribute'>
+    <entry key='database.linkUserAttribute'>
         INSERT INTO user_attribute (userId, attributeId) VALUES (:userId, :attributeId)
     </entry>
 
-    <entry key='database.unlinkAttribute'>
+    <entry key='database.unlinkUserAttribute'>
         DELETE FROM user_attribute WHERE userId = :userId AND attributeId = :attributeId
     </entry>
 
@@ -456,11 +456,11 @@
         SELECT userId, driverId FROM user_driver
     </entry>
 
-    <entry key='database.linkDriver'>
+    <entry key='database.linkUserDriver'>
         INSERT INTO user_driver (userId, driverId) VALUES (:userId, :driverId)
     </entry>
 
-    <entry key='database.unlinkDriver'>
+    <entry key='database.unlinkUserDriver'>
         DELETE FROM user_driver WHERE userId = :userId AND driverId = :driverId
     </entry>
 
diff --git a/src/org/traccar/BaseProtocolDecoder.java b/src/org/traccar/BaseProtocolDecoder.java
index 54d2bf28f..b8d2b122c 100644
--- a/src/org/traccar/BaseProtocolDecoder.java
+++ b/src/org/traccar/BaseProtocolDecoder.java
@@ -51,9 +51,7 @@ public abstract class BaseProtocolDecoder extends ExtendedObjectDecoder {
 
             if (defaultGroupId != 0) {
                 Context.getPermissionsManager().refreshPermissions();
-                if (Context.getGeofenceManager() != null) {
-                    Context.getGeofenceManager().refresh();
-                }
+                Context.getPermissionsManager().refreshAllExtendedPermissions();
             }
 
             return device.getId();
diff --git a/src/org/traccar/api/resource/AttributePermissionResource.java b/src/org/traccar/api/resource/AttributePermissionResource.java
deleted file mode 100644
index 37e50e371..000000000
--- a/src/org/traccar/api/resource/AttributePermissionResource.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.api.resource;
-
-import java.sql.SQLException;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.traccar.Context;
-import org.traccar.api.BaseResource;
-import org.traccar.model.AttributePermission;
-
-@Path("permissions/attributes")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
-public class AttributePermissionResource extends BaseResource {
-
-    @POST
-    public Response add(AttributePermission entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId());
-        Context.getPermissionsManager().checkPermission("attribute", getUserId(), entity.getAttributeId());
-        Context.getDataManager().linkAttribute(entity.getUserId(), entity.getAttributeId());
-        Context.getAttributesManager().refreshUserItems();
-        return Response.ok(entity).build();
-    }
-
-    @DELETE
-    public Response remove(AttributePermission entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId());
-        Context.getPermissionsManager().checkPermission("attribute", getUserId(), entity.getAttributeId());
-        Context.getDataManager().unlinkAttribute(entity.getUserId(), entity.getAttributeId());
-        Context.getAttributesManager().refreshUserItems();
-        return Response.noContent().build();
-    }
-
-}
diff --git a/src/org/traccar/api/resource/AttributeResource.java b/src/org/traccar/api/resource/AttributeResource.java
index c67d9cafe..2f731e3a7 100644
--- a/src/org/traccar/api/resource/AttributeResource.java
+++ b/src/org/traccar/api/resource/AttributeResource.java
@@ -19,6 +19,7 @@ package org.traccar.api.resource;
 import java.sql.SQLException;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.Set;
 
 import javax.ws.rs.Consumes;
@@ -86,7 +87,10 @@ public class AttributeResource extends BaseResource {
 
     private Response add(Attribute entity) throws SQLException {
         Context.getAttributesManager().addItem(entity);
-        Context.getDataManager().linkAttribute(getUserId(), entity.getId());
+        LinkedHashMap<String, Long> link = new LinkedHashMap<>();
+        link.put("userId", getUserId());
+        link.put("attributeId", entity.getId());
+        Context.getDataManager().linkObject(link, true);
         Context.getAttributesManager().refreshUserItems();
         return Response.ok(entity).build();
     }
diff --git a/src/org/traccar/api/resource/CalendarPermissionResource.java b/src/org/traccar/api/resource/CalendarPermissionResource.java
deleted file mode 100644
index 3936bcaf3..000000000
--- a/src/org/traccar/api/resource/CalendarPermissionResource.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.api.resource;
-
-import java.sql.SQLException;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.traccar.Context;
-import org.traccar.api.BaseResource;
-import org.traccar.model.CalendarPermission;
-
-@Path("permissions/calendars")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
-public class CalendarPermissionResource extends BaseResource {
-
-    @POST
-    public Response add(CalendarPermission entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId());
-        Context.getPermissionsManager().checkPermission("calendar", getUserId(), entity.getCalendarId());
-        Context.getDataManager().linkCalendar(entity.getUserId(), entity.getCalendarId());
-        Context.getCalendarManager().refreshUserItems();
-        return Response.ok(entity).build();
-    }
-
-    @DELETE
-    public Response remove(CalendarPermission entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId());
-        Context.getPermissionsManager().checkPermission("calendar", getUserId(), entity.getCalendarId());
-        Context.getDataManager().unlinkCalendar(entity.getUserId(), entity.getCalendarId());
-        Context.getCalendarManager().refreshUserItems();
-        return Response.noContent().build();
-    }
-}
diff --git a/src/org/traccar/api/resource/CalendarResource.java b/src/org/traccar/api/resource/CalendarResource.java
index be675fc79..f4ff9d4e9 100644
--- a/src/org/traccar/api/resource/CalendarResource.java
+++ b/src/org/traccar/api/resource/CalendarResource.java
@@ -18,6 +18,7 @@ package org.traccar.api.resource;
 
 import java.sql.SQLException;
 import java.util.Collection;
+import java.util.LinkedHashMap;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -66,7 +67,10 @@ public class CalendarResource extends BaseResource {
     public Response add(Calendar entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getCalendarManager().addItem(entity);
-        Context.getDataManager().linkCalendar(getUserId(), entity.getId());
+        LinkedHashMap<String, Long> link = new LinkedHashMap<>();
+        link.put("userId", getUserId());
+        link.put("calendarId", entity.getId());
+        Context.getDataManager().linkObject(link, true);
         Context.getCalendarManager().refreshUserItems();
         return Response.ok(entity).build();
     }
diff --git a/src/org/traccar/api/resource/DeviceAttributeResource.java b/src/org/traccar/api/resource/DeviceAttributeResource.java
deleted file mode 100644
index bb833d4db..000000000
--- a/src/org/traccar/api/resource/DeviceAttributeResource.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.api.resource;
-
-import java.sql.SQLException;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.traccar.Context;
-import org.traccar.api.BaseResource;
-import org.traccar.model.DeviceAttribute;
-
-@Path("devices/attributes")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
-public class DeviceAttributeResource extends BaseResource {
-
-    @POST
-    public Response add(DeviceAttribute entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId());
-        Context.getPermissionsManager().checkPermission("attribute", getUserId(), entity.getAttributeId());
-        Context.getDataManager().linkDeviceAttribute(entity.getDeviceId(), entity.getAttributeId());
-        Context.getAttributesManager().refresh();
-        return Response.ok(entity).build();
-    }
-
-    @DELETE
-    public Response remove(DeviceAttribute entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId());
-        Context.getPermissionsManager().checkPermission("attribute", getUserId(), entity.getAttributeId());
-        Context.getDataManager().unlinkDeviceAttribute(entity.getDeviceId(), entity.getAttributeId());
-        Context.getAttributesManager().refresh();
-        return Response.noContent().build();
-    }
-
-}
diff --git a/src/org/traccar/api/resource/DeviceDriverResource.java b/src/org/traccar/api/resource/DeviceDriverResource.java
deleted file mode 100644
index 286f2223f..000000000
--- a/src/org/traccar/api/resource/DeviceDriverResource.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.api.resource;
-
-import java.sql.SQLException;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.traccar.Context;
-import org.traccar.api.BaseResource;
-import org.traccar.model.DeviceDriver;
-
-@Path("devices/drivers")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
-public class DeviceDriverResource extends BaseResource {
-
-    @POST
-    public Response add(DeviceDriver entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId());
-        Context.getPermissionsManager().checkPermission("driver", getUserId(), entity.getDriverId());
-        Context.getDataManager().linkDeviceDriver(entity.getDeviceId(), entity.getDriverId());
-        Context.getDriversManager().refresh();
-        return Response.ok(entity).build();
-    }
-
-    @DELETE
-    public Response remove(DeviceDriver entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId());
-        Context.getPermissionsManager().checkPermission("driver", getUserId(), entity.getDriverId());
-        Context.getDataManager().unlinkDeviceDriver(entity.getDeviceId(), entity.getDriverId());
-        Context.getDriversManager().refresh();
-        return Response.noContent().build();
-    }
-
-}
diff --git a/src/org/traccar/api/resource/DeviceGeofenceResource.java b/src/org/traccar/api/resource/DeviceGeofenceResource.java
deleted file mode 100644
index 8034e2168..000000000
--- a/src/org/traccar/api/resource/DeviceGeofenceResource.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.api.resource;
-
-import org.traccar.Context;
-import org.traccar.api.BaseResource;
-import org.traccar.model.DeviceGeofence;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import java.sql.SQLException;
-
-@Path("devices/geofences")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
-public class DeviceGeofenceResource extends BaseResource {
-
-    @POST
-    public Response add(DeviceGeofence entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId());
-        Context.getPermissionsManager().checkPermission("geofence", getUserId(), entity.getGeofenceId());
-        Context.getDataManager().linkDeviceGeofence(entity.getDeviceId(), entity.getGeofenceId());
-        Context.getGeofenceManager().refresh();
-        return Response.ok(entity).build();
-    }
-
-    @DELETE
-    public Response remove(DeviceGeofence entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId());
-        Context.getPermissionsManager().checkPermission("geofence", getUserId(), entity.getGeofenceId());
-        Context.getDataManager().unlinkDeviceGeofence(entity.getDeviceId(), entity.getGeofenceId());
-        Context.getGeofenceManager().refresh();
-        return Response.noContent().build();
-    }
-
-}
diff --git a/src/org/traccar/api/resource/DevicePermissionResource.java b/src/org/traccar/api/resource/DevicePermissionResource.java
deleted file mode 100644
index 6e00dc47f..000000000
--- a/src/org/traccar/api/resource/DevicePermissionResource.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.api.resource;
-
-import org.traccar.Context;
-import org.traccar.api.BaseResource;
-import org.traccar.model.DevicePermission;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import java.sql.SQLException;
-
-@Path("permissions/devices")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
-public class DevicePermissionResource extends BaseResource {
-
-    @POST
-    public Response add(DevicePermission entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId());
-        Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId());
-        Context.getDataManager().linkDevice(entity.getUserId(), entity.getDeviceId());
-        Context.getPermissionsManager().refreshPermissions();
-        if (Context.getGeofenceManager() != null) {
-            Context.getGeofenceManager().refresh();
-        }
-        return Response.ok(entity).build();
-    }
-
-    @DELETE
-    public Response remove(DevicePermission entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        if (getUserId() != entity.getUserId()) {
-            Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId());
-        } else {
-            Context.getPermissionsManager().checkAdmin(getUserId());
-        }
-        Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId());
-        Context.getDataManager().unlinkDevice(entity.getUserId(), entity.getDeviceId());
-        Context.getPermissionsManager().refreshPermissions();
-        if (Context.getGeofenceManager() != null) {
-            Context.getGeofenceManager().refresh();
-        }
-        return Response.noContent().build();
-    }
-
-}
diff --git a/src/org/traccar/api/resource/DeviceResource.java b/src/org/traccar/api/resource/DeviceResource.java
index ce46b4e29..41a8970e2 100644
--- a/src/org/traccar/api/resource/DeviceResource.java
+++ b/src/org/traccar/api/resource/DeviceResource.java
@@ -35,7 +35,9 @@ import javax.ws.rs.core.Response;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 @Path("devices")
 @Produces(MediaType.APPLICATION_JSON)
@@ -77,11 +79,12 @@ public class DeviceResource extends BaseResource {
         Context.getPermissionsManager().checkDeviceReadonly(getUserId());
         Context.getPermissionsManager().checkDeviceLimit(getUserId());
         Context.getDeviceManager().addDevice(entity);
-        Context.getDataManager().linkDevice(getUserId(), entity.getId());
+        LinkedHashMap<String, Long> link = new LinkedHashMap<>();
+        link.put("userId", getUserId());
+        link.put("deviceId", entity.getId());
+        Context.getDataManager().linkObject(link, true);
         Context.getPermissionsManager().refreshPermissions();
-        if (Context.getGeofenceManager() != null) {
-            Context.getGeofenceManager().refresh();
-        }
+        Context.getPermissionsManager().refreshAllExtendedPermissions();
         return Response.ok(entity).build();
     }
 
@@ -93,13 +96,11 @@ public class DeviceResource extends BaseResource {
         Context.getPermissionsManager().checkDevice(getUserId(), entity.getId());
         Context.getDeviceManager().updateDevice(entity);
         Context.getPermissionsManager().refreshPermissions();
-        if (Context.getGeofenceManager() != null) {
-            Context.getGeofenceManager().refresh();
-        }
+        Context.getPermissionsManager().refreshAllExtendedPermissions();
         return Response.ok(entity).build();
     }
 
-    @Path("{id}")
+    @Path("{id : \\d+}")
     @DELETE
     public Response remove(@PathParam("id") long id) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
@@ -107,9 +108,7 @@ public class DeviceResource extends BaseResource {
         Context.getPermissionsManager().checkDevice(getUserId(), id);
         Context.getDeviceManager().removeDevice(id);
         Context.getPermissionsManager().refreshPermissions();
-        if (Context.getGeofenceManager() != null) {
-            Context.getGeofenceManager().refresh();
-        }
+        Context.getPermissionsManager().refreshAllExtendedPermissions();
         Context.getAliasesManager().removeDevice(id);
         return Response.noContent().build();
     }
@@ -122,4 +121,28 @@ public class DeviceResource extends BaseResource {
         return Response.noContent().build();
     }
 
+    @Path("/{slave : (geofences|drivers|attributes)}")
+    @POST
+    public Response add(Map<String, Long> entity) throws SQLException {
+        Context.getPermissionsManager().checkReadonly(getUserId());
+        for (String key : entity.keySet()) {
+            Context.getPermissionsManager().checkPermission(key.replace("Id", ""), getUserId(), entity.get(key));
+        }
+        Context.getDataManager().linkObject(entity, true);
+        Context.getPermissionsManager().refreshPermissions(entity);
+        return Response.noContent().build();
+    }
+
+    @Path("/{slave : (geofences|drivers|attributes)}")
+    @DELETE
+    public Response remove(Map<String, Long> entity) throws SQLException {
+        Context.getPermissionsManager().checkReadonly(getUserId());
+        for (String key : entity.keySet()) {
+            Context.getPermissionsManager().checkPermission(key.replace("Id", ""), getUserId(), entity.get(key));
+        }
+        Context.getDataManager().linkObject(entity, false);
+        Context.getPermissionsManager().refreshPermissions(entity);
+        return Response.noContent().build();
+    }
+
 }
diff --git a/src/org/traccar/api/resource/DriverPermissionResource.java b/src/org/traccar/api/resource/DriverPermissionResource.java
deleted file mode 100644
index 4d890cae9..000000000
--- a/src/org/traccar/api/resource/DriverPermissionResource.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.api.resource;
-
-import java.sql.SQLException;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.traccar.Context;
-import org.traccar.api.BaseResource;
-
-import org.traccar.model.DriverPermission;
-
-@Path("permissions/drivers")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
-public class DriverPermissionResource extends BaseResource {
-
-    @POST
-    public Response add(DriverPermission entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId());
-        Context.getPermissionsManager().checkPermission("driver", getUserId(), entity.getDriverId());
-        Context.getDataManager().linkDriver(entity.getUserId(), entity.getDriverId());
-        Context.getDriversManager().refreshUserItems();
-        return Response.ok(entity).build();
-    }
-
-    @DELETE
-    public Response remove(DriverPermission entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId());
-        Context.getPermissionsManager().checkPermission("driver", getUserId(), entity.getDriverId());
-        Context.getDataManager().unlinkDriver(entity.getUserId(), entity.getDriverId());
-        Context.getDriversManager().refreshUserItems();
-        return Response.noContent().build();
-    }
-
-}
diff --git a/src/org/traccar/api/resource/DriverResource.java b/src/org/traccar/api/resource/DriverResource.java
index 3d6a12795..91a502790 100644
--- a/src/org/traccar/api/resource/DriverResource.java
+++ b/src/org/traccar/api/resource/DriverResource.java
@@ -19,6 +19,7 @@ package org.traccar.api.resource;
 import java.sql.SQLException;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.Set;
 
 import javax.ws.rs.Consumes;
@@ -86,7 +87,10 @@ public class DriverResource extends BaseResource {
     public Response add(Driver entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getDriversManager().addItem(entity);
-        Context.getDataManager().linkDriver(getUserId(), entity.getId());
+        LinkedHashMap<String, Long> link = new LinkedHashMap<>();
+        link.put("userId", getUserId());
+        link.put("driverId", entity.getId());
+        Context.getDataManager().linkObject(link, true);
         Context.getDriversManager().refreshUserItems();
         return Response.ok(entity).build();
     }
diff --git a/src/org/traccar/api/resource/GeofencePermissionResource.java b/src/org/traccar/api/resource/GeofencePermissionResource.java
deleted file mode 100644
index a569e56fd..000000000
--- a/src/org/traccar/api/resource/GeofencePermissionResource.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.api.resource;
-
-import org.traccar.Context;
-import org.traccar.api.BaseResource;
-import org.traccar.model.GeofencePermission;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import java.sql.SQLException;
-
-@Path("permissions/geofences")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
-public class GeofencePermissionResource extends BaseResource {
-
-    @POST
-    public Response add(GeofencePermission entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId());
-        Context.getPermissionsManager().checkPermission("geofence", getUserId(), entity.getGeofenceId());
-        Context.getDataManager().linkGeofence(entity.getUserId(), entity.getGeofenceId());
-        Context.getGeofenceManager().refreshUserItems();
-        return Response.ok(entity).build();
-    }
-
-    @DELETE
-    public Response remove(GeofencePermission entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId());
-        Context.getPermissionsManager().checkPermission("geofence", getUserId(), entity.getGeofenceId());
-        Context.getDataManager().unlinkGeofence(entity.getUserId(), entity.getGeofenceId());
-        Context.getGeofenceManager().refreshUserItems();
-        return Response.noContent().build();
-    }
-
-}
diff --git a/src/org/traccar/api/resource/GeofenceResource.java b/src/org/traccar/api/resource/GeofenceResource.java
index 4a52822cc..c39d882b6 100644
--- a/src/org/traccar/api/resource/GeofenceResource.java
+++ b/src/org/traccar/api/resource/GeofenceResource.java
@@ -35,6 +35,7 @@ import javax.ws.rs.core.Response;
 import java.sql.SQLException;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.Set;
 
 @Path("geofences")
@@ -85,7 +86,10 @@ public class GeofenceResource extends BaseResource {
     public Response add(Geofence entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getGeofenceManager().addItem(entity);
-        Context.getDataManager().linkGeofence(getUserId(), entity.getId());
+        LinkedHashMap<String, Long> link = new LinkedHashMap<>();
+        link.put("userId", getUserId());
+        link.put("geofenceId", entity.getId());
+        Context.getDataManager().linkObject(link, true);
         Context.getGeofenceManager().refreshUserItems();
         return Response.ok(entity).build();
     }
diff --git a/src/org/traccar/api/resource/GroupAttributeResource.java b/src/org/traccar/api/resource/GroupAttributeResource.java
deleted file mode 100644
index 5df63194e..000000000
--- a/src/org/traccar/api/resource/GroupAttributeResource.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.api.resource;
-
-import java.sql.SQLException;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.traccar.Context;
-import org.traccar.api.BaseResource;
-import org.traccar.model.GroupAttribute;
-
-@Path("groups/attributes")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
-public class GroupAttributeResource extends BaseResource {
-
-    @POST
-    public Response add(GroupAttribute entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkGroup(getUserId(), entity.getGroupId());
-        Context.getPermissionsManager().checkPermission("attribute", getUserId(), entity.getAttributeId());
-        Context.getDataManager().linkGroupAttribute(entity.getGroupId(), entity.getAttributeId());
-        Context.getAttributesManager().refresh();
-        return Response.ok(entity).build();
-    }
-
-    @DELETE
-    public Response remove(GroupAttribute entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkGroup(getUserId(), entity.getGroupId());
-        Context.getPermissionsManager().checkPermission("attribute", getUserId(), entity.getAttributeId());
-        Context.getDataManager().unlinkGroupAttribute(entity.getGroupId(), entity.getAttributeId());
-        Context.getAttributesManager().refresh();
-        return Response.noContent().build();
-    }
-
-}
diff --git a/src/org/traccar/api/resource/GroupDriverResource.java b/src/org/traccar/api/resource/GroupDriverResource.java
deleted file mode 100644
index 71c1aca29..000000000
--- a/src/org/traccar/api/resource/GroupDriverResource.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.api.resource;
-
-import java.sql.SQLException;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.traccar.Context;
-import org.traccar.api.BaseResource;
-import org.traccar.model.GroupDriver;
-
-@Path("groups/drivers")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
-public class GroupDriverResource extends BaseResource {
-
-    @POST
-    public Response add(GroupDriver entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkGroup(getUserId(), entity.getGroupId());
-        Context.getPermissionsManager().checkPermission("driver", getUserId(), entity.getDriverId());
-        Context.getDataManager().linkGroupDriver(entity.getGroupId(), entity.getDriverId());
-        Context.getDriversManager().refresh();
-        return Response.ok(entity).build();
-    }
-
-    @DELETE
-    public Response remove(GroupDriver entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkGroup(getUserId(), entity.getGroupId());
-        Context.getPermissionsManager().checkPermission("driver", getUserId(), entity.getDriverId());
-        Context.getDataManager().unlinkGroupDriver(entity.getGroupId(), entity.getDriverId());
-        Context.getDriversManager().refresh();
-        return Response.noContent().build();
-    }
-
-}
diff --git a/src/org/traccar/api/resource/GroupGeofenceResource.java b/src/org/traccar/api/resource/GroupGeofenceResource.java
deleted file mode 100644
index 14000c4b5..000000000
--- a/src/org/traccar/api/resource/GroupGeofenceResource.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.api.resource;
-
-import org.traccar.Context;
-import org.traccar.api.BaseResource;
-import org.traccar.model.GroupGeofence;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import java.sql.SQLException;
-
-@Path("groups/geofences")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
-public class GroupGeofenceResource extends BaseResource {
-
-    @POST
-    public Response add(GroupGeofence entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkGroup(getUserId(), entity.getGroupId());
-        Context.getPermissionsManager().checkPermission("geofence", getUserId(), entity.getGeofenceId());
-        Context.getDataManager().linkGroupGeofence(entity.getGroupId(), entity.getGeofenceId());
-        Context.getGeofenceManager().refresh();
-        return Response.ok(entity).build();
-    }
-
-    @DELETE
-    public Response remove(GroupGeofence entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkGroup(getUserId(), entity.getGroupId());
-        Context.getPermissionsManager().checkPermission("geofence", getUserId(), entity.getGeofenceId());
-        Context.getDataManager().unlinkGroupGeofence(entity.getGroupId(), entity.getGeofenceId());
-        Context.getGeofenceManager().refresh();
-        return Response.noContent().build();
-    }
-
-}
diff --git a/src/org/traccar/api/resource/GroupPermissionResource.java b/src/org/traccar/api/resource/GroupPermissionResource.java
deleted file mode 100644
index 61a725222..000000000
--- a/src/org/traccar/api/resource/GroupPermissionResource.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.api.resource;
-
-import org.traccar.Context;
-import org.traccar.api.BaseResource;
-import org.traccar.model.GroupPermission;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import java.sql.SQLException;
-
-@Path("permissions/groups")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
-public class GroupPermissionResource extends BaseResource {
-
-    @POST
-    public Response add(GroupPermission entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId());
-        Context.getPermissionsManager().checkGroup(getUserId(), entity.getGroupId());
-        Context.getDataManager().linkGroup(entity.getUserId(), entity.getGroupId());
-        Context.getPermissionsManager().refreshPermissions();
-        if (Context.getGeofenceManager() != null) {
-            Context.getGeofenceManager().refresh();
-        }
-        return Response.ok(entity).build();
-    }
-
-    @DELETE
-    public Response remove(GroupPermission entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId());
-        Context.getPermissionsManager().checkGroup(getUserId(), entity.getGroupId());
-        Context.getDataManager().unlinkGroup(entity.getUserId(), entity.getGroupId());
-        Context.getPermissionsManager().refreshPermissions();
-        if (Context.getGeofenceManager() != null) {
-            Context.getGeofenceManager().refresh();
-        }
-        return Response.noContent().build();
-    }
-
-}
diff --git a/src/org/traccar/api/resource/GroupResource.java b/src/org/traccar/api/resource/GroupResource.java
index ceba69105..97b6d671d 100644
--- a/src/org/traccar/api/resource/GroupResource.java
+++ b/src/org/traccar/api/resource/GroupResource.java
@@ -32,6 +32,8 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import java.sql.SQLException;
 import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 @Path("groups")
 @Produces(MediaType.APPLICATION_JSON)
@@ -61,11 +63,12 @@ public class GroupResource extends BaseResource {
     public Response add(Group entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getDeviceManager().addGroup(entity);
-        Context.getDataManager().linkGroup(getUserId(), entity.getId());
+        LinkedHashMap<String, Long> link = new LinkedHashMap<>();
+        link.put("userId", getUserId());
+        link.put("groupId", entity.getId());
+        Context.getDataManager().linkObject(link, true);
         Context.getPermissionsManager().refreshPermissions();
-        if (Context.getGeofenceManager() != null) {
-            Context.getGeofenceManager().refresh();
-        }
+        Context.getPermissionsManager().refreshAllExtendedPermissions();
         return Response.ok(entity).build();
     }
 
@@ -75,22 +78,42 @@ public class GroupResource extends BaseResource {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getPermissionsManager().checkGroup(getUserId(), entity.getId());
         Context.getDeviceManager().updateGroup(entity);
-        if (Context.getGeofenceManager() != null) {
-            Context.getGeofenceManager().refresh();
-        }
+        Context.getPermissionsManager().refreshAllExtendedPermissions();
         return Response.ok(entity).build();
     }
 
-    @Path("{id}")
+    @Path("{id : \\d+}")
     @DELETE
     public Response remove(@PathParam("id") long id) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getPermissionsManager().checkGroup(getUserId(), id);
         Context.getDeviceManager().removeGroup(id);
         Context.getPermissionsManager().refreshPermissions();
-        if (Context.getGeofenceManager() != null) {
-            Context.getGeofenceManager().refresh();
+        Context.getPermissionsManager().refreshAllExtendedPermissions();
+        return Response.noContent().build();
+    }
+
+    @Path("/{slave : (geofences|drivers|attributes)}")
+    @POST
+    public Response add(Map<String, Long> entity) throws SQLException {
+        Context.getPermissionsManager().checkReadonly(getUserId());
+        for (String key : entity.keySet()) {
+            Context.getPermissionsManager().checkPermission(key.replace("Id", ""), getUserId(), entity.get(key));
+        }
+        Context.getDataManager().linkObject(entity, true);
+        Context.getPermissionsManager().refreshPermissions(entity);
+        return Response.noContent().build();
+    }
+
+    @Path("/{slave : (geofences|drivers|attributes)}")
+    @DELETE
+    public Response remove(Map<String, Long> entity) throws SQLException {
+        Context.getPermissionsManager().checkReadonly(getUserId());
+        for (String key : entity.keySet()) {
+            Context.getPermissionsManager().checkPermission(key.replace("Id", ""), getUserId(), entity.get(key));
         }
+        Context.getDataManager().linkObject(entity, false);
+        Context.getPermissionsManager().refreshPermissions(entity);
         return Response.noContent().build();
     }
 
diff --git a/src/org/traccar/api/resource/PermissionsResource.java b/src/org/traccar/api/resource/PermissionsResource.java
new file mode 100644
index 000000000..ac7acb93f
--- /dev/null
+++ b/src/org/traccar/api/resource/PermissionsResource.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.api.resource;
+
+import java.sql.SQLException;
+import java.util.Map;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.traccar.Context;
+import org.traccar.api.BaseResource;
+
+@Path("permissions")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+public class PermissionsResource  extends BaseResource {
+
+    @Path("/{slave : (users|devices|groups|geofences|drivers|attributes|calendars)}")
+    @POST
+    public Response add(Map<String, Long> entity) throws SQLException {
+        Context.getPermissionsManager().checkReadonly(getUserId());
+        for (String key : entity.keySet()) {
+            Context.getPermissionsManager().checkPermission(key.replace("Id", ""), getUserId(), entity.get(key));
+        }
+        Context.getDataManager().linkObject(entity, true);
+        Context.getPermissionsManager().refreshPermissions(entity);
+        return Response.noContent().build();
+    }
+
+    @Path("/{slave : (users|devices|groups|geofences|drivers|attributes|calendars)}")
+    @DELETE
+    public Response remove(Map<String, Long> entity) throws SQLException {
+        Context.getPermissionsManager().checkReadonly(getUserId());
+        for (String key : entity.keySet()) {
+            Context.getPermissionsManager().checkPermission(key.replace("Id", ""), getUserId(), entity.get(key));
+        }
+        Context.getDataManager().linkObject(entity, false);
+        Context.getPermissionsManager().refreshPermissions(entity);
+        return Response.noContent().build();
+    }
+
+}
diff --git a/src/org/traccar/api/resource/UserPermissionResource.java b/src/org/traccar/api/resource/UserPermissionResource.java
deleted file mode 100644
index a97c4a665..000000000
--- a/src/org/traccar/api/resource/UserPermissionResource.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.api.resource;
-
-import java.sql.SQLException;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.traccar.Context;
-import org.traccar.api.BaseResource;
-import org.traccar.model.UserPermission;
-
-@Path("permissions/users")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
-public class UserPermissionResource extends BaseResource {
-
-    @POST
-    public Response add(UserPermission entity) throws SQLException {
-        Context.getPermissionsManager().checkAdmin(getUserId());
-        if (entity.getUserId() != entity.getManagedUserId()) {
-            Context.getDataManager().linkUser(entity.getUserId(), entity.getManagedUserId());
-            Context.getPermissionsManager().refreshUserPermissions();
-        }
-        return Response.ok(entity).build();
-    }
-
-    @DELETE
-    public Response remove(UserPermission entity) throws SQLException {
-        Context.getPermissionsManager().checkAdmin(getUserId());
-        Context.getDataManager().unlinkUser(entity.getUserId(), entity.getManagedUserId());
-        Context.getPermissionsManager().refreshUserPermissions();
-        return Response.noContent().build();
-    }
-
-}
diff --git a/src/org/traccar/api/resource/UserResource.java b/src/org/traccar/api/resource/UserResource.java
index b9187fdbb..94cc56b47 100644
--- a/src/org/traccar/api/resource/UserResource.java
+++ b/src/org/traccar/api/resource/UserResource.java
@@ -34,6 +34,7 @@ import javax.ws.rs.core.Response;
 import java.sql.SQLException;
 import java.util.Collection;
 import java.util.Date;
+import java.util.LinkedHashMap;
 
 @Path("users")
 @Produces(MediaType.APPLICATION_JSON)
@@ -74,7 +75,10 @@ public class UserResource extends BaseResource {
         }
         Context.getPermissionsManager().addUser(entity);
         if (Context.getPermissionsManager().isManager(getUserId())) {
-            Context.getDataManager().linkUser(getUserId(), entity.getId());
+            LinkedHashMap<String, Long> link = new LinkedHashMap<>();
+            link.put("userId", getUserId());
+            link.put("managedUserId", entity.getId());
+            Context.getDataManager().linkObject(link, true);
         }
         Context.getPermissionsManager().refreshUserPermissions();
         if (Context.getNotificationManager() != null) {
diff --git a/src/org/traccar/database/AttributesManager.java b/src/org/traccar/database/AttributesManager.java
index 88bedfba4..ebfdbc9b4 100644
--- a/src/org/traccar/database/AttributesManager.java
+++ b/src/org/traccar/database/AttributesManager.java
@@ -29,7 +29,7 @@ public class AttributesManager extends ExtendedObjectManager {
     public AttributesManager(DataManager dataManager) {
         super(dataManager, Attribute.class, AttributePermission.class, DeviceAttribute.class, GroupAttribute.class);
         refreshItems();
-        refresh();
+        refreshExtendedPermissions();
     }
 
     @Override
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index 4bf4b1b9a..6c9cca86c 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -23,6 +23,7 @@ import java.sql.SQLException;
 import java.text.SimpleDateFormat;
 import java.util.Collection;
 import java.util.Date;
+import java.util.Map;
 
 import javax.naming.InitialContext;
 import javax.sql.DataSource;
@@ -39,17 +40,12 @@ import org.traccar.Config;
 import org.traccar.helper.Log;
 import org.traccar.model.AttributeAlias;
 import org.traccar.model.Device;
-import org.traccar.model.DevicePermission;
 import org.traccar.model.Event;
-import org.traccar.model.Group;
-import org.traccar.model.GroupPermission;
 import org.traccar.model.Identifiable;
-import org.traccar.model.Notification;
 import org.traccar.model.Position;
 import org.traccar.model.Server;
 import org.traccar.model.Statistics;
 import org.traccar.model.User;
-import org.traccar.model.UserPermission;
 
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
@@ -153,17 +149,6 @@ public class DataManager {
         }
     }
 
-    public Collection<User> getUsers() throws SQLException {
-        return QueryBuilder.create(dataSource, getQuery("database.selectUsersAll"))
-                .executeQuery(User.class);
-    }
-
-    public void addUser(User user) throws SQLException {
-        user.setId(QueryBuilder.create(dataSource, getQuery("database.insertUser"), true)
-                .setObject(user)
-                .executeUpdate());
-    }
-
     public void updateUser(User user) throws SQLException {
         QueryBuilder.create(dataSource, getQuery("database.updateUser"))
                 .setObject(user)
@@ -175,102 +160,12 @@ public class DataManager {
         }
     }
 
-    public void removeUser(long userId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.deleteUser"))
-                .setLong("id", userId)
-                .executeUpdate();
-    }
-
-    public Collection<DevicePermission> getDevicePermissions() throws SQLException {
-        return QueryBuilder.create(dataSource, getQuery("database.selectDevicePermissions"))
-                .executeQuery(DevicePermission.class);
-    }
-
-    public Collection<GroupPermission> getGroupPermissions() throws SQLException {
-        return QueryBuilder.create(dataSource, getQuery("database.selectGroupPermissions"))
-                .executeQuery(GroupPermission.class);
-    }
-
-    public Collection<Device> getAllDevices() throws SQLException {
-        return QueryBuilder.create(dataSource, getQuery("database.selectDevicesAll"))
-                .executeQuery(Device.class);
-    }
-
-    public void addDevice(Device device) throws SQLException {
-        device.setId(QueryBuilder.create(dataSource, getQuery("database.insertDevice"), true)
-                .setObject(device)
-                .executeUpdate());
-    }
-
-    public void updateDevice(Device device) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.updateDevice"))
-                .setObject(device)
-                .executeUpdate();
-    }
-
     public void updateDeviceStatus(Device device) throws SQLException {
         QueryBuilder.create(dataSource, getQuery("database.updateDeviceStatus"))
                 .setObject(device)
                 .executeUpdate();
     }
 
-    public void removeDevice(long deviceId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.deleteDevice"))
-                .setLong("id", deviceId)
-                .executeUpdate();
-    }
-
-    public void linkDevice(long userId, long deviceId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.linkDevice"))
-                .setLong("userId", userId)
-                .setLong("deviceId", deviceId)
-                .executeUpdate();
-    }
-
-    public void unlinkDevice(long userId, long deviceId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.unlinkDevice"))
-                .setLong("userId", userId)
-                .setLong("deviceId", deviceId)
-                .executeUpdate();
-    }
-
-    public Collection<Group> getAllGroups() throws SQLException {
-        return QueryBuilder.create(dataSource, getQuery("database.selectGroupsAll"))
-                .executeQuery(Group.class);
-    }
-
-    public void addGroup(Group group) throws SQLException {
-        group.setId(QueryBuilder.create(dataSource, getQuery("database.insertGroup"), true)
-                .setObject(group)
-                .executeUpdate());
-    }
-
-    public void updateGroup(Group group) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.updateGroup"))
-                .setObject(group)
-                .executeUpdate();
-    }
-
-    public void removeGroup(long groupId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.deleteGroup"))
-                .setLong("id", groupId)
-                .executeUpdate();
-    }
-
-    public void linkGroup(long userId, long groupId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.linkGroup"))
-                .setLong("userId", userId)
-                .setLong("groupId", groupId)
-                .executeUpdate();
-    }
-
-    public void unlinkGroup(long userId, long groupId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.unlinkGroup"))
-                .setLong("userId", userId)
-                .setLong("groupId", groupId)
-                .executeUpdate();
-    }
-
     public Collection<Position> getPositions(long deviceId, Date from, Date to) throws SQLException {
         return QueryBuilder.create(dataSource, getQuery("database.selectPositions"))
                 .setLong("deviceId", deviceId)
@@ -323,24 +218,12 @@ public class DataManager {
                 .executeQuerySingle(Server.class);
     }
 
-    public void updateServer(Server server) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.updateServer"))
-                .setObject(server)
-                .executeUpdate();
-    }
-
     public Event getEvent(long eventId) throws SQLException {
         return QueryBuilder.create(dataSource, getQuery("database.selectEvent"))
                 .setLong("id", eventId)
                 .executeQuerySingle(Event.class);
     }
 
-    public void addEvent(Event event) throws SQLException {
-        event.setId(QueryBuilder.create(dataSource, getQuery("database.insertEvent"), true)
-                .setObject(event)
-                .executeUpdate());
-    }
-
     public Collection<Event> getEvents(long deviceId, Date from, Date to) throws SQLException {
         return QueryBuilder.create(dataSource, getQuery("database.selectEvents"))
                 .setLong("deviceId", deviceId)
@@ -349,71 +232,6 @@ public class DataManager {
                 .executeQuery(Event.class);
     }
 
-    public void linkGeofence(long userId, long geofenceId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.linkGeofence"))
-                .setLong("userId", userId)
-                .setLong("geofenceId", geofenceId)
-                .executeUpdate();
-    }
-
-    public void unlinkGeofence(long userId, long geofenceId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.unlinkGeofence"))
-                .setLong("userId", userId)
-                .setLong("geofenceId", geofenceId)
-                .executeUpdate();
-    }
-
-    public void linkGroupGeofence(long groupId, long geofenceId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.linkGroupGeofence"))
-                .setLong("groupId", groupId)
-                .setLong("geofenceId", geofenceId)
-                .executeUpdate();
-    }
-
-    public void unlinkGroupGeofence(long groupId, long geofenceId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.unlinkGroupGeofence"))
-                .setLong("groupId", groupId)
-                .setLong("geofenceId", geofenceId)
-                .executeUpdate();
-    }
-
-    public void linkDeviceGeofence(long deviceId, long geofenceId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.linkDeviceGeofence"))
-                .setLong("deviceId", deviceId)
-                .setLong("geofenceId", geofenceId)
-                .executeUpdate();
-    }
-
-    public void unlinkDeviceGeofence(long deviceId, long geofenceId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.unlinkDeviceGeofence"))
-                .setLong("deviceId", deviceId)
-                .setLong("geofenceId", geofenceId)
-                .executeUpdate();
-    }
-
-    public Collection<Notification> getNotifications() throws SQLException {
-        return QueryBuilder.create(dataSource, getQuery("database.selectNotifications"))
-                .executeQuery(Notification.class);
-    }
-
-    public void addNotification(Notification notification) throws SQLException {
-        notification.setId(QueryBuilder.create(dataSource, getQuery("database.insertNotification"), true)
-                .setObject(notification)
-                .executeUpdate());
-    }
-
-    public void updateNotification(Notification notification) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.updateNotification"))
-                .setObject(notification)
-                .executeUpdate();
-    }
-
-    public void removeNotification(Notification notification) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.deleteNotification"))
-                .setLong("id", notification.getId())
-                .executeUpdate();
-    }
-
     public Collection<AttributeAlias> getAttributeAliases() throws SQLException {
         return QueryBuilder.create(dataSource, getQuery("database.selectAttributeAliases"))
                 .executeQuery(AttributeAlias.class);
@@ -450,121 +268,16 @@ public class DataManager {
                 .executeUpdate());
     }
 
-    public void linkCalendar(long userId, long calendarId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.linkCalendar"))
-                .setLong("userId", userId)
-                .setLong("calendarId", calendarId)
-                .executeUpdate();
-    }
-
-    public void unlinkCalendar(long userId, long calendarId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.unlinkCalendar"))
-                .setLong("userId", userId)
-                .setLong("calendarId", calendarId)
-                .executeUpdate();
-    }
-
-    public Collection<UserPermission> getUserPermissions() throws SQLException {
-        return QueryBuilder.create(dataSource, getQuery("database.selectUserPermissions"))
-                .executeQuery(UserPermission.class);
-    }
-
-    public void linkUser(long userId, long managedUserId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.linkUser"))
-                .setLong("userId", userId)
-                .setLong("managedUserId", managedUserId)
-                .executeUpdate();
-    }
-
-    public void unlinkUser(long userId, long managedUserId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.unlinkUser"))
-                .setLong("userId", userId)
-                .setLong("managedUserId", managedUserId)
-                .executeUpdate();
-    }
-
-    public void linkAttribute(long userId, long attributeId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.linkAttribute"))
-                .setLong("userId", userId)
-                .setLong("attributeId", attributeId)
-                .executeUpdate();
-    }
-
-    public void unlinkAttribute(long userId, long attributeId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.unlinkAttribute"))
-                .setLong("userId", userId)
-                .setLong("attributeId", attributeId)
-                .executeUpdate();
-    }
-
-    public void linkGroupAttribute(long groupId, long attributeId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.linkGroupAttribute"))
-                .setLong("groupId", groupId)
-                .setLong("attributeId", attributeId)
-                .executeUpdate();
-    }
-
-    public void unlinkGroupAttribute(long groupId, long attributeId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.unlinkGroupAttribute"))
-                .setLong("groupId", groupId)
-                .setLong("attributeId", attributeId)
-                .executeUpdate();
-    }
-
-    public void linkDeviceAttribute(long deviceId, long attributeId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.linkDeviceAttribute"))
-                .setLong("deviceId", deviceId)
-                .setLong("attributeId", attributeId)
-                .executeUpdate();
-    }
-
-    public void unlinkDeviceAttribute(long deviceId, long attributeId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.unlinkDeviceAttribute"))
-                .setLong("deviceId", deviceId)
-                .setLong("attributeId", attributeId)
-                .executeUpdate();
-    }
-
-    public void linkDriver(long userId, long driverId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.linkDriver"))
-                .setLong("userId", userId)
-                .setLong("driverId", driverId)
-                .executeUpdate();
-    }
-
-    public void unlinkDriver(long userId, long driverId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.unlinkDriver"))
-                .setLong("userId", userId)
-                .setLong("driverId", driverId)
-                .executeUpdate();
-    }
-
-    public void linkGroupDriver(long groupId, long driverId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.linkGroupDriver"))
-                .setLong("groupId", groupId)
-                .setLong("driverId", driverId)
-                .executeUpdate();
-    }
-
-    public void unlinkGroupDriver(long groupId, long driverId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.unlinkGroupDriver"))
-                .setLong("groupId", groupId)
-                .setLong("driverId", driverId)
-                .executeUpdate();
-    }
-
-    public void linkDeviceDriver(long deviceId, long driverId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.linkDeviceDriver"))
-                .setLong("deviceId", deviceId)
-                .setLong("driverId", driverId)
-                .executeUpdate();
-    }
-
-    public void unlinkDeviceDriver(long deviceId, long driverId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.unlinkDeviceDriver"))
-                .setLong("deviceId", deviceId)
-                .setLong("driverId", driverId)
-                .executeUpdate();
+    public void linkObject(Map<String, Long> permission, boolean link) throws SQLException {
+        String query = "database." + (!link ? "un" : "") + "link";
+        for (String key : permission.keySet()) {
+            query += key.substring(0, 1).toUpperCase() + key.replace("Id", "").substring(1);
+        }
+        QueryBuilder queryBuilder = QueryBuilder.create(dataSource, getQuery(query));
+        for (String key : permission.keySet()) {
+            queryBuilder.setLong(key, permission.get(key));
+        }
+        queryBuilder.executeUpdate();
     }
 
     public <T> Collection<T> getObjects(Class<T> clazz) throws SQLException {
diff --git a/src/org/traccar/database/DeviceManager.java b/src/org/traccar/database/DeviceManager.java
index f2a2dd565..ba360f165 100644
--- a/src/org/traccar/database/DeviceManager.java
+++ b/src/org/traccar/database/DeviceManager.java
@@ -85,7 +85,7 @@ public class DeviceManager implements IdentityManager {
         if ((force || System.currentTimeMillis() - lastUpdate > dataRefreshDelay)
                 && devicesLastUpdate.compareAndSet(lastUpdate, System.currentTimeMillis())) {
             GeofenceManager geofenceManager = Context.getGeofenceManager();
-            Collection<Device> databaseDevices = dataManager.getAllDevices();
+            Collection<Device> databaseDevices = dataManager.getObjects(Device.class);
             if (devicesById == null) {
                 devicesById = new ConcurrentHashMap<>(databaseDevices.size());
             }
@@ -199,7 +199,7 @@ public class DeviceManager implements IdentityManager {
     }
 
     public void addDevice(Device device) throws SQLException {
-        dataManager.addDevice(device);
+        dataManager.addObject(device);
 
         devicesById.put(device.getId(), device);
         devicesByUniqueId.put(device.getUniqueId(), device);
@@ -209,7 +209,7 @@ public class DeviceManager implements IdentityManager {
     }
 
     public void updateDevice(Device device) throws SQLException {
-        dataManager.updateDevice(device);
+        dataManager.updateObject(device);
 
         devicesById.put(device.getId(), device);
         devicesByUniqueId.put(device.getUniqueId(), device);
@@ -227,7 +227,7 @@ public class DeviceManager implements IdentityManager {
     }
 
     public void removeDevice(long deviceId) throws SQLException {
-        dataManager.removeDevice(deviceId);
+        dataManager.removeObject(Device.class, deviceId);
 
         if (devicesById.containsKey(deviceId)) {
             String deviceUniqueId = devicesById.get(deviceId).getUniqueId();
@@ -289,7 +289,7 @@ public class DeviceManager implements IdentityManager {
         long lastUpdate = groupsLastUpdate.get();
         if ((force || System.currentTimeMillis() - lastUpdate > dataRefreshDelay)
                 && groupsLastUpdate.compareAndSet(lastUpdate, System.currentTimeMillis())) {
-            Collection<Group> databaseGroups = dataManager.getAllGroups();
+            Collection<Group> databaseGroups = dataManager.getObjects(Group.class);
             if (groupsById == null) {
                 groupsById = new ConcurrentHashMap<>(databaseGroups.size());
             }
@@ -359,18 +359,18 @@ public class DeviceManager implements IdentityManager {
 
     public void addGroup(Group group) throws SQLException {
         checkGroupCycles(group);
-        dataManager.addGroup(group);
+        dataManager.addObject(group);
         groupsById.put(group.getId(), group);
     }
 
     public void updateGroup(Group group) throws SQLException {
         checkGroupCycles(group);
-        dataManager.updateGroup(group);
+        dataManager.updateObject(group);
         groupsById.put(group.getId(), group);
     }
 
     public void removeGroup(long groupId) throws SQLException {
-        dataManager.removeGroup(groupId);
+        dataManager.removeObject(Group.class, groupId);
         groupsById.remove(groupId);
     }
 
diff --git a/src/org/traccar/database/DriversManager.java b/src/org/traccar/database/DriversManager.java
index 391708f64..9b01f1a70 100644
--- a/src/org/traccar/database/DriversManager.java
+++ b/src/org/traccar/database/DriversManager.java
@@ -34,7 +34,7 @@ public class DriversManager extends ExtendedObjectManager {
     public DriversManager(DataManager dataManager) {
         super(dataManager, Driver.class, DriverPermission.class, DeviceDriver.class, GroupDriver.class);
         refreshItems();
-        refresh();
+        refreshExtendedPermissions();
     }
 
     @Override
@@ -83,7 +83,7 @@ public class DriversManager extends ExtendedObjectManager {
             driversByUniqueId.remove(driverUniqueId);
         }
         refreshUserItems();
-        refresh();
+        refreshExtendedPermissions();
     }
 
     public Driver getDriverByUniqueId(String uniqueId) {
diff --git a/src/org/traccar/database/ExtendedObjectManager.java b/src/org/traccar/database/ExtendedObjectManager.java
index 5147b9f9f..a6508f066 100644
--- a/src/org/traccar/database/ExtendedObjectManager.java
+++ b/src/org/traccar/database/ExtendedObjectManager.java
@@ -82,10 +82,10 @@ public abstract class ExtendedObjectManager extends SimpleObjectManager {
     @Override
     public void removeItem(long itemId) throws SQLException {
         super.removeItem(itemId);
-        refresh();
+        refreshExtendedPermissions();
     }
 
-    public void refresh() {
+    public void refreshExtendedPermissions() {
         if (getDataManager() != null) {
             try {
 
diff --git a/src/org/traccar/database/GeofenceManager.java b/src/org/traccar/database/GeofenceManager.java
index 868804d8f..ed1f26f78 100644
--- a/src/org/traccar/database/GeofenceManager.java
+++ b/src/org/traccar/database/GeofenceManager.java
@@ -31,11 +31,12 @@ public class GeofenceManager extends ExtendedObjectManager {
     public GeofenceManager(DataManager dataManager) {
         super(dataManager, Geofence.class, GeofencePermission.class, DeviceGeofence.class, GroupGeofence.class);
         refreshItems();
-        refresh();
+        refreshExtendedPermissions();
     }
 
-    public final void refresh() {
-        super.refresh();
+    @Override
+    public final void refreshExtendedPermissions() {
+        super.refreshExtendedPermissions();
         recalculateDevicesGeofences();
     }
 
diff --git a/src/org/traccar/database/NotificationManager.java b/src/org/traccar/database/NotificationManager.java
index 11d5a9aca..0987f255b 100644
--- a/src/org/traccar/database/NotificationManager.java
+++ b/src/org/traccar/database/NotificationManager.java
@@ -49,7 +49,7 @@ public class NotificationManager {
 
     public void updateEvent(Event event, Position position) {
         try {
-            dataManager.addEvent(event);
+            dataManager.addObject(event);
         } catch (SQLException error) {
             Log.warning(error);
         }
@@ -105,7 +105,7 @@ public class NotificationManager {
                 notificationsLock.writeLock().lock();
                 try {
                     userNotifications.clear();
-                    for (Notification notification : dataManager.getNotifications()) {
+                    for (Notification notification : dataManager.getObjects(Notification.class)) {
                         getUserNotificationsUnsafe(notification.getUserId()).add(notification);
                     }
                 } finally {
@@ -139,7 +139,7 @@ public class NotificationManager {
                     || cachedNotification.getSms() != notification.getSms()) {
                 if (!notification.getWeb() && !notification.getMail() && !notification.getSms()) {
                     try {
-                        dataManager.removeNotification(cachedNotification);
+                        dataManager.removeObject(Notification.class, cachedNotification.getId());
                     } catch (SQLException error) {
                         Log.warning(error);
                     }
@@ -160,7 +160,7 @@ public class NotificationManager {
                         notificationsLock.writeLock().unlock();
                     }
                     try {
-                        dataManager.updateNotification(cachedNotification);
+                        dataManager.updateObject(cachedNotification);
                     } catch (SQLException error) {
                         Log.warning(error);
                     }
@@ -170,7 +170,7 @@ public class NotificationManager {
             }
         } else if (notification.getWeb() || notification.getMail() || notification.getSms()) {
             try {
-                dataManager.addNotification(notification);
+                dataManager.addObject(notification);
             } catch (SQLException error) {
                 Log.warning(error);
             }
diff --git a/src/org/traccar/database/PermissionsManager.java b/src/org/traccar/database/PermissionsManager.java
index f88e14bfe..caae86b84 100644
--- a/src/org/traccar/database/PermissionsManager.java
+++ b/src/org/traccar/database/PermissionsManager.java
@@ -98,7 +98,7 @@ public class PermissionsManager {
         usersTokens.clear();
         try {
             server = dataManager.getServer();
-            for (User user : dataManager.getUsers()) {
+            for (User user : dataManager.getObjects(User.class)) {
                 users.put(user.getId(), user);
                 if (user.getToken() != null) {
                     usersTokens.put(user.getToken(), user.getId());
@@ -112,7 +112,7 @@ public class PermissionsManager {
     public final void refreshUserPermissions() {
         userPermissions.clear();
         try {
-            for (UserPermission permission : dataManager.getUserPermissions()) {
+            for (UserPermission permission : dataManager.getObjects(UserPermission.class)) {
                 getUserPermissions(permission.getUserId()).add(permission.getManagedUserId());
             }
         } catch (SQLException error) {
@@ -126,7 +126,7 @@ public class PermissionsManager {
         try {
             GroupTree groupTree = new GroupTree(Context.getDeviceManager().getAllGroups(),
                     Context.getDeviceManager().getAllDevices());
-            for (GroupPermission permission : dataManager.getGroupPermissions()) {
+            for (GroupPermission permission : dataManager.getObjects(GroupPermission.class)) {
                 Set<Long> userGroupPermissions = getGroupPermissions(permission.getUserId());
                 Set<Long> userDevicePermissions = getDevicePermissions(permission.getUserId());
                 userGroupPermissions.add(permission.getGroupId());
@@ -137,7 +137,7 @@ public class PermissionsManager {
                     userDevicePermissions.add(device.getId());
                 }
             }
-            for (DevicePermission permission : dataManager.getDevicePermissions()) {
+            for (DevicePermission permission : dataManager.getObjects(DevicePermission.class)) {
                 getDevicePermissions(permission.getUserId()).add(permission.getDeviceId());
             }
 
@@ -302,6 +302,15 @@ public class PermissionsManager {
         SimpleObjectManager manager = null;
 
         switch (object) {
+            case "device":
+                checkDevice(userId, objectId);
+                break;
+            case "group":
+                checkGroup(userId, objectId);
+                break;
+            case "user":
+                checkUser(userId, objectId);
+                break;
             case "geofence":
                 manager = Context.getGeofenceManager();
                 break;
@@ -332,12 +341,51 @@ public class PermissionsManager {
         }
     }
 
+    public void refreshAllExtendedPermissions() {
+        if (Context.getGeofenceManager() != null) {
+            Context.getGeofenceManager().refreshExtendedPermissions();
+        }
+        Context.getDriversManager().refreshExtendedPermissions();
+        Context.getAttributesManager().refreshExtendedPermissions();
+    }
+
+    public void refreshPermissions(Map<String, Long> entity) {
+        if (entity.containsKey("userId")) {
+            if (entity.containsKey("deviceId") || entity.containsKey("groupId")) {
+                refreshPermissions();
+                refreshAllExtendedPermissions();
+            } else if (entity.containsKey("managedUserId")) {
+                refreshUserPermissions();
+            } else if (entity.containsKey("geofenceId")) {
+                if (Context.getGeofenceManager() != null) {
+                    Context.getGeofenceManager().refreshUserItems();
+                }
+            } else if (entity.containsKey("driverId")) {
+                Context.getDriversManager().refreshUserItems();
+            } else if (entity.containsKey("attributeId")) {
+                Context.getAttributesManager().refreshUserItems();
+            } else if (entity.containsKey("calendarId")) {
+                Context.getCalendarManager().refreshUserItems();
+            }
+        } else if (entity.containsKey("deviceId") || entity.containsKey("groupId")) {
+            if (entity.containsKey("geofenceId")) {
+                if (Context.getGeofenceManager() != null) {
+                    Context.getGeofenceManager().refreshExtendedPermissions();
+                }
+            } else if (entity.containsKey("driverId")) {
+                Context.getDriversManager().refreshExtendedPermissions();
+            } else if (entity.containsKey("attributeId")) {
+                Context.getAttributesManager().refreshExtendedPermissions();
+            }
+        }
+    }
+
     public Server getServer() {
         return server;
     }
 
     public void updateServer(Server server) throws SQLException {
-        dataManager.updateServer(server);
+        dataManager.updateObject(server);
         this.server = server;
     }
 
@@ -364,7 +412,7 @@ public class PermissionsManager {
     }
 
     public void addUser(User user) throws SQLException {
-        dataManager.addUser(user);
+        dataManager.addObject(user);
         users.put(user.getId(), user);
         if (user.getToken() != null) {
             usersTokens.put(user.getToken(), user.getId());
@@ -386,7 +434,7 @@ public class PermissionsManager {
     }
 
     public void removeUser(long userId) throws SQLException {
-        dataManager.removeUser(userId);
+        dataManager.removeObject(User.class, userId);
         usersTokens.remove(users.get(userId).getToken());
         users.remove(userId);
         refreshPermissions();
diff --git a/src/org/traccar/database/SimpleObjectManager.java b/src/org/traccar/database/SimpleObjectManager.java
index 84d41a84f..f5f807850 100644
--- a/src/org/traccar/database/SimpleObjectManager.java
+++ b/src/org/traccar/database/SimpleObjectManager.java
@@ -132,14 +132,6 @@ public abstract class SimpleObjectManager {
         refreshUserItems();
     }
 
-//    public final Collection<? extends Identifiable> getItems(Set<Long> itemIds) {
-//        Collection<Identifiable> result = new LinkedList<>();
-//        for (long itemId : itemIds) {
-//            result.add(getById(itemId));
-//        }
-//        return result;
-//    }
-
     public final <T> Collection<T> getItems(Class<T> clazz, Set<Long> itemIds) {
         Collection<T> result = new LinkedList<>();
         for (long itemId : itemIds) {
-- 
cgit v1.2.3


From 69c46399ee0f6b3dd2b0589cb412e9e17f040369 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Fri, 21 Jul 2017 18:41:49 +0500
Subject: Use classes instead of constants everywhere

---
 setup/default.xml                                  | 14 ++--
 src/org/traccar/Context.java                       |  8 --
 src/org/traccar/api/BaseResource.java              | 29 +++----
 .../traccar/api/resource/AttributeResource.java    |  6 +-
 src/org/traccar/api/resource/CalendarResource.java |  6 +-
 src/org/traccar/api/resource/DeviceResource.java   |  2 +-
 src/org/traccar/api/resource/DriverResource.java   |  6 +-
 src/org/traccar/api/resource/EventResource.java    |  3 +-
 src/org/traccar/api/resource/GeofenceResource.java |  6 +-
 src/org/traccar/api/resource/GroupResource.java    |  2 +-
 .../traccar/api/resource/PermissionsResource.java  | 10 +--
 src/org/traccar/api/resource/UserResource.java     |  3 +-
 src/org/traccar/database/DataManager.java          | 21 +++--
 src/org/traccar/database/DriversManager.java       |  2 +-
 .../traccar/database/ExtendedObjectManager.java    | 14 ++--
 src/org/traccar/database/PermissionsManager.java   | 96 +++++++++++-----------
 src/org/traccar/database/SimpleObjectManager.java  | 16 ++--
 src/org/traccar/model/ManagedUser.java             | 21 +++++
 18 files changed, 144 insertions(+), 121 deletions(-)
 create mode 100644 src/org/traccar/model/ManagedUser.java

(limited to 'setup')

diff --git a/setup/default.xml b/setup/default.xml
index dcf995af0..f0f9ef4a3 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -103,11 +103,11 @@
         DELETE FROM users WHERE id = :id
     </entry>
 
-    <entry key='database.selectDevicePermissions'>
+    <entry key='database.selectUserDevices'>
         SELECT userId, deviceId FROM user_device
     </entry>
 
-    <entry key='database.selectGroupPermissions'>
+    <entry key='database.selectUserGroups'>
         SELECT userId, groupId FROM user_group
     </entry>
 
@@ -230,7 +230,7 @@
         DELETE FROM geofences WHERE id = :id
     </entry>
 
-    <entry key='database.selectGeofencePermissions'>
+    <entry key='database.selectUserGeofences'>
         SELECT userId, geofenceId FROM user_geofence
     </entry>
 
@@ -349,7 +349,7 @@
         DELETE FROM calendars WHERE id = :id
     </entry>
 
-    <entry key='database.selectCalendarPermissions'>
+    <entry key='database.selectUserCalendars'>
         SELECT userId, calendarId FROM user_calendar
     </entry>
 
@@ -361,7 +361,7 @@
         DELETE FROM user_calendar WHERE userId = :userId AND calendarId = :calendarId
     </entry>
     
-    <entry key='database.selectUserPermissions'>
+    <entry key='database.selectUserUsers'>
         SELECT userId, managedUserId FROM user_user
     </entry>
 
@@ -395,7 +395,7 @@
         DELETE FROM attributes WHERE id = :id
     </entry>
     
-        <entry key='database.selectAttributePermissions'>
+        <entry key='database.selectUserAttributes'>
         SELECT userId, attributeId FROM user_attribute
     </entry>
 
@@ -452,7 +452,7 @@
         DELETE FROM drivers WHERE id = :id
     </entry>
     
-    <entry key='database.selectDriverPermissions'>
+    <entry key='database.selectUserDrivers'>
         SELECT userId, driverId FROM user_driver
     </entry>
 
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index 57c6bc908..a4fc5b679 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -59,14 +59,6 @@ import org.traccar.web.WebServer;
 
 public final class Context {
 
-    public static final String TYPE_USER = "User";
-    public static final String TYPE_DEVICE = "Device";
-    public static final String TYPE_GROUP = "Group";
-    public static final String TYPE_GEOFENCE = "Geofence";
-    public static final String TYPE_CALENDAR = "Calendar";
-    public static final String TYPE_ATTRIBUTE = "Attribute";
-    public static final String TYPE_DRIVER = "Driver";
-
     private Context() {
     }
 
diff --git a/src/org/traccar/api/BaseResource.java b/src/org/traccar/api/BaseResource.java
index 4ad1477c2..920bb3931 100644
--- a/src/org/traccar/api/BaseResource.java
+++ b/src/org/traccar/api/BaseResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,13 +17,15 @@ package org.traccar.api;
 
 import java.sql.SQLException;
 import java.util.Iterator;
-import java.util.Map;
+import java.util.LinkedHashMap;
 
 import javax.ws.rs.core.SecurityContext;
 
 import org.traccar.Context;
 import org.traccar.database.DataManager;
 import org.traccar.model.BaseModel;
+import org.traccar.model.Device;
+import org.traccar.model.User;
 
 public class BaseResource {
 
@@ -38,34 +40,33 @@ public class BaseResource {
         return 0;
     }
 
-    protected void handlePermission(Map<String, Long> entity, boolean link) throws SQLException {
-        if (entity.size() != 2) {
-            throw new IllegalArgumentException();
-        }
+    protected void checkAndLinkPermission(LinkedHashMap<String, Long> entity, boolean link)
+            throws SQLException, ClassNotFoundException {
         Iterator<String> iterator = entity.keySet().iterator();
         String owner = iterator.next();
+        Class<?> ownerClass = DataManager.getClassByName(owner);
         String property = iterator.next();
+        Class<?> propertyClass = DataManager.getClassByName(property);
 
         long ownerId = entity.get(owner);
         long propertyId = entity.get(property);
 
-        if (!link && DataManager.makeName(owner).equals(Context.TYPE_USER)
-                && DataManager.makeName(property).equals(Context.TYPE_DEVICE)) {
+        if (!link && ownerClass.equals(User.class)
+                && propertyClass.equals(Device.class)) {
             if (getUserId() != ownerId) {
                 Context.getPermissionsManager().checkUser(getUserId(), ownerId);
             } else {
                 Context.getPermissionsManager().checkAdmin(getUserId());
             }
         } else {
-            Context.getPermissionsManager().checkPermission(owner, getUserId(), ownerId);
+            Context.getPermissionsManager().checkPermission(ownerClass, getUserId(), ownerId);
         }
-        Context.getPermissionsManager().checkPermission(property, getUserId(), propertyId);
+        Context.getPermissionsManager().checkPermission(propertyClass, getUserId(), propertyId);
 
-        Context.getDataManager().linkObject(owner, ownerId, property, propertyId, link);
+        Context.getDataManager().linkObject(ownerClass, ownerId, propertyClass, propertyId, link);
     }
 
-    protected void linkNew(BaseModel entity) throws SQLException {
-        Context.getDataManager().linkObject("userId", getUserId(),
-                entity.getClass().getSimpleName(), entity.getId(), true);
+    protected void linkNewEntity(BaseModel entity) throws SQLException {
+        Context.getDataManager().linkObject(User.class, getUserId(), entity.getClass(), entity.getId(), true);
     }
 }
diff --git a/src/org/traccar/api/resource/AttributeResource.java b/src/org/traccar/api/resource/AttributeResource.java
index 63cdfb2a7..7e6947d26 100644
--- a/src/org/traccar/api/resource/AttributeResource.java
+++ b/src/org/traccar/api/resource/AttributeResource.java
@@ -87,7 +87,7 @@ public class AttributeResource extends BaseResource {
     private Response add(Attribute entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getAttributesManager().addItem(entity);
-        linkNew(entity);
+        linkNewEntity(entity);
         Context.getAttributesManager().refreshUserItems();
         return Response.ok(entity).build();
     }
@@ -128,7 +128,7 @@ public class AttributeResource extends BaseResource {
     @PUT
     public Response update(Attribute entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkPermission(Context.TYPE_ATTRIBUTE, getUserId(), entity.getId());
+        Context.getPermissionsManager().checkPermission(Attribute.class, getUserId(), entity.getId());
         Context.getAttributesManager().updateItem(entity);
         return Response.ok(entity).build();
     }
@@ -137,7 +137,7 @@ public class AttributeResource extends BaseResource {
     @DELETE
     public Response remove(@PathParam("id") long id) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkPermission(Context.TYPE_ATTRIBUTE, getUserId(), id);
+        Context.getPermissionsManager().checkPermission(Attribute.class, getUserId(), id);
         Context.getAttributesManager().removeItem(id);
         return Response.noContent().build();
     }
diff --git a/src/org/traccar/api/resource/CalendarResource.java b/src/org/traccar/api/resource/CalendarResource.java
index d29080ee2..30f5df6b8 100644
--- a/src/org/traccar/api/resource/CalendarResource.java
+++ b/src/org/traccar/api/resource/CalendarResource.java
@@ -66,7 +66,7 @@ public class CalendarResource extends BaseResource {
     public Response add(Calendar entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getCalendarManager().addItem(entity);
-        linkNew(entity);
+        linkNewEntity(entity);
         Context.getCalendarManager().refreshUserItems();
         return Response.ok(entity).build();
     }
@@ -75,7 +75,7 @@ public class CalendarResource extends BaseResource {
     @PUT
     public Response update(Calendar entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkPermission(Context.TYPE_CALENDAR, getUserId(), entity.getId());
+        Context.getPermissionsManager().checkPermission(Calendar.class, getUserId(), entity.getId());
         Context.getCalendarManager().updateItem(entity);
         return Response.ok(entity).build();
     }
@@ -84,7 +84,7 @@ public class CalendarResource extends BaseResource {
     @DELETE
     public Response remove(@PathParam("id") long id) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkPermission(Context.TYPE_CALENDAR, getUserId(), id);
+        Context.getPermissionsManager().checkPermission(Calendar.class, getUserId(), id);
         Context.getCalendarManager().removeItem(id);
         return Response.noContent().build();
     }
diff --git a/src/org/traccar/api/resource/DeviceResource.java b/src/org/traccar/api/resource/DeviceResource.java
index 285ed6a31..e1c0fc96d 100644
--- a/src/org/traccar/api/resource/DeviceResource.java
+++ b/src/org/traccar/api/resource/DeviceResource.java
@@ -77,7 +77,7 @@ public class DeviceResource extends BaseResource {
         Context.getPermissionsManager().checkDeviceReadonly(getUserId());
         Context.getPermissionsManager().checkDeviceLimit(getUserId());
         Context.getDeviceManager().addDevice(entity);
-        linkNew(entity);
+        linkNewEntity(entity);
         Context.getPermissionsManager().refreshPermissions();
         Context.getPermissionsManager().refreshAllExtendedPermissions();
         return Response.ok(entity).build();
diff --git a/src/org/traccar/api/resource/DriverResource.java b/src/org/traccar/api/resource/DriverResource.java
index b528a197a..cf80bf7df 100644
--- a/src/org/traccar/api/resource/DriverResource.java
+++ b/src/org/traccar/api/resource/DriverResource.java
@@ -86,7 +86,7 @@ public class DriverResource extends BaseResource {
     public Response add(Driver entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getDriversManager().addItem(entity);
-        linkNew(entity);
+        linkNewEntity(entity);
         Context.getDriversManager().refreshUserItems();
         return Response.ok(entity).build();
     }
@@ -95,7 +95,7 @@ public class DriverResource extends BaseResource {
     @PUT
     public Response update(Driver entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkPermission(Context.TYPE_DRIVER, getUserId(), entity.getId());
+        Context.getPermissionsManager().checkPermission(Driver.class, getUserId(), entity.getId());
         Context.getDriversManager().updateItem(entity);
         return Response.ok(entity).build();
     }
@@ -104,7 +104,7 @@ public class DriverResource extends BaseResource {
     @DELETE
     public Response remove(@PathParam("id") long id) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkPermission(Context.TYPE_DRIVER, getUserId(), id);
+        Context.getPermissionsManager().checkPermission(Driver.class, getUserId(), id);
         Context.getDriversManager().removeItem(id);
         return Response.noContent().build();
     }
diff --git a/src/org/traccar/api/resource/EventResource.java b/src/org/traccar/api/resource/EventResource.java
index 85f981514..b7fda6f73 100644
--- a/src/org/traccar/api/resource/EventResource.java
+++ b/src/org/traccar/api/resource/EventResource.java
@@ -12,6 +12,7 @@ import javax.ws.rs.core.MediaType;
 import org.traccar.Context;
 import org.traccar.api.BaseResource;
 import org.traccar.model.Event;
+import org.traccar.model.Geofence;
 
 @Path("events")
 @Produces(MediaType.APPLICATION_JSON)
@@ -25,7 +26,7 @@ public class EventResource extends BaseResource {
         Event event = Context.getDataManager().getEvent(id);
         Context.getPermissionsManager().checkDevice(getUserId(), event.getDeviceId());
         if (event.getGeofenceId() != 0) {
-            Context.getPermissionsManager().checkPermission(Context.TYPE_GEOFENCE, getUserId(), event.getGeofenceId());
+            Context.getPermissionsManager().checkPermission(Geofence.class, getUserId(), event.getGeofenceId());
         }
         return event;
     }
diff --git a/src/org/traccar/api/resource/GeofenceResource.java b/src/org/traccar/api/resource/GeofenceResource.java
index c9cc72bd7..341180cf8 100644
--- a/src/org/traccar/api/resource/GeofenceResource.java
+++ b/src/org/traccar/api/resource/GeofenceResource.java
@@ -85,7 +85,7 @@ public class GeofenceResource extends BaseResource {
     public Response add(Geofence entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getGeofenceManager().addItem(entity);
-        linkNew(entity);
+        linkNewEntity(entity);
         Context.getGeofenceManager().refreshUserItems();
         return Response.ok(entity).build();
     }
@@ -94,7 +94,7 @@ public class GeofenceResource extends BaseResource {
     @PUT
     public Response update(Geofence entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkPermission(Context.TYPE_GEOFENCE, getUserId(), entity.getId());
+        Context.getPermissionsManager().checkPermission(Geofence.class, getUserId(), entity.getId());
         Context.getGeofenceManager().updateItem(entity);
         return Response.ok(entity).build();
     }
@@ -103,7 +103,7 @@ public class GeofenceResource extends BaseResource {
     @DELETE
     public Response remove(@PathParam("id") long id) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkPermission(Context.TYPE_GEOFENCE, getUserId(), id);
+        Context.getPermissionsManager().checkPermission(Geofence.class, getUserId(), id);
         Context.getGeofenceManager().removeItem(id);
         return Response.noContent().build();
     }
diff --git a/src/org/traccar/api/resource/GroupResource.java b/src/org/traccar/api/resource/GroupResource.java
index 5d575ebfe..2ecd11fe5 100644
--- a/src/org/traccar/api/resource/GroupResource.java
+++ b/src/org/traccar/api/resource/GroupResource.java
@@ -61,7 +61,7 @@ public class GroupResource extends BaseResource {
     public Response add(Group entity) throws SQLException {
         Context.getPermissionsManager().checkReadonly(getUserId());
         Context.getDeviceManager().addGroup(entity);
-        linkNew(entity);
+        linkNewEntity(entity);
         Context.getPermissionsManager().refreshPermissions();
         Context.getPermissionsManager().refreshAllExtendedPermissions();
         return Response.ok(entity).build();
diff --git a/src/org/traccar/api/resource/PermissionsResource.java b/src/org/traccar/api/resource/PermissionsResource.java
index 707242cf1..515efbe41 100644
--- a/src/org/traccar/api/resource/PermissionsResource.java
+++ b/src/org/traccar/api/resource/PermissionsResource.java
@@ -17,7 +17,7 @@
 package org.traccar.api.resource;
 
 import java.sql.SQLException;
-import java.util.Map;
+import java.util.LinkedHashMap;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -36,17 +36,17 @@ import org.traccar.api.BaseResource;
 public class PermissionsResource  extends BaseResource {
 
     @POST
-    public Response add(Map<String, Long> entity) throws SQLException {
+    public Response add(LinkedHashMap<String, Long> entity) throws SQLException, ClassNotFoundException {
         Context.getPermissionsManager().checkReadonly(getUserId());
-        handlePermission(entity, true);
+        checkAndLinkPermission(entity, true);
         Context.getPermissionsManager().refreshPermissions(entity);
         return Response.noContent().build();
     }
 
     @DELETE
-    public Response remove(Map<String, Long> entity) throws SQLException {
+    public Response remove(LinkedHashMap<String, Long> entity) throws SQLException, ClassNotFoundException {
         Context.getPermissionsManager().checkReadonly(getUserId());
-        handlePermission(entity, false);
+        checkAndLinkPermission(entity, false);
         Context.getPermissionsManager().refreshPermissions(entity);
         return Response.noContent().build();
     }
diff --git a/src/org/traccar/api/resource/UserResource.java b/src/org/traccar/api/resource/UserResource.java
index e710c940d..98395e3cc 100644
--- a/src/org/traccar/api/resource/UserResource.java
+++ b/src/org/traccar/api/resource/UserResource.java
@@ -17,6 +17,7 @@ package org.traccar.api.resource;
 
 import org.traccar.Context;
 import org.traccar.api.BaseResource;
+import org.traccar.model.ManagedUser;
 import org.traccar.model.User;
 
 import javax.annotation.security.PermitAll;
@@ -74,7 +75,7 @@ public class UserResource extends BaseResource {
         }
         Context.getPermissionsManager().addUser(entity);
         if (Context.getPermissionsManager().isManager(getUserId())) {
-            Context.getDataManager().linkObject("userId", getUserId(), "managedUserId", entity.getId(), true);
+            Context.getDataManager().linkObject(User.class, getUserId(), ManagedUser.class, entity.getId(), true);
         }
         Context.getPermissionsManager().refreshUserPermissions();
         if (Context.getNotificationManager() != null) {
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index 3bb367ece..80b9f98e9 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -268,17 +268,19 @@ public class DataManager {
                 .executeUpdate());
     }
 
-    public static String makeName(String object) {
-        return object.substring(0, 1).toUpperCase() + object.replace("Id", "").substring(1);
+    public static Class<?> getClassByName(String name) throws ClassNotFoundException {
+        return Class.forName("org.traccar.model."
+                + name.substring(0, 1).toUpperCase() + name.replace("Id", "").substring(1));
     }
 
-    public static String makeNameId(String object) {
-        return object.substring(0, 1).toLowerCase() + object.substring(1) + (object.indexOf("Id") == -1 ? "Id" : "");
+    public static String makeNameId(Class<?> clazz) {
+        String name = clazz.getSimpleName();
+        return name.substring(0, 1).toLowerCase() + name.substring(1) + (name.indexOf("Id") == -1 ? "Id" : "");
     }
 
-    public void linkObject(String owner, long ownerId, String property, long propertyId,
-            boolean link) throws SQLException {
-        String query = "database." + (!link ? "un" : "") + "link" + makeName(owner) + makeName(property);
+    public void linkObject(Class<?> owner, long ownerId, Class<?> property, long propertyId, boolean link)
+            throws SQLException {
+        String query = "database." + (link ? "link" : "unlink") + owner.getSimpleName() + property.getSimpleName();
         QueryBuilder queryBuilder = QueryBuilder.create(dataSource, getQuery(query));
 
         queryBuilder.setLong(makeNameId(owner), ownerId);
@@ -291,8 +293,9 @@ public class DataManager {
         return QueryBuilder.create(dataSource, getQuery(query)).executeQuery(clazz);
     }
 
-    public Collection<Map<String, Long>> getPermissions(String owner, String property) throws SQLException {
-        String query = "database.select" + makeName(owner) + makeName(property) + "s";
+    public Collection<Map<String, Long>> getPermissions(Class<? extends BaseModel> owner,
+            Class<? extends BaseModel> property) throws SQLException {
+        String query = "database.select" + owner.getSimpleName() + property.getSimpleName() + "s";
         return QueryBuilder.create(dataSource, getQuery(query)).executeMapQuery(Long.class);
     }
 
diff --git a/src/org/traccar/database/DriversManager.java b/src/org/traccar/database/DriversManager.java
index 8c35f3ddf..0dc2b102d 100644
--- a/src/org/traccar/database/DriversManager.java
+++ b/src/org/traccar/database/DriversManager.java
@@ -73,7 +73,7 @@ public class DriversManager extends ExtendedObjectManager {
     @Override
     public void removeItem(long driverId) throws SQLException {
         Driver cachedDriver = (Driver) getById(driverId);
-        getDataManager().removeObject(cachedDriver.getClass(), driverId);
+        getDataManager().removeObject(Driver.class, driverId);
         if (cachedDriver != null) {
             String driverUniqueId = cachedDriver.getUniqueId();
             removeCachedItem(driverId);
diff --git a/src/org/traccar/database/ExtendedObjectManager.java b/src/org/traccar/database/ExtendedObjectManager.java
index fce32fb41..8380b9da2 100644
--- a/src/org/traccar/database/ExtendedObjectManager.java
+++ b/src/org/traccar/database/ExtendedObjectManager.java
@@ -26,6 +26,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.traccar.Context;
 import org.traccar.helper.Log;
 import org.traccar.model.Device;
+import org.traccar.model.Group;
 import org.traccar.model.BaseModel;
 
 public abstract class ExtendedObjectManager extends SimpleObjectManager {
@@ -79,23 +80,26 @@ public abstract class ExtendedObjectManager extends SimpleObjectManager {
             try {
 
                 Collection<Map<String, Long>> databaseGroupPermissions =
-                        getDataManager().getPermissions("Group", getBaseClassName());
+                        getDataManager().getPermissions(Group.class, getBaseClass());
 
                 clearGroupItems();
                 for (Map<String, Long> groupPermission : databaseGroupPermissions) {
-                    getGroupItems(groupPermission.get("groupId")).add(groupPermission.get(getBaseClassIdName()));
+                    getGroupItems(groupPermission.get(DataManager.makeNameId(Group.class)))
+                            .add(groupPermission.get(getBaseClassIdName()));
                 }
 
                 Collection<Map<String, Long>> databaseDevicePermissions =
-                        getDataManager().getPermissions("Device", getBaseClassName());
+                        getDataManager().getPermissions(Device.class, getBaseClass());
                 Collection<Device> allDevices = Context.getDeviceManager().getAllDevices();
 
                 clearDeviceItems();
                 deviceItemsWithGroups.clear();
 
                 for (Map<String, Long> devicePermission : databaseDevicePermissions) {
-                    getDeviceItems(devicePermission.get("deviceId")).add(devicePermission.get(getBaseClassIdName()));
-                    getAllDeviceItems(devicePermission.get("deviceId")).add(devicePermission.get(getBaseClassIdName()));
+                    getDeviceItems(devicePermission.get(DataManager.makeNameId(Device.class)))
+                            .add(devicePermission.get(getBaseClassIdName()));
+                    getAllDeviceItems(devicePermission.get(DataManager.makeNameId(Device.class)))
+                            .add(devicePermission.get(getBaseClassIdName()));
                 }
 
                 for (Device device : allDevices) {
diff --git a/src/org/traccar/database/PermissionsManager.java b/src/org/traccar/database/PermissionsManager.java
index 56a12e941..4008134ec 100644
--- a/src/org/traccar/database/PermissionsManager.java
+++ b/src/org/traccar/database/PermissionsManager.java
@@ -17,8 +17,13 @@ package org.traccar.database;
 
 import org.traccar.Context;
 import org.traccar.helper.Log;
+import org.traccar.model.Attribute;
+import org.traccar.model.Calendar;
 import org.traccar.model.Device;
+import org.traccar.model.Driver;
+import org.traccar.model.Geofence;
 import org.traccar.model.Group;
+import org.traccar.model.ManagedUser;
 import org.traccar.model.Server;
 import org.traccar.model.User;
 
@@ -109,8 +114,9 @@ public class PermissionsManager {
     public final void refreshUserPermissions() {
         userPermissions.clear();
         try {
-            for (Map<String, Long> permission : dataManager.getPermissions("User", "Permission")) {
-                getUserPermissions(permission.get("userId")).add(permission.get("managedUserId"));
+            for (Map<String, Long> permission : dataManager.getPermissions(User.class, User.class)) {
+                getUserPermissions(permission.get(DataManager.makeNameId(User.class)))
+                        .add(permission.get(DataManager.makeNameId(ManagedUser.class)));
             }
         } catch (SQLException error) {
             Log.warning(error);
@@ -123,20 +129,23 @@ public class PermissionsManager {
         try {
             GroupTree groupTree = new GroupTree(Context.getDeviceManager().getAllGroups(),
                     Context.getDeviceManager().getAllDevices());
-            for (Map<String, Long> groupPermission : dataManager.getPermissions("Group", "Permission")) {
-                Set<Long> userGroupPermissions = getGroupPermissions(groupPermission.get("userId"));
-                Set<Long> userDevicePermissions = getDevicePermissions(groupPermission.get("userId"));
-                userGroupPermissions.add(groupPermission.get("groupId"));
-                for (Group group : groupTree.getGroups(groupPermission.get("groupId"))) {
+            for (Map<String, Long> groupPermission : dataManager.getPermissions(User.class, Group.class)) {
+                Set<Long> userGroupPermissions = getGroupPermissions(groupPermission
+                        .get(DataManager.makeNameId(User.class)));
+                Set<Long> userDevicePermissions = getDevicePermissions(groupPermission
+                        .get(DataManager.makeNameId(User.class)));
+                userGroupPermissions.add(groupPermission.get(DataManager.makeNameId(Group.class)));
+                for (Group group : groupTree.getGroups(groupPermission.get(DataManager.makeNameId(Group.class)))) {
                     userGroupPermissions.add(group.getId());
                 }
-                for (Device device : groupTree.getDevices(groupPermission.get("groupId"))) {
+                for (Device device : groupTree.getDevices(groupPermission.get(DataManager.makeNameId(Group.class)))) {
                     userDevicePermissions.add(device.getId());
                 }
             }
 
-            for (Map<String, Long> devicePermission : dataManager.getPermissions("Device", "Permission")) {
-                getDevicePermissions(devicePermission.get("userId")).add(devicePermission.get("deviceId"));
+            for (Map<String, Long> devicePermission : dataManager.getPermissions(User.class, Device.class)) {
+                getDevicePermissions(devicePermission.get(DataManager.makeNameId(User.class)))
+                        .add(devicePermission.get(DataManager.makeNameId(Device.class)));
             }
 
             groupDevices.clear();
@@ -296,33 +305,26 @@ public class PermissionsManager {
         }
     }
 
-    public void checkPermission(String object, long userId, long objectId) throws SecurityException {
+    public void checkPermission(Class<?> object, long userId, long objectId)
+            throws SecurityException {
         SimpleObjectManager manager = null;
 
-        switch (DataManager.makeName(object)) {
-            case Context.TYPE_DEVICE:
-                checkDevice(userId, objectId);
-                break;
-            case Context.TYPE_GROUP:
-                checkGroup(userId, objectId);
-                break;
-            case Context.TYPE_USER:
-                checkUser(userId, objectId);
-                break;
-            case Context.TYPE_GEOFENCE:
-                manager = Context.getGeofenceManager();
-                break;
-            case Context.TYPE_ATTRIBUTE:
-                manager = Context.getAttributesManager();
-                break;
-            case Context.TYPE_DRIVER:
-                manager = Context.getDriversManager();
-                break;
-            case Context.TYPE_CALENDAR:
-                manager = Context.getCalendarManager();
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown object type");
+        if (object.equals(Device.class)) {
+            checkDevice(userId, objectId);
+        } else if (object.equals(Group.class)) {
+            checkGroup(userId, objectId);
+        } else if (object.equals(User.class) || object.equals(ManagedUser.class)) {
+            checkUser(userId, objectId);
+        } else if (object.equals(Geofence.class)) {
+            manager = Context.getGeofenceManager();
+        } else if (object.equals(Attribute.class)) {
+            manager = Context.getAttributesManager();
+        } else if (object.equals(Driver.class)) {
+            manager = Context.getDriversManager();
+        } else if (object.equals(Calendar.class)) {
+            manager = Context.getCalendarManager();
+        } else {
+            throw new IllegalArgumentException("Unknown object type");
         }
 
         if (manager != null) {
@@ -347,31 +349,33 @@ public class PermissionsManager {
     }
 
     public void refreshPermissions(Map<String, Long> entity) {
-        if (entity.containsKey("userId")) {
-            if (entity.containsKey("deviceId") || entity.containsKey("groupId")) {
+        if (entity.containsKey(DataManager.makeNameId(User.class))) {
+            if (entity.containsKey(DataManager.makeNameId(Device.class))
+                    || entity.containsKey(DataManager.makeNameId(Group.class))) {
                 refreshPermissions();
                 refreshAllExtendedPermissions();
-            } else if (entity.containsKey("managedUserId")) {
+            } else if (entity.containsKey(DataManager.makeNameId(ManagedUser.class))) {
                 refreshUserPermissions();
-            } else if (entity.containsKey("geofenceId")) {
+            } else if (entity.containsKey(DataManager.makeNameId(Geofence.class))) {
                 if (Context.getGeofenceManager() != null) {
                     Context.getGeofenceManager().refreshUserItems();
                 }
-            } else if (entity.containsKey("driverId")) {
+            } else if (entity.containsKey(DataManager.makeNameId(Driver.class))) {
                 Context.getDriversManager().refreshUserItems();
-            } else if (entity.containsKey("attributeId")) {
+            } else if (entity.containsKey(DataManager.makeNameId(Attribute.class))) {
                 Context.getAttributesManager().refreshUserItems();
-            } else if (entity.containsKey("calendarId")) {
+            } else if (entity.containsKey(DataManager.makeNameId(Calendar.class))) {
                 Context.getCalendarManager().refreshUserItems();
             }
-        } else if (entity.containsKey("deviceId") || entity.containsKey("groupId")) {
-            if (entity.containsKey("geofenceId")) {
+        } else if (entity.containsKey(DataManager.makeNameId(Device.class))
+                || entity.containsKey(DataManager.makeNameId(Group.class))) {
+            if (entity.containsKey(DataManager.makeNameId(Geofence.class))) {
                 if (Context.getGeofenceManager() != null) {
                     Context.getGeofenceManager().refreshExtendedPermissions();
                 }
-            } else if (entity.containsKey("driverId")) {
+            } else if (entity.containsKey(DataManager.makeNameId(Driver.class))) {
                 Context.getDriversManager().refreshExtendedPermissions();
-            } else if (entity.containsKey("attributeId")) {
+            } else if (entity.containsKey(DataManager.makeNameId(Attribute.class))) {
                 Context.getAttributesManager().refreshExtendedPermissions();
             }
         }
diff --git a/src/org/traccar/database/SimpleObjectManager.java b/src/org/traccar/database/SimpleObjectManager.java
index c4fc0e97a..0db8af658 100644
--- a/src/org/traccar/database/SimpleObjectManager.java
+++ b/src/org/traccar/database/SimpleObjectManager.java
@@ -27,6 +27,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.traccar.Context;
 import org.traccar.helper.Log;
 import org.traccar.model.BaseModel;
+import org.traccar.model.User;
 
 public abstract class SimpleObjectManager {
 
@@ -36,14 +37,12 @@ public abstract class SimpleObjectManager {
     private final Map<Long, Set<Long>> userItems = new ConcurrentHashMap<>();
 
     private Class<? extends BaseModel> baseClass;
-    private String baseClassName;
     private String baseClassIdName;
 
     protected SimpleObjectManager(DataManager dataManager, Class<? extends BaseModel> baseClass) {
         this.dataManager = dataManager;
         this.baseClass = baseClass;
-        baseClassName = baseClass.getSimpleName();
-        baseClassIdName = baseClassName.substring(0, 1).toLowerCase() + baseClassName.substring(1) + "Id";
+        baseClassIdName = DataManager.makeNameId(baseClass);
     }
 
     protected final DataManager getDataManager() {
@@ -54,10 +53,6 @@ public abstract class SimpleObjectManager {
         return baseClass;
     }
 
-    protected final String getBaseClassName() {
-        return baseClassName;
-    }
-
     protected final String getBaseClassIdName() {
         return baseClassIdName;
     }
@@ -111,8 +106,9 @@ public abstract class SimpleObjectManager {
         if (dataManager != null) {
             try {
                 clearUserItems();
-                for (Map<String, Long> permission : dataManager.getPermissions(baseClassName, "Permission")) {
-                    getUserItems(permission.get("userId")).add(permission.get(baseClassIdName));
+                for (Map<String, Long> permission : dataManager.getPermissions(User.class, baseClass)) {
+                    getUserItems(permission.get(DataManager.makeNameId(User.class)))
+                            .add(permission.get(baseClassIdName));
                 }
             } catch (SQLException error) {
                 Log.warning(error);
@@ -133,7 +129,7 @@ public abstract class SimpleObjectManager {
     public void removeItem(long itemId) throws SQLException {
         BaseModel item = getById(itemId);
         if (item != null) {
-            dataManager.removeObject(item.getClass(), itemId);
+            dataManager.removeObject(baseClass, itemId);
             removeCachedItem(itemId);
         }
         refreshUserItems();
diff --git a/src/org/traccar/model/ManagedUser.java b/src/org/traccar/model/ManagedUser.java
new file mode 100644
index 000000000..03c5ef48d
--- /dev/null
+++ b/src/org/traccar/model/ManagedUser.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.model;
+
+public class ManagedUser extends User {
+
+}
-- 
cgit v1.2.3


From ae76cbf971bfc9e47ef21e87606dacc7c0e3ddc6 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Mon, 31 Jul 2017 14:08:36 +0500
Subject: Implement SQL requests construction

---
 schema/changelog-3.14.xml                          |   4 +-
 setup/default.xml                                  | 406 +--------------------
 src/org/traccar/Config.java                        |   4 +
 src/org/traccar/api/resource/EventResource.java    |   2 +-
 src/org/traccar/api/resource/PositionResource.java |   2 +-
 src/org/traccar/database/DataManager.java          | 210 ++++++++---
 src/org/traccar/database/QueryAdditional.java      |  27 ++
 src/org/traccar/database/StatisticsManager.java    |   2 +-
 src/org/traccar/model/Device.java                  |   7 +
 src/org/traccar/model/Position.java                |   9 +
 src/org/traccar/model/Server.java                  |   2 +
 src/org/traccar/model/User.java                    |   6 +
 test/org/traccar/database/DataManagerTest.java     |  79 ++++
 13 files changed, 299 insertions(+), 461 deletions(-)
 create mode 100644 src/org/traccar/database/QueryAdditional.java
 create mode 100644 test/org/traccar/database/DataManagerTest.java

(limited to 'setup')

diff --git a/schema/changelog-3.14.xml b/schema/changelog-3.14.xml
index 7965bc020..f6cda4c1f 100644
--- a/schema/changelog-3.14.xml
+++ b/schema/changelog-3.14.xml
@@ -61,5 +61,7 @@
     <addForeignKeyConstraint baseTableName="device_driver" baseColumnNames="deviceid" constraintName="fk_device_driver_deviceid" referencedTableName="devices" referencedColumnNames="id" onDelete="CASCADE" />
     <addForeignKeyConstraint baseTableName="device_driver" baseColumnNames="driverid" constraintName="fk_device_driver_driverid" referencedTableName="drivers" referencedColumnNames="id" onDelete="CASCADE" />
 
+    <renameTable oldTableName="server" newTableName="servers" />
+
   </changeSet>
-</databaseChangeLog>
\ No newline at end of file
+</databaseChangeLog>
diff --git a/setup/default.xml b/setup/default.xml
index f0f9ef4a3..ea8c32fbd 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -29,163 +29,16 @@
     <entry key='database.ignoreUnknown'>true</entry>
 
     <entry key='database.changelog'>./schema/changelog-master.xml</entry>
-
-    <entry key='database.selectServers'>
-        SELECT * FROM server
-    </entry>
-
-    <entry key='database.updateServer'>
-        UPDATE server SET
-        registration = :registration,
-        readonly = :readonly,
-        deviceReadonly = :deviceReadonly,
-        map = :map,
-        bingKey = :bingKey,
-        mapUrl = :mapUrl,
-        distanceUnit = :distanceUnit,
-        speedUnit = :speedUnit,
-        latitude = :latitude,
-        longitude = :longitude,
-        zoom = :zoom,
-        twelveHourFormat = :twelveHourFormat,
-        coordinateFormat = :coordinateFormat,
-        forceSettings = :forceSettings,
-        timezone = :timezone,
-        attributes = :attributes
-        WHERE id = :id
-    </entry>
-
+ 
     <entry key='database.loginUser'>
         SELECT * FROM users
         WHERE email = :email
     </entry>
 
-    <entry key='database.selectUsers'>
-        SELECT * FROM users
-    </entry>
-
-    <entry key='database.insertUser'>
-        INSERT INTO users (name, email, phone, hashedPassword, salt, readonly, admin, map, distanceUnit, speedUnit, latitude, longitude, zoom, twelveHourFormat, coordinateFormat, disabled, expirationTime, deviceLimit, userLimit, deviceReadonly, token, timezone, attributes)
-        VALUES (:name, :email, :phone, :hashedPassword, :salt, :readonly, :admin, :map, :distanceUnit, :speedUnit, :latitude, :longitude, :zoom, :twelveHourFormat, :coordinateFormat, :disabled, :expirationTime, :deviceLimit, :userLimit, :deviceReadonly, :token, :timezone, :attributes)
-    </entry>
-
-    <entry key='database.updateUser'>
-        UPDATE users SET
-        name = :name,
-        email = :email,
-        phone = :phone,
-        readonly = :readonly,
-        admin = :admin,
-        map = :map,
-        distanceUnit = :distanceUnit,
-        speedUnit = :speedUnit,
-        latitude = :latitude,
-        longitude = :longitude,
-        zoom = :zoom,
-        twelveHourFormat = :twelveHourFormat,
-        coordinateFormat = :coordinateFormat,
-        disabled = :disabled,
-        expirationTime = :expirationTime,
-        deviceLimit = :deviceLimit,
-        userLimit = :userLimit,
-        deviceReadonly = :deviceReadonly,
-        token = :token,
-        timezone = :timezone,
-        attributes = :attributes
-        WHERE id = :id
-    </entry>
-
-    <entry key='database.updateUserPassword'>
-        UPDATE users SET hashedPassword = :hashedPassword, salt = :salt WHERE id = :id
-    </entry>
-
-    <entry key='database.deleteUser'>
-        DELETE FROM users WHERE id = :id
-    </entry>
-
-    <entry key='database.selectUserDevices'>
-        SELECT userId, deviceId FROM user_device
-    </entry>
-
-    <entry key='database.selectUserGroups'>
-        SELECT userId, groupId FROM user_group
-    </entry>
-
-    <entry key='database.selectDevices'>
-        SELECT * FROM devices
-    </entry>
-
-    <entry key='database.insertDevice'>
-        INSERT INTO devices (name, uniqueId, groupId, attributes, phone, model, contact, category)
-        VALUES (:name, :uniqueId, :groupId, :attributes, :phone, :model, :contact, :category)
-    </entry>
-
-    <entry key='database.updateDevice'>
-        UPDATE devices SET
-        name = :name,
-        uniqueId = :uniqueId,
-        groupId = :groupId,
-        attributes = :attributes,
-        phone = :phone,
-        model = :model,
-        contact = :contact,
-        category = :category
-        WHERE id = :id
-    </entry>
-
-    <entry key='database.updateDeviceStatus'>
-        UPDATE devices SET lastUpdate = :lastUpdate WHERE id = :id
-    </entry>
-
-    <entry key='database.deleteDevice'>
-        DELETE FROM devices WHERE id = :id
-    </entry>
-
-    <entry key='database.linkUserDevice'>
-        INSERT INTO user_device (userId, deviceId) VALUES (:userId, :deviceId)
-    </entry>
-
-    <entry key='database.unlinkUserDevice'>
-        DELETE FROM user_device WHERE userId = :userId AND deviceId = :deviceId
-    </entry>
-
-    <entry key='database.selectGroups'>
-        SELECT * FROM groups
-    </entry>
-
-    <entry key='database.insertGroup'>
-        INSERT INTO groups (name, groupId, attributes) VALUES (:name, :groupId, :attributes)
-    </entry>
-
-    <entry key='database.updateGroup'>
-        UPDATE groups SET name = :name, groupId = :groupId, attributes = :attributes WHERE id = :id
-    </entry>
-
-    <entry key='database.deleteGroup'>
-        DELETE FROM groups WHERE id = :id
-    </entry>
-
-    <entry key='database.linkUserGroup'>
-        INSERT INTO user_group (userId, groupId) VALUES (:userId, :groupId)
-    </entry>
-
-    <entry key='database.unlinkUserGroup'>
-        DELETE FROM user_group WHERE userId = :userId AND groupId = :groupId
-    </entry>
-
     <entry key='database.selectPositions'>
         SELECT * FROM positions WHERE deviceId = :deviceId AND fixTime BETWEEN :from AND :to ORDER BY fixTime
     </entry>
 
-    <entry key='database.selectPosition'>
-        SELECT * FROM positions WHERE id = :id
-    </entry>
-
-    <entry key='database.insertPosition'>
-        INSERT INTO positions (deviceId, protocol, serverTime, deviceTime, fixTime, valid, latitude, longitude, altitude, speed, course, address, attributes, accuracy, network)
-        VALUES (:deviceId, :protocol, :now, :deviceTime, :fixTime, :valid, :latitude, :longitude, :altitude, :speed, :course, :address, :attributes, :accuracy, :network)
-    </entry>
-
     <entry key='database.selectLatestPositions'>
         SELECT positions.* FROM positions INNER JOIN devices ON positions.id = devices.positionid;
     </entry>
@@ -194,102 +47,10 @@
         UPDATE devices SET positionId = :id WHERE id = :deviceId
     </entry>
 
-    <entry key='database.selectEvent'>
-        SELECT * FROM events WHERE id = :id
-    </entry>
-
-    <entry key='database.insertEvent'>
-        INSERT INTO events (type, serverTime, deviceId, positionId, geofenceId, attributes)
-        VALUES (:type, :serverTime, :deviceId, :positionId, :geofenceId, :attributes)
-    </entry>
-
     <entry key='database.selectEvents'>
         SELECT * FROM events WHERE deviceId = :deviceId AND serverTime BETWEEN :from AND :to ORDER BY serverTime
     </entry>
 
-    <entry key='database.selectGeofences'>
-        SELECT * FROM geofences
-    </entry>
-
-    <entry key='database.insertGeofence'>
-        INSERT INTO geofences (name, description, calendarid, area, attributes)
-        VALUES (:name, :description, :calendarid, :area, :attributes)
-    </entry>
-
-    <entry key='database.updateGeofence'>
-        UPDATE geofences SET
-        name = :name,
-        description = :description,
-        calendarid = :calendarid,
-        area = :area,
-        attributes = :attributes
-        WHERE id = :id
-    </entry>
-
-    <entry key='database.deleteGeofence'>
-        DELETE FROM geofences WHERE id = :id
-    </entry>
-
-    <entry key='database.selectUserGeofences'>
-        SELECT userId, geofenceId FROM user_geofence
-    </entry>
-
-    <entry key='database.linkUserGeofence'>
-        INSERT INTO user_geofence (userId, geofenceId) VALUES (:userId, :geofenceId)
-    </entry>
-
-    <entry key='database.unlinkUserGeofence'>
-        DELETE FROM user_geofence WHERE userId = :userId AND geofenceId = :geofenceId
-    </entry>
-
-    <entry key='database.selectGroupGeofences'>
-        SELECT groupId, geofenceId FROM group_geofence
-    </entry>
-
-    <entry key='database.linkGroupGeofence'>
-        INSERT INTO group_geofence (groupId, geofenceId) VALUES (:groupId, :geofenceId)
-    </entry>
-
-    <entry key='database.unlinkGroupGeofence'>
-        DELETE FROM group_geofence WHERE groupId = :groupId AND geofenceId = :geofenceId
-    </entry>
-
-    <entry key='database.selectDeviceGeofences'>
-        SELECT deviceId, geofenceId FROM device_geofence
-    </entry>
-
-    <entry key='database.linkDeviceGeofence'>
-        INSERT INTO device_geofence (deviceId, geofenceId) VALUES (:deviceId, :geofenceId)
-    </entry>
-
-    <entry key='database.unlinkDeviceGeofence'>
-        DELETE FROM device_geofence WHERE deviceId = :deviceId AND geofenceId = :geofenceId
-    </entry>
-
-    <entry key='database.selectNotifications'>
-        SELECT * FROM notifications
-    </entry>
-
-    <entry key='database.insertNotification'>
-        INSERT INTO notifications (userId, type, web, mail, sms, attributes)
-        VALUES (:userId, :type, :web, :mail, :sms, :attributes)
-    </entry>
-
-    <entry key='database.updateNotification'>
-        UPDATE notifications SET
-        userId = :userId,
-        type = :type,
-        web = :web,
-        mail = :mail,
-        sms = :sms,
-        attributes = :attributes
-        WHERE id = :id
-    </entry>
-
-    <entry key='database.deleteNotification'>
-        DELETE FROM notifications WHERE id = :id
-    </entry>
-
     <entry key='database.deletePositions'>
         DELETE FROM positions WHERE serverTime &lt; :serverTime AND id NOT IN (SELECT positionId FROM devices)
     </entry>
@@ -323,171 +84,6 @@
         SELECT * FROM statistics WHERE captureTime BETWEEN :from AND :to ORDER BY captureTime
     </entry>
 
-    <entry key='database.insertStatistics'>
-        INSERT INTO statistics (captureTime, activeUsers, activeDevices, requests, messagesReceived, messagesStored, mailSent, smsSent, geocoderRequests, geolocationRequests, attributes)
-        VALUES (:captureTime, :activeUsers, :activeDevices, :requests, :messagesReceived, :messagesStored, :mailSent, :smsSent, :geocoderRequests, :geolocationRequests, :attributes)
-    </entry>
-    
-    <entry key='database.selectCalendars'>
-        SELECT * FROM calendars
-    </entry>
-
-    <entry key='database.insertCalendar'>
-        INSERT INTO calendars (name, data, attributes)
-        VALUES (:name, :data, :attributes)
-    </entry>
-
-    <entry key='database.updateCalendar'>
-        UPDATE calendars SET
-        name = :name,
-        data = :data,
-        attributes = :attributes
-        WHERE id = :id
-    </entry>
-
-    <entry key='database.deleteCalendar'>
-        DELETE FROM calendars WHERE id = :id
-    </entry>
-
-    <entry key='database.selectUserCalendars'>
-        SELECT userId, calendarId FROM user_calendar
-    </entry>
-
-    <entry key='database.linkUserCalendar'>
-        INSERT INTO user_calendar (userId, calendarId) VALUES (:userId, :calendarId)
-    </entry>
-
-    <entry key='database.unlinkUserCalendar'>
-        DELETE FROM user_calendar WHERE userId = :userId AND calendarId = :calendarId
-    </entry>
-    
-    <entry key='database.selectUserUsers'>
-        SELECT userId, managedUserId FROM user_user
-    </entry>
-
-    <entry key='database.linkUserManagedUser'>
-        INSERT INTO user_user (userId, managedUserId) VALUES (:userId, :managedUserId)
-    </entry>
-
-    <entry key='database.unlinkUserManagedUser'>
-        DELETE FROM user_user WHERE userId = :userId AND managedUserId = :managedUserId
-    </entry>
-
-    <entry key='database.selectAttributes'>
-        SELECT * FROM attributes
-    </entry>
-
-    <entry key='database.insertAttribute'>
-        INSERT INTO attributes (description, type, attribute, expression)
-        VALUES (:description, :type, :attribute, :expression)
-    </entry>
-
-    <entry key='database.updateAttribute'>
-        UPDATE attributes SET
-        description = :description,
-        type = :type,
-        attribute = :attribute,
-        expression = :expression
-        WHERE id = :id
-    </entry>
-
-    <entry key='database.deleteAttribute'>
-        DELETE FROM attributes WHERE id = :id
-    </entry>
-    
-        <entry key='database.selectUserAttributes'>
-        SELECT userId, attributeId FROM user_attribute
-    </entry>
-
-    <entry key='database.linkUserAttribute'>
-        INSERT INTO user_attribute (userId, attributeId) VALUES (:userId, :attributeId)
-    </entry>
-
-    <entry key='database.unlinkUserAttribute'>
-        DELETE FROM user_attribute WHERE userId = :userId AND attributeId = :attributeId
-    </entry>
-
-    <entry key='database.selectGroupAttributes'>
-        SELECT groupId, attributeId FROM group_attribute
-    </entry>
-
-    <entry key='database.linkGroupAttribute'>
-        INSERT INTO group_attribute (groupId, attributeId) VALUES (:groupId, :attributeId)
-    </entry>
-
-    <entry key='database.unlinkGroupAttribute'>
-        DELETE FROM group_attribute WHERE groupId = :groupId AND attributeId = :attributeId
-    </entry>
-
-    <entry key='database.selectDeviceAttributes'>
-        SELECT deviceId, attributeId FROM device_attribute
-    </entry>
-
-    <entry key='database.linkDeviceAttribute'>
-        INSERT INTO device_attribute (deviceId, attributeId) VALUES (:deviceId, :attributeId)
-    </entry>
-
-    <entry key='database.unlinkDeviceAttribute'>
-        DELETE FROM device_attribute WHERE deviceId = :deviceId AND attributeId = :attributeId
-    </entry>
-
-    <entry key='database.selectDrivers'>
-        SELECT * FROM drivers
-    </entry>
-
-    <entry key='database.insertDriver'>
-        INSERT INTO drivers (name, uniqueId, attributes)
-        VALUES (:name, :uniqueId, :attributes)
-    </entry>
-
-    <entry key='database.updateDriver'>
-        UPDATE drivers SET
-        name = :name,
-        uniqueId = :uniqueId,
-        attributes = :attributes
-        WHERE id = :id
-    </entry>
-
-    <entry key='database.deleteDriver'>
-        DELETE FROM drivers WHERE id = :id
-    </entry>
-    
-    <entry key='database.selectUserDrivers'>
-        SELECT userId, driverId FROM user_driver
-    </entry>
-
-    <entry key='database.linkUserDriver'>
-        INSERT INTO user_driver (userId, driverId) VALUES (:userId, :driverId)
-    </entry>
-
-    <entry key='database.unlinkUserDriver'>
-        DELETE FROM user_driver WHERE userId = :userId AND driverId = :driverId
-    </entry>
-
-    <entry key='database.selectGroupDrivers'>
-        SELECT groupId, driverId FROM group_driver
-    </entry>
-
-    <entry key='database.linkGroupDriver'>
-        INSERT INTO group_driver (groupId, driverId) VALUES (:groupId, :driverId)
-    </entry>
-
-    <entry key='database.unlinkGroupDriver'>
-        DELETE FROM group_driver WHERE groupId = :groupId AND driverId = :driverId
-    </entry>
-
-    <entry key='database.selectDeviceDrivers'>
-        SELECT deviceId, driverId FROM device_driver
-    </entry>
-
-    <entry key='database.linkDeviceDriver'>
-        INSERT INTO device_driver (deviceId, driverId) VALUES (:deviceId, :driverId)
-    </entry>
-
-    <entry key='database.unlinkDeviceDriver'>
-        DELETE FROM device_driver WHERE deviceId = :deviceId AND driverId = :driverId
-    </entry>
-
     <!-- PROTOCOL CONFIG -->
 
     <entry key='gps103.port'>5001</entry>
diff --git a/src/org/traccar/Config.java b/src/org/traccar/Config.java
index 0bc3cafaa..a0f3f8c2e 100644
--- a/src/org/traccar/Config.java
+++ b/src/org/traccar/Config.java
@@ -96,4 +96,8 @@ public class Config {
         return key.replaceAll("\\.", "_").replaceAll("(\\p{Lu})", "_$1").toUpperCase();
     }
 
+    public void setString(String key, String value) {
+        properties.putIfAbsent(key, value);
+    }
+
 }
diff --git a/src/org/traccar/api/resource/EventResource.java b/src/org/traccar/api/resource/EventResource.java
index b7fda6f73..a7cf9edbd 100644
--- a/src/org/traccar/api/resource/EventResource.java
+++ b/src/org/traccar/api/resource/EventResource.java
@@ -23,7 +23,7 @@ public class EventResource extends BaseResource {
     @Path("{id}")
     @GET
     public Event get(@PathParam("id") long id) throws SQLException {
-        Event event = Context.getDataManager().getEvent(id);
+        Event event = Context.getDataManager().getObject(Event.class, id);
         Context.getPermissionsManager().checkDevice(getUserId(), event.getDeviceId());
         if (event.getGeofenceId() != 0) {
             Context.getPermissionsManager().checkPermission(Geofence.class, getUserId(), event.getGeofenceId());
diff --git a/src/org/traccar/api/resource/PositionResource.java b/src/org/traccar/api/resource/PositionResource.java
index 6dab51744..c031b842f 100644
--- a/src/org/traccar/api/resource/PositionResource.java
+++ b/src/org/traccar/api/resource/PositionResource.java
@@ -54,7 +54,7 @@ public class PositionResource extends BaseResource {
         if (!positionIds.isEmpty()) {
             ArrayList<Position> positions = new ArrayList<>();
             for (Long positionId : positionIds) {
-                Position position = Context.getDataManager().getPosition(positionId);
+                Position position = Context.getDataManager().getObject(Position.class, positionId);
                 Context.getPermissionsManager().checkDevice(getUserId(), position.getDeviceId());
                 positions.add(position);
             }
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index 07ad0be44..a753c311b 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -21,8 +21,11 @@ import java.net.URL;
 import java.net.URLClassLoader;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
 
 import javax.naming.InitialContext;
 import javax.sql.DataSource;
@@ -58,6 +61,12 @@ import com.zaxxer.hikari.HikariDataSource;
 
 public class DataManager {
 
+    public static final String ACTION_SELECT_ALL = "selectAll";
+    public static final String ACTION_SELECT = "select";
+    public static final String ACTION_INSERT = "insert";
+    public static final String ACTION_UPDATE = "update";
+    public static final String ACTION_DELETE = "delete";
+
     private final Config config;
 
     private DataSource dataSource;
@@ -115,6 +124,73 @@ public class DataManager {
         }
     }
 
+    public static String constructObjectQuery(String action, Class<?> clazz, boolean additional) {
+        switch (action) {
+            case ACTION_INSERT:
+            case ACTION_UPDATE:
+                StringBuilder result = new StringBuilder();
+                StringBuilder fields = new StringBuilder();
+                StringBuilder values = new StringBuilder();
+
+                Set<Method> methods = new HashSet<>(Arrays.asList(clazz.getMethods()));
+                methods.removeAll(Arrays.asList(Object.class.getMethods()));
+                methods.removeAll(Arrays.asList(BaseModel.class.getMethods()));
+                for (Method method : methods) {
+                    if (method.getName().startsWith("get") && method.getParameterTypes().length == 0
+                            && (additional ? method.isAnnotationPresent(QueryAdditional.class)
+                                : !method.isAnnotationPresent(QueryIgnore.class)
+                                && !method.isAnnotationPresent(QueryAdditional.class))) {
+                        String name = method.getName().substring(3, 4).toLowerCase()
+                                + method.getName().substring(4);
+                        if (action.equals(ACTION_INSERT)) {
+                            fields.append(name).append(", ");
+                            values.append(":").append(name).append(", ");
+                        } else {
+                            fields.append(name).append(" = :").append(name).append(",\n");
+                        }
+                    }
+                }
+                fields.setLength(fields.length() - 2);
+                if (action.equals(ACTION_INSERT)) {
+                    values.setLength(values.length() - 2);
+                    result.append("INSERT INTO ").append(getObjectsTableName(clazz)).append(" (");
+                    result.append(fields).append(")\n");
+                    result.append("VALUES (").append(values).append(")");
+                } else {
+                    result.append("UPDATE ").append(getObjectsTableName(clazz)).append(" SET\n");
+                    result.append(fields);
+                    result.append("\nWHERE id = :id");
+                }
+                return result.toString();
+            case ACTION_SELECT_ALL:
+                return "SELECT * FROM " + getObjectsTableName(clazz);
+            case ACTION_SELECT:
+                return "SELECT * FROM " + getObjectsTableName(clazz) + " WHERE id = :id";
+            case ACTION_DELETE:
+                return "DELETE FROM " + getObjectsTableName(clazz) + " WHERE id = :id";
+            default:
+                throw new IllegalArgumentException("Unknown action");
+            }
+    }
+
+    public static String constructPermissionQuery(String action, Class<?> owner, Class<?> property) {
+        switch (action) {
+        case ACTION_SELECT_ALL:
+            return "SELECT " + makeNameId(owner) + ", " + makeNameId(property) + " FROM "
+                    + getPermissionsTableName(owner, property);
+        case ACTION_INSERT:
+            return "INSERT INTO " + getPermissionsTableName(owner, property)
+            + " (" + makeNameId(owner) + ", " + makeNameId(property) + ") VALUES (:"
+            + makeNameId(owner) + ", :" + makeNameId(property) + ")";
+        case ACTION_DELETE:
+            return "DELETE FROM " + getPermissionsTableName(owner, property)
+            + " WHERE " + makeNameId(owner) + " = :" + makeNameId(owner)
+            + " AND " + makeNameId(property) + " = :" + makeNameId(property);
+        default:
+            throw new IllegalArgumentException("Unknown action");
+    }
+    }
+
     private String getQuery(String key) {
         String query = config.getString(key);
         if (query == null) {
@@ -123,6 +199,59 @@ public class DataManager {
         return query;
     }
 
+    public String getQuery(String action, Class<?> clazz) {
+        return getQuery(action, clazz, false);
+    }
+
+    public String getQuery(String action, Class<?> clazz, boolean additional) {
+        String queryName;
+        if (action.equals(ACTION_SELECT_ALL)) {
+            queryName = "database.select" + clazz.getSimpleName() + "s";
+        } else {
+            queryName = "database." + action.toLowerCase() + clazz.getSimpleName();
+        }
+        String query = config.getString(queryName);
+        if (query == null) {
+            query = constructObjectQuery(action, clazz, additional);
+            config.setString(queryName, query);
+        }
+
+        return query;
+    }
+
+    public String getQuery(String action, Class<?> owner, Class<?> property) {
+        String queryName;
+        if (action.equals(ACTION_SELECT_ALL)) {
+            queryName = "database.select" + owner.getSimpleName() + property.getSimpleName() + "s";
+        } else if (action.equals(ACTION_INSERT)) {
+            queryName = "database.link" + owner.getSimpleName() + property.getSimpleName();
+        } else {
+            queryName = "database.unlink" + owner.getSimpleName() + property.getSimpleName();
+        }
+        String query = config.getString(queryName);
+        if (query == null) {
+            query = constructPermissionQuery(action, owner, property.equals(User.class) ? ManagedUser.class : property);
+            config.setString(queryName, query);
+        }
+
+        return query;
+    }
+
+    private static String getPermissionsTableName(Class<?> owner, Class<?> property) {
+        String ownerName = owner.getSimpleName();
+        String propertyName = property.getSimpleName();
+        if (propertyName.equals("ManagedUser")) {
+            propertyName = "User";
+        }
+        return ownerName.substring(0, 1).toLowerCase() + ownerName.substring(1) + "_"
+            + propertyName.substring(0, 1).toLowerCase() + propertyName.substring(1);
+    }
+
+    private static String getObjectsTableName(Class<?> clazz) {
+        String name = clazz.getSimpleName();
+        return name.substring(0, 1).toLowerCase() + name.substring(1) + "s";
+    }
+
     private void initDatabaseSchema() throws SQLException, LiquibaseException {
 
         if (config.hasKey("database.changelog")) {
@@ -155,19 +284,8 @@ public class DataManager {
         }
     }
 
-    public void updateUser(User user) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.updateUser"))
-                .setObject(user)
-                .executeUpdate();
-        if (user.getHashedPassword() != null) {
-            QueryBuilder.create(dataSource, getQuery("database.updateUserPassword"))
-                .setObject(user)
-                .executeUpdate();
-        }
-    }
-
     public void updateDeviceStatus(Device device) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.updateDeviceStatus"))
+        QueryBuilder.create(dataSource, getQuery(ACTION_UPDATE, Device.class, true))
                 .setObject(device)
                 .executeUpdate();
     }
@@ -180,16 +298,10 @@ public class DataManager {
                 .executeQuery(Position.class);
     }
 
-    public Position getPosition(long positionId) throws SQLException {
-        return QueryBuilder.create(dataSource, getQuery("database.selectPosition"))
-                .setLong("id", positionId)
-                .executeQuerySingle(Position.class);
-    }
-
     public void addPosition(Position position) throws SQLException {
-        position.setId(QueryBuilder.create(dataSource, getQuery("database.insertPosition"), true)
-                .setDate("now", new Date())
+        position.setId(QueryBuilder.create(dataSource, getQuery(ACTION_INSERT, Position.class), true)
                 .setObject(position)
+                .setDate("serverTime", new Date())
                 .executeUpdate());
     }
 
@@ -220,16 +332,10 @@ public class DataManager {
     }
 
     public Server getServer() throws SQLException {
-        return QueryBuilder.create(dataSource, getQuery("database.selectServers"))
+        return QueryBuilder.create(dataSource, getQuery(ACTION_SELECT_ALL, Server.class))
                 .executeQuerySingle(Server.class);
     }
 
-    public Event getEvent(long eventId) throws SQLException {
-        return QueryBuilder.create(dataSource, getQuery("database.selectEvent"))
-                .setLong("id", eventId)
-                .executeQuerySingle(Event.class);
-    }
-
     public Collection<Event> getEvents(long deviceId, Date from, Date to) throws SQLException {
         return QueryBuilder.create(dataSource, getQuery("database.selectEvents"))
                 .setLong("deviceId", deviceId)
@@ -268,12 +374,6 @@ public class DataManager {
                 .executeQuery(Statistics.class);
     }
 
-    public void addStatistics(Statistics statistics) throws SQLException {
-        statistics.setId(QueryBuilder.create(dataSource, getQuery("database.insertStatistics"), true)
-                .setObject(statistics)
-                .executeUpdate());
-    }
-
     public static Class<?> getClassByName(String name) throws ClassNotFoundException {
         switch (name.toLowerCase().replace("id", "")) {
             case "device":
@@ -302,44 +402,50 @@ public class DataManager {
         return name.substring(0, 1).toLowerCase() + name.substring(1) + (name.indexOf("Id") == -1 ? "Id" : "");
     }
 
+    public Collection<Permission> getPermissions(Class<? extends BaseModel> owner, Class<? extends BaseModel> property)
+            throws SQLException, ClassNotFoundException {
+        return QueryBuilder.create(dataSource, getQuery(ACTION_SELECT_ALL, owner, property))
+                .executePermissionsQuery();
+    }
+
     public void linkObject(Class<?> owner, long ownerId, Class<?> property, long propertyId, boolean link)
             throws SQLException {
-        String query = "database." + (link ? "link" : "unlink") + owner.getSimpleName() + property.getSimpleName();
-        QueryBuilder queryBuilder = QueryBuilder.create(dataSource, getQuery(query));
-
-        queryBuilder.setLong(makeNameId(owner), ownerId);
-        queryBuilder.setLong(makeNameId(property), propertyId);
-        queryBuilder.executeUpdate();
+        QueryBuilder.create(dataSource, getQuery(link ? ACTION_INSERT : ACTION_DELETE, owner, property))
+                .setLong(makeNameId(owner), ownerId)
+                .setLong(makeNameId(property), propertyId)
+                .executeUpdate();
     }
 
-    public <T> Collection<T> getObjects(Class<T> clazz) throws SQLException {
-        String query = "database.select" + clazz.getSimpleName() + "s";
-        return QueryBuilder.create(dataSource, getQuery(query)).executeQuery(clazz);
+    public <T extends BaseModel> T getObject(Class<T> clazz, long entityId) throws SQLException {
+        return QueryBuilder.create(dataSource, getQuery(ACTION_SELECT, clazz))
+                .setLong("id", entityId)
+                .executeQuerySingle(clazz);
     }
 
-    public Collection<Permission> getPermissions(Class<? extends BaseModel> owner,
-            Class<? extends BaseModel> property) throws SQLException, ClassNotFoundException {
-        String query = "database.select" + owner.getSimpleName() + property.getSimpleName() + "s";
-        return QueryBuilder.create(dataSource, getQuery(query)).executePermissionsQuery();
+    public <T extends BaseModel> Collection<T> getObjects(Class<T> clazz) throws SQLException {
+        return QueryBuilder.create(dataSource, getQuery(ACTION_SELECT_ALL, clazz))
+                .executeQuery(clazz);
     }
 
     public void addObject(BaseModel entity) throws SQLException {
-        String query = "database.insert" + entity.getClass().getSimpleName();
-        entity.setId(QueryBuilder.create(dataSource, getQuery(query), true)
+        entity.setId(QueryBuilder.create(dataSource, getQuery(ACTION_INSERT, entity.getClass()), true)
                 .setObject(entity)
                 .executeUpdate());
     }
 
     public void updateObject(BaseModel entity) throws SQLException {
-        String query = "database.update" + entity.getClass().getSimpleName();
-        QueryBuilder.create(dataSource, getQuery(query))
+        QueryBuilder.create(dataSource, getQuery(ACTION_UPDATE, entity.getClass()))
                 .setObject(entity)
                 .executeUpdate();
+        if (entity instanceof User && ((User) entity).getHashedPassword() != null) {
+            QueryBuilder.create(dataSource, getQuery(ACTION_UPDATE, User.class, true))
+                    .setObject(entity)
+                    .executeUpdate();
+        }
     }
 
     public void removeObject(Class<? extends BaseModel> clazz, long entityId) throws SQLException {
-        String query = "database.delete" + clazz.getSimpleName();
-        QueryBuilder.create(dataSource, getQuery(query))
+        QueryBuilder.create(dataSource, getQuery(ACTION_DELETE, clazz))
                 .setLong("id", entityId)
                 .executeUpdate();
     }
diff --git a/src/org/traccar/database/QueryAdditional.java b/src/org/traccar/database/QueryAdditional.java
new file mode 100644
index 000000000..7a42c1875
--- /dev/null
+++ b/src/org/traccar/database/QueryAdditional.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.database;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface QueryAdditional {
+}
diff --git a/src/org/traccar/database/StatisticsManager.java b/src/org/traccar/database/StatisticsManager.java
index 5b42416ad..06a3e7b35 100644
--- a/src/org/traccar/database/StatisticsManager.java
+++ b/src/org/traccar/database/StatisticsManager.java
@@ -61,7 +61,7 @@ public class StatisticsManager {
             statistics.setGeolocationRequests(geolocationRequests);
 
             try {
-                Context.getDataManager().addStatistics(statistics);
+                Context.getDataManager().addObject(statistics);
             } catch (SQLException e) {
                 Log.warning(e);
             }
diff --git a/src/org/traccar/model/Device.java b/src/org/traccar/model/Device.java
index 6a13c2b77..cd5dd12c4 100644
--- a/src/org/traccar/model/Device.java
+++ b/src/org/traccar/model/Device.java
@@ -18,6 +18,9 @@ package org.traccar.model;
 import java.util.Date;
 import java.util.List;
 
+import org.traccar.database.QueryAdditional;
+import org.traccar.database.QueryIgnore;
+
 public class Device extends ExtendedModel {
 
     private String name;
@@ -46,6 +49,7 @@ public class Device extends ExtendedModel {
 
     private String status;
 
+    @QueryIgnore
     public String getStatus() {
         return status != null ? status : STATUS_OFFLINE;
     }
@@ -56,6 +60,7 @@ public class Device extends ExtendedModel {
 
     private Date lastUpdate;
 
+    @QueryAdditional
     public Date getLastUpdate() {
         if (lastUpdate != null) {
             return new Date(lastUpdate.getTime());
@@ -74,6 +79,7 @@ public class Device extends ExtendedModel {
 
     private long positionId;
 
+    @QueryIgnore
     public long getPositionId() {
         return positionId;
     }
@@ -94,6 +100,7 @@ public class Device extends ExtendedModel {
 
     private List<Long> geofenceIds;
 
+    @QueryIgnore
     public List<Long> getGeofenceIds() {
         return geofenceIds;
     }
diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java
index 4412b012c..66a6f91ce 100644
--- a/src/org/traccar/model/Position.java
+++ b/src/org/traccar/model/Position.java
@@ -17,6 +17,8 @@ package org.traccar.model;
 
 import java.util.Date;
 
+import org.traccar.database.QueryIgnore;
+
 public class Position extends Message {
 
     public static final String KEY_ORIGINAL = "raw";
@@ -196,6 +198,7 @@ public class Position extends Message {
 
     private boolean outdated;
 
+    @QueryIgnore
     public boolean getOutdated() {
         return outdated;
     }
@@ -294,4 +297,10 @@ public class Position extends Message {
         this.network = network;
     }
 
+    @Override
+    @QueryIgnore
+    public String getType() {
+        return super.getType();
+    }
+
 }
diff --git a/src/org/traccar/model/Server.java b/src/org/traccar/model/Server.java
index cd5b0624e..246be0b4f 100644
--- a/src/org/traccar/model/Server.java
+++ b/src/org/traccar/model/Server.java
@@ -17,10 +17,12 @@ package org.traccar.model;
 
 import java.util.TimeZone;
 
+import org.traccar.database.QueryIgnore;
 import org.traccar.helper.Log;
 
 public class Server extends ExtendedModel {
 
+    @QueryIgnore
     public String getVersion() {
         return Log.getAppVersion();
     }
diff --git a/src/org/traccar/model/User.java b/src/org/traccar/model/User.java
index 6e6a079c2..72b53ee5d 100644
--- a/src/org/traccar/model/User.java
+++ b/src/org/traccar/model/User.java
@@ -16,6 +16,9 @@
 package org.traccar.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import org.traccar.database.QueryAdditional;
+import org.traccar.database.QueryIgnore;
 import org.traccar.helper.Hashing;
 
 import java.util.Date;
@@ -228,6 +231,7 @@ public class User extends ExtendedModel {
         }
     }
 
+    @QueryIgnore
     public String getPassword() {
         return null;
     }
@@ -243,6 +247,7 @@ public class User extends ExtendedModel {
     private String hashedPassword;
 
     @JsonIgnore
+    @QueryAdditional
     public String getHashedPassword() {
         return hashedPassword;
     }
@@ -254,6 +259,7 @@ public class User extends ExtendedModel {
     private String salt;
 
     @JsonIgnore
+    @QueryAdditional
     public String getSalt() {
         return salt;
     }
diff --git a/test/org/traccar/database/DataManagerTest.java b/test/org/traccar/database/DataManagerTest.java
new file mode 100644
index 000000000..3383c3d22
--- /dev/null
+++ b/test/org/traccar/database/DataManagerTest.java
@@ -0,0 +1,79 @@
+package org.traccar.database;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.traccar.model.Attribute;
+import org.traccar.model.Device;
+import org.traccar.model.Driver;
+import org.traccar.model.Geofence;
+import org.traccar.model.Group;
+import org.traccar.model.ManagedUser;
+import org.traccar.model.Position;
+import org.traccar.model.User;
+
+public class DataManagerTest {
+
+    @Test
+    public void constructObjectQuery() {
+        Assert.assertEquals("SELECT * FROM users",
+                DataManager.constructObjectQuery(DataManager.ACTION_SELECT_ALL, User.class, false));
+        Assert.assertEquals("DELETE FROM groups WHERE id = :id",
+                DataManager.constructObjectQuery(DataManager.ACTION_DELETE, Group.class, false));
+        Assert.assertEquals("SELECT * FROM positions WHERE id = :id",
+                DataManager.constructObjectQuery(DataManager.ACTION_SELECT, Position.class, false));
+
+        String insertDevice = DataManager.constructObjectQuery(DataManager.ACTION_INSERT, Device.class, false);
+        Assert.assertFalse(insertDevice.contains("class"));
+        Assert.assertFalse(insertDevice.contains("id"));
+        Assert.assertFalse(insertDevice.contains("status"));
+        Assert.assertFalse(insertDevice.contains("lastUpdate"));
+        Assert.assertFalse(insertDevice.contains("geofenceIds"));
+
+        String updateDeviceStatus = DataManager.constructObjectQuery("update", Device.class, true);
+        Assert.assertTrue(updateDeviceStatus.contains("lastUpdate"));
+
+        String updateUser = DataManager.constructObjectQuery(DataManager.ACTION_UPDATE, User.class, false);
+        Assert.assertFalse(updateUser.contains("class"));
+        Assert.assertFalse(updateUser.contains("password"));
+        Assert.assertFalse(updateUser.contains("salt"));
+
+        String updateUserPassword = DataManager.constructObjectQuery(DataManager.ACTION_UPDATE, User.class, true);
+        Assert.assertFalse(updateUserPassword.contains("name"));
+        Assert.assertTrue(updateUserPassword.contains("hashedPassword"));
+        Assert.assertTrue(updateUserPassword.contains("salt"));
+
+        String insertPosition = DataManager.constructObjectQuery(DataManager.ACTION_INSERT, Position.class, false);
+        Assert.assertFalse(insertPosition.contains("type"));
+        Assert.assertFalse(insertPosition.contains("outdated"));
+
+    }
+
+    @Test
+    public void constructPermissionsQuery() {
+        Assert.assertEquals("SELECT userId, deviceId FROM user_device",
+                DataManager.constructPermissionQuery(DataManager.ACTION_SELECT_ALL, User.class, Device.class));
+
+        Assert.assertEquals("SELECT userId, managedUserId FROM user_user",
+                DataManager.constructPermissionQuery(DataManager.ACTION_SELECT_ALL, User.class, ManagedUser.class));
+
+        Assert.assertEquals("SELECT deviceId, driverId FROM device_driver",
+                DataManager.constructPermissionQuery(DataManager.ACTION_SELECT_ALL, Device.class, Driver.class));
+
+        Assert.assertEquals("SELECT groupId, geofenceId FROM group_geofence",
+                DataManager.constructPermissionQuery(DataManager.ACTION_SELECT_ALL, Group.class, Geofence.class));
+
+        Assert.assertEquals("INSERT INTO user_device (userId, deviceId) VALUES (:userId, :deviceId)",
+                DataManager.constructPermissionQuery(DataManager.ACTION_INSERT, User.class, Device.class));
+
+        Assert.assertEquals("DELETE FROM user_user WHERE userId = :userId AND managedUserId = :managedUserId",
+                DataManager.constructPermissionQuery(DataManager.ACTION_DELETE, User.class, ManagedUser.class));
+
+        Assert.assertEquals("INSERT INTO device_geofence (deviceId, geofenceId) VALUES (:deviceId, :geofenceId)",
+                DataManager.constructPermissionQuery(DataManager.ACTION_INSERT, Device.class, Geofence.class));
+
+        Assert.assertEquals("DELETE FROM group_attribute WHERE groupId = :groupId AND attributeId = :attributeId",
+                DataManager.constructPermissionQuery(DataManager.ACTION_DELETE, Group.class, Attribute.class));
+
+    }
+
+}
-- 
cgit v1.2.3


From 536e04dd996041d2ae608e56ea6233850cc027f2 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Tue, 1 Aug 2017 10:28:50 +0500
Subject: Make query generator switchable

---
 setup/default.xml                         |  2 ++
 src/org/traccar/database/DataManager.java | 12 ++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'setup')

diff --git a/setup/default.xml b/setup/default.xml
index ea8c32fbd..2c126e6dd 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -28,6 +28,8 @@
 
     <entry key='database.ignoreUnknown'>true</entry>
 
+    <entry key='database.generateQueries'>true</entry>
+
     <entry key='database.changelog'>./schema/changelog-master.xml</entry>
  
     <entry key='database.loginUser'>
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index 63d98818d..709d2f057 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -72,6 +72,8 @@ public class DataManager {
 
     private DataSource dataSource;
 
+    private boolean generateQueries;
+
     public DataManager(Config config) throws Exception {
         this.config = config;
 
@@ -120,6 +122,8 @@ public class DataManager {
                 hikariConfig.setMaximumPoolSize(maxPoolSize);
             }
 
+            generateQueries = config.getBoolean("database.generateQueries");
+
             dataSource = new HikariDataSource(hikariConfig);
 
         }
@@ -218,9 +222,11 @@ public class DataManager {
             }
         }
         String query = config.getString(queryName);
-        if (query == null) {
+        if (query == null && generateQueries) {
             query = constructObjectQuery(action, clazz, extended);
             config.setString(queryName, query);
+        } else {
+            Log.info("Query not provided: " + queryName);
         }
 
         return query;
@@ -236,9 +242,11 @@ public class DataManager {
             queryName = "database.unlink" + owner.getSimpleName() + property.getSimpleName();
         }
         String query = config.getString(queryName);
-        if (query == null) {
+        if (query == null && generateQueries) {
             query = constructPermissionQuery(action, owner, property.equals(User.class) ? ManagedUser.class : property);
             config.setString(queryName, query);
+        } else {
+            Log.info("Query not provided: " + queryName);
         }
 
         return query;
-- 
cgit v1.2.3


From 237c80296fe947c6857c9509ba1b947ed02b354f Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Wed, 2 Aug 2017 07:52:33 +1200
Subject: Implement TLV communication protocol

---
 setup/default.xml                                  |   1 +
 src/org/traccar/protocol/TlvProtocol.java          |  43 ++++++++
 src/org/traccar/protocol/TlvProtocolDecoder.java   | 109 +++++++++++++++++++++
 .../traccar/protocol/TlvProtocolDecoderTest.java   |  24 +++++
 4 files changed, 177 insertions(+)
 create mode 100644 src/org/traccar/protocol/TlvProtocol.java
 create mode 100644 src/org/traccar/protocol/TlvProtocolDecoder.java
 create mode 100644 test/org/traccar/protocol/TlvProtocolDecoderTest.java

(limited to 'setup')

diff --git a/setup/default.xml b/setup/default.xml
index 2c126e6dd..ff0447652 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -234,5 +234,6 @@
     <entry key='vt200.port'>5143</entry>
     <entry key='owntracks.port'>5144</entry>
     <entry key='vtfms.port'>5145</entry>
+    <entry key='tlv.port'>5146</entry>
 
 </properties>
diff --git a/src/org/traccar/protocol/TlvProtocol.java b/src/org/traccar/protocol/TlvProtocol.java
new file mode 100644
index 000000000..da8d88b8a
--- /dev/null
+++ b/src/org/traccar/protocol/TlvProtocol.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.protocol;
+
+import org.jboss.netty.bootstrap.ServerBootstrap;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.traccar.BaseProtocol;
+import org.traccar.CharacterDelimiterFrameDecoder;
+import org.traccar.TrackerServer;
+
+import java.util.List;
+
+public class TlvProtocol extends BaseProtocol {
+
+    public TlvProtocol() {
+        super("tlv");
+    }
+
+    @Override
+    public void initTrackerServers(List<TrackerServer> serverList) {
+        serverList.add(new TrackerServer(new ServerBootstrap(), getName()) {
+            @Override
+            protected void addSpecificHandlers(ChannelPipeline pipeline) {
+                pipeline.addLast("frameDecoder", new CharacterDelimiterFrameDecoder('\0'));
+                pipeline.addLast("objectDecoder", new TlvProtocolDecoder(TlvProtocol.this));
+            }
+        });
+    }
+
+}
diff --git a/src/org/traccar/protocol/TlvProtocolDecoder.java b/src/org/traccar/protocol/TlvProtocolDecoder.java
new file mode 100644
index 000000000..41d65be09
--- /dev/null
+++ b/src/org/traccar/protocol/TlvProtocolDecoder.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.protocol;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.Channel;
+import org.traccar.BaseProtocolDecoder;
+import org.traccar.DeviceSession;
+import org.traccar.helper.UnitsConverter;
+import org.traccar.model.Position;
+
+import java.net.SocketAddress;
+import java.nio.charset.StandardCharsets;
+import java.util.Date;
+
+public class TlvProtocolDecoder extends BaseProtocolDecoder {
+
+    public TlvProtocolDecoder(TlvProtocol protocol) {
+        super(protocol);
+    }
+
+    private void sendResponse(Channel channel, String type, String... arguments) {
+        if (channel != null) {
+            ChannelBuffer response = ChannelBuffers.dynamicBuffer();
+            response.writeBytes(ChannelBuffers.copiedBuffer(type, StandardCharsets.US_ASCII));
+            for (String argument : arguments) {
+                response.writeByte(argument.length());
+                response.writeBytes(ChannelBuffers.copiedBuffer(argument, StandardCharsets.US_ASCII));
+            }
+            response.writeByte(0);
+            channel.write(response);
+        }
+    }
+
+    private String readArgument(ChannelBuffer buf) {
+        return buf.readBytes(buf.readUnsignedByte()).toString(StandardCharsets.US_ASCII);
+    }
+
+    @Override
+    protected Object decode(
+            Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+
+        ChannelBuffer buf = (ChannelBuffer) msg;
+
+        String type = buf.readBytes(2).toString(StandardCharsets.US_ASCII);
+
+        if (channel != null) {
+            switch (type) {
+                case "0A":
+                case "0C":
+                    sendResponse(channel, type);
+                    break;
+                case "0B":
+                    sendResponse(channel, type, "1482202689", "10", "20", "15");
+                    break;
+                case "0E":
+                case "0F":
+                    sendResponse(channel, type, "30", "Unknown");
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        if (type.equals("0E")) {
+
+            DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, readArgument(buf));
+            if (deviceSession == null) {
+                return null;
+            }
+
+            Position position = new Position();
+            position.setProtocol(getProtocolName());
+            position.setDeviceId(deviceSession.getDeviceId());
+
+            position.setValid(true);
+            position.setTime(new Date(Long.parseLong(readArgument(buf)) * 1000));
+
+            readArgument(buf); // location identifier
+
+            position.setLongitude(Double.parseDouble(readArgument(buf)));
+            position.setLatitude(Double.parseDouble(readArgument(buf)));
+            position.setSpeed(UnitsConverter.knotsFromKph(Double.parseDouble(readArgument(buf))));
+            position.setCourse(Double.parseDouble(readArgument(buf)));
+
+            position.set(Position.KEY_SATELLITES, Integer.parseInt(readArgument(buf)));
+
+            return position;
+
+        }
+
+        return null;
+    }
+
+}
diff --git a/test/org/traccar/protocol/TlvProtocolDecoderTest.java b/test/org/traccar/protocol/TlvProtocolDecoderTest.java
new file mode 100644
index 000000000..6c37c4dbb
--- /dev/null
+++ b/test/org/traccar/protocol/TlvProtocolDecoderTest.java
@@ -0,0 +1,24 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+public class TlvProtocolDecoderTest extends ProtocolTest {
+
+    @Test
+    public void testDecode() throws Exception {
+
+        TlvProtocolDecoder decoder = new TlvProtocolDecoder(new TlvProtocol());
+
+        verifyNull(decoder, binary(
+                "30430f383630323437303330303934333931ff10393233323132323030303834353433340f533636385f415f56312e30315f454eff1130303a30433a45373a30303a30303a30300132"));
+
+        verifyNull(decoder, binary(
+                "30410f383630323437303330303934333931"));
+
+        verifyNull(decoder, binary(
+                "30420f3836303234373033303039343339310131"));
+
+    }
+
+}
-- 
cgit v1.2.3


From cbaf29aeb7525deb1f81426c7d4d6cd9f39f500d Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Wed, 16 Aug 2017 00:36:49 +1200
Subject: Make cache control configurable

---
 setup/default.xml                  | 1 +
 src/org/traccar/web/WebServer.java | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'setup')

diff --git a/setup/default.xml b/setup/default.xml
index ff0447652..edb3dd47d 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -9,6 +9,7 @@
     <entry key='web.enable'>true</entry>
     <entry key='web.port'>8082</entry>
     <entry key='web.path'>./web</entry>
+    <entry key='web.cacheControl'>max-age=3600,public</entry>
 
     <entry key='geocoder.enable'>true</entry>
     <entry key='geocoder.type'>google</entry>
diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java
index 83ead7ad8..9b4b566ef 100644
--- a/src/org/traccar/web/WebServer.java
+++ b/src/org/traccar/web/WebServer.java
@@ -29,6 +29,7 @@ import org.glassfish.jersey.jackson.JacksonFeature;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.servlet.ServletContainer;
 import org.traccar.Config;
+import org.traccar.Context;
 import org.traccar.api.AsyncSocketServlet;
 import org.traccar.api.CorsResponseFilter;
 import org.traccar.api.ObjectMapperProvider;
@@ -105,7 +106,10 @@ public class WebServer {
             resourceHandler.setWelcomeFiles(new String[] {"debug.html", "index.html"});
             resourceHandler.setMinMemoryMappedContentLength(-1); // avoid locking files on Windows
         } else {
-            resourceHandler.setCacheControl("max-age=3600,public");
+            String cache = config.getString("web.cacheControl");
+            if (cache != null && !cache.isEmpty()) {
+                resourceHandler.setCacheControl(cache);
+            }
             resourceHandler.setWelcomeFiles(new String[] {"release.html", "index.html"});
         }
         handlers.addHandler(resourceHandler);
-- 
cgit v1.2.3


From 4a14edeea2b98062d1d61fe5eee5e1dfaf664916 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Fri, 18 Aug 2017 05:42:43 +1200
Subject: Implement eSky ES610 protocol

---
 setup/default.xml                                  |  1 +
 src/org/traccar/protocol/EskyFrameDecoder.java     | 39 +++++++++
 src/org/traccar/protocol/EskyProtocol.java         | 46 +++++++++++
 src/org/traccar/protocol/EskyProtocolDecoder.java  | 92 ++++++++++++++++++++++
 .../org/traccar/protocol/EskyFrameDecoderTest.java | 24 ++++++
 .../traccar/protocol/EskyProtocolDecoderTest.java  | 18 +++++
 6 files changed, 220 insertions(+)
 create mode 100644 src/org/traccar/protocol/EskyFrameDecoder.java
 create mode 100644 src/org/traccar/protocol/EskyProtocol.java
 create mode 100644 src/org/traccar/protocol/EskyProtocolDecoder.java
 create mode 100644 test/org/traccar/protocol/EskyFrameDecoderTest.java
 create mode 100644 test/org/traccar/protocol/EskyProtocolDecoderTest.java

(limited to 'setup')

diff --git a/setup/default.xml b/setup/default.xml
index edb3dd47d..0047949eb 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -236,5 +236,6 @@
     <entry key='owntracks.port'>5144</entry>
     <entry key='vtfms.port'>5145</entry>
     <entry key='tlv.port'>5146</entry>
+    <entry key='esky.port'>5147</entry>
 
 </properties>
diff --git a/src/org/traccar/protocol/EskyFrameDecoder.java b/src/org/traccar/protocol/EskyFrameDecoder.java
new file mode 100644
index 000000000..3175698fd
--- /dev/null
+++ b/src/org/traccar/protocol/EskyFrameDecoder.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.protocol;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.handler.codec.frame.FrameDecoder;
+
+public class EskyFrameDecoder extends FrameDecoder {
+
+    @Override
+    protected Object decode(
+            ChannelHandlerContext ctx, Channel channel, ChannelBuffer buf) throws Exception {
+
+        buf.readerIndex(buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) 'E'));
+
+        int endIndex = buf.indexOf(buf.readerIndex() + 1, buf.writerIndex(), (byte) 'E');
+        if (endIndex > 0) {
+            return buf.readBytes(endIndex - buf.readerIndex());
+        } else {
+            return buf.readBytes(buf.readableBytes()); // assume full frame
+        }
+    }
+
+}
diff --git a/src/org/traccar/protocol/EskyProtocol.java b/src/org/traccar/protocol/EskyProtocol.java
new file mode 100644
index 000000000..4c1d11f7d
--- /dev/null
+++ b/src/org/traccar/protocol/EskyProtocol.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.protocol;
+
+import org.jboss.netty.bootstrap.ServerBootstrap;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.handler.codec.string.StringDecoder;
+import org.jboss.netty.handler.codec.string.StringEncoder;
+import org.traccar.BaseProtocol;
+import org.traccar.TrackerServer;
+
+import java.util.List;
+
+public class EskyProtocol extends BaseProtocol {
+
+    public EskyProtocol() {
+        super("esky");
+    }
+
+    @Override
+    public void initTrackerServers(List<TrackerServer> serverList) {
+        serverList.add(new TrackerServer(new ServerBootstrap(), getName()) {
+            @Override
+            protected void addSpecificHandlers(ChannelPipeline pipeline) {
+                pipeline.addLast("frameDecoder", new EskyFrameDecoder());
+                pipeline.addLast("stringEncoder", new StringEncoder());
+                pipeline.addLast("stringDecoder", new StringDecoder());
+                pipeline.addLast("objectDecoder", new EskyProtocolDecoder(EskyProtocol.this));
+            }
+        });
+    }
+
+}
diff --git a/src/org/traccar/protocol/EskyProtocolDecoder.java b/src/org/traccar/protocol/EskyProtocolDecoder.java
new file mode 100644
index 000000000..c12753881
--- /dev/null
+++ b/src/org/traccar/protocol/EskyProtocolDecoder.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.protocol;
+
+import org.jboss.netty.channel.Channel;
+import org.traccar.BaseProtocolDecoder;
+import org.traccar.DeviceSession;
+import org.traccar.helper.Parser;
+import org.traccar.helper.PatternBuilder;
+import org.traccar.helper.UnitsConverter;
+import org.traccar.model.Position;
+
+import java.net.SocketAddress;
+import java.util.regex.Pattern;
+
+public class EskyProtocolDecoder extends BaseProtocolDecoder {
+
+    public EskyProtocolDecoder(EskyProtocol protocol) {
+        super(protocol);
+    }
+
+    private static final Pattern PATTERN = new PatternBuilder()
+            .text("EO;")                         // header
+            .number("d+;")                       // index
+            .number("(d+);")                     // imei
+            .text("R;")                          // data type
+            .number("(d+)").text("+")            // satellites
+            .number("(dd)(dd)(dd)")              // date
+            .number("(dd)(dd)(dd)").text("+")    // time
+            .number("(d+.d+)").text("+")         // latitude
+            .number("(d+.d+)").text("+")         // longitude
+            .number("(d+.d+)").text("+")         // speed
+            .number("(d+)").text("+")            // course
+            .text("0x").number("(d+)").text("+") // input
+            .number("(d+)").text("+")            // message type
+            .number("(d+)").text("+")            // odometer
+            .number("(d+)")                      // voltage
+            .any()
+            .compile();
+
+    @Override
+    protected Object decode(
+            Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+
+        org.traccar.helper.PatternUtil.MatchResult matchResult =
+                org.traccar.helper.PatternUtil.checkPattern(PATTERN.pattern(), (String) msg);
+
+        Parser parser = new Parser(PATTERN, (String) msg);
+        if (!parser.matches()) {
+            return null;
+        }
+
+        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next());
+        if (deviceSession == null) {
+            return null;
+        }
+
+        Position position = new Position();
+        position.setProtocol(getProtocolName());
+        position.setDeviceId(deviceSession.getDeviceId());
+
+        position.set(Position.KEY_SATELLITES, parser.nextInt());
+
+        position.setValid(true);
+        position.setTime(parser.nextDateTime());
+        position.setLatitude(parser.nextDouble());
+        position.setLongitude(parser.nextDouble());
+        position.setSpeed(UnitsConverter.knotsFromMps(parser.nextDouble()));
+        position.setCourse(parser.nextDouble());
+
+        position.set(Position.KEY_INPUT, parser.nextHexInt());
+        position.set(Position.KEY_EVENT, parser.nextInt());
+        position.set(Position.KEY_ODOMETER, parser.nextInt());
+        position.set(Position.KEY_POWER, parser.nextInt());
+
+        return position;
+    }
+
+}
diff --git a/test/org/traccar/protocol/EskyFrameDecoderTest.java b/test/org/traccar/protocol/EskyFrameDecoderTest.java
new file mode 100644
index 000000000..34a984bb2
--- /dev/null
+++ b/test/org/traccar/protocol/EskyFrameDecoderTest.java
@@ -0,0 +1,24 @@
+package org.traccar.protocol;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+public class EskyFrameDecoderTest extends ProtocolTest {
+
+    @Test
+    public void testDecode() throws Exception {
+
+        EskyFrameDecoder decoder = new EskyFrameDecoder();
+
+        verifyFrame(
+                binary("454f3b303b3836343930363032393139363632363b523b302b3137303830383135353335322b302e30303030302b302e30303030302b302e30302b302b3078312b302b302b302b31323333"),
+                decoder.decode(null, null, binary("454f3b303b3836343930363032393139363632363b523b302b3137303830383135353335322b302e30303030302b302e30303030302b302e30302b302b3078312b302b302b302b31323333")));
+
+        verifyFrame(
+                binary("454f3b303b3836343930363032393139363632363b523b302b3137303830383135353335322b302e30303030302b302e30303030302b302e30302b302b3078312b302b302b302b31323333"),
+                decoder.decode(null, null, binary("454f3b303b3836343930363032393139363632363b523b302b3137303830383135353335322b302e30303030302b302e30303030302b302e30302b302b3078312b302b302b302b31323333454f3b303b3836343930363032393139363632363b523b302b3137303830383135353335322b302e30303030302b302e30303030302b302e30302b302b3078312b302b302b302b31323333")));
+
+    }
+
+}
diff --git a/test/org/traccar/protocol/EskyProtocolDecoderTest.java b/test/org/traccar/protocol/EskyProtocolDecoderTest.java
new file mode 100644
index 000000000..52dff971f
--- /dev/null
+++ b/test/org/traccar/protocol/EskyProtocolDecoderTest.java
@@ -0,0 +1,18 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+public class EskyProtocolDecoderTest extends ProtocolTest {
+
+    @Test
+    public void testDecode() throws Exception {
+
+        EskyProtocolDecoder decoder = new EskyProtocolDecoder(new EskyProtocol());
+
+        verifyPosition(decoder, text(
+                "EO;0;864906029196626;R;0+170808155352+0.00000+0.00000+0.00+0+0x1+0+0+0+1233"));
+
+    }
+
+}
-- 
cgit v1.2.3


From d5ad3af86c6faa5d45b8724219bf06cdd58e3eed Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Wed, 23 Aug 2017 01:07:21 +1200
Subject: Update clear positions SQL query

---
 setup/default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'setup')

diff --git a/setup/default.xml b/setup/default.xml
index 0047949eb..fea747c01 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -55,7 +55,7 @@
     </entry>
 
     <entry key='database.deletePositions'>
-        DELETE FROM positions WHERE serverTime &lt; :serverTime AND id NOT IN (SELECT positionId FROM devices)
+        DELETE FROM positions WHERE serverTime &lt; :serverTime AND id NOT IN (SELECT positionId FROM devices WHERE positionId IS NOT NULL)
     </entry>
 
     <entry key='database.deleteEvents'>
-- 
cgit v1.2.3


From 5e0f914657067256827ebb6ec0c478e8b809d4d7 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 2 Sep 2017 09:40:51 +1200
Subject: Update version number

---
 pom.xml           | 2 +-
 setup/traccar.iss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'setup')

diff --git a/pom.xml b/pom.xml
index 0a8de00b2..26a26f14b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.traccar</groupId>
     <artifactId>traccar</artifactId>
-    <version>3.12-SNAPSHOT</version>
+    <version>3.14-SNAPSHOT</version>
 
     <name>traccar</name>
     <url>https://www.traccar.org</url>
diff --git a/setup/traccar.iss b/setup/traccar.iss
index 370b0bf35..3d6c1a872 100644
--- a/setup/traccar.iss
+++ b/setup/traccar.iss
@@ -1,6 +1,6 @@
 [Setup]
 AppName=Traccar
-AppVersion=3.12
+AppVersion=3.14
 DefaultDirName={pf}\Traccar
 AlwaysRestart=yes
 OutputBaseFilename=traccar-setup
-- 
cgit v1.2.3


From 99fd421c76c8e7491095a91630516f6d2db27034 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Mon, 4 Sep 2017 07:24:06 +1200
Subject: Implement GenX protocol

---
 setup/default.xml                                  |  1 +
 src/org/traccar/protocol/GenxProtocol.java         | 45 +++++++++++++
 src/org/traccar/protocol/GenxProtocolDecoder.java  | 75 ++++++++++++++++++++++
 .../traccar/protocol/GenxProtocolDecoderTest.java  | 21 ++++++
 4 files changed, 142 insertions(+)
 create mode 100644 src/org/traccar/protocol/GenxProtocol.java
 create mode 100644 src/org/traccar/protocol/GenxProtocolDecoder.java
 create mode 100644 test/org/traccar/protocol/GenxProtocolDecoderTest.java

(limited to 'setup')

diff --git a/setup/default.xml b/setup/default.xml
index fea747c01..d96ceeb6d 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -237,5 +237,6 @@
     <entry key='vtfms.port'>5145</entry>
     <entry key='tlv.port'>5146</entry>
     <entry key='esky.port'>5147</entry>
+    <entry key='genx.port'>5148</entry>
 
 </properties>
diff --git a/src/org/traccar/protocol/GenxProtocol.java b/src/org/traccar/protocol/GenxProtocol.java
new file mode 100644
index 000000000..deb89e4ae
--- /dev/null
+++ b/src/org/traccar/protocol/GenxProtocol.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.protocol;
+
+import org.jboss.netty.bootstrap.ServerBootstrap;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.handler.codec.string.StringDecoder;
+import org.traccar.BaseProtocol;
+import org.traccar.CharacterDelimiterFrameDecoder;
+import org.traccar.TrackerServer;
+
+import java.util.List;
+
+public class GenxProtocol extends BaseProtocol {
+
+    public GenxProtocol() {
+        super("genx");
+    }
+
+    @Override
+    public void initTrackerServers(List<TrackerServer> serverList) {
+        serverList.add(new TrackerServer(new ServerBootstrap(), getName()) {
+            @Override
+            protected void addSpecificHandlers(ChannelPipeline pipeline) {
+                pipeline.addLast("frameDecoder", new CharacterDelimiterFrameDecoder(1024, '\r'));
+                pipeline.addLast("stringDecoder", new StringDecoder());
+                pipeline.addLast("objectDecoder", new GenxProtocolDecoder(GenxProtocol.this));
+            }
+        });
+    }
+
+}
diff --git a/src/org/traccar/protocol/GenxProtocolDecoder.java b/src/org/traccar/protocol/GenxProtocolDecoder.java
new file mode 100644
index 000000000..6d16db9ad
--- /dev/null
+++ b/src/org/traccar/protocol/GenxProtocolDecoder.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.protocol;
+
+import org.jboss.netty.channel.Channel;
+import org.traccar.BaseProtocolDecoder;
+import org.traccar.Context;
+import org.traccar.DeviceSession;
+import org.traccar.model.Position;
+
+import java.net.SocketAddress;
+import java.text.SimpleDateFormat;
+
+public class GenxProtocolDecoder extends BaseProtocolDecoder {
+
+    private int[] reportColumns;
+
+    public GenxProtocolDecoder(GenxProtocol protocol) {
+        super(protocol);
+        String[] columns = Context.getConfig().getString(getProtocolName() + ".reportColumns", "1,2,3,4").split(",");
+        reportColumns = new int[columns.length];
+        for (int i = 0; i < columns.length; i++) {
+            reportColumns[i] = Integer.parseInt(columns[i]);
+        }
+    }
+
+    @Override
+    protected Object decode(
+            Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+
+        String[] values = ((String) msg).split(",");
+
+        Position position = new Position();
+        position.setProtocol(getProtocolName());
+        position.setValid(true);
+
+        for (int i = 0; i < Math.min(values.length, reportColumns.length); i++) {
+            switch (reportColumns[i]) {
+                case 1:
+                    DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, values[i]);
+                    if (deviceSession != null) {
+                        position.setDeviceId(deviceSession.getDeviceId());
+                    }
+                    break;
+                case 2:
+                    position.setTime(new SimpleDateFormat("MM/dd/yy HH:mm:ss").parse(values[i]));
+                    break;
+                case 3:
+                    position.setLatitude(Double.parseDouble(values[i]));
+                    break;
+                case 4:
+                    position.setLongitude(Double.parseDouble(values[i]));
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        return position;
+    }
+
+}
diff --git a/test/org/traccar/protocol/GenxProtocolDecoderTest.java b/test/org/traccar/protocol/GenxProtocolDecoderTest.java
new file mode 100644
index 000000000..5e99b8fb8
--- /dev/null
+++ b/test/org/traccar/protocol/GenxProtocolDecoderTest.java
@@ -0,0 +1,21 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+public class GenxProtocolDecoderTest extends ProtocolTest {
+
+    @Test
+    public void testDecode() throws Exception {
+
+        GenxProtocolDecoder decoder = new GenxProtocolDecoder(new GenxProtocol());
+
+        verifyPosition(decoder, text(
+                "000036004130,08/31/2017 17:24:13,45.47275,-73.65491,5,19,117,1.14,147,ON,1462,0,6,N,0,0.000,-95.0,-1.0,0,0.0000,0.0000,0.000,0,0.00,0.00,0.00,NA,U,UUU,0,-95.0,U"));
+
+        verifyPosition(decoder, text(
+                "000036004130,08/31/2017 17:24:37,45.47257,-73.65506,3,0,117,1.14,124,ON,1489,0,5,N,0,0.000,-95.0,-1.0,0,0.0000,0.0000,0.000,0,0.00,0.00,0.00,NA,U,UUU,0,-95.0,U"));
+
+    }
+
+}
-- 
cgit v1.2.3


From ba892a34c4a78ddc4ec7b24cc72b62278f608322 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Tue, 5 Sep 2017 18:14:36 +0500
Subject: Remove Attribute Aliases support

---
 schema/changelog-3.15.xml                          |  17 ++++
 schema/changelog-master.xml                        |   1 +
 setup/default.xml                                  |  21 ----
 src/org/traccar/Context.java                       |   9 --
 src/org/traccar/api/BaseObjectResource.java        |   4 -
 .../api/resource/AttributeAliasResource.java       |  93 -----------------
 src/org/traccar/database/AliasesManager.java       | 113 ---------------------
 src/org/traccar/database/DataManager.java          |  24 -----
 src/org/traccar/model/AttributeAlias.java          |  51 ----------
 swagger.json                                       | 109 +++++---------------
 10 files changed, 44 insertions(+), 398 deletions(-)
 create mode 100644 schema/changelog-3.15.xml
 delete mode 100644 src/org/traccar/api/resource/AttributeAliasResource.java
 delete mode 100644 src/org/traccar/database/AliasesManager.java
 delete mode 100644 src/org/traccar/model/AttributeAlias.java

(limited to 'setup')

diff --git a/schema/changelog-3.15.xml b/schema/changelog-3.15.xml
new file mode 100644
index 000000000..a2d944abb
--- /dev/null
+++ b/schema/changelog-3.15.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+  xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                      http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"
+  logicalFilePath="changelog-3.15">
+
+  <changeSet author="author" id="changelog-3.15">
+      
+    <dropForeignKeyConstraint baseTableName="attribute_aliases" constraintName="fk_attribute_aliases_deviceid" />
+    <dropUniqueConstraint tableName="attribute_aliases" constraintName="uk_deviceid_attribute" />
+
+    <dropTable tableName="attribute_aliases" />
+
+  </changeSet>
+</databaseChangeLog>
diff --git a/schema/changelog-master.xml b/schema/changelog-master.xml
index d1b51b40e..58b2a8307 100644
--- a/schema/changelog-master.xml
+++ b/schema/changelog-master.xml
@@ -15,4 +15,5 @@
   <include file="changelog-3.11.xml" relativeToChangelogFile="true" />
   <include file="changelog-3.12.xml" relativeToChangelogFile="true" />
   <include file="changelog-3.14.xml" relativeToChangelogFile="true" />
+  <include file="changelog-3.15.xml" relativeToChangelogFile="true" />
 </databaseChangeLog>
diff --git a/setup/default.xml b/setup/default.xml
index d96ceeb6d..95b69e216 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -62,27 +62,6 @@
         DELETE FROM events WHERE serverTime &lt; :serverTime
     </entry>
 
-    <entry key='database.selectAttributeAliases'>
-        SELECT * FROM attribute_aliases
-    </entry>
-
-    <entry key='database.insertAttributeAlias'>
-        INSERT INTO attribute_aliases (deviceId, attribute, alias)
-        VALUES (:deviceId, :attribute, :alias)
-    </entry>
-
-    <entry key='database.updateAttributeAlias'>
-        UPDATE attribute_aliases SET
-        deviceId = :deviceId,
-        attribute = :attribute,
-        alias = :alias
-        WHERE id = :id
-    </entry>
-
-    <entry key='database.deleteAttributeAlias'>
-        DELETE FROM attribute_aliases WHERE id = :id
-    </entry>
-
     <entry key='database.selectStatistics'>
         SELECT * FROM statistics WHERE captureTime BETWEEN :from AND :to ORDER BY captureTime
     </entry>
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index 10fdd9f29..87d8257ee 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -25,7 +25,6 @@ import java.util.Properties;
 
 import org.apache.velocity.app.VelocityEngine;
 import org.eclipse.jetty.util.URIUtil;
-import org.traccar.database.AliasesManager;
 import org.traccar.database.CalendarManager;
 import org.traccar.database.AttributesManager;
 import org.traccar.database.BaseObjectManager;
@@ -202,12 +201,6 @@ public final class Context {
         return eventForwarder;
     }
 
-    private static AliasesManager aliasesManager;
-
-    public static AliasesManager getAliasesManager() {
-        return aliasesManager;
-    }
-
     private static AttributesManager attributesManager;
 
     public static AttributesManager getAttributesManager() {
@@ -395,8 +388,6 @@ public final class Context {
             eventForwarder = new EventForwarder();
         }
 
-        aliasesManager = new AliasesManager(dataManager);
-
         attributesManager = new AttributesManager(dataManager);
 
         driversManager = new DriversManager(dataManager);
diff --git a/src/org/traccar/api/BaseObjectResource.java b/src/org/traccar/api/BaseObjectResource.java
index a1b90bc28..b13dc2e71 100644
--- a/src/org/traccar/api/BaseObjectResource.java
+++ b/src/org/traccar/api/BaseObjectResource.java
@@ -138,10 +138,6 @@ public abstract class BaseObjectResource<T extends BaseModel> extends BaseResour
                 Context.getPermissionsManager().refreshAllExtendedPermissions();
             }
         }
-        // Next should be removed with Attribute Aliases
-        if (baseClass.equals(Device.class)) {
-            Context.getAliasesManager().removeDevice(id);
-        }
         return Response.noContent().build();
     }
 
diff --git a/src/org/traccar/api/resource/AttributeAliasResource.java b/src/org/traccar/api/resource/AttributeAliasResource.java
deleted file mode 100644
index b2636acf1..000000000
--- a/src/org/traccar/api/resource/AttributeAliasResource.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.api.resource;
-
-import java.sql.SQLException;
-import java.util.Collection;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.traccar.Context;
-import org.traccar.api.BaseResource;
-import org.traccar.model.AttributeAlias;
-
-@Path("attributes/aliases")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
-public class AttributeAliasResource extends BaseResource {
-
-    @GET
-    public Collection<AttributeAlias> get(@QueryParam("deviceId") long deviceId) throws SQLException {
-        if (deviceId != 0) {
-            if (!Context.getPermissionsManager().isAdmin(getUserId())) {
-                Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
-            }
-            return Context.getAliasesManager().getAttributeAliases(deviceId);
-        } else {
-            return Context.getAliasesManager().getAllAttributeAliases(getUserId());
-        }
-    }
-
-    @POST
-    public Response add(AttributeAlias entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkDeviceReadonly(getUserId());
-        if (!Context.getPermissionsManager().isAdmin(getUserId())) {
-            Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId());
-        }
-        Context.getAliasesManager().addAttributeAlias(entity);
-        return Response.ok(entity).build();
-    }
-
-    @Path("{id}")
-    @PUT
-    public Response update(AttributeAlias entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkDeviceReadonly(getUserId());
-        if (!Context.getPermissionsManager().isAdmin(getUserId())) {
-            AttributeAlias oldEntity = Context.getAliasesManager().getAttributeAlias(entity.getId());
-            Context.getPermissionsManager().checkDevice(getUserId(), oldEntity.getDeviceId());
-            Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId());
-        }
-        Context.getAliasesManager().updateAttributeAlias(entity);
-        return Response.ok(entity).build();
-    }
-
-    @Path("{id}")
-    @DELETE
-    public Response remove(@PathParam("id") long id) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkDeviceReadonly(getUserId());
-        if (!Context.getPermissionsManager().isAdmin(getUserId())) {
-            AttributeAlias entity = Context.getAliasesManager().getAttributeAlias(id);
-            Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId());
-        }
-        Context.getAliasesManager().removeArrtibuteAlias(id);
-        return Response.noContent().build();
-    }
-
-}
diff --git a/src/org/traccar/database/AliasesManager.java b/src/org/traccar/database/AliasesManager.java
deleted file mode 100644
index 4f4f09731..000000000
--- a/src/org/traccar/database/AliasesManager.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.database;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.traccar.Context;
-import org.traccar.helper.Log;
-import org.traccar.model.AttributeAlias;
-
-public class AliasesManager {
-
-    private final DataManager dataManager;
-
-    private final Map<Long, Set<AttributeAlias>> deviceAliases = new ConcurrentHashMap<>();
-    private final Map<Long, AttributeAlias> aliasesById = new ConcurrentHashMap<>();
-
-    public AliasesManager(DataManager dataManager) {
-        this.dataManager = dataManager;
-        if (dataManager != null) {
-            try {
-                for (AttributeAlias attributeAlias : dataManager.getAttributeAliases()) {
-                    getAttributeAliases(attributeAlias.getDeviceId())
-                            .add(attributeAlias);
-                    aliasesById.put(attributeAlias.getId(), attributeAlias);
-                }
-            } catch (SQLException error) {
-                Log.warning(error);
-            }
-        }
-    }
-
-    public Set<AttributeAlias> getAttributeAliases(long deviceId) {
-        if (!deviceAliases.containsKey(deviceId)) {
-            deviceAliases.put(deviceId, new HashSet<AttributeAlias>());
-        }
-        return deviceAliases.get(deviceId);
-    }
-
-    public void removeDevice(long deviceId) {
-        for (AttributeAlias attributeAlias : getAttributeAliases(deviceId)) {
-            aliasesById.remove(attributeAlias.getId());
-        }
-        deviceAliases.remove(deviceId);
-    }
-
-    public void addAttributeAlias(AttributeAlias attributeAlias) throws SQLException {
-        dataManager.addAttributeAlias(attributeAlias);
-        aliasesById.put(attributeAlias.getId(), attributeAlias);
-        getAttributeAliases(attributeAlias.getDeviceId()).add(attributeAlias);
-    }
-
-    public void updateAttributeAlias(AttributeAlias attributeAlias) throws SQLException {
-        dataManager.updateAttributeAlias(attributeAlias);
-        AttributeAlias cachedAlias = aliasesById.get(attributeAlias.getId());
-        if (cachedAlias.getDeviceId() != attributeAlias.getDeviceId()) {
-            getAttributeAliases(cachedAlias.getDeviceId()).remove(cachedAlias);
-            cachedAlias.setDeviceId(attributeAlias.getDeviceId());
-            getAttributeAliases(cachedAlias.getDeviceId()).add(cachedAlias);
-        }
-        cachedAlias.setAttribute(attributeAlias.getAttribute());
-        cachedAlias.setAlias(attributeAlias.getAlias());
-    }
-
-    public void removeArrtibuteAlias(long attributeAliasId) throws SQLException {
-        dataManager.removeAttributeAlias(attributeAliasId);
-        AttributeAlias cachedAlias = aliasesById.get(attributeAliasId);
-        getAttributeAliases(cachedAlias.getDeviceId()).remove(cachedAlias);
-        aliasesById.remove(attributeAliasId);
-    }
-
-    public AttributeAlias getAttributeAlias(long deviceId, String attribute) {
-        for (AttributeAlias alias : getAttributeAliases(deviceId)) {
-            if (alias.getAttribute().equals(attribute)) {
-                return alias;
-            }
-        }
-        return null;
-    }
-
-    public Collection<AttributeAlias> getAllAttributeAliases(long userId) {
-        Collection<AttributeAlias> userDevicesAliases = new ArrayList<>();
-        for (long deviceId : Context.getPermissionsManager().getDevicePermissions(userId)) {
-            userDevicesAliases.addAll(getAttributeAliases(deviceId));
-        }
-        return userDevicesAliases;
-    }
-
-    public AttributeAlias getAttributeAlias(long id) {
-        return aliasesById.get(id);
-    }
-
-}
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index 2e3e68bc9..4535a9c38 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -42,7 +42,6 @@ import liquibase.resource.ResourceAccessor;
 import org.traccar.Config;
 import org.traccar.helper.Log;
 import org.traccar.model.Attribute;
-import org.traccar.model.AttributeAlias;
 import org.traccar.model.Device;
 import org.traccar.model.Driver;
 import org.traccar.model.Event;
@@ -366,29 +365,6 @@ public class DataManager {
                 .executeQuery(Event.class);
     }
 
-    public Collection<AttributeAlias> getAttributeAliases() throws SQLException {
-        return QueryBuilder.create(dataSource, getQuery("database.selectAttributeAliases"))
-                .executeQuery(AttributeAlias.class);
-    }
-
-    public void addAttributeAlias(AttributeAlias attributeAlias) throws SQLException {
-        attributeAlias.setId(QueryBuilder.create(dataSource, getQuery("database.insertAttributeAlias"), true)
-                .setObject(attributeAlias)
-                .executeUpdate());
-    }
-
-    public void updateAttributeAlias(AttributeAlias attributeAlias) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.updateAttributeAlias"))
-                .setObject(attributeAlias)
-                .executeUpdate();
-    }
-
-    public void removeAttributeAlias(long attributeAliasId) throws SQLException {
-        QueryBuilder.create(dataSource, getQuery("database.deleteAttributeAlias"))
-                .setLong("id", attributeAliasId)
-                .executeUpdate();
-    }
-
     public Collection<Statistics> getStatistics(Date from, Date to) throws SQLException {
         return QueryBuilder.create(dataSource, getQuery("database.selectStatistics"))
                 .setDate("from", from)
diff --git a/src/org/traccar/model/AttributeAlias.java b/src/org/traccar/model/AttributeAlias.java
deleted file mode 100644
index 1599ab939..000000000
--- a/src/org/traccar/model/AttributeAlias.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.model;
-
-public class AttributeAlias extends BaseModel {
-
-    private long deviceId;
-
-    public long getDeviceId() {
-        return deviceId;
-    }
-
-    public void setDeviceId(long deviceId) {
-        this.deviceId = deviceId;
-    }
-
-    private String attribute;
-
-    public String getAttribute() {
-        return attribute;
-    }
-
-    public void setAttribute(String attribute) {
-        this.attribute = attribute;
-    }
-
-    private String alias;
-
-    public String getAlias() {
-        return alias;
-    }
-
-    public void setAlias(String alias) {
-        this.alias = alias;
-    }
-
-}
diff --git a/swagger.json b/swagger.json
index ffe56c9da..eba9e0910 100644
--- a/swagger.json
+++ b/swagger.json
@@ -1,7 +1,7 @@
 {
     "swagger": "2.0",
     "info": {
-        "version": "3.13",
+        "version": "3.14",
         "title": "traccar"
     },
     "host": "demo.traccar.org",
@@ -861,10 +861,25 @@
                 }
             }
         },
-        "/statistics": {
+        "/reports/stops": {
             "get": {
-                "summary": "Fetch server Statistics",
+                "summary": "Fetch a list of ReportStops within the time period for the Devices or Groups",
+                "description": "At least one _deviceId_ or one _groupId_ must be passed",
+                "consumes": [
+                    "application/json",
+                    "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+                ],
+                "produces": [
+                    "application/json",
+                    "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+                ],
                 "parameters": [
+                    {
+                        "$ref": "#/parameters/deviceIdArray"
+                    },
+                    {
+                        "$ref": "#/parameters/groupIdArray"
+                    },
                     {
                         "$ref": "#/parameters/fromTime"
                     },
@@ -878,20 +893,22 @@
                         "schema": {
                             "type": "array",
                             "items": {
-                                "$ref": "#/definitions/Statistics"
+                                "$ref": "#/definitions/ReportStops"
                             }
                         }
                     }
                 }
             }
         },
-        "/attributes/aliases": {
+        "/statistics": {
             "get": {
-                "summary": "Fetch a list of AttributeAlias",
-                "description": "Without params, it returns a list of AttributeAlias from all the user's Devices",
+                "summary": "Fetch server Statistics",
                 "parameters": [
                     {
-                        "$ref": "#/parameters/deviceId"
+                        "$ref": "#/parameters/fromTime"
+                    },
+                    {
+                        "$ref": "#/parameters/toTime"
                     }
                 ],
                 "responses": {
@@ -900,61 +917,11 @@
                         "schema": {
                             "type": "array",
                             "items": {
-                                "$ref": "#/definitions/AttributeAlias"
+                                "$ref": "#/definitions/Statistics"
                             }
                         }
                     }
                 }
-            },
-            "post": {
-                "summary": "Set an AttributeAlias",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/AttributeAlias"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/AttributeAlias"
-                        }
-                    }
-                }
-            }
-        },
-        "/attributes/aliases/{id}": {
-            "put": {
-                "summary": "Update an AttributeAlias",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/entityId"
-                    },
-                    {
-                        "$ref": "#/parameters/AttributeAlias"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/AttributeAlias"
-                        }
-                    }
-                }
-            },
-            "delete": {
-                "summary": "Delete an AttributeAlias",
-                "parameters": [
-                    {
-                        "$ref": "#/parameters/entityId"
-                    }
-                ],
-                "responses": {
-                    "204": {
-                        "description": "No Content"
-                    }
-                }
             }
         },
         "/calendars": {
@@ -1714,22 +1681,6 @@
                 }
             }
         },
-        "AttributeAlias": {
-            "properties": {
-                "id": {
-                    "type": "integer"
-                },
-                "deviceId": {
-                    "type": "integer"
-                },
-                "attribute": {
-                    "type": "string"
-                },
-                "alias": {
-                    "type": "string"
-                }
-            }
-        },
         "DeviceTotalDistance": {
             "properties": {
                 "deviceId": {
@@ -1868,14 +1819,6 @@
                 "$ref": "#/definitions/Geofence"
             }
         },
-        "AttributeAlias": {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-                "$ref": "#/definitions/AttributeAlias"
-            }
-        },
         "Calendar": {
             "name": "body",
             "in": "body",
-- 
cgit v1.2.3


From b834e078836921fd19319f32f332d59588d5dc55 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Tue, 19 Sep 2017 21:15:40 +1200
Subject: Minor config file adjustment

---
 debug.xml         | 2 +-
 setup/traccar.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'setup')

diff --git a/debug.xml b/debug.xml
index 05eac10da..282350b8a 100644
--- a/debug.xml
+++ b/debug.xml
@@ -4,7 +4,7 @@
 
 <properties>
 
-    <entry key="config.default">./setup/default.xml</entry>
+    <entry key='config.default'>./setup/default.xml</entry>
 
     <entry key='web.path'>./traccar-web/web</entry>
     <entry key='web.debug'>true</entry>
diff --git a/setup/traccar.xml b/setup/traccar.xml
index 61e23a066..aab9ba311 100644
--- a/setup/traccar.xml
+++ b/setup/traccar.xml
@@ -4,6 +4,8 @@
 
 <properties>
 
+    <entry key='config.default'>./conf/default.xml</entry>
+
     <!--
 
     This is the main configuration file. All your configuration parameters should be placed in this file.
@@ -16,8 +18,6 @@
 
     -->
 
-    <entry key="config.default">./conf/default.xml</entry>
-
     <entry key='database.driver'>org.h2.Driver</entry>
     <entry key='database.url'>jdbc:h2:./data/database</entry>
     <entry key='database.user'>sa</entry>
-- 
cgit v1.2.3


From 0edc2866092a9b44f7a520eece94bd120a94cab7 Mon Sep 17 00:00:00 2001
From: Sun Howwrongbum <sun.animus@gmail.com>
Date: Thu, 5 Oct 2017 20:46:11 +0530
Subject: Fix version assignment in docker build script

Docker builds were being versioned with literal '_version'
---
 setup/docker/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'setup')

diff --git a/setup/docker/build.sh b/setup/docker/build.sh
index 0b292fc5f..b4cb75a4a 100755
--- a/setup/docker/build.sh
+++ b/setup/docker/build.sh
@@ -8,7 +8,7 @@ mvn package || { echo >&2 "Maven package has failed. Aborting."; exit 1; }
 export company=${1:-"tananaev"}
 export software=${2:-"traccar"}
 export _version=$(head -n 10 ./pom.xml |grep version|cut -d ">" -f2|cut -d"<" -f1)
-export version=${3:-_version}
+export version=${3:-$_version}
 
 tmp="./setup/docker/tmp"
 
-- 
cgit v1.2.3