From 77b3f9f4b05dfc44809b578eaae55645f496b65c Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Sat, 24 Feb 2024 16:58:07 -0800
Subject: Refactor notificator classes

---
 .../java/org/traccar/notificators/NotificatorTraccar.java    | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/main/java/org/traccar/notificators/NotificatorTraccar.java')

diff --git a/src/main/java/org/traccar/notificators/NotificatorTraccar.java b/src/main/java/org/traccar/notificators/NotificatorTraccar.java
index c00e3e029..983c4cda6 100644
--- a/src/main/java/org/traccar/notificators/NotificatorTraccar.java
+++ b/src/main/java/org/traccar/notificators/NotificatorTraccar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 - 2023 Anton Tananaev (anton@traccar.org)
+ * Copyright 2020 - 2024 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.
@@ -25,6 +25,7 @@ import org.traccar.model.Event;
 import org.traccar.model.Position;
 import org.traccar.model.User;
 import org.traccar.notification.NotificationFormatter;
+import org.traccar.notification.NotificationMessage;
 import org.traccar.session.cache.CacheManager;
 import org.traccar.storage.Storage;
 import org.traccar.storage.query.Columns;
@@ -43,11 +44,10 @@ import java.util.LinkedList;
 import java.util.List;
 
 @Singleton
-public class NotificatorTraccar implements Notificator {
+public class NotificatorTraccar extends Notificator {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(NotificatorTraccar.class);
 
-    private final NotificationFormatter notificationFormatter;
     private final Client client;
     private final Storage storage;
     private final CacheManager cacheManager;
@@ -75,7 +75,7 @@ public class NotificatorTraccar implements Notificator {
     public NotificatorTraccar(
             Config config, NotificationFormatter notificationFormatter, Client client,
             Storage storage, CacheManager cacheManager) {
-        this.notificationFormatter = notificationFormatter;
+        super(notificationFormatter, "short");
         this.client = client;
         this.storage = storage;
         this.cacheManager = cacheManager;
@@ -84,11 +84,9 @@ public class NotificatorTraccar implements Notificator {
     }
 
     @Override
-    public void send(org.traccar.model.Notification notification, User user, Event event, Position position) {
+    public void send(User user, NotificationMessage shortMessage, Event event, Position position) {
         if (user.hasAttribute("notificationTokens")) {
 
-            var shortMessage = notificationFormatter.formatMessage(notification, user, event, position, "short");
-
             NotificationObject item = new NotificationObject();
             item.title = shortMessage.getSubject();
             item.body = shortMessage.getBody();
-- 
cgit v1.2.3