Refactor notificator classes

1 files changed, 9 insertions, 12 deletions

diff --git a/src/main/java/org/traccar/notificators/NotificatorMail.java b/src/main/java/org/traccar/notificators/NotificatorMail.java
index 11d4c5bae..e7ca10157 100644
--- a/src/main/java/org/traccar/notificators/NotificatorMail.java
+++ b/src/main/java/org/traccar/notificators/NotificatorMail.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2024 Anton Tananaev (anton@traccar.org)
  * Copyright 2017 - 2018 Andrey Kunitsyn (andrey@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,35 +16,32 @@
  */
 package org.traccar.notificators;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+import jakarta.mail.MessagingException;
 import org.traccar.mail.MailManager;
 import org.traccar.model.Event;
-import org.traccar.model.Notification;
 import org.traccar.model.Position;
 import org.traccar.model.User;
 import org.traccar.notification.MessageException;
 import org.traccar.notification.NotificationFormatter;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import jakarta.mail.MessagingException;
+import org.traccar.notification.NotificationMessage;
 
 @Singleton
-public class NotificatorMail implements Notificator {
+public class NotificatorMail extends Notificator {
 
     private final MailManager mailManager;
-    private final NotificationFormatter notificationFormatter;
 
     @Inject
     public NotificatorMail(MailManager mailManager, NotificationFormatter notificationFormatter) {
+        super(notificationFormatter, "full");
         this.mailManager = mailManager;
-        this.notificationFormatter = notificationFormatter;
     }
 
     @Override
-    public void send(Notification notification, User user, Event event, Position position) throws MessageException {
+    public void send(User user, NotificationMessage message, Event event, Position position) throws MessageException {
         try {
-            var fullMessage = notificationFormatter.formatMessage(notification, user, event, position, "full");
-            mailManager.sendMessage(user, false, fullMessage.getSubject(), fullMessage.getBody());
+            mailManager.sendMessage(user, false, message.getSubject(), message.getBody());
         } catch (MessagingException e) {
             throw new MessageException(e);
         }