1 files changed, 43 insertions, 63 deletions

diff --git a/src/main/java/org/traccar/notification/NotificatorManager.java b/src/main/java/org/traccar/notification/NotificatorManager.java
index dfd8cd3d6..8d41ee354 100644
--- a/src/main/java/org/traccar/notification/NotificatorManager.java
+++ b/src/main/java/org/traccar/notification/NotificatorManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2020 Anton Tananaev (anton@traccar.org)
+ * Copyright 2018 - 2023 Anton Tananaev (anton@traccar.org)
  * Copyright 2018 Andrey Kunitsyn (andrey@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,87 +16,67 @@
  */
 package org.traccar.notification;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.traccar.Context;
+import com.google.inject.Injector;
+import org.traccar.config.Config;
+import org.traccar.config.Keys;
 import org.traccar.model.Typed;
+import org.traccar.notificators.Notificator;
+import org.traccar.notificators.NotificatorCommand;
 import org.traccar.notificators.NotificatorFirebase;
 import org.traccar.notificators.NotificatorMail;
-import org.traccar.notificators.NotificatorNull;
-import org.traccar.notificators.Notificator;
+import org.traccar.notificators.NotificatorPushover;
 import org.traccar.notificators.NotificatorSms;
+import org.traccar.notificators.NotificatorTelegram;
 import org.traccar.notificators.NotificatorTraccar;
 import org.traccar.notificators.NotificatorWeb;
-import org.traccar.notificators.NotificatorTelegram;
-import org.traccar.notificators.NotificatorPushover;
 
-public final class NotificatorManager {
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(NotificatorManager.class);
+@Singleton
+public class NotificatorManager {
 
-    private static final Notificator NULL_NOTIFICATOR = new NotificatorNull();
+    private static final Map<String, Class<? extends Notificator>> NOTIFICATORS_ALL = Map.of(
+            "command", NotificatorCommand.class,
+            "web", NotificatorWeb.class,
+            "mail", NotificatorMail.class,
+            "sms", NotificatorSms.class,
+            "firebase", NotificatorFirebase.class,
+            "traccar", NotificatorTraccar.class,
+            "telegram", NotificatorTelegram.class,
+            "pushover", NotificatorPushover.class);
 
-    private final Map<String, Notificator> notificators = new HashMap<>();
+    private final Injector injector;
 
-    public NotificatorManager() {
-        final String[] types = Context.getConfig().getString("notificator.types", "").split(",");
-        for (String type : types) {
-            String defaultNotificator = "";
-            switch (type) {
-                case "web":
-                    defaultNotificator = NotificatorWeb.class.getCanonicalName();
-                    break;
-                case "mail":
-                    defaultNotificator = NotificatorMail.class.getCanonicalName();
-                    break;
-                case "sms":
-                    defaultNotificator = NotificatorSms.class.getCanonicalName();
-                    break;
-                case "firebase":
-                    defaultNotificator = NotificatorFirebase.class.getCanonicalName();
-                    break;
-                case "traccar":
-                    defaultNotificator = NotificatorTraccar.class.getCanonicalName();
-                    break;
-                case "telegram":
-                    defaultNotificator = NotificatorTelegram.class.getCanonicalName();
-                    break;
-                case "pushover":
-                    defaultNotificator = NotificatorPushover.class.getCanonicalName();
-                    break;
-                default:
-                    break;
-            }
-            final String className = Context.getConfig()
-                    .getString("notificator." + type + ".class", defaultNotificator);
-            try {
-                notificators.put(type, (Notificator) Class.forName(className).newInstance());
-            } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
-                LOGGER.warn("Unable to load notificator class for " + type + " " + className + " " + e.getMessage());
-            }
+    private final Set<String> types = new HashSet<>();
+
+    @Inject
+    public NotificatorManager(Injector injector, Config config) {
+        this.injector = injector;
+        String types = config.getString(Keys.NOTIFICATOR_TYPES);
+        if (types != null) {
+            this.types.addAll(Arrays.asList(types.split(",")));
         }
     }
 
     public Notificator getNotificator(String type) {
-        final Notificator notificator = notificators.get(type);
-        if (notificator == null) {
-            LOGGER.warn("No notificator configured for type : " + type);
-            return NULL_NOTIFICATOR;
+        var clazz = NOTIFICATORS_ALL.get(type);
+        if (clazz != null && types.contains(type)) {
+            var notificator = injector.getInstance(clazz);
+            if (notificator != null) {
+                return notificator;
+            }
         }
-        return notificator;
+        throw new RuntimeException("Failed to get notificator " + type);
     }
 
     public Set<Typed> getAllNotificatorTypes() {
-        Set<Typed> result = new HashSet<>();
-        for (String notificator : notificators.keySet()) {
-            result.add(new Typed(notificator));
-        }
-        return result;
+        return types.stream().map(Typed::new).collect(Collectors.toUnmodifiableSet());
     }
 
 }