Use singletons where possible

6 files changed, 13 insertions, 5 deletions

diff --git a/src/main/java/org/traccar/notificators/NotificatorMail.java b/src/main/java/org/traccar/notificators/NotificatorMail.java
index 75571cfc4..19fde6756 100644
--- a/src/main/java/org/traccar/notificators/NotificatorMail.java
+++ b/src/main/java/org/traccar/notificators/NotificatorMail.java
@@ -24,8 +24,10 @@ import org.traccar.notification.MessageException;
 import org.traccar.notification.NotificationFormatter;
 
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.mail.MessagingException;
 
+@Singleton
 public class NotificatorMail implements Notificator {
 
     private final MailManager mailManager;
diff --git a/src/main/java/org/traccar/notificators/NotificatorPushover.java b/src/main/java/org/traccar/notificators/NotificatorPushover.java
index 105cb27f0..e00db0579 100644
--- a/src/main/java/org/traccar/notificators/NotificatorPushover.java
+++ b/src/main/java/org/traccar/notificators/NotificatorPushover.java
@@ -24,9 +24,11 @@ import org.traccar.model.User;
 import org.traccar.notification.NotificationFormatter;
 
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.Entity;
 
+@Singleton
 public class NotificatorPushover implements Notificator {
 
     private final NotificationFormatter notificationFormatter;
diff --git a/src/main/java/org/traccar/notificators/NotificatorSms.java b/src/main/java/org/traccar/notificators/NotificatorSms.java
index 544b67a5e..e37d10888 100644
--- a/src/main/java/org/traccar/notificators/NotificatorSms.java
+++ b/src/main/java/org/traccar/notificators/NotificatorSms.java
@@ -25,7 +25,9 @@ import org.traccar.notification.NotificationFormatter;
 import org.traccar.sms.SmsManager;
 
 import javax.inject.Inject;
+import javax.inject.Singleton;
 
+@Singleton
 public class NotificatorSms implements Notificator {
 
     private final SmsManager smsManager;
diff --git a/src/main/java/org/traccar/notificators/NotificatorTelegram.java b/src/main/java/org/traccar/notificators/NotificatorTelegram.java
index a00cd36f1..38e87c222 100644
--- a/src/main/java/org/traccar/notificators/NotificatorTelegram.java
+++ b/src/main/java/org/traccar/notificators/NotificatorTelegram.java
@@ -25,9 +25,11 @@ import org.traccar.model.User;
 import org.traccar.notification.NotificationFormatter;
 
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.Entity;
 
+@Singleton
 public class NotificatorTelegram implements Notificator {
 
     private final NotificationFormatter notificationFormatter;
diff --git a/src/main/java/org/traccar/notificators/NotificatorTraccar.java b/src/main/java/org/traccar/notificators/NotificatorTraccar.java
index 123b16ad8..9ae39f975 100644
--- a/src/main/java/org/traccar/notificators/NotificatorTraccar.java
+++ b/src/main/java/org/traccar/notificators/NotificatorTraccar.java
@@ -24,9 +24,11 @@ import org.traccar.model.User;
 import org.traccar.notification.NotificationFormatter;
 
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.Entity;
 
+@Singleton
 public class NotificatorTraccar implements Notificator {
 
     private final NotificationFormatter notificationFormatter;
diff --git a/src/main/java/org/traccar/notificators/NotificatorWeb.java b/src/main/java/org/traccar/notificators/NotificatorWeb.java
index f495042a5..deabeade1 100644
--- a/src/main/java/org/traccar/notificators/NotificatorWeb.java
+++ b/src/main/java/org/traccar/notificators/NotificatorWeb.java
@@ -16,7 +16,6 @@
  */
 package org.traccar.notificators;
 
-import org.traccar.broadcast.BroadcastService;
 import org.traccar.model.Event;
 import org.traccar.model.Position;
 import org.traccar.model.User;
@@ -24,19 +23,18 @@ import org.traccar.notification.NotificationFormatter;
 import org.traccar.session.ConnectionManager;
 
 import javax.inject.Inject;
+import javax.inject.Singleton;
 
+@Singleton
 public final class NotificatorWeb implements Notificator {
 
     private final ConnectionManager connectionManager;
-    private final BroadcastService broadcastService;
     private final NotificationFormatter notificationFormatter;
 
     @Inject
     public NotificatorWeb(
-            ConnectionManager connectionManager, BroadcastService broadcastService,
-            NotificationFormatter notificationFormatter) {
+            ConnectionManager connectionManager, NotificationFormatter notificationFormatter) {
         this.connectionManager = connectionManager;
-        this.broadcastService = broadcastService;
         this.notificationFormatter = notificationFormatter;
     }