Merge branch 'master' into develop

1 files changed, 4 insertions, 18 deletions

diff --git a/src/main/java/org/traccar/notificators/Notificator.java b/src/main/java/org/traccar/notificators/Notificator.java
index dd888bae9..052365c7a 100644
--- a/src/main/java/org/traccar/notificators/Notificator.java
+++ b/src/main/java/org/traccar/notificators/Notificator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2018 - 2022 Anton Tananaev (anton@traccar.org)
  * Copyright 2018 Andrey Kunitsyn (andrey@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,27 +16,13 @@
  */
 package org.traccar.notificators;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.traccar.model.Event;
 import org.traccar.model.Position;
+import org.traccar.model.User;
 import org.traccar.notification.MessageException;
 
-public abstract class Notificator {
+public interface Notificator {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(Notificator.class);
-
-    public void sendAsync(final long userId, final Event event, final Position position) {
-        new Thread(() -> {
-            try {
-                sendSync(userId, event, position);
-            } catch (MessageException | InterruptedException error) {
-                LOGGER.warn("Event send error", error);
-            }
-        }).start();
-    }
-
-    public abstract void sendSync(long userId, Event event, Position position)
-        throws MessageException, InterruptedException;
+    void send(User user, Event event, Position position) throws MessageException, InterruptedException;
 
 }