- Implement base manager classes as generics

- Remame getDeviceById and getDeviceByUniqueId functions

2 files changed, 2 insertions, 2 deletions

diff --git a/src/org/traccar/notification/EventForwarder.java b/src/org/traccar/notification/EventForwarder.java
index 08f55df75..ac37f980c 100644
--- a/src/org/traccar/notification/EventForwarder.java
+++ b/src/org/traccar/notification/EventForwarder.java
@@ -69,7 +69,7 @@ public final class EventForwarder {
             data.put(KEY_POSITION, position);
         }
         if (event.getDeviceId() != 0) {
-            Device device = Context.getIdentityManager().getDeviceById(event.getDeviceId());
+            Device device = Context.getIdentityManager().getById(event.getDeviceId());
             if (device != null) {
                 data.put(KEY_DEVICE, device);
             }
diff --git a/src/org/traccar/notification/NotificationFormatter.java b/src/org/traccar/notification/NotificationFormatter.java
index cd9959671..33fd2cdc7 100644
--- a/src/org/traccar/notification/NotificationFormatter.java
+++ b/src/org/traccar/notification/NotificationFormatter.java
@@ -40,7 +40,7 @@ public final class NotificationFormatter {
 
     public static VelocityContext prepareContext(long userId, Event event, Position position) {
         User user = Context.getPermissionsManager().getUser(userId);
-        Device device = Context.getIdentityManager().getDeviceById(event.getDeviceId());
+        Device device = Context.getIdentityManager().getById(event.getDeviceId());
 
         VelocityContext velocityContext = new VelocityContext();
         velocityContext.put("user", user);